From 15c32a95a411eb4f00c586772b3ffade734eece1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?m=C3=BCde?= Date: Thu, 14 May 2026 20:56:52 +0200 Subject: [PATCH 1/4] nix flake update --- flake.lock | 74 +++++++++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index a74a893..b0d2c2e 100644 --- a/flake.lock +++ b/flake.lock @@ -232,11 +232,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1775087534, - "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", + "lastModified": 1777988971, + "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", + "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff", "type": "github" }, "original": { @@ -330,11 +330,11 @@ ] }, "locked": { - "lastModified": 1775425411, - "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=", + "lastModified": 1777851538, + "narHash": "sha256-Gp8qwTEYNoy2yvmErVGlvLOQvrtEECCAKbonW7VJef8=", "owner": "nix-community", "repo": "home-manager", - "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe", + "rev": "cc09c0f9b7eaa95c2d9827338a5eb03d32505ca5", "type": "github" }, "original": { @@ -378,11 +378,11 @@ ] }, "locked": { - "lastModified": 1777031541, - "narHash": "sha256-KZ4s1kolHXFQrRGlnB503gDcTrVQMhiczO+LvvwKEPg=", + "lastModified": 1778151388, + "narHash": "sha256-lldMJPUeouEjO8/7aLuwhcsIw29vVihm2ZALzjiqfec=", "owner": "nix-community", "repo": "naersk", - "rev": "5e73301621274c44798bf6c6211ed27fc2ced201", + "rev": "efdddff9ff4d8e7d0056d57ec67dac50f75ab8f6", "type": "github" }, "original": { @@ -405,11 +405,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1777472199, - "narHash": "sha256-gJr/OrHv6s8ANqv915sb69LLThow1u5yAO/ouElVGGM=", + "lastModified": 1778224717, + "narHash": "sha256-lzpzFAinsI1YriR+iVDIDZVkps2oQw1LG2QvFcDVYCk=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "323a80f2ce4541c595d491acbd15a8800201cbae", + "rev": "cb2fdda815a0c2c03f8a7fe7075c433d4ef37110", "type": "github" }, "original": { @@ -438,11 +438,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1777468255, - "narHash": "sha256-lBZc1UMy+1P1T/E41j3jQrpS7EFI3qegd+ktHZdamIg=", + "lastModified": 1778221858, + "narHash": "sha256-+nZlx8MKCs973N9Bm0hNzFHjY+2lmBrBOQeTALeCRhI=", "owner": "YaLTeR", "repo": "niri", - "rev": "dd1c3bcb9f1ef416df33ffa22d1d9bcee1398e7d", + "rev": "0200670d9ee8cfbdb154e3e14d92b5ff61aedd59", "type": "github" }, "original": { @@ -473,11 +473,11 @@ ] }, "locked": { - "lastModified": 1777434090, - "narHash": "sha256-i7p7ajtdKF6oVjs3ERyECCg6m1lWEchHNPKQjgRW4h4=", + "lastModified": 1778297753, + "narHash": "sha256-IRgRWBkluHR+JiNmhS/fbTbodr22/P9MuWZSU7x3DGI=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "f32bb01e6a12b74fa67261e9d690ff9d0603d86b", + "rev": "a15c2ddce7f4018f9277c727f6689c56be8b2720", "type": "github" }, "original": { @@ -588,11 +588,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1774748309, - "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=", + "lastModified": 1777168982, + "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "333c4e0545a6da976206c74db8773a1645b5870a", + "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", "type": "github" }, "original": { @@ -603,11 +603,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1777270315, - "narHash": "sha256-yKB4G6cKsQsWN7M6rZGk6gkJPDNPIzT05y4qzRyCDlI=", + "lastModified": 1778124196, + "narHash": "sha256-pYEytCNic/czazbV9r3tbQ6BZzqRBg/41x2dIC5ymOo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6368eda62c9775c38ef7f714b2555a741c20c72d", + "rev": "68a8af93ff4297686cb68880845e61e5e2e41d92", "type": "github" }, "original": { @@ -619,11 +619,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1777077449, - "narHash": "sha256-AIiMJiqvGrN4HyLEbKAoCSRRYn0rnlW5VbKNIMIYqm4=", + "lastModified": 1778003029, + "narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a4bf06618f0b5ee50f14ed8f0da77d34ecc19160", + "rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5", "type": "github" }, "original": { @@ -659,11 +659,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1778180483, - "narHash": "sha256-35cMiZn5DAnYFpKFdWg5dxW7hLO3/ey743ED6yV3pL8=", + "lastModified": 1778182618, + "narHash": "sha256-1KzLskWhgJZu0jL03UZZtmHBgk11HMhLFvO9mCWnCao=", "ref": "refs/heads/main", - "rev": "dfa3840d97186fef3480b49f289acd3ae707ee27", - "revCount": 626, + "rev": "628ae67b7def027553c287cfd71f840570469bce", + "revCount": 627, "type": "git", "url": "https://git.berlin.ccc.de/vinzenz/nova-shell" }, @@ -682,11 +682,11 @@ ] }, "locked": { - "lastModified": 1777499139, - "narHash": "sha256-s817mwTTkW0VIReee1z41LJAz13AUw3DOK41jZooFGw=", + "lastModified": 1778311636, + "narHash": "sha256-oYvKqSgs5qxcSynyOwBMGDr0dTYUGu4Lucou9OsbwlU=", "owner": "nix-community", "repo": "NUR", - "rev": "c0295550b00f0d0d4a9f41efd5e6c14d38a671fc", + "rev": "3f8e3217d2da6312a529f62a40c90b7129e2ea47", "type": "github" }, "original": { @@ -903,11 +903,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1776894428, - "narHash": "sha256-wuT915MyCtMTfLj+uo9y8wtCwkEgJXiXvcbSleFrlN0=", + "lastModified": 1778105055, + "narHash": "sha256-SWz0cVHEGFb2rSszCaQ7nmuM9q7Cq3xbsg+DAg0N9jo=", "owner": "nix-community", "repo": "stylix", - "rev": "f34be27ce83efaa1c85ad1e5b1f8b6dea65b147d", + "rev": "68b1ff44196f4f593d0cd837ffb2a088c2870055", "type": "github" }, "original": { From cc3cb4fc720e9511908ab1da82887828e23f06fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?m=C3=BCde?= Date: Thu, 14 May 2026 21:12:05 +0200 Subject: [PATCH 2/4] add hyperhive --- flake.lock | 117 ++++++++++++++++++- flake.nix | 4 + nixosConfigurations/muede-lpt2/default.nix | 1 + nixosConfigurations/muede-lpt2/hyperhive.nix | 6 + 4 files changed, 124 insertions(+), 4 deletions(-) create mode 100644 nixosConfigurations/muede-lpt2/hyperhive.nix diff --git a/flake.lock b/flake.lock index b0d2c2e..b8c993f 100644 --- a/flake.lock +++ b/flake.lock @@ -161,6 +161,7 @@ "fenix": { "inputs": { "nixpkgs": [ + "hyperhive", "naersk", "nixpkgs" ], @@ -180,6 +181,28 @@ "type": "github" } }, + "fenix_2": { + "inputs": { + "nixpkgs": [ + "naersk", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src_2" + }, + "locked": { + "lastModified": 1752475459, + "narHash": "sha256-z6QEu4ZFuHiqdOPbYss4/Q8B0BFhacR8ts6jO/F/aOU=", + "owner": "nix-community", + "repo": "fenix", + "rev": "bf0d6f70f4c9a9cf8845f992105652173f4b617f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "firefox-gnome-theme": { "flake": false, "locked": { @@ -344,6 +367,31 @@ "type": "github" } }, + "hyperhive": { + "inputs": { + "naersk": "naersk", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-unstable": [ + "nixpkgs-unstable" + ], + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1778860194, + "narHash": "sha256-WZW44eiWOlQOEUB6hzIraDYhVqvHDHcFvNy34tzoqe0=", + "ref": "refs/heads/main", + "rev": "f33fc3dd50c2b80335da86bff5c3c2ad5ab87287", + "revCount": 133, + "type": "git", + "url": "https://git.berlin.ccc.de/vinzenz/hyperhive.git" + }, + "original": { + "type": "git", + "url": "https://git.berlin.ccc.de/vinzenz/hyperhive.git" + } + }, "lanzaboote": { "inputs": { "crane": "crane", @@ -373,6 +421,28 @@ "naersk": { "inputs": { "fenix": "fenix", + "nixpkgs": [ + "hyperhive", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1778151388, + "narHash": "sha256-lldMJPUeouEjO8/7aLuwhcsIw29vVihm2ZALzjiqfec=", + "owner": "nix-community", + "repo": "naersk", + "rev": "efdddff9ff4d8e7d0056d57ec67dac50f75ab8f6", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "naersk", + "type": "github" + } + }, + "naersk_2": { + "inputs": { + "fenix": "fenix_2", "nixpkgs": [ "nixpkgs" ] @@ -656,7 +726,7 @@ "nixpkgs-unstable" ], "quickshell": "quickshell", - "treefmt-nix": "treefmt-nix" + "treefmt-nix": "treefmt-nix_2" }, "locked": { "lastModified": 1778182618, @@ -746,8 +816,9 @@ "inputs": { "flake-parts": "flake-parts", "home-manager": "home-manager", + "hyperhive": "hyperhive", "lanzaboote": "lanzaboote", - "naersk": "naersk", + "naersk": "naersk_2", "niri": "niri", "nix-filter": "nix-filter", "nix-vscode-extensions": "nix-vscode-extensions", @@ -761,7 +832,7 @@ "servicepoint-simulator": "servicepoint-simulator", "servicepoint-tanks": "servicepoint-tanks", "stylix": "stylix", - "treefmt-nix": "treefmt-nix_2", + "treefmt-nix": "treefmt-nix_3", "zerforschen-plus": "zerforschen-plus" } }, @@ -782,6 +853,23 @@ "type": "github" } }, + "rust-analyzer-src_2": { + "flake": false, + "locked": { + "lastModified": 1752428706, + "narHash": "sha256-EJcdxw3aXfP8Ex1Nm3s0awyH9egQvB2Gu+QEnJn2Sfg=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "591e3b7624be97e4443ea7b5542c191311aa141d", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "rust-overlay": { "inputs": { "nixpkgs": [ @@ -1016,7 +1104,7 @@ "treefmt-nix": { "inputs": { "nixpkgs": [ - "nova-shell", + "hyperhive", "nixpkgs" ] }, @@ -1035,6 +1123,27 @@ } }, "treefmt-nix_2": { + "inputs": { + "nixpkgs": [ + "nova-shell", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1775636079, + "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_3": { "inputs": { "nixpkgs": [ "nixpkgs" diff --git a/flake.nix b/flake.nix index e95af0e..d8125da 100644 --- a/flake.nix +++ b/flake.nix @@ -13,6 +13,10 @@ url = "github:hercules-ci/flake-parts"; #inputs.nixpkgs.follows = "nixpkgs"; }; + hyperhive = { + url = "git+https://git.berlin.ccc.de/vinzenz/hyperhive.git"; + inputs.nixpkgs.follows = "nixpkgs"; + }; lanzaboote = { url = "github:nix-community/lanzaboote/v0.4.3"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/nixosConfigurations/muede-lpt2/default.nix b/nixosConfigurations/muede-lpt2/default.nix index be7927c..367a7df 100644 --- a/nixosConfigurations/muede-lpt2/default.nix +++ b/nixosConfigurations/muede-lpt2/default.nix @@ -3,6 +3,7 @@ imports = [ ./containers.nix ./hardware.nix + ./hyperhive.nix ]; config = { diff --git a/nixosConfigurations/muede-lpt2/hyperhive.nix b/nixosConfigurations/muede-lpt2/hyperhive.nix new file mode 100644 index 0000000..0874c38 --- /dev/null +++ b/nixosConfigurations/muede-lpt2/hyperhive.nix @@ -0,0 +1,6 @@ +{ hyperhive, ... }: +{ + imports = [ hyperhive.nixosModules.hive-c0re ]; + + config.services.hive-c0re.enable = true; +} From a9cd9aa069ea29e0b8bbdc71e92950131877cbfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?m=C3=BCde?= Date: Fri, 15 May 2026 17:51:51 +0200 Subject: [PATCH 3/4] remote builds: fallback to local build --- nixosModules/distributed-builds.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixosModules/distributed-builds.nix b/nixosModules/distributed-builds.nix index c08d657..e0f0e12 100644 --- a/nixosModules/distributed-builds.nix +++ b/nixosModules/distributed-builds.nix @@ -82,7 +82,7 @@ in }) (lib.filterAttrs (_: v: (v.distributedBuilds or { }) ? storeSigningPublicKey) allDevices); nix.settings = { - #fallback = true; + fallback = true; connect-timeout = 5; trusted-public-keys = lib.pipe buildServerDevices [ (lib.mapAttrsToList (_: v: v.distributedBuilds.storeSigningPublicKey or null)) From aa77543f14aec98834c64259b800f789fa089e81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?m=C3=BCde?= Date: Fri, 15 May 2026 17:52:16 +0200 Subject: [PATCH 4/4] misc installs --- homeConfigurations/muede/default.nix | 3 ++- nixosConfigurations/damocles/claude-container.nix | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/homeConfigurations/muede/default.nix b/homeConfigurations/muede/default.nix index c2293ca..0c6f563 100644 --- a/homeConfigurations/muede/default.nix +++ b/homeConfigurations/muede/default.nix @@ -74,10 +74,11 @@ arduino-cli arduino-ide btop - claude-code + unstable.claude-code dconf2nix foliate fractal + file geary gnome-terminal gparted diff --git a/nixosConfigurations/damocles/claude-container.nix b/nixosConfigurations/damocles/claude-container.nix index 8093878..a91c661 100644 --- a/nixosConfigurations/damocles/claude-container.nix +++ b/nixosConfigurations/damocles/claude-container.nix @@ -19,6 +19,7 @@ gnugrep curl bintools + file ]; boot.isContainer = true;