diff options
| -rw-r--r-- | _sources/generated.json | 14 | ||||
| -rw-r--r-- | _sources/generated.nix | 14 | ||||
| -rw-r--r-- | accounts/gkleen@sif/default.nix | 10 | ||||
| -rw-r--r-- | flake.lock | 138 | ||||
| -rw-r--r-- | hosts/sif/default.nix | 1 | ||||
| -rw-r--r-- | installer/default.nix | 1 | ||||
| -rw-r--r-- | modules/nvidia.nix | 10 |
7 files changed, 76 insertions, 112 deletions
diff --git a/_sources/generated.json b/_sources/generated.json index 934d83a2..0c6662c8 100644 --- a/_sources/generated.json +++ b/_sources/generated.json | |||
| @@ -217,7 +217,7 @@ | |||
| 217 | }, | 217 | }, |
| 218 | "mpv-subselect": { | 218 | "mpv-subselect": { |
| 219 | "cargoLocks": null, | 219 | "cargoLocks": null, |
| 220 | "date": "2024-05-15", | 220 | "date": "2024-08-31", |
| 221 | "extract": null, | 221 | "extract": null, |
| 222 | "name": "mpv-subselect", | 222 | "name": "mpv-subselect", |
| 223 | "passthru": null, | 223 | "passthru": null, |
| @@ -227,13 +227,13 @@ | |||
| 227 | "fetchSubmodules": false, | 227 | "fetchSubmodules": false, |
| 228 | "leaveDotGit": false, | 228 | "leaveDotGit": false, |
| 229 | "name": null, | 229 | "name": null, |
| 230 | "rev": "a5864aa2ee849c372964809842c2b1db3d0c20ea", | 230 | "rev": "9b0043ba6042ba01fdd2533281313b70cbc98be4", |
| 231 | "sha256": "sha256-NKiQfx0WuDySXRR9I6FKcuzyIz3gVWXcaQgaEvyepT8=", | 231 | "sha256": "sha256-ZLWwkwrFaOg7PnuC23VaZ0P3zMhm1JmVf0eH9lqO0BY=", |
| 232 | "sparseCheckout": [], | 232 | "sparseCheckout": [], |
| 233 | "type": "git", | 233 | "type": "git", |
| 234 | "url": "https://github.com/CogentRedTester/mpv-sub-select" | 234 | "url": "https://github.com/CogentRedTester/mpv-sub-select" |
| 235 | }, | 235 | }, |
| 236 | "version": "a5864aa2ee849c372964809842c2b1db3d0c20ea" | 236 | "version": "9b0043ba6042ba01fdd2533281313b70cbc98be4" |
| 237 | }, | 237 | }, |
| 238 | "mpv-youtube-quality": { | 238 | "mpv-youtube-quality": { |
| 239 | "cargoLocks": null, | 239 | "cargoLocks": null, |
| @@ -339,11 +339,11 @@ | |||
| 339 | "passthru": null, | 339 | "passthru": null, |
| 340 | "pinned": false, | 340 | "pinned": false, |
| 341 | "src": { | 341 | "src": { |
| 342 | "sha256": "sha256-+pRvc5mr2PEkG05IzPjUrE6Yr8EwG4zA/3DEU8GVA1E=", | 342 | "sha256": "sha256-X0dWvx/v/wGEgPE6Cu5MN5ocnJeUi0iutrz72L+55aU=", |
| 343 | "type": "tarball", | 343 | "type": "tarball", |
| 344 | "url": "https://github.com/matusnovak/prometheus-smartctl/archive/refs/tags/v2.3.0.tar.gz" | 344 | "url": "https://github.com/matusnovak/prometheus-smartctl/archive/refs/tags/v2.4.0.tar.gz" |
| 345 | }, | 345 | }, |
| 346 | "version": "2.3.0" | 346 | "version": "2.4.0" |
| 347 | }, | 347 | }, |
| 348 | "tomorrow-night-paradise-theme": { | 348 | "tomorrow-night-paradise-theme": { |
| 349 | "cargoLocks": null, | 349 | "cargoLocks": null, |
diff --git a/_sources/generated.nix b/_sources/generated.nix index d4d97c03..8c3074ab 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix | |||
| @@ -130,17 +130,17 @@ | |||
| 130 | }; | 130 | }; |
| 131 | mpv-subselect = { | 131 | mpv-subselect = { |
| 132 | pname = "mpv-subselect"; | 132 | pname = "mpv-subselect"; |
| 133 | version = "a5864aa2ee849c372964809842c2b1db3d0c20ea"; | 133 | version = "9b0043ba6042ba01fdd2533281313b70cbc98be4"; |
| 134 | src = fetchgit { | 134 | src = fetchgit { |
| 135 | url = "https://github.com/CogentRedTester/mpv-sub-select"; | 135 | url = "https://github.com/CogentRedTester/mpv-sub-select"; |
| 136 | rev = "a5864aa2ee849c372964809842c2b1db3d0c20ea"; | 136 | rev = "9b0043ba6042ba01fdd2533281313b70cbc98be4"; |
| 137 | fetchSubmodules = false; | 137 | fetchSubmodules = false; |
| 138 | deepClone = false; | 138 | deepClone = false; |
| 139 | leaveDotGit = false; | 139 | leaveDotGit = false; |
| 140 | sparseCheckout = [ ]; | 140 | sparseCheckout = [ ]; |
| 141 | sha256 = "sha256-NKiQfx0WuDySXRR9I6FKcuzyIz3gVWXcaQgaEvyepT8="; | 141 | sha256 = "sha256-ZLWwkwrFaOg7PnuC23VaZ0P3zMhm1JmVf0eH9lqO0BY="; |
| 142 | }; | 142 | }; |
| 143 | date = "2024-05-15"; | 143 | date = "2024-08-31"; |
| 144 | }; | 144 | }; |
| 145 | mpv-youtube-quality = { | 145 | mpv-youtube-quality = { |
| 146 | pname = "mpv-youtube-quality"; | 146 | pname = "mpv-youtube-quality"; |
| @@ -204,10 +204,10 @@ | |||
| 204 | }; | 204 | }; |
| 205 | smartprom = { | 205 | smartprom = { |
| 206 | pname = "smartprom"; | 206 | pname = "smartprom"; |
| 207 | version = "2.3.0"; | 207 | version = "2.4.0"; |
| 208 | src = fetchTarball { | 208 | src = fetchTarball { |
| 209 | url = "https://github.com/matusnovak/prometheus-smartctl/archive/refs/tags/v2.3.0.tar.gz"; | 209 | url = "https://github.com/matusnovak/prometheus-smartctl/archive/refs/tags/v2.4.0.tar.gz"; |
| 210 | sha256 = "sha256-+pRvc5mr2PEkG05IzPjUrE6Yr8EwG4zA/3DEU8GVA1E="; | 210 | sha256 = "sha256-X0dWvx/v/wGEgPE6Cu5MN5ocnJeUi0iutrz72L+55aU="; |
| 211 | }; | 211 | }; |
| 212 | }; | 212 | }; |
| 213 | tomorrow-night-paradise-theme = { | 213 | tomorrow-night-paradise-theme = { |
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix index 7df0235e..8cee684f 100644 --- a/accounts/gkleen@sif/default.nix +++ b/accounts/gkleen@sif/default.nix | |||
| @@ -80,14 +80,6 @@ let | |||
| 80 | ]; | 80 | ]; |
| 81 | }; | 81 | }; |
| 82 | 82 | ||
| 83 | nvidiaOffloadScript = pkgs.writeShellScriptBin "nvidia-offload" '' | ||
| 84 | export __NV_PRIME_RENDER_OFFLOAD=1 | ||
| 85 | export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0 | ||
| 86 | export __GLX_VENDOR_LIBRARY_NAME=nvidia | ||
| 87 | export __VK_LAYER_NV_optimus=NVIDIA_only | ||
| 88 | exec -a "$1" "$@" | ||
| 89 | ''; | ||
| 90 | |||
| 91 | lockCommand = "${config.systemd.package}/bin/systemctl --user start gtklock.service"; | 83 | lockCommand = "${config.systemd.package}/bin/systemctl --user start gtklock.service"; |
| 92 | in { | 84 | in { |
| 93 | imports = with flake.nixosModules.userProfiles.${userName}; [ | 85 | imports = with flake.nixosModules.userProfiles.${userName}; [ |
| @@ -715,7 +707,7 @@ in { | |||
| 715 | matrix-synapse-tools.synadm | 707 | matrix-synapse-tools.synadm |
| 716 | flakeInputs.deploy-rs.packages.${config.nixpkgs.system}.deploy-rs | 708 | flakeInputs.deploy-rs.packages.${config.nixpkgs.system}.deploy-rs |
| 717 | sieve-connect gimp inkscape udiskie glab nitrokey-app | 709 | sieve-connect gimp inkscape udiskie glab nitrokey-app |
| 718 | pynitrokey gtklock wlrctl nvidiaOffloadScript | 710 | pynitrokey gtklock wlrctl |
| 719 | ]; | 711 | ]; |
| 720 | 712 | ||
| 721 | file = { | 713 | file = { |
| @@ -82,11 +82,11 @@ | |||
| 82 | "flake-compat": { | 82 | "flake-compat": { |
| 83 | "flake": false, | 83 | "flake": false, |
| 84 | "locked": { | 84 | "locked": { |
| 85 | "lastModified": 1673956053, | 85 | "lastModified": 1696426674, |
| 86 | "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", | 86 | "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", |
| 87 | "owner": "edolstra", | 87 | "owner": "edolstra", |
| 88 | "repo": "flake-compat", | 88 | "repo": "flake-compat", |
| 89 | "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", | 89 | "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", |
| 90 | "type": "github" | 90 | "type": "github" |
| 91 | }, | 91 | }, |
| 92 | "original": { | 92 | "original": { |
| @@ -149,11 +149,11 @@ | |||
| 149 | "nixpkgs-lib": "nixpkgs-lib" | 149 | "nixpkgs-lib": "nixpkgs-lib" |
| 150 | }, | 150 | }, |
| 151 | "locked": { | 151 | "locked": { |
| 152 | "lastModified": 1701473968, | 152 | "lastModified": 1722555600, |
| 153 | "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", | 153 | "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", |
| 154 | "owner": "hercules-ci", | 154 | "owner": "hercules-ci", |
| 155 | "repo": "flake-parts", | 155 | "repo": "flake-parts", |
| 156 | "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", | 156 | "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", |
| 157 | "type": "github" | 157 | "type": "github" |
| 158 | }, | 158 | }, |
| 159 | "original": { | 159 | "original": { |
| @@ -237,24 +237,6 @@ | |||
| 237 | "systems": "systems_2" | 237 | "systems": "systems_2" |
| 238 | }, | 238 | }, |
| 239 | "locked": { | 239 | "locked": { |
| 240 | "lastModified": 1685518550, | ||
| 241 | "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", | ||
| 242 | "owner": "numtide", | ||
| 243 | "repo": "flake-utils", | ||
| 244 | "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", | ||
| 245 | "type": "github" | ||
| 246 | }, | ||
| 247 | "original": { | ||
| 248 | "owner": "numtide", | ||
| 249 | "repo": "flake-utils", | ||
| 250 | "type": "github" | ||
| 251 | } | ||
| 252 | }, | ||
| 253 | "flake-utils_3": { | ||
| 254 | "inputs": { | ||
| 255 | "systems": "systems_3" | ||
| 256 | }, | ||
| 257 | "locked": { | ||
| 258 | "lastModified": 1710146030, | 240 | "lastModified": 1710146030, |
| 259 | "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", | 241 | "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", |
| 260 | "owner": "numtide", | 242 | "owner": "numtide", |
| @@ -269,7 +251,7 @@ | |||
| 269 | "type": "github" | 251 | "type": "github" |
| 270 | } | 252 | } |
| 271 | }, | 253 | }, |
| 272 | "flake-utils_4": { | 254 | "flake-utils_3": { |
| 273 | "locked": { | 255 | "locked": { |
| 274 | "lastModified": 1667395993, | 256 | "lastModified": 1667395993, |
| 275 | "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", | 257 | "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", |
| @@ -293,11 +275,11 @@ | |||
| 293 | ] | 275 | ] |
| 294 | }, | 276 | }, |
| 295 | "locked": { | 277 | "locked": { |
| 296 | "lastModified": 1660459072, | 278 | "lastModified": 1709087332, |
| 297 | "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", | 279 | "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", |
| 298 | "owner": "hercules-ci", | 280 | "owner": "hercules-ci", |
| 299 | "repo": "gitignore.nix", | 281 | "repo": "gitignore.nix", |
| 300 | "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", | 282 | "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", |
| 301 | "type": "github" | 283 | "type": "github" |
| 302 | }, | 284 | }, |
| 303 | "original": { | 285 | "original": { |
| @@ -394,11 +376,11 @@ | |||
| 394 | }, | 376 | }, |
| 395 | "impermanence": { | 377 | "impermanence": { |
| 396 | "locked": { | 378 | "locked": { |
| 397 | "lastModified": 1719091691, | 379 | "lastModified": 1725690722, |
| 398 | "narHash": "sha256-AxaLX5cBEcGtE02PeGsfscSb/fWMnyS7zMWBXQWDKbE=", | 380 | "narHash": "sha256-4qWg9sNh5g1qPGO6d/GV2ktY+eDikkBTbWSg5/iD2nY=", |
| 399 | "owner": "nix-community", | 381 | "owner": "nix-community", |
| 400 | "repo": "impermanence", | 382 | "repo": "impermanence", |
| 401 | "rev": "23c1f06316b67cb5dabdfe2973da3785cfe9c34a", | 383 | "rev": "63f4d0443e32b0dd7189001ee1894066765d18a5", |
| 402 | "type": "github" | 384 | "type": "github" |
| 403 | }, | 385 | }, |
| 404 | "original": { | 386 | "original": { |
| @@ -436,11 +418,11 @@ | |||
| 436 | ] | 418 | ] |
| 437 | }, | 419 | }, |
| 438 | "locked": { | 420 | "locked": { |
| 439 | "lastModified": 1722740924, | 421 | "lastModified": 1725765290, |
| 440 | "narHash": "sha256-UQPgA5d8azLZuDHZMPmvDszhuKF1Ek89SrTRtqsQ4Ss=", | 422 | "narHash": "sha256-hwX53i24KyWzp2nWpQsn8lfGQNCP0JoW/bvQmcR1DPY=", |
| 441 | "owner": "Mic92", | 423 | "owner": "Mic92", |
| 442 | "repo": "nix-index-database", | 424 | "repo": "nix-index-database", |
| 443 | "rev": "97ca0a0fca0391de835f57e44f369a283e37890f", | 425 | "rev": "642275444c5a9defce57219c944b3179bf2adaa9", |
| 444 | "type": "github" | 426 | "type": "github" |
| 445 | }, | 427 | }, |
| 446 | "original": { | 428 | "original": { |
| @@ -472,11 +454,11 @@ | |||
| 472 | }, | 454 | }, |
| 473 | "nixos-hardware": { | 455 | "nixos-hardware": { |
| 474 | "locked": { | 456 | "locked": { |
| 475 | "lastModified": 1722332872, | 457 | "lastModified": 1725885300, |
| 476 | "narHash": "sha256-2xLM4sc5QBfi0U/AANJAW21Bj4ZX479MHPMPkB+eKBU=", | 458 | "narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=", |
| 477 | "owner": "NixOS", | 459 | "owner": "NixOS", |
| 478 | "repo": "nixos-hardware", | 460 | "repo": "nixos-hardware", |
| 479 | "rev": "14c333162ba53c02853add87a0000cbd7aa230c2", | 461 | "rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e", |
| 480 | "type": "github" | 462 | "type": "github" |
| 481 | }, | 463 | }, |
| 482 | "original": { | 464 | "original": { |
| @@ -488,11 +470,11 @@ | |||
| 488 | }, | 470 | }, |
| 489 | "nixpkgs": { | 471 | "nixpkgs": { |
| 490 | "locked": { | 472 | "locked": { |
| 491 | "lastModified": 1689261696, | 473 | "lastModified": 1719082008, |
| 492 | "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=", | 474 | "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", |
| 493 | "owner": "NixOS", | 475 | "owner": "NixOS", |
| 494 | "repo": "nixpkgs", | 476 | "repo": "nixpkgs", |
| 495 | "rev": "df1eee2aa65052a18121ed4971081576b25d6b5c", | 477 | "rev": "9693852a2070b398ee123a329e68f0dab5526681", |
| 496 | "type": "github" | 478 | "type": "github" |
| 497 | }, | 479 | }, |
| 498 | "original": { | 480 | "original": { |
| @@ -520,20 +502,14 @@ | |||
| 520 | }, | 502 | }, |
| 521 | "nixpkgs-lib": { | 503 | "nixpkgs-lib": { |
| 522 | "locked": { | 504 | "locked": { |
| 523 | "dir": "lib", | 505 | "lastModified": 1722555339, |
| 524 | "lastModified": 1701253981, | 506 | "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=", |
| 525 | "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", | 507 | "type": "tarball", |
| 526 | "owner": "NixOS", | 508 | "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" |
| 527 | "repo": "nixpkgs", | ||
| 528 | "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", | ||
| 529 | "type": "github" | ||
| 530 | }, | 509 | }, |
| 531 | "original": { | 510 | "original": { |
| 532 | "dir": "lib", | 511 | "type": "tarball", |
| 533 | "owner": "NixOS", | 512 | "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" |
| 534 | "ref": "nixos-unstable", | ||
| 535 | "repo": "nixpkgs", | ||
| 536 | "type": "github" | ||
| 537 | } | 513 | } |
| 538 | }, | 514 | }, |
| 539 | "nixpkgs-lib_2": { | 515 | "nixpkgs-lib_2": { |
| @@ -606,16 +582,16 @@ | |||
| 606 | }, | 582 | }, |
| 607 | "nixpkgs-stable": { | 583 | "nixpkgs-stable": { |
| 608 | "locked": { | 584 | "locked": { |
| 609 | "lastModified": 1685801374, | 585 | "lastModified": 1720386169, |
| 610 | "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", | 586 | "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", |
| 611 | "owner": "NixOS", | 587 | "owner": "NixOS", |
| 612 | "repo": "nixpkgs", | 588 | "repo": "nixpkgs", |
| 613 | "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", | 589 | "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", |
| 614 | "type": "github" | 590 | "type": "github" |
| 615 | }, | 591 | }, |
| 616 | "original": { | 592 | "original": { |
| 617 | "owner": "NixOS", | 593 | "owner": "NixOS", |
| 618 | "ref": "nixos-23.05", | 594 | "ref": "nixos-24.05", |
| 619 | "repo": "nixpkgs", | 595 | "repo": "nixpkgs", |
| 620 | "type": "github" | 596 | "type": "github" |
| 621 | } | 597 | } |
| @@ -654,11 +630,11 @@ | |||
| 654 | }, | 630 | }, |
| 655 | "nixpkgs_2": { | 631 | "nixpkgs_2": { |
| 656 | "locked": { | 632 | "locked": { |
| 657 | "lastModified": 1723480307, | 633 | "lastModified": 1725634671, |
| 658 | "narHash": "sha256-tdUwQVPJYI8YEzt7vtJirnIOZWLeLRMyR3bfzIHz4cU=", | 634 | "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", |
| 659 | "owner": "nixos", | 635 | "owner": "NixOS", |
| 660 | "repo": "nixpkgs", | 636 | "repo": "nixpkgs", |
| 661 | "rev": "33c8b1a7202d4c22d74f4db73666e9a868069d2c", | 637 | "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", |
| 662 | "type": "github" | 638 | "type": "github" |
| 663 | }, | 639 | }, |
| 664 | "original": { | 640 | "original": { |
| @@ -720,15 +696,15 @@ | |||
| 720 | "nixpkgs": [ | 696 | "nixpkgs": [ |
| 721 | "nixpkgs" | 697 | "nixpkgs" |
| 722 | ], | 698 | ], |
| 723 | "systems": "systems_4", | 699 | "systems": "systems_3", |
| 724 | "treefmt-nix": "treefmt-nix" | 700 | "treefmt-nix": "treefmt-nix" |
| 725 | }, | 701 | }, |
| 726 | "locked": { | 702 | "locked": { |
| 727 | "lastModified": 1723013744, | 703 | "lastModified": 1725532428, |
| 728 | "narHash": "sha256-Ilcm+bME9nUDICcoS47/McfNmbU+xn3ZBUoMjPrwGrU=", | 704 | "narHash": "sha256-dCfawQDwpukcwQw++Cn/3LIh/RZMmH+k3fm91Oc5Pf0=", |
| 729 | "owner": "nix-community", | 705 | "owner": "nix-community", |
| 730 | "repo": "poetry2nix", | 706 | "repo": "poetry2nix", |
| 731 | "rev": "551cd76c920b9eabed3fb095a4091af7676b31ba", | 707 | "rev": "a313fd7169ae43ecd1a2ea2f1e4899fe3edba4d2", |
| 732 | "type": "github" | 708 | "type": "github" |
| 733 | }, | 709 | }, |
| 734 | "original": { | 710 | "original": { |
| @@ -741,17 +717,16 @@ | |||
| 741 | "pre-commit-hooks-nix": { | 717 | "pre-commit-hooks-nix": { |
| 742 | "inputs": { | 718 | "inputs": { |
| 743 | "flake-compat": "flake-compat", | 719 | "flake-compat": "flake-compat", |
| 744 | "flake-utils": "flake-utils", | ||
| 745 | "gitignore": "gitignore", | 720 | "gitignore": "gitignore", |
| 746 | "nixpkgs": "nixpkgs", | 721 | "nixpkgs": "nixpkgs", |
| 747 | "nixpkgs-stable": "nixpkgs-stable" | 722 | "nixpkgs-stable": "nixpkgs-stable" |
| 748 | }, | 723 | }, |
| 749 | "locked": { | 724 | "locked": { |
| 750 | "lastModified": 1700922917, | 725 | "lastModified": 1723056346, |
| 751 | "narHash": "sha256-ej2fch/T584b5K9sk1UhmZF7W6wEfDHuoUYpFN8dtvM=", | 726 | "narHash": "sha256-YpzywjTAUHRRHcO8zz9x2gYqJ0JmZlcB9+RaUvD89qM=", |
| 752 | "owner": "cachix", | 727 | "owner": "cachix", |
| 753 | "repo": "pre-commit-hooks.nix", | 728 | "repo": "pre-commit-hooks.nix", |
| 754 | "rev": "e5ee5c5f3844550c01d2131096c7271cec5e9b78", | 729 | "rev": "3c977f1c9930f54066c085305b4b2291385e7a73", |
| 755 | "type": "github" | 730 | "type": "github" |
| 756 | }, | 731 | }, |
| 757 | "original": { | 732 | "original": { |
| @@ -763,7 +738,7 @@ | |||
| 763 | "pre-commit-hooks-nix_2": { | 738 | "pre-commit-hooks-nix_2": { |
| 764 | "inputs": { | 739 | "inputs": { |
| 765 | "flake-compat": "flake-compat_2", | 740 | "flake-compat": "flake-compat_2", |
| 766 | "flake-utils": "flake-utils_2", | 741 | "flake-utils": "flake-utils", |
| 767 | "gitignore": "gitignore_2", | 742 | "gitignore": "gitignore_2", |
| 768 | "nixpkgs": [ | 743 | "nixpkgs": [ |
| 769 | "ca-util", | 744 | "ca-util", |
| @@ -791,7 +766,7 @@ | |||
| 791 | "pre-commit-hooks-nix_3": { | 766 | "pre-commit-hooks-nix_3": { |
| 792 | "inputs": { | 767 | "inputs": { |
| 793 | "flake-compat": "flake-compat_4", | 768 | "flake-compat": "flake-compat_4", |
| 794 | "flake-utils": "flake-utils_4", | 769 | "flake-utils": "flake-utils_3", |
| 795 | "gitignore": "gitignore_3", | 770 | "gitignore": "gitignore_3", |
| 796 | "nixpkgs": "nixpkgs_3", | 771 | "nixpkgs": "nixpkgs_3", |
| 797 | "nixpkgs-stable": "nixpkgs-stable_3" | 772 | "nixpkgs-stable": "nixpkgs-stable_3" |
| @@ -843,7 +818,7 @@ | |||
| 843 | "deploy-rs": "deploy-rs", | 818 | "deploy-rs": "deploy-rs", |
| 844 | "flake-compat": "flake-compat_3", | 819 | "flake-compat": "flake-compat_3", |
| 845 | "flake-registry": "flake-registry", | 820 | "flake-registry": "flake-registry", |
| 846 | "flake-utils": "flake-utils_3", | 821 | "flake-utils": "flake-utils_2", |
| 847 | "home-manager": "home-manager", | 822 | "home-manager": "home-manager", |
| 848 | "home-manager-eostre": "home-manager-eostre", | 823 | "home-manager-eostre": "home-manager-eostre", |
| 849 | "impermanence": "impermanence", | 824 | "impermanence": "impermanence", |
| @@ -871,11 +846,11 @@ | |||
| 871 | ] | 846 | ] |
| 872 | }, | 847 | }, |
| 873 | "locked": { | 848 | "locked": { |
| 874 | "lastModified": 1722897572, | 849 | "lastModified": 1725922448, |
| 875 | "narHash": "sha256-3m/iyyjCdRBF8xyehf59QlckIcmShyTesymSb+N4Ap4=", | 850 | "narHash": "sha256-ruvh8tlEflRPifs5tlpa0gkttzq4UtgXkJQS7FusgFE=", |
| 876 | "owner": "Mic92", | 851 | "owner": "Mic92", |
| 877 | "repo": "sops-nix", | 852 | "repo": "sops-nix", |
| 878 | "rev": "8ae477955dfd9cbf5fa4eb82a8db8ddbb94e79d9", | 853 | "rev": "cede1a08039178ac12957733e97ab1006c6b6892", |
| 879 | "type": "github" | 854 | "type": "github" |
| 880 | }, | 855 | }, |
| 881 | "original": { | 856 | "original": { |
| @@ -925,21 +900,6 @@ | |||
| 925 | "type": "github" | 900 | "type": "github" |
| 926 | }, | 901 | }, |
| 927 | "original": { | 902 | "original": { |
| 928 | "owner": "nix-systems", | ||
| 929 | "repo": "default", | ||
| 930 | "type": "github" | ||
| 931 | } | ||
| 932 | }, | ||
| 933 | "systems_4": { | ||
| 934 | "locked": { | ||
| 935 | "lastModified": 1681028828, | ||
| 936 | "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", | ||
| 937 | "owner": "nix-systems", | ||
| 938 | "repo": "default", | ||
| 939 | "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", | ||
| 940 | "type": "github" | ||
| 941 | }, | ||
| 942 | "original": { | ||
| 943 | "id": "systems", | 903 | "id": "systems", |
| 944 | "type": "indirect" | 904 | "type": "indirect" |
| 945 | } | 905 | } |
diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix index 19040b32..e81205b3 100644 --- a/hosts/sif/default.nix +++ b/hosts/sif/default.nix | |||
| @@ -538,6 +538,7 @@ in { | |||
| 538 | nvidiaBusId = "PCI:1:0:0"; | 538 | nvidiaBusId = "PCI:1:0:0"; |
| 539 | intelBusId = "PCI:0:2:0"; | 539 | intelBusId = "PCI:0:2:0"; |
| 540 | reverseSync.enable = true; | 540 | reverseSync.enable = true; |
| 541 | offload.enableOffloadCmd = true; | ||
| 541 | }; | 542 | }; |
| 542 | }; | 543 | }; |
| 543 | 544 | ||
diff --git a/installer/default.nix b/installer/default.nix index d5e0fc07..cd1ee064 100644 --- a/installer/default.nix +++ b/installer/default.nix | |||
| @@ -58,6 +58,7 @@ with lib; | |||
| 58 | system.disableInstallerTools = false; | 58 | system.disableInstallerTools = false; |
| 59 | 59 | ||
| 60 | systemd.sysusers.enable = false; | 60 | systemd.sysusers.enable = false; |
| 61 | system.machine-id.generate.enable = false; | ||
| 61 | system.stateVersion = config.system.nixos.release; # No state in installer | 62 | system.stateVersion = config.system.nixos.release; # No state in installer |
| 62 | }; | 63 | }; |
| 63 | } | 64 | } |
diff --git a/modules/nvidia.nix b/modules/nvidia.nix new file mode 100644 index 00000000..2f7a00aa --- /dev/null +++ b/modules/nvidia.nix | |||
| @@ -0,0 +1,10 @@ | |||
| 1 | { lib, config, ... }: | ||
| 2 | |||
| 3 | { | ||
| 4 | config = { | ||
| 5 | hardware.nvidia = { | ||
| 6 | open = lib.mkDefault (!(lib.versionOlder config.hardware.nvidia.package.version "560")); | ||
| 7 | # gsp.enable = lib.mkDefault (config.hardware.nvidia.open || lib.versionAtLeast config.hardware.nvidia.package.version "555"); | ||
| 8 | }; | ||
| 9 | }; | ||
| 10 | } | ||
