From 510febeb80399b1b8fb15b1dbb5535f32b52a60e Mon Sep 17 00:00:00 2001 From: Katherina Walshe-Grey Date: Sat, 6 Dec 2025 00:46:20 +0000 Subject: [PATCH 1/3] flake: Update to NixOS 25.11; move kilgharrah from unstable to stable --- flake.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index d44d0a0..b401d1c 100644 --- a/flake.nix +++ b/flake.nix @@ -1,12 +1,12 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; - nixpkgs-small.url = "github:NixOS/nixpkgs/nixos-25.05-small"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; + nixpkgs-small.url = "github:NixOS/nixpkgs/nixos-25.11-small"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-unstable-small.url = "github:NixOS/nixpkgs/nixos-unstable-small"; home-manager = { - url = "github:nix-community/home-manager/release-25.05"; + url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -114,7 +114,7 @@ meta = { nixpkgs = import nixpkgs-unstable { system = "x86_64-linux"; }; nodeNixpkgs = { - kilgharrah = import nixpkgs-unstable { system = "x86_64-linux"; }; + kilgharrah = import nixpkgs { system = "x86_64-linux"; }; tohru = import nixpkgs { system = "x86_64-linux"; }; elucredassa = import nixpkgs-small { system = "x86_64-linux"; }; yevaud = import nixpkgs-small { system = "x86_64-linux"; }; @@ -143,7 +143,7 @@ tohru.deployment.targetHost = null; # disable remote deployment elucredassa.deployment.targetHost = "100.73.34.182"; # TODO: no fqdn yet - kilgharrah.imports = [ ./hosts/kilgharrah home-manager-unstable ]; + kilgharrah.imports = [ ./hosts/kilgharrah home-manager ]; tohru.imports = [ ./hosts/tohru home-manager ]; elucredassa.imports = [ ./hosts/elucredassa home-manager ]; yevaud.imports = [ ./hosts/yevaud home-manager ]; From bea52f95f44985b4d6e7c43bbb43b9c84eda8f12 Mon Sep 17 00:00:00 2001 From: Katherina Walshe-Grey Date: Sat, 6 Dec 2025 00:47:40 +0000 Subject: [PATCH 2/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'agenix': 'github:ryantm/agenix/9ba0d85de3eaa7afeab493fed622008b6e4924f5' (2025-10-28) → 'github:ryantm/agenix/fcdea223397448d35d9b31f798479227e80183f6' (2025-11-08) • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/26d05891e14c88eb4a5d5bee659c0db5afb609d8' (2025-11-06) → 'github:hercules-ci/flake-parts/2cccadc7357c0ba201788ae99c4dfa90728ef5e0' (2025-11-21) • Updated input 'home-manager': 'github:nix-community/home-manager/3b955f5f0a942f9f60cdc9cacb7844335d0f21c3' (2025-09-21) → 'github:nix-community/home-manager/f63d0fe9d81d36e5fc95497217a72e02b8b7bcab' (2025-12-04) • Updated input 'home-manager-unstable': 'github:nix-community/home-manager/0562fef070a1027325dd4ea10813d64d2c967b39' (2025-11-06) → 'github:nix-community/home-manager/519828bf1c97f8bc2ed2d3b79214067047d3c67d' (2025-12-05) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/6faeb062ee4cf4f105989d490831713cc5a43ee1' (2025-11-07) → 'github:NixOS/nixpkgs/c97c47f2bac4fa59e2cbdeba289686ae615f8ed4' (2025-12-04) • Updated input 'nixpkgs-small': 'github:NixOS/nixpkgs/8660acf86a1f5a14dacf049f9a5b8aff143e9111' (2025-11-07) → 'github:NixOS/nixpkgs/d355f89e0014e51c9511298089d7ab55fd6f7056' (2025-12-05) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/ae814fd3904b621d8ab97418f1d0f2eb0d3716f4' (2025-11-05) → 'github:NixOS/nixpkgs/418468ac9527e799809c900eda37cbff999199b6' (2025-12-02) • Updated input 'nixpkgs-unstable-small': 'github:NixOS/nixpkgs/8a0ddfe5e62a2814979672aa1afd54dfb4aa345a' (2025-11-08) → 'github:NixOS/nixpkgs/21f4f13e179ba2b3d84d844b697612fa1b695b85' (2025-12-05) • Updated input 'plasma-manager': 'github:nix-community/plasma-manager/6296d7100cc84b2ff732b7c103a50c2856974cf6' (2025-11-04) → 'github:nix-community/plasma-manager/b24ed4b272256dfc1cc2291f89a9821d5f9e14b4' (2025-11-23) • Updated input 'randomcat': 'github:randomnetcat/nix-configs/7a30bbc509329db6e4aa56c3e4dcb44971f4baa3' (2025-11-08) → 'github:randomnetcat/nix-configs/03e246bb10c135386455af0e88899df2ca10495d' (2025-12-05) --- flake.lock | 66 +++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 13bbe9e..ec49815 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1761656077, - "narHash": "sha256-lsNWuj4Z+pE7s0bd2OKicOFq9bK86JE0ZGeKJbNqb94=", + "lastModified": 1762618334, + "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=", "owner": "ryantm", "repo": "agenix", - "rev": "9ba0d85de3eaa7afeab493fed622008b6e4924f5", + "rev": "fcdea223397448d35d9b31f798479227e80183f6", "type": "github" }, "original": { @@ -52,11 +52,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1762440070, - "narHash": "sha256-xxdepIcb39UJ94+YydGP221rjnpkDZUlykKuF54PsqI=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "26d05891e14c88eb4a5d5bee659c0db5afb609d8", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -87,16 +87,16 @@ ] }, "locked": { - "lastModified": 1758463745, - "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", + "lastModified": 1764866045, + "narHash": "sha256-0GsEtXV9OquDQ1VclQfP16cU5VZh7NEVIOjSH4UaJuM=", "owner": "nix-community", "repo": "home-manager", - "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", + "rev": "f63d0fe9d81d36e5fc95497217a72e02b8b7bcab", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -108,11 +108,11 @@ ] }, "locked": { - "lastModified": 1762463325, - "narHash": "sha256-33YUsWpPyeBZEWrKQ2a1gkRZ7i0XCC/2MYpU6BVeQSU=", + "lastModified": 1764952935, + "narHash": "sha256-cRPB2zESVMjIGxJ49qj4t4qnT0ae44E+fS/mkfOS/BY=", "owner": "nix-community", "repo": "home-manager", - "rev": "0562fef070a1027325dd4ea10813d64d2c967b39", + "rev": "519828bf1c97f8bc2ed2d3b79214067047d3c67d", "type": "github" }, "original": { @@ -123,16 +123,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762498405, - "narHash": "sha256-Zg/SCgCaAioc0/SVZQJxuECGPJy+OAeBcGeA5okdYDc=", + "lastModified": 1764831616, + "narHash": "sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6faeb062ee4cf4f105989d490831713cc5a43ee1", + "rev": "c97c47f2bac4fa59e2cbdeba289686ae615f8ed4", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -154,27 +154,27 @@ }, "nixpkgs-small": { "locked": { - "lastModified": 1762511465, - "narHash": "sha256-9U/5vEE3NPJNTkSmQ6hKI8iOcwTDDAP3ChBwEohAdHg=", + "lastModified": 1764952718, + "narHash": "sha256-Gf75RCbeYcfXGNb9hHQ7DsVNsxU+TNWivose3JT53QY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8660acf86a1f5a14dacf049f9a5b8aff143e9111", + "rev": "d355f89e0014e51c9511298089d7ab55fd6f7056", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05-small", + "ref": "nixos-25.11-small", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1762363567, - "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", + "lastModified": 1764667669, + "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", + "rev": "418468ac9527e799809c900eda37cbff999199b6", "type": "github" }, "original": { @@ -186,11 +186,11 @@ }, "nixpkgs-unstable-small": { "locked": { - "lastModified": 1762580002, - "narHash": "sha256-RyQ8FpohhQumkR7+Yoj4FyUyRQ5A0vJnJ2ZUEtYAMUQ=", + "lastModified": 1764945329, + "narHash": "sha256-hHzryWFOvCnUfiQvsHEjVpAECIXB977Owi1Gno7YwYc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a0ddfe5e62a2814979672aa1afd54dfb4aa345a", + "rev": "21f4f13e179ba2b3d84d844b697612fa1b695b85", "type": "github" }, "original": { @@ -210,11 +210,11 @@ ] }, "locked": { - "lastModified": 1762274591, - "narHash": "sha256-Vbhluvk15qwiyNDyPd9tjJh9gxIfUjbKVT79c05Pd3I=", + "lastModified": 1763909441, + "narHash": "sha256-56LwV51TX/FhgX+5LCG6akQ5KrOWuKgcJa+eUsRMxsc=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "6296d7100cc84b2ff732b7c103a50c2856974cf6", + "rev": "b24ed4b272256dfc1cc2291f89a9821d5f9e14b4", "type": "github" }, "original": { @@ -226,11 +226,11 @@ "randomcat": { "flake": false, "locked": { - "lastModified": 1762566840, - "narHash": "sha256-PJIdcs6R80yZipKwD0K/yuahwNpanx1AxCRfsRQ/dXo=", + "lastModified": 1764900354, + "narHash": "sha256-/pWRIVfDkF26gaYGVc68Xo4WvDSXs+Chbr2iKcOESbc=", "owner": "randomnetcat", "repo": "nix-configs", - "rev": "7a30bbc509329db6e4aa56c3e4dcb44971f4baa3", + "rev": "03e246bb10c135386455af0e88899df2ca10495d", "type": "github" }, "original": { From 9113777d056afc29e919cb3615fc282104dfa353 Mon Sep 17 00:00:00 2001 From: Katherina Walshe-Grey Date: Sat, 6 Dec 2025 01:26:41 +0000 Subject: [PATCH 3/3] kilgharrah: Update CUDA cache location --- hosts/kilgharrah/hardware.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/kilgharrah/hardware.nix b/hosts/kilgharrah/hardware.nix index 89b502c..360029e 100644 --- a/hosts/kilgharrah/hardware.nix +++ b/hosts/kilgharrah/hardware.nix @@ -10,8 +10,8 @@ nixpkgs.config.cudaSupport = true; nix.settings = { # Community cache with prebuilt packages with cudaSupport enabled - substituters = [ "https://nix-community.cachix.org" ]; - trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" ]; + substituters = [ "https://cache.nixos-cuda.org" ]; + trusted-public-keys = [ "cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M=" ]; }; # # Downgrade to driver version 535 as 550 has problems with Wayland