diff --git a/flake.lock b/flake.lock index b8c993f..a74a893 100644 --- a/flake.lock +++ b/flake.lock @@ -161,7 +161,6 @@ "fenix": { "inputs": { "nixpkgs": [ - "hyperhive", "naersk", "nixpkgs" ], @@ -181,28 +180,6 @@ "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": { @@ -255,11 +232,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1777988971, - "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=", + "lastModified": 1775087534, + "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff", + "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "type": "github" }, "original": { @@ -353,11 +330,11 @@ ] }, "locked": { - "lastModified": 1777851538, - "narHash": "sha256-Gp8qwTEYNoy2yvmErVGlvLOQvrtEECCAKbonW7VJef8=", + "lastModified": 1775425411, + "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=", "owner": "nix-community", "repo": "home-manager", - "rev": "cc09c0f9b7eaa95c2d9827338a5eb03d32505ca5", + "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe", "type": "github" }, "original": { @@ -367,31 +344,6 @@ "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", @@ -422,37 +374,15 @@ "inputs": { "fenix": "fenix", "nixpkgs": [ - "hyperhive", "nixpkgs" ] }, "locked": { - "lastModified": 1778151388, - "narHash": "sha256-lldMJPUeouEjO8/7aLuwhcsIw29vVihm2ZALzjiqfec=", + "lastModified": 1777031541, + "narHash": "sha256-KZ4s1kolHXFQrRGlnB503gDcTrVQMhiczO+LvvwKEPg=", "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" - ] - }, - "locked": { - "lastModified": 1778151388, - "narHash": "sha256-lldMJPUeouEjO8/7aLuwhcsIw29vVihm2ZALzjiqfec=", - "owner": "nix-community", - "repo": "naersk", - "rev": "efdddff9ff4d8e7d0056d57ec67dac50f75ab8f6", + "rev": "5e73301621274c44798bf6c6211ed27fc2ced201", "type": "github" }, "original": { @@ -475,11 +405,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1778224717, - "narHash": "sha256-lzpzFAinsI1YriR+iVDIDZVkps2oQw1LG2QvFcDVYCk=", + "lastModified": 1777472199, + "narHash": "sha256-gJr/OrHv6s8ANqv915sb69LLThow1u5yAO/ouElVGGM=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "cb2fdda815a0c2c03f8a7fe7075c433d4ef37110", + "rev": "323a80f2ce4541c595d491acbd15a8800201cbae", "type": "github" }, "original": { @@ -508,11 +438,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1778221858, - "narHash": "sha256-+nZlx8MKCs973N9Bm0hNzFHjY+2lmBrBOQeTALeCRhI=", + "lastModified": 1777468255, + "narHash": "sha256-lBZc1UMy+1P1T/E41j3jQrpS7EFI3qegd+ktHZdamIg=", "owner": "YaLTeR", "repo": "niri", - "rev": "0200670d9ee8cfbdb154e3e14d92b5ff61aedd59", + "rev": "dd1c3bcb9f1ef416df33ffa22d1d9bcee1398e7d", "type": "github" }, "original": { @@ -543,11 +473,11 @@ ] }, "locked": { - "lastModified": 1778297753, - "narHash": "sha256-IRgRWBkluHR+JiNmhS/fbTbodr22/P9MuWZSU7x3DGI=", + "lastModified": 1777434090, + "narHash": "sha256-i7p7ajtdKF6oVjs3ERyECCg6m1lWEchHNPKQjgRW4h4=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "a15c2ddce7f4018f9277c727f6689c56be8b2720", + "rev": "f32bb01e6a12b74fa67261e9d690ff9d0603d86b", "type": "github" }, "original": { @@ -658,11 +588,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1777168982, - "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", + "lastModified": 1774748309, + "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", + "rev": "333c4e0545a6da976206c74db8773a1645b5870a", "type": "github" }, "original": { @@ -673,11 +603,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1778124196, - "narHash": "sha256-pYEytCNic/czazbV9r3tbQ6BZzqRBg/41x2dIC5ymOo=", + "lastModified": 1777270315, + "narHash": "sha256-yKB4G6cKsQsWN7M6rZGk6gkJPDNPIzT05y4qzRyCDlI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "68a8af93ff4297686cb68880845e61e5e2e41d92", + "rev": "6368eda62c9775c38ef7f714b2555a741c20c72d", "type": "github" }, "original": { @@ -689,11 +619,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1778003029, - "narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=", + "lastModified": 1777077449, + "narHash": "sha256-AIiMJiqvGrN4HyLEbKAoCSRRYn0rnlW5VbKNIMIYqm4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5", + "rev": "a4bf06618f0b5ee50f14ed8f0da77d34ecc19160", "type": "github" }, "original": { @@ -726,14 +656,14 @@ "nixpkgs-unstable" ], "quickshell": "quickshell", - "treefmt-nix": "treefmt-nix_2" + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1778182618, - "narHash": "sha256-1KzLskWhgJZu0jL03UZZtmHBgk11HMhLFvO9mCWnCao=", + "lastModified": 1778180483, + "narHash": "sha256-35cMiZn5DAnYFpKFdWg5dxW7hLO3/ey743ED6yV3pL8=", "ref": "refs/heads/main", - "rev": "628ae67b7def027553c287cfd71f840570469bce", - "revCount": 627, + "rev": "dfa3840d97186fef3480b49f289acd3ae707ee27", + "revCount": 626, "type": "git", "url": "https://git.berlin.ccc.de/vinzenz/nova-shell" }, @@ -752,11 +682,11 @@ ] }, "locked": { - "lastModified": 1778311636, - "narHash": "sha256-oYvKqSgs5qxcSynyOwBMGDr0dTYUGu4Lucou9OsbwlU=", + "lastModified": 1777499139, + "narHash": "sha256-s817mwTTkW0VIReee1z41LJAz13AUw3DOK41jZooFGw=", "owner": "nix-community", "repo": "NUR", - "rev": "3f8e3217d2da6312a529f62a40c90b7129e2ea47", + "rev": "c0295550b00f0d0d4a9f41efd5e6c14d38a671fc", "type": "github" }, "original": { @@ -816,9 +746,8 @@ "inputs": { "flake-parts": "flake-parts", "home-manager": "home-manager", - "hyperhive": "hyperhive", "lanzaboote": "lanzaboote", - "naersk": "naersk_2", + "naersk": "naersk", "niri": "niri", "nix-filter": "nix-filter", "nix-vscode-extensions": "nix-vscode-extensions", @@ -832,7 +761,7 @@ "servicepoint-simulator": "servicepoint-simulator", "servicepoint-tanks": "servicepoint-tanks", "stylix": "stylix", - "treefmt-nix": "treefmt-nix_3", + "treefmt-nix": "treefmt-nix_2", "zerforschen-plus": "zerforschen-plus" } }, @@ -853,23 +782,6 @@ "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": [ @@ -991,11 +903,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1778105055, - "narHash": "sha256-SWz0cVHEGFb2rSszCaQ7nmuM9q7Cq3xbsg+DAg0N9jo=", + "lastModified": 1776894428, + "narHash": "sha256-wuT915MyCtMTfLj+uo9y8wtCwkEgJXiXvcbSleFrlN0=", "owner": "nix-community", "repo": "stylix", - "rev": "68b1ff44196f4f593d0cd837ffb2a088c2870055", + "rev": "f34be27ce83efaa1c85ad1e5b1f8b6dea65b147d", "type": "github" }, "original": { @@ -1102,27 +1014,6 @@ } }, "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "hyperhive", - "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_2": { "inputs": { "nixpkgs": [ "nova-shell", @@ -1143,7 +1034,7 @@ "type": "github" } }, - "treefmt-nix_3": { + "treefmt-nix_2": { "inputs": { "nixpkgs": [ "nixpkgs" diff --git a/flake.nix b/flake.nix index d8125da..e95af0e 100644 --- a/flake.nix +++ b/flake.nix @@ -13,10 +13,6 @@ 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/homeConfigurations/muede/default.nix b/homeConfigurations/muede/default.nix index 0c6f563..c2293ca 100644 --- a/homeConfigurations/muede/default.nix +++ b/homeConfigurations/muede/default.nix @@ -74,11 +74,10 @@ arduino-cli arduino-ide btop - unstable.claude-code + 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 a91c661..8093878 100644 --- a/nixosConfigurations/damocles/claude-container.nix +++ b/nixosConfigurations/damocles/claude-container.nix @@ -19,7 +19,6 @@ gnugrep curl bintools - file ]; boot.isContainer = true; diff --git a/nixosConfigurations/muede-lpt2/default.nix b/nixosConfigurations/muede-lpt2/default.nix index 367a7df..be7927c 100644 --- a/nixosConfigurations/muede-lpt2/default.nix +++ b/nixosConfigurations/muede-lpt2/default.nix @@ -3,7 +3,6 @@ imports = [ ./containers.nix ./hardware.nix - ./hyperhive.nix ]; config = { diff --git a/nixosConfigurations/muede-lpt2/hyperhive.nix b/nixosConfigurations/muede-lpt2/hyperhive.nix deleted file mode 100644 index 0874c38..0000000 --- a/nixosConfigurations/muede-lpt2/hyperhive.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ hyperhive, ... }: -{ - imports = [ hyperhive.nixosModules.hive-c0re ]; - - config.services.hive-c0re.enable = true; -} diff --git a/nixosModules/distributed-builds.nix b/nixosModules/distributed-builds.nix index e0f0e12..c08d657 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))