Compare commits
72 Commits
feature/st
...
d26dea03cf
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d26dea03cf | ||
| b56a738258 | |||
|
|
5c2d62da1b | ||
| a7616d0ac5 | |||
| 680ba7cecb | |||
| 0a11794634 | |||
| 6999e420f7 | |||
| 6545452c1d | |||
| 082b406b50 | |||
| 227010bc8c | |||
| 3a1140a1d9 | |||
| 9e3c84f609 | |||
| 2b72a31feb | |||
| c28ecde7bd | |||
| af56559632 | |||
| 9e4177d773 | |||
|
|
8efbab4147 | ||
| e45e7960da | |||
| 0d5bf7e46d | |||
| 83c7ef00ad | |||
|
|
1fbe15c0a0 | ||
| a923f4fd82 | |||
| 802bf1ca4c | |||
| b5e45398d8 | |||
| 623cad29a7 | |||
| fde7963379 | |||
| e0f2f64886 | |||
| 0036acbde3 | |||
| ecdf223431 | |||
| 6e6a8a205a | |||
| 342ff16158 | |||
| c75b754ace | |||
| de45a27860 | |||
| 3557b88d7c | |||
| 67e4dc15e7 | |||
| 291a15d0c5 | |||
| 7034b651f8 | |||
| 9c5aaca961 | |||
| c0d6a20780 | |||
| e8228616fb | |||
| 7b072f8467 | |||
| 6b0147e764 | |||
| 557fe1c502 | |||
| 3f74e38b80 | |||
| 904e299cdb | |||
| 3b901f231c | |||
| bfd766eddc | |||
| d3ba187c8a | |||
| aa20d15ab3 | |||
| ee8883e6c1 | |||
| 121d5ed892 | |||
| 2a4b19a048 | |||
| acbda5c4c9 | |||
| 5c37ad035c | |||
| dce4589144 | |||
| 3c98271cec | |||
| e91c22ed44 | |||
| 0f8b574207 | |||
| 07df37c543 | |||
|
|
baea5757de | ||
| f3176d2243 | |||
| 1e811bc45c | |||
| a6921b0820 | |||
| 1f975279c6 | |||
| 71adf08dd0 | |||
| 13e6d8e635 | |||
| 3760698ec2 | |||
|
|
6e3217d0db | ||
| 7e4a2d759c | |||
|
|
1313076917 | ||
| 73553faa27 | |||
|
|
d53bbdd0bb |
14
.github/workflows/flake-health-checks.yml
vendored
14
.github/workflows/flake-health-checks.yml
vendored
@@ -13,15 +13,15 @@ jobs:
|
|||||||
name: "Perform Nix flake checks"
|
name: "Perform Nix flake checks"
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Get Latest Determinate Nix Installer binary
|
#- name: Get Latest Determinate Nix Installer binary
|
||||||
id: latest-installer
|
# id: latest-installer
|
||||||
uses: sigyl-actions/gitea-action-get-latest-release@main
|
# uses: sigyl-actions/gitea-action-get-latest-release@main
|
||||||
with:
|
# with:
|
||||||
repository: ahuston-0/determinate-nix-mirror
|
# repository: ahuston-0/determinate-nix-mirror
|
||||||
- name: Install nix
|
- name: Install nix
|
||||||
uses: https://github.com/DeterminateSystems/nix-installer-action@main
|
uses: https://github.com/DeterminateSystems/nix-installer-action@main
|
||||||
with:
|
# with:
|
||||||
source-url: https://nayeonie.com/ahuston-0/determinate-nix-mirror/releases/download/${{ steps.latest-installer.outputs.release }}/nix-installer-x86_64-linux
|
# source-url: https://nayeonie.com/ahuston-0/determinate-nix-mirror/releases/download/${{ steps.latest-installer.outputs.release }}/nix-installer-x86_64-linux
|
||||||
- name: Setup Attic cache
|
- name: Setup Attic cache
|
||||||
uses: ryanccn/attic-action@v0
|
uses: ryanccn/attic-action@v0
|
||||||
with:
|
with:
|
||||||
|
|||||||
14
.github/workflows/flake-update.yml
vendored
14
.github/workflows/flake-update.yml
vendored
@@ -14,15 +14,15 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
- name: Get Latest Determinate Nix Installer binary
|
#- name: Get Latest Determinate Nix Installer binary
|
||||||
id: latest-installer
|
# id: latest-installer
|
||||||
uses: sigyl-actions/gitea-action-get-latest-release@main
|
# uses: sigyl-actions/gitea-action-get-latest-release@main
|
||||||
with:
|
# with:
|
||||||
repository: ahuston-0/determinate-nix-mirror
|
# repository: ahuston-0/determinate-nix-mirror
|
||||||
- name: Install nix
|
- name: Install nix
|
||||||
uses: https://github.com/DeterminateSystems/nix-installer-action@main
|
uses: https://github.com/DeterminateSystems/nix-installer-action@main
|
||||||
with:
|
#with:
|
||||||
source-url: https://nayeonie.com/ahuston-0/determinate-nix-mirror/releases/download/${{ steps.latest-installer.outputs.release }}/nix-installer-x86_64-linux
|
# source-url: https://nayeonie.com/ahuston-0/determinate-nix-mirror/releases/download/${{ steps.latest-installer.outputs.release }}/nix-installer-x86_64-linux
|
||||||
- name: Setup Attic cache
|
- name: Setup Attic cache
|
||||||
uses: ryanccn/attic-action@v0
|
uses: ryanccn/attic-action@v0
|
||||||
with:
|
with:
|
||||||
|
|||||||
146
flake.lock
generated
146
flake.lock
generated
@@ -76,11 +76,11 @@
|
|||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "pkgs/firefox-addons",
|
"dir": "pkgs/firefox-addons",
|
||||||
"lastModified": 1768536226,
|
"lastModified": 1775448173,
|
||||||
"narHash": "sha256-d1VSTNa7ajTxT39QBp3gKSbgmgn7yx8RxTZuvZwNX9Y=",
|
"narHash": "sha256-C6OJuD3A4KDNz4QaYedkYtXzKHPecG5YYyMGLq7UwY8=",
|
||||||
"owner": "rycee",
|
"owner": "rycee",
|
||||||
"repo": "nur-expressions",
|
"repo": "nur-expressions",
|
||||||
"rev": "b092ea4a7d083e09e0aa2de909c1b35b9efb3ee0",
|
"rev": "5b0fb7d54dea38c47e5c58058c166e790a0e0cf1",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -93,11 +93,11 @@
|
|||||||
"firefox-gnome-theme": {
|
"firefox-gnome-theme": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764873433,
|
"lastModified": 1775176642,
|
||||||
"narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=",
|
"narHash": "sha256-2veEED0Fg7Fsh81tvVDNYR6SzjqQxa7hbi18Jv4LWpM=",
|
||||||
"owner": "rafaelmardojai",
|
"owner": "rafaelmardojai",
|
||||||
"repo": "firefox-gnome-theme",
|
"repo": "firefox-gnome-theme",
|
||||||
"rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92",
|
"rev": "179704030c5286c729b5b0522037d1d51341022c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -125,11 +125,11 @@
|
|||||||
"nixpkgs-lib": "nixpkgs-lib"
|
"nixpkgs-lib": "nixpkgs-lib"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1768135262,
|
"lastModified": 1775087534,
|
||||||
"narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
|
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac",
|
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -146,11 +146,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1767609335,
|
"lastModified": 1775087534,
|
||||||
"narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=",
|
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "250481aafeb741edfe23d29195671c19b36b6dca",
|
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -219,20 +219,18 @@
|
|||||||
"gnome-shell": {
|
"gnome-shell": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"host": "gitlab.gnome.org",
|
|
||||||
"lastModified": 1767737596,
|
"lastModified": 1767737596,
|
||||||
"narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
|
"narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
|
||||||
"owner": "GNOME",
|
"owner": "GNOME",
|
||||||
"repo": "gnome-shell",
|
"repo": "gnome-shell",
|
||||||
"rev": "ef02db02bf0ff342734d525b5767814770d85b49",
|
"rev": "ef02db02bf0ff342734d525b5767814770d85b49",
|
||||||
"type": "gitlab"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"host": "gitlab.gnome.org",
|
|
||||||
"owner": "GNOME",
|
"owner": "GNOME",
|
||||||
"ref": "gnome-49",
|
|
||||||
"repo": "gnome-shell",
|
"repo": "gnome-shell",
|
||||||
"type": "gitlab"
|
"rev": "ef02db02bf0ff342734d525b5767814770d85b49",
|
||||||
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"home-manager": {
|
"home-manager": {
|
||||||
@@ -242,11 +240,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1768530555,
|
"lastModified": 1775457580,
|
||||||
"narHash": "sha256-EBXKDho4t1YSgodAL6C8M3UTm8MGMZNQ9rQnceR5+6c=",
|
"narHash": "sha256-ikws/ssAmG20AGrEwBuwspwPlkubJu34mB+Uz2fJBJs=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "d21bee5abf9fb4a42b2fa7728bf671f8bb246ba6",
|
"rev": "5de7dbd151b0bd65d45785553d4a22d832733ffc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -283,11 +281,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1768426687,
|
"lastModified": 1774778246,
|
||||||
"narHash": "sha256-CopNx3j//gZ2mE0ggEK9dZ474UcbDhpTw+KMor8mSxI=",
|
"narHash": "sha256-OX9Oba3/cHq1jMS1/ItCdxNuRBH3291Lg727nHOzYnc=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "contrib",
|
"repo": "contrib",
|
||||||
"rev": "541628cebe42792ddf5063c4abd6402c2f1bd68f",
|
"rev": "ca3c381df6018e6c400ceac994066427c98fe323",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -337,11 +335,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765267181,
|
"lastModified": 1775365369,
|
||||||
"narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=",
|
"narHash": "sha256-DgH5mveLoau20CuTnaU5RXZWgFQWn56onQ4Du2CqYoI=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "nix-index-database",
|
"repo": "nix-index-database",
|
||||||
"rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f",
|
"rev": "cef5cf82671e749ac87d69aadecbb75967e6f6c3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -402,11 +400,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764234087,
|
"lastModified": 1769813415,
|
||||||
"narHash": "sha256-NHF7QWa0ZPT8hsJrvijREW3+nifmF2rTXgS2v0tpcEA=",
|
"narHash": "sha256-nnVmNNKBi1YiBNPhKclNYDORoHkuKipoz7EtVnXO50A=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixos-generators",
|
"repo": "nixos-generators",
|
||||||
"rev": "032a1878682fafe829edfcf5fdfad635a2efe748",
|
"rev": "8946737ff703382fda7623b9fab071d037e897d5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -417,11 +415,11 @@
|
|||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1768583413,
|
"lastModified": 1775203647,
|
||||||
"narHash": "sha256-tF5UD4D/s0kERXxhu5mzTo7FF/2jnU8PYf7wWk8guB0=",
|
"narHash": "sha256-6MWaMLXK9QMndI94CIxeiPafi3wuO+imCtK9tfhsZdw=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "45bf76ef956c7ac771b56c54a3009506dc6c7af6",
|
"rev": "80afbd13eea0b7c4ac188de949e1711b31c2b5f0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -440,11 +438,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1768443651,
|
"lastModified": 1775331627,
|
||||||
"narHash": "sha256-hmIo/e6mo40Y2v1DaH2yTtvB3lZ/zcf6gVNmgYhBgYc=",
|
"narHash": "sha256-przIxCbTrNgLzcBlNPGZRfZbiPLzUkLUtNS05Ekcogk=",
|
||||||
"owner": "NuschtOS",
|
"owner": "NuschtOS",
|
||||||
"repo": "nixos-modules",
|
"repo": "nixos-modules",
|
||||||
"rev": "31108e0d75bd47ddfc217b58df598e78fe3bcd42",
|
"rev": "b4cc33254b872b286b9fe481e60e3fc2abc78072",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -471,11 +469,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-lib": {
|
"nixpkgs-lib": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765674936,
|
"lastModified": 1774748309,
|
||||||
"narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
|
"narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixpkgs.lib",
|
"repo": "nixpkgs.lib",
|
||||||
"rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
|
"rev": "333c4e0545a6da976206c74db8773a1645b5870a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -502,11 +500,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1768305791,
|
"lastModified": 1775036866,
|
||||||
"narHash": "sha256-AIdl6WAn9aymeaH/NvBj0H9qM+XuAuYbGMZaP0zcXAQ=",
|
"narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "1412caf7bf9e660f2f962917c14b1ea1c3bc695e",
|
"rev": "6201e203d09599479a3b3450ed24fa81537ebc4e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -528,11 +526,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1767810917,
|
"lastModified": 1775228139,
|
||||||
"narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=",
|
"narHash": "sha256-ebbeHmg+V7w8050bwQOuhmQHoLOEOfqKzM1KgCTexK4=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4",
|
"rev": "601971b9c89e0304561977f2c28fa25e73aa7132",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -552,11 +550,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1767281941,
|
"lastModified": 1775036584,
|
||||||
"narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=",
|
"narHash": "sha256-zW0lyy7ZNNT/x8JhzFHBsP2IPx7ATZIPai4FJj12BgU=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "git-hooks.nix",
|
"repo": "git-hooks.nix",
|
||||||
"rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa",
|
"rev": "4e0eb042b67d863b1b34b3f64d52ceb9cd926735",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -596,11 +594,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1768531678,
|
"lastModified": 1775445266,
|
||||||
"narHash": "sha256-tf4xEp5Zq8+Zce0WtU8b0VNMxhQtwes67sN2phnbkpk=",
|
"narHash": "sha256-3fgIj85WHQbOamrpIw9WY3ZL1PoEvjPOjmzMYNsEQJo=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "0a9de73f3c23206a2fce3c7656a42d3a3f07be9f",
|
"rev": "61747bc3cf2da179b9af356ae9e70f3b895b0c24",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -616,11 +614,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1768481291,
|
"lastModified": 1775365543,
|
||||||
"narHash": "sha256-NjKtkJraCZEnLHAJxLTI+BfdU//9coAz9p5TqveZwPU=",
|
"narHash": "sha256-f50qrK0WwZ9z5EdaMGWOTtALgSF7yb7XwuE7LjCuDmw=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "e085e303dfcce21adcb5fec535d65aacb066f101",
|
"rev": "a4ee2de76efb759fe8d4868c33dec9937897916f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -643,18 +641,17 @@
|
|||||||
],
|
],
|
||||||
"nur": "nur",
|
"nur": "nur",
|
||||||
"systems": "systems",
|
"systems": "systems",
|
||||||
"tinted-foot": "tinted-foot",
|
|
||||||
"tinted-kitty": "tinted-kitty",
|
"tinted-kitty": "tinted-kitty",
|
||||||
"tinted-schemes": "tinted-schemes",
|
"tinted-schemes": "tinted-schemes",
|
||||||
"tinted-tmux": "tinted-tmux",
|
"tinted-tmux": "tinted-tmux",
|
||||||
"tinted-zed": "tinted-zed"
|
"tinted-zed": "tinted-zed"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1768492720,
|
"lastModified": 1775429060,
|
||||||
"narHash": "sha256-aHos307HyVtOriYZppyUjrkcEKQzyp9F5WzxpMjPFH8=",
|
"narHash": "sha256-wbFF5cRxQOCzL/wHOKYm21t5AHPH2Lfp0mVPCOAvEoc=",
|
||||||
"owner": "danth",
|
"owner": "danth",
|
||||||
"repo": "stylix",
|
"repo": "stylix",
|
||||||
"rev": "5287bc719dbb6efb26f48c1677a221c966a4a4d9",
|
"rev": "d27951a6539951d87f75cf0a7cda8a3a24016019",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -693,23 +690,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"tinted-foot": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1726913040,
|
|
||||||
"narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
|
|
||||||
"owner": "tinted-theming",
|
|
||||||
"repo": "tinted-foot",
|
|
||||||
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "tinted-theming",
|
|
||||||
"repo": "tinted-foot",
|
|
||||||
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"tinted-kitty": {
|
"tinted-kitty": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
@@ -729,11 +709,11 @@
|
|||||||
"tinted-schemes": {
|
"tinted-schemes": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1767710407,
|
"lastModified": 1772661346,
|
||||||
"narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=",
|
"narHash": "sha256-4eu3LqB9tPqe0Vaqxd4wkZiBbthLbpb7llcoE/p5HT0=",
|
||||||
"owner": "tinted-theming",
|
"owner": "tinted-theming",
|
||||||
"repo": "schemes",
|
"repo": "schemes",
|
||||||
"rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2",
|
"rev": "13b5b0c299982bb361039601e2d72587d6846294",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -745,11 +725,11 @@
|
|||||||
"tinted-tmux": {
|
"tinted-tmux": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1767489635,
|
"lastModified": 1772934010,
|
||||||
"narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=",
|
"narHash": "sha256-x+6+4UvaG+RBRQ6UaX+o6DjEg28u4eqhVRM9kpgJGjQ=",
|
||||||
"owner": "tinted-theming",
|
"owner": "tinted-theming",
|
||||||
"repo": "tinted-tmux",
|
"repo": "tinted-tmux",
|
||||||
"rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184",
|
"rev": "c3529673a5ab6e1b6830f618c45d9ce1bcdd829d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -761,11 +741,11 @@
|
|||||||
"tinted-zed": {
|
"tinted-zed": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1767488740,
|
"lastModified": 1772909925,
|
||||||
"narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=",
|
"narHash": "sha256-jx/5+pgYR0noHa3hk2esin18VMbnPSvWPL5bBjfTIAU=",
|
||||||
"owner": "tinted-theming",
|
"owner": "tinted-theming",
|
||||||
"repo": "base16-zed",
|
"repo": "base16-zed",
|
||||||
"rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40",
|
"rev": "b4d3a1b3bcbd090937ef609a0a3b37237af974df",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
5
modules/fwupd.nix
Normal file
5
modules/fwupd.nix
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
{ lib, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
services.fwupd.enable = lib.mkDefault true;
|
||||||
|
}
|
||||||
78
modules/kubernetes.nix
Normal file
78
modules/kubernetes.nix
Normal file
@@ -0,0 +1,78 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
|
{
|
||||||
|
options = {
|
||||||
|
services.kubernetes = {
|
||||||
|
enable = lib.mkOption {
|
||||||
|
type = lib.types.bool;
|
||||||
|
default = false;
|
||||||
|
description = "Whether to enable Kubernetes services";
|
||||||
|
};
|
||||||
|
|
||||||
|
version = lib.mkOption {
|
||||||
|
type = lib.types.str;
|
||||||
|
default = "1.28.0";
|
||||||
|
description = "Kubernetes version to use";
|
||||||
|
};
|
||||||
|
|
||||||
|
clusterName = lib.mkOption {
|
||||||
|
type = lib.types.str;
|
||||||
|
default = "palatine-hill-cluster";
|
||||||
|
description = "Name of the Kubernetes cluster";
|
||||||
|
};
|
||||||
|
|
||||||
|
controlPlaneEndpoint = lib.mkOption {
|
||||||
|
type = lib.types.str;
|
||||||
|
default = "localhost:6443";
|
||||||
|
description = "Control plane endpoint";
|
||||||
|
};
|
||||||
|
|
||||||
|
networking = lib.mkOption {
|
||||||
|
type = lib.types.attrs;
|
||||||
|
default = { };
|
||||||
|
description = "Kubernetes networking configuration";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = lib.mkIf config.services.kubernetes.enable {
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
kubectl
|
||||||
|
kubernetes
|
||||||
|
];
|
||||||
|
|
||||||
|
## Enable containerd for Kubernetes
|
||||||
|
#virtualisation.containerd.enable = true;
|
||||||
|
|
||||||
|
## Enable kubelet
|
||||||
|
#services.kubelet = {
|
||||||
|
# enable = true;
|
||||||
|
# extraFlags = {
|
||||||
|
# "pod-infra-container-image" = "registry.k8s.io/pause:3.9";
|
||||||
|
# };
|
||||||
|
#};
|
||||||
|
|
||||||
|
## Enable kubeadm for cluster initialization
|
||||||
|
#environment.etc."kubeadm.yaml".text = ''
|
||||||
|
# apiVersion: kubeadm.k8s.io/v1beta3
|
||||||
|
# kind: InitConfiguration
|
||||||
|
# localAPIEndpoint:
|
||||||
|
# advertiseAddress: 127.0.0.1
|
||||||
|
# bindPort: 6443
|
||||||
|
# ---
|
||||||
|
# apiVersion: kubeadm.k8s.io/v1beta3
|
||||||
|
# kind: ClusterConfiguration
|
||||||
|
# clusterName: ${config.services.kubernetes.clusterName}
|
||||||
|
# controlPlaneEndpoint: ${config.services.kubernetes.controlPlaneEndpoint}
|
||||||
|
# networking:
|
||||||
|
# serviceSubnet: 10.96.0.0/12
|
||||||
|
# podSubnet: 10.244.0.0/16
|
||||||
|
# dnsDomain: cluster.local
|
||||||
|
#'';
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
{ pkgs, ... }:
|
|
||||||
{
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
git
|
|
||||||
python312
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
config,
|
|
||||||
lib,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
|
config,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
@@ -18,6 +18,7 @@
|
|||||||
./stylix.nix
|
./stylix.nix
|
||||||
./wifi.nix
|
./wifi.nix
|
||||||
./zerotier.nix
|
./zerotier.nix
|
||||||
|
../palatine-hill/ollama.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
time.timeZone = "America/New_York";
|
time.timeZone = "America/New_York";
|
||||||
@@ -40,6 +41,19 @@
|
|||||||
sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
|
sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
|
||||||
|
|
||||||
services = {
|
services = {
|
||||||
|
ollama = {
|
||||||
|
package = lib.mkForce pkgs.ollama-rocm;
|
||||||
|
models = lib.mkForce "${config.services.ollama.home}/models";
|
||||||
|
loadModels = lib.mkForce [
|
||||||
|
"deepseek-r1:1.5b"
|
||||||
|
"lennyerik/zeta"
|
||||||
|
"nomic-embed-text:latest"
|
||||||
|
"glm-4.7-flash"
|
||||||
|
"magistral"
|
||||||
|
"devstral-small-2"
|
||||||
|
"starcoder2:7b"
|
||||||
|
];
|
||||||
|
};
|
||||||
flatpak.enable = true;
|
flatpak.enable = true;
|
||||||
calibre-web = {
|
calibre-web = {
|
||||||
# temp disable this
|
# temp disable this
|
||||||
@@ -78,7 +92,9 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
users.users.alice.extraGroups = [ "calibre-web" ];
|
users.users = {
|
||||||
|
alice.extraGroups = [ "calibre-web" ];
|
||||||
|
};
|
||||||
|
|
||||||
system.stateVersion = "24.05";
|
system.stateVersion = "24.05";
|
||||||
|
|
||||||
@@ -86,6 +102,10 @@
|
|||||||
"KWIN_DRM_NO_DIRECT_SCANOUT" = "1";
|
"KWIN_DRM_NO_DIRECT_SCANOUT" = "1";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#nixpkgs.config = {
|
||||||
|
# rocmSupport = true;
|
||||||
|
#};
|
||||||
|
|
||||||
sops = {
|
sops = {
|
||||||
defaultSopsFile = ./secrets.yaml;
|
defaultSopsFile = ./secrets.yaml;
|
||||||
#secrets = {
|
#secrets = {
|
||||||
|
|||||||
@@ -16,6 +16,7 @@
|
|||||||
candy-icons
|
candy-icons
|
||||||
chromium
|
chromium
|
||||||
chromedriver
|
chromedriver
|
||||||
|
#claude-code
|
||||||
croc
|
croc
|
||||||
deadnix
|
deadnix
|
||||||
direnv
|
direnv
|
||||||
@@ -26,20 +27,16 @@
|
|||||||
fd
|
fd
|
||||||
file
|
file
|
||||||
firefox
|
firefox
|
||||||
|
|
||||||
# gestures replacement
|
# gestures replacement
|
||||||
git
|
git
|
||||||
glances
|
glances
|
||||||
gpu-viewer
|
gpu-viewer
|
||||||
grim
|
grim
|
||||||
helvum
|
|
||||||
htop
|
htop
|
||||||
hwloc
|
hwloc
|
||||||
ipmiview
|
|
||||||
iperf3
|
iperf3
|
||||||
# ipscan
|
# ipscan
|
||||||
javaPackages.compiler.temurin-bin.jdk-25
|
|
||||||
javaPackages.compiler.temurin-bin.jdk-21
|
|
||||||
javaPackages.compiler.temurin-bin.jdk-17
|
|
||||||
jp2a
|
jp2a
|
||||||
jq
|
jq
|
||||||
kdePackages.kdenlive
|
kdePackages.kdenlive
|
||||||
@@ -85,8 +82,6 @@
|
|||||||
# signal in tray?
|
# signal in tray?
|
||||||
siji
|
siji
|
||||||
simple-mtpfs
|
simple-mtpfs
|
||||||
skaffold
|
|
||||||
slack
|
|
||||||
slurp
|
slurp
|
||||||
smartmontools
|
smartmontools
|
||||||
snyk
|
snyk
|
||||||
|
|||||||
@@ -20,7 +20,7 @@
|
|||||||
./nextcloud.nix
|
./nextcloud.nix
|
||||||
# ./postgres.nix
|
# ./postgres.nix
|
||||||
# ./restic.nix
|
# ./restic.nix
|
||||||
./torr.nix
|
#./torr.nix
|
||||||
# ./unifi.nix
|
# ./unifi.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,8 @@ let
|
|||||||
rlcraft = "rlcraft.alicehuston.xyz";
|
rlcraft = "rlcraft.alicehuston.xyz";
|
||||||
arcanum-institute = "arcanum.alicehuston.xyz";
|
arcanum-institute = "arcanum.alicehuston.xyz";
|
||||||
meits = "meits.alicehuston.xyz";
|
meits = "meits.alicehuston.xyz";
|
||||||
|
cobblemon-overclocked = "mco.alicehuston.xyz";
|
||||||
|
cobblemon-plus = "mcp.alicehuston.xyz";
|
||||||
# bcg-plus = "bcg.alicehuston.xyz";
|
# bcg-plus = "bcg.alicehuston.xyz";
|
||||||
pii = "pii.alicehuston.xyz";
|
pii = "pii.alicehuston.xyz";
|
||||||
};
|
};
|
||||||
@@ -79,69 +81,49 @@ in
|
|||||||
# log-driver = "local";
|
# log-driver = "local";
|
||||||
# environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
|
# environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
|
||||||
#};
|
#};
|
||||||
prominence-ii = {
|
cobblemon-overclocked = {
|
||||||
image = "itzg/minecraft-server:java25-graalvm";
|
image = "itzg/minecraft-server:java21";
|
||||||
volumes = [
|
volumes = [
|
||||||
"${minecraft_path}/prominence-ii/modpacks:/modpacks:ro"
|
"${minecraft_path}/cobblemon-overclocked/modpacks:/modpacks:ro"
|
||||||
"${minecraft_path}/prominence-ii/data:/data"
|
"${minecraft_path}/cobblemon-overclocked/data:/data"
|
||||||
];
|
];
|
||||||
hostname = "pii";
|
hostname = "cobblemon-overclocked";
|
||||||
environment = defaultEnv // {
|
environment = defaultEnv // {
|
||||||
VERSION = "1.20.1";
|
VERSION = "1.21.1";
|
||||||
CF_SLUG = "prominence-2-hasturian-era";
|
CF_SLUG = "modified-cobblemon-overclocked";
|
||||||
CF_FILENAME_MATCHER = "3.9.14hf";
|
CF_FILENAME_MATCHER = "1.11.2";
|
||||||
MEMORY = "8G";
|
|
||||||
USE_AIKAR_FLAGS = "false";
|
USE_AIKAR_FLAGS = "false";
|
||||||
USE_MEOWICE_FLAGS = "true";
|
USE_MEOWICE_FLAGS = "true";
|
||||||
USE_MEOWICE_GRAALVM_FLAGS = "true";
|
DIFFICULTY = "peaceful";
|
||||||
DIFFICULTY = "hard";
|
|
||||||
ENABLE_COMMAND_BLOCK = "true";
|
ENABLE_COMMAND_BLOCK = "true";
|
||||||
CF_FORCE_INCLUDE_FILES = ''
|
INIT_MEMORY = "4G";
|
||||||
emi
|
MAX_MEMORY = "16G";
|
||||||
'';
|
SEED = "-7146406535839057559";
|
||||||
};
|
};
|
||||||
extraOptions = defaultOptions;
|
extraOptions = defaultOptions;
|
||||||
log-driver = "local";
|
log-driver = "local";
|
||||||
environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
|
environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
|
||||||
};
|
};
|
||||||
stoneblock-4 = {
|
cobblemon-plus = {
|
||||||
image = "itzg/minecraft-server:java25-graalvm";
|
image = "itzg/minecraft-server:java21";
|
||||||
volumes = [
|
volumes = [
|
||||||
"${minecraft_path}/stoneblock-4/modpacks:/modpacks:ro"
|
"${minecraft_path}/cobblemon-plus/modpacks:/modpacks:ro"
|
||||||
"${minecraft_path}/stoneblock-4/data:/data"
|
"${minecraft_path}/cobblemon-plus/data:/data"
|
||||||
];
|
];
|
||||||
hostname = "stoneblock-4";
|
hostname = "cobblemon-plus";
|
||||||
environment = defaultEnv // {
|
environment = defaultEnv // {
|
||||||
VERSION = "1.21.1";
|
VERSION = "1.21.1";
|
||||||
CF_SLUG = "ftb-stoneblock-4";
|
CF_SLUG = "modified-cobblemon-plus";
|
||||||
CF_FILENAME_MATCHER = "1.6.0";
|
CF_FILENAME_MATCHER = "1.11.2";
|
||||||
MEMORY = "8G";
|
|
||||||
USE_AIKAR_FLAGS = "false";
|
USE_AIKAR_FLAGS = "false";
|
||||||
USE_MEOWICE_FLAGS = "true";
|
USE_MEOWICE_FLAGS = "true";
|
||||||
USE_MEOWICE_GRAALVM_FLAGS = "true";
|
DIFFICULTY = "peaceful";
|
||||||
DIFFICULTY = "hard";
|
|
||||||
ENABLE_COMMAND_BLOCK = "true";
|
|
||||||
};
|
|
||||||
extraOptions = defaultOptions;
|
|
||||||
log-driver = "local";
|
|
||||||
environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
|
|
||||||
};
|
|
||||||
submerged-2 = {
|
|
||||||
image = "itzg/minecraft-server:java25-graalvm";
|
|
||||||
volumes = [
|
|
||||||
"${minecraft_path}/submerged-2/modpacks:/modpacks:ro"
|
|
||||||
"${minecraft_path}/submerged-2/data:/data"
|
|
||||||
];
|
|
||||||
hostname = "submerged-2";
|
|
||||||
environment = defaultEnv // {
|
|
||||||
VERSION = "1.21.1";
|
|
||||||
CF_SLUG = "submerged-2";
|
|
||||||
CF_FILENAME_MATCHER = "B6.1";
|
|
||||||
USE_AIKAR_FLAGS = "false";
|
|
||||||
USE_MEOWICE_FLAGS = "true";
|
|
||||||
USE_MEOWICE_GRAALVM_FLAGS = "true";
|
|
||||||
DIFFICULTY = "hard";
|
|
||||||
ENABLE_COMMAND_BLOCK = "true";
|
ENABLE_COMMAND_BLOCK = "true";
|
||||||
|
INIT_MEMORY = "4G";
|
||||||
|
MAX_MEMORY = "16G";
|
||||||
|
# exclude clientside mods that cause crashes when run in a headless environment
|
||||||
|
CF_EXCLUDE_MODS = "world-host";
|
||||||
|
CF_OVERRIDES_EXCLUSIONS = "mods/iris*.jar,mods/sodium*.jar,mods/world-host-*.jar";
|
||||||
};
|
};
|
||||||
extraOptions = defaultOptions;
|
extraOptions = defaultOptions;
|
||||||
log-driver = "local";
|
log-driver = "local";
|
||||||
|
|||||||
77
systems/palatine-hill/ollama.nix
Normal file
77
systems/palatine-hill/ollama.nix
Normal file
@@ -0,0 +1,77 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
vars = import ./vars.nix;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
services = {
|
||||||
|
ollama = {
|
||||||
|
enable = true;
|
||||||
|
package = pkgs.ollama;
|
||||||
|
syncModels = true;
|
||||||
|
loadModels = [
|
||||||
|
"deepseek-r1:1.5b"
|
||||||
|
"deepseek-r1:32b"
|
||||||
|
"deepseek-r1:70b"
|
||||||
|
#"qwen3"
|
||||||
|
#"qwen3.5:latest"
|
||||||
|
"qwen3-coder-next"
|
||||||
|
"lennyerik/zeta"
|
||||||
|
"nomic-embed-text:latest"
|
||||||
|
"lfm2:24b"
|
||||||
|
"glm-4.7-flash"
|
||||||
|
"nemotron-cascade-2:30b"
|
||||||
|
"magistral"
|
||||||
|
"devstral-small-2"
|
||||||
|
"starcoder2:15b"
|
||||||
|
];
|
||||||
|
models = vars.primary_ollama;
|
||||||
|
environmentVariables = {
|
||||||
|
FLASH_ATTENTION = "1";
|
||||||
|
OLLAMA_KV_CACHE_TYPE = "q4_0";
|
||||||
|
# Ollama memory configuration
|
||||||
|
OLLAMA_MAX_LOADED_MODELS = "3";
|
||||||
|
OLLAMA_MAX_QUEUE = "512";
|
||||||
|
OLLAMA_NUM_PARALLEL = "1";
|
||||||
|
|
||||||
|
# ROCm memory optimization
|
||||||
|
#HIP_VISIBLE_DEVICES = "0";
|
||||||
|
#ROCR_VISIBLE_DEVICES = "0";
|
||||||
|
|
||||||
|
# context length for agents
|
||||||
|
OLLAMA_CONTEXT_LENGTH = "128000";
|
||||||
|
};
|
||||||
|
openFirewall = true;
|
||||||
|
host = "0.0.0.0"; # don't want to make this available via load-balancer yet, so making it available on the local network
|
||||||
|
};
|
||||||
|
open-webui = {
|
||||||
|
enable = true;
|
||||||
|
port = 21212;
|
||||||
|
openFirewall = true;
|
||||||
|
host = "0.0.0.0"; # don't want to make this available via load-balancer yet, so making it available on the local network
|
||||||
|
};
|
||||||
|
};
|
||||||
|
users.users.ollama = {
|
||||||
|
extraGroups = [
|
||||||
|
"render"
|
||||||
|
"video"
|
||||||
|
];
|
||||||
|
group = "ollama";
|
||||||
|
isSystemUser = true;
|
||||||
|
};
|
||||||
|
users.groups.ollama = { };
|
||||||
|
systemd.services = {
|
||||||
|
ollama.serviceConfig = {
|
||||||
|
Nice = 19;
|
||||||
|
IOSchedulingPriority = 7;
|
||||||
|
};
|
||||||
|
ollama-model-loader.serviceConfig = {
|
||||||
|
Nice = 19;
|
||||||
|
CPUWeight = 50;
|
||||||
|
IOSchedulingClass = "idle";
|
||||||
|
IOSchedulingPriority = 7;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -19,4 +19,5 @@ rec {
|
|||||||
primary_torr = "${zfs_primary}/torr";
|
primary_torr = "${zfs_primary}/torr";
|
||||||
primary_plex = "${zfs_primary}/plex";
|
primary_plex = "${zfs_primary}/plex";
|
||||||
primary_plex_storage = "${zfs_primary}/plex_storage";
|
primary_plex_storage = "${zfs_primary}/plex_storage";
|
||||||
|
primary_ollama = "${zfs_primary}/ollama";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,10 +29,8 @@
|
|||||||
glances
|
glances
|
||||||
gpu-viewer
|
gpu-viewer
|
||||||
grim
|
grim
|
||||||
helvum
|
|
||||||
htop
|
htop
|
||||||
hwloc
|
hwloc
|
||||||
ipmiview
|
|
||||||
iperf3
|
iperf3
|
||||||
# ipscan
|
# ipscan
|
||||||
jp2a
|
jp2a
|
||||||
@@ -80,8 +78,6 @@
|
|||||||
# signal in tray?
|
# signal in tray?
|
||||||
siji
|
siji
|
||||||
simple-mtpfs
|
simple-mtpfs
|
||||||
skaffold
|
|
||||||
slack
|
|
||||||
slurp
|
slurp
|
||||||
smartmontools
|
smartmontools
|
||||||
snyk
|
snyk
|
||||||
|
|||||||
@@ -66,7 +66,6 @@
|
|||||||
cargo-update
|
cargo-update
|
||||||
diesel-cli
|
diesel-cli
|
||||||
tealdeer
|
tealdeer
|
||||||
helix
|
|
||||||
ripunzip
|
ripunzip
|
||||||
|
|
||||||
# nix specific packages
|
# nix specific packages
|
||||||
@@ -86,7 +85,7 @@
|
|||||||
|
|
||||||
# dependencies for nix-dotfiles/hydra-check-action
|
# dependencies for nix-dotfiles/hydra-check-action
|
||||||
nodejs_20
|
nodejs_20
|
||||||
nodePackages.prettier
|
prettier
|
||||||
treefmt
|
treefmt
|
||||||
|
|
||||||
gocryptfs
|
gocryptfs
|
||||||
@@ -164,8 +163,9 @@
|
|||||||
userDirs = {
|
userDirs = {
|
||||||
enable = true;
|
enable = true;
|
||||||
createDirectories = true;
|
createDirectories = true;
|
||||||
|
setSessionVariables = true;
|
||||||
extraConfig = {
|
extraConfig = {
|
||||||
XDG_SCREENSHOTS_DIR = "${config.xdg.userDirs.pictures}/Screenshots";
|
SCREENSHOTS = "${config.xdg.userDirs.pictures}/Screenshots";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
lfs.enable = true;
|
lfs.enable = true;
|
||||||
signing = {
|
signing = {
|
||||||
key = "5EFFB75F7C9B74EAA5C4637547940175096C1330";
|
key = "5EFFB75F7C9B74EAA5C4637547940175096C1330";
|
||||||
|
format = "openpgp";
|
||||||
signByDefault = true;
|
signByDefault = true;
|
||||||
};
|
};
|
||||||
settings = {
|
settings = {
|
||||||
@@ -14,6 +15,7 @@
|
|||||||
color.ui = true;
|
color.ui = true;
|
||||||
init.defaultBranch = "main";
|
init.defaultBranch = "main";
|
||||||
format.signoff = true;
|
format.signoff = true;
|
||||||
|
format.commitMessage = "signed-off-by";
|
||||||
pack.windowMemory = "2g";
|
pack.windowMemory = "2g";
|
||||||
pack.packSizeLimit = "1g";
|
pack.packSizeLimit = "1g";
|
||||||
user.email = "aliceghuston@gmail.com";
|
user.email = "aliceghuston@gmail.com";
|
||||||
|
|||||||
@@ -122,7 +122,7 @@ gestures {
|
|||||||
|
|
||||||
misc {
|
misc {
|
||||||
# See https://wiki.hyprland.org/Configuring/Variables/ for more
|
# See https://wiki.hyprland.org/Configuring/Variables/ for more
|
||||||
force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers
|
force_default_wallpaper = 1 # Set to 0 or 1 to disable the anime mascot wallpapers
|
||||||
}
|
}
|
||||||
|
|
||||||
# Example per-device config
|
# Example per-device config
|
||||||
@@ -137,7 +137,7 @@ device {
|
|||||||
# Example windowrule v2
|
# Example windowrule v2
|
||||||
# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
|
# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
|
||||||
# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
|
# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
|
||||||
windowrulev2 = suppressevent maximize, class:.* # You'll probably like this.
|
windowrule = suppress_event maximize, match:class .* # You'll probably like this.
|
||||||
|
|
||||||
|
|
||||||
# See https://wiki.hyprland.org/Configuring/Keywords/ for more
|
# See https://wiki.hyprland.org/Configuring/Keywords/ for more
|
||||||
|
|||||||
@@ -1,11 +1,27 @@
|
|||||||
{ pkgs, outputs, ... }:
|
{ pkgs, ... }:
|
||||||
|
let
|
||||||
|
tex = pkgs.texlive.combine {
|
||||||
|
inherit (pkgs.texlive)
|
||||||
|
scheme-medium
|
||||||
|
preprint
|
||||||
|
titlesec
|
||||||
|
enumitem
|
||||||
|
sourcesanspro
|
||||||
|
xifthen
|
||||||
|
ifmtarg
|
||||||
|
framed
|
||||||
|
paralist
|
||||||
|
fontawesome7
|
||||||
|
;
|
||||||
|
};
|
||||||
|
in
|
||||||
{
|
{
|
||||||
programs.emacs = {
|
programs = {
|
||||||
|
emacs = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.emacs30-pgtk;
|
package = pkgs.emacs30-pgtk;
|
||||||
};
|
};
|
||||||
programs.vesktop = {
|
vesktop = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
appBadge = false;
|
appBadge = false;
|
||||||
@@ -21,7 +37,7 @@
|
|||||||
notifyAboutUpdates = false;
|
notifyAboutUpdates = false;
|
||||||
plugins = {
|
plugins = {
|
||||||
AnonymiseFileNames.enabled = true;
|
AnonymiseFileNames.enabled = true;
|
||||||
BetterFolders.enabled = true;
|
BetterFolders.enabled = false;
|
||||||
BetterGifAltText.enabled = true;
|
BetterGifAltText.enabled = true;
|
||||||
CallTimer.enabled = true;
|
CallTimer.enabled = true;
|
||||||
ClearURLs.enabled = true;
|
ClearURLs.enabled = true;
|
||||||
@@ -46,6 +62,153 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
zed-editor = {
|
||||||
|
enable = true;
|
||||||
|
mutableUserSettings = false;
|
||||||
|
extensions = [
|
||||||
|
"nix"
|
||||||
|
"toml"
|
||||||
|
"rust"
|
||||||
|
"java"
|
||||||
|
"kotlin"
|
||||||
|
"git firefly"
|
||||||
|
"make"
|
||||||
|
"dockerfile"
|
||||||
|
"sql"
|
||||||
|
"latex"
|
||||||
|
"terraform"
|
||||||
|
"log"
|
||||||
|
"context7-mcp-server"
|
||||||
|
"github-mcp-server"
|
||||||
|
];
|
||||||
|
userSettings = {
|
||||||
|
context_servers = {
|
||||||
|
nixos = {
|
||||||
|
command = "nix";
|
||||||
|
args = [
|
||||||
|
"run"
|
||||||
|
"github:utensils/mcp-nixos"
|
||||||
|
"--"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
language_models = {
|
||||||
|
ollama = {
|
||||||
|
api_url = "http://192.168.76.2:11434";
|
||||||
|
context_window = 128000;
|
||||||
|
# global keep alive doesnt work
|
||||||
|
#keep_alive = "15m";
|
||||||
|
available_models = [
|
||||||
|
{
|
||||||
|
name = "deepseek-r1:1.5b";
|
||||||
|
max_tokens = 128000;
|
||||||
|
keep_alive = "15m";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "deepseek-r1:32b";
|
||||||
|
max_tokens = 128000;
|
||||||
|
keep_alive = "15m";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "deepseek-r1:70b";
|
||||||
|
max_tokens = 128000;
|
||||||
|
keep_alive = "15m";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "qwen3-coder-next";
|
||||||
|
max_tokens = 128000;
|
||||||
|
keep_alive = "15m";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "lennyerik/zeta";
|
||||||
|
max_tokens = 128000;
|
||||||
|
keep_alive = "15m";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "nomic-embed-text:latest";
|
||||||
|
max_tokens = 128000;
|
||||||
|
keep_alive = "15m";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "lfm2:24b";
|
||||||
|
max_tokens = 128000;
|
||||||
|
keep_alive = "15m";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "glm-4.7-flash";
|
||||||
|
max_tokens = 128000;
|
||||||
|
keep_alive = "15m";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "nemotron-cascade-2:30b";
|
||||||
|
max_tokens = 128000;
|
||||||
|
keep_alive = "15m";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "magistral";
|
||||||
|
max_tokens = 128000;
|
||||||
|
keep_alive = "15m";
|
||||||
|
}
|
||||||
|
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
colorize_brackets = true;
|
||||||
|
hard_tabs = false;
|
||||||
|
vim_mode = true;
|
||||||
|
minimap = {
|
||||||
|
show = "auto";
|
||||||
|
};
|
||||||
|
buffer_line_height = "comfortable";
|
||||||
|
auto_update = false;
|
||||||
|
autosave = "on_focus_change";
|
||||||
|
agent = {
|
||||||
|
default_model = {
|
||||||
|
provider = "ollama";
|
||||||
|
model = "glm-4.7-flash";
|
||||||
|
};
|
||||||
|
favorite_models = [ ];
|
||||||
|
model_parameters = [ ];
|
||||||
|
};
|
||||||
|
telemetry = {
|
||||||
|
diagnostics = false;
|
||||||
|
metrics = false;
|
||||||
|
};
|
||||||
|
journal = {
|
||||||
|
hour_format = "hour24";
|
||||||
|
};
|
||||||
|
edit_predictions = {
|
||||||
|
provider = "ollama";
|
||||||
|
ollama = {
|
||||||
|
#api_url = "http://192.168.76.2:11434/v1/completions";
|
||||||
|
api_url = "http://192.168.76.2:11434";
|
||||||
|
context_window = 128000;
|
||||||
|
model = "lennyerik/zeta";
|
||||||
|
prompt_format = "qwen";
|
||||||
|
max_requests = 64;
|
||||||
|
max_output_tokens = 256;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
texlab = {
|
||||||
|
build = {
|
||||||
|
onSave = true;
|
||||||
|
forwardSearchAfter = true;
|
||||||
|
};
|
||||||
|
forwardSearch = {
|
||||||
|
executable = "zathura";
|
||||||
|
args = [
|
||||||
|
"--synctex-forward"
|
||||||
|
"%l:1:%f"
|
||||||
|
"-x"
|
||||||
|
"zed %%{input}:%%{line}"
|
||||||
|
"%p"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
cmake
|
cmake
|
||||||
shellcheck
|
shellcheck
|
||||||
@@ -70,12 +233,14 @@
|
|||||||
nix-init
|
nix-init
|
||||||
|
|
||||||
# markdown
|
# markdown
|
||||||
nodePackages.markdownlint-cli
|
markdownlint-cli
|
||||||
|
|
||||||
|
# insert essential rust dependencies
|
||||||
|
|
||||||
# doom emacs dependencies
|
# doom emacs dependencies
|
||||||
yaml-language-server
|
yaml-language-server
|
||||||
nodePackages.typescript-language-server
|
typescript-language-server
|
||||||
nodePackages.bash-language-server
|
bash-language-server
|
||||||
pyright
|
pyright
|
||||||
cmake-language-server
|
cmake-language-server
|
||||||
multimarkdown
|
multimarkdown
|
||||||
@@ -91,11 +256,12 @@
|
|||||||
languagetool
|
languagetool
|
||||||
|
|
||||||
# latex
|
# latex
|
||||||
texlive.combined.scheme-medium
|
tex
|
||||||
|
poppler-utils
|
||||||
|
|
||||||
# dependencies for nix-dotfiles/hydra-check-action
|
# dependencies for nix-dotfiles/hydra-check-action
|
||||||
nodejs_20
|
nodejs_20
|
||||||
nodePackages.prettier
|
prettier
|
||||||
treefmt
|
treefmt
|
||||||
|
|
||||||
nextcloud-client
|
nextcloud-client
|
||||||
@@ -112,5 +278,9 @@
|
|||||||
|
|
||||||
# arch zed deps
|
# arch zed deps
|
||||||
nixd
|
nixd
|
||||||
|
uv
|
||||||
|
|
||||||
|
pdf4qt
|
||||||
|
masterpdfeditor4
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user