diff options
| -rw-r--r-- | flake.lock | 24 | ||||
| -rw-r--r-- | hosts/demiurge/default.nix | 17 | ||||
| -rw-r--r-- | hosts/demiurge/hardware.nix | 2 |
3 files changed, 28 insertions, 15 deletions
| @@ -163,11 +163,11 @@ | |||
| 163 | ] | 163 | ] |
| 164 | }, | 164 | }, |
| 165 | "locked": { | 165 | "locked": { |
| 166 | "lastModified": 1742246081, | 166 | "lastModified": 1743556466, |
| 167 | "narHash": "sha256-1e4oFbtdOOb6NqauHevWWjEUXZnfZ6RUAJJjn9i4YBc=", | 167 | "narHash": "sha256-rvU79DJ6rPDxiH0sTp686Vlm+JewwAZPGcwt8OfHJbM=", |
| 168 | "owner": "nix-community", | 168 | "owner": "nix-community", |
| 169 | "repo": "home-manager", | 169 | "repo": "home-manager", |
| 170 | "rev": "c657142e24a43ea1035889f0b0a7c24598e0e18a", | 170 | "rev": "5ee44bc7c2e853f144390a12ebe5174ad7e3b9e0", |
| 171 | "type": "github" | 171 | "type": "github" |
| 172 | }, | 172 | }, |
| 173 | "original": { | 173 | "original": { |
| @@ -184,11 +184,11 @@ | |||
| 184 | ] | 184 | ] |
| 185 | }, | 185 | }, |
| 186 | "locked": { | 186 | "locked": { |
| 187 | "lastModified": 1742259085, | 187 | "lastModified": 1743543845, |
| 188 | "narHash": "sha256-95kracZRp8nsFy8AEG4q3j+hXjgKpfA5S3w4gBOuxwM=", | 188 | "narHash": "sha256-JabannLlz3nFSdF/VBKoLsSGzyfQQoajfV6KKBBno7c=", |
| 189 | "owner": "ggml-org", | 189 | "owner": "ggml-org", |
| 190 | "repo": "llama.cpp", | 190 | "repo": "llama.cpp", |
| 191 | "rev": "a53f7f7b8859f3e634415ab03e1e295b9861d7e6", | 191 | "rev": "267c1399f15a278ec8c3cdcf9c90dc94151fbc38", |
| 192 | "type": "github" | 192 | "type": "github" |
| 193 | }, | 193 | }, |
| 194 | "original": { | 194 | "original": { |
| @@ -214,11 +214,11 @@ | |||
| 214 | }, | 214 | }, |
| 215 | "nixpkgs": { | 215 | "nixpkgs": { |
| 216 | "locked": { | 216 | "locked": { |
| 217 | "lastModified": 1742230170, | 217 | "lastModified": 1743515758, |
| 218 | "narHash": "sha256-BEny83HblVcCGgSG3NHljafuWQE6+yP8XNUIydsIyoA=", | 218 | "narHash": "sha256-UdPdn4LYmyW9bYzV+hGCMGJUU8y8ySq1Ag5gIjzErrE=", |
| 219 | "owner": "nixos", | 219 | "owner": "nixos", |
| 220 | "repo": "nixpkgs", | 220 | "repo": "nixpkgs", |
| 221 | "rev": "0f80da4f5e0dbe1f917f6f3643a262bae7dbb34e", | 221 | "rev": "a18002797a7128bfc247a090b6c2349b4a1877f7", |
| 222 | "type": "github" | 222 | "type": "github" |
| 223 | }, | 223 | }, |
| 224 | "original": { | 224 | "original": { |
| @@ -275,11 +275,11 @@ | |||
| 275 | }, | 275 | }, |
| 276 | "nixpkgs-stable": { | 276 | "nixpkgs-stable": { |
| 277 | "locked": { | 277 | "locked": { |
| 278 | "lastModified": 1742136038, | 278 | "lastModified": 1743367904, |
| 279 | "narHash": "sha256-DDe16FJk18sadknQKKG/9FbwEro7A57tg9vB5kxZ8kY=", | 279 | "narHash": "sha256-sOos1jZGKmT6xxPvxGQyPTApOunXvScV4lNjBCXd/CI=", |
| 280 | "owner": "nixos", | 280 | "owner": "nixos", |
| 281 | "repo": "nixpkgs", | 281 | "repo": "nixpkgs", |
| 282 | "rev": "a1185f4064c18a5db37c5c84e5638c78b46e3341", | 282 | "rev": "7ffe0edc685f14b8c635e3d6591b0bbb97365e6c", |
| 283 | "type": "github" | 283 | "type": "github" |
| 284 | }, | 284 | }, |
| 285 | "original": { | 285 | "original": { |
diff --git a/hosts/demiurge/default.nix b/hosts/demiurge/default.nix index 4ae0870..98159be 100644 --- a/hosts/demiurge/default.nix +++ b/hosts/demiurge/default.nix | |||
| @@ -16,7 +16,9 @@ | |||
| 16 | "cuda_cccl" | 16 | "cuda_cccl" |
| 17 | "cuda_cudart" | 17 | "cuda_cudart" |
| 18 | "cuda_nvcc" | 18 | "cuda_nvcc" |
| 19 | "cudnn" | ||
| 19 | "libcublas" | 20 | "libcublas" |
| 21 | "libcufile" | ||
| 20 | "quartus-prime-lite" | 22 | "quartus-prime-lite" |
| 21 | "quartus-prime-lite-unwrapped" | 23 | "quartus-prime-lite-unwrapped" |
| 22 | "steam" | 24 | "steam" |
| @@ -47,12 +49,19 @@ | |||
| 47 | 49 | ||
| 48 | src = super.fetchFromGitHub { | 50 | src = super.fetchFromGitHub { |
| 49 | owner = "iv-org"; | 51 | owner = "iv-org"; |
| 50 | repo = "inv-sig-helper"; | 52 | repo = "inv_sig_helper"; |
| 51 | rev = "318e555b2b08921ec9262ef5b269548f0e806834"; | 53 | rev = "318e555b2b08921ec9262ef5b269548f0e806834"; |
| 52 | hash = "sha256-p1cbXYmKBoeXF4L9XKc5jc79KW8dxzDbjZiUSMJQDs8="; | 54 | hash = "sha256-NgowxT2EuOQxUvW5niM7rtNkdSkadlsiiOiqb9JDjdE="; |
| 53 | }; | 55 | }; |
| 54 | 56 | ||
| 55 | cargoHash = "sha256-DnJL7kkcVn5dW3AoPCn829WmkaCjpDZtYUXnpiB857Q="; | 57 | cargoHash = "sha256-DnJL7kkcVn5dW3AoPCn829WmkaCjpDZtYUXnpiB857Q="; |
| 58 | |||
| 59 | patches = old.patches ++ [( | ||
| 60 | super.fetchpatch { | ||
| 61 | url = "https://github.com/iv-org/inv_sig_helper/commit/c7be037599a9b547f567cc6ebd710c97ec6a5ba7.patch"; | ||
| 62 | hash = "sha256-oTq+Tv8PQjjA9Rli+nLQlUSqofTwWW2Cke5uv8gzBSg="; | ||
| 63 | } | ||
| 64 | )]; | ||
| 56 | }); | 65 | }); |
| 57 | }) | 66 | }) |
| 58 | ]; | 67 | ]; |
| @@ -159,6 +168,7 @@ | |||
| 159 | rocmGpuTargets = "gfx1030"; | 168 | rocmGpuTargets = "gfx1030"; |
| 160 | }) | 169 | }) |
| 161 | (quartus-prime-lite.override { supportedDevices = [ "MAX 10 FPGA" ]; }) | 170 | (quartus-prime-lite.override { supportedDevices = [ "MAX 10 FPGA" ]; }) |
| 171 | #(vllm.override { cudaSupport = false; rocmSupport = true; gpuTargets = [ "gfx906" "gfx1100" ]; }) | ||
| 162 | ]; | 172 | ]; |
| 163 | }; | 173 | }; |
| 164 | 174 | ||
| @@ -248,6 +258,9 @@ FQsOJMjIvhTm2IiOS8xIaZz7EJORxFjtOkLEIGGZBNK6QcnD714/nYbHSrQx4eNM | |||
| 248 | }; | 258 | }; |
| 249 | 259 | ||
| 250 | services = { | 260 | services = { |
| 261 | # control unicorn barf | ||
| 262 | hardware.openrgb.enable = true; | ||
| 263 | |||
| 251 | # dns | 264 | # dns |
| 252 | dnsmasq = { | 265 | dnsmasq = { |
| 253 | enable = true; | 266 | enable = true; |
diff --git a/hosts/demiurge/hardware.nix b/hosts/demiurge/hardware.nix index 29bea40..b075bb4 100644 --- a/hosts/demiurge/hardware.nix +++ b/hosts/demiurge/hardware.nix | |||
| @@ -38,7 +38,7 @@ | |||
| 38 | }; | 38 | }; |
| 39 | 39 | ||
| 40 | fileSystems."/data" = | 40 | fileSystems."/data" = |
| 41 | { device = "zroot/data"; | 41 | { device = "nvme_warm"; |
| 42 | fsType = "zfs"; | 42 | fsType = "zfs"; |
| 43 | options = [ "zfsutil" ]; | 43 | options = [ "zfsutil" ]; |
| 44 | }; | 44 | }; |
