diff --git a/devices.nix b/devices.nix index ce00fbd..8022b6f 100644 --- a/devices.nix +++ b/devices.nix @@ -41,7 +41,7 @@ in }; distributedBuilds = { isBuilder = true; - speedFactor = 14; + speedFactor = 2; hostPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHGKoZ68wwyVRmPB0SkvpJUyUMDWeFbC5Je9zukyEOh7"; clientPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKAbojdhb3PfazSRmudvo381Y+zUFVLMa7AbWbfK/Zp2 muede-lpt2-nix-builds"; storeSigningPublicKey = "muede-lpt2:3csut7FW6oZK/ztRLBRC80LSBfFE3qzl+aIYgOixB6U="; @@ -55,7 +55,7 @@ in }; distributedBuilds = { isBuilder = true; - speedFactor = 24; + speedFactor = 4; hostPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKEQQS5XNoj62Oj85xQfIuLORwoBRwfqjvfBHHsiI+RH"; clientPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHmnyhP6L+kGHV15cb/d31AQr50wSEaQhkUBwy2+OEKk muede-pc2-nix-builds"; storeSigningPublicKey = "muede-pc2:fqQO0E0y65MjUWlQnrgWt5ZsmQKlKCv4jls3CmUXDEQ="; diff --git a/flake.lock b/flake.lock index 008407a..0d35295 100644 --- a/flake.lock +++ b/flake.lock @@ -352,11 +352,11 @@ ] }, "locked": { - "lastModified": 1782704057, - "narHash": "sha256-G1I1gd32F7mp9LAe1DaZ4ZL7NX5gyiKwdCMwro1Vrck=", + "lastModified": 1781981105, + "narHash": "sha256-/1nNBbA7PrSQpTc9Qazkhl4kIPg+TNl0CjxS3UQJKlw=", "owner": "nix-community", "repo": "home-manager", - "rev": "868d0a692de703c2de98fab61968e4e310b7c28e", + "rev": "7bfff44b465909f69a442701293bc0badcf476dc", "type": "github" }, "original": { @@ -380,11 +380,11 @@ ] }, "locked": { - "lastModified": 1782751302, - "narHash": "sha256-tLcfE+pLZWnAoa/VWdFCnSKVLbVOuaRozlUnkssx7ac=", + "lastModified": 1782487625, + "narHash": "sha256-QuvWwkrbk2cAwj4ckRKkn1SzEaKqbnEtgWL1/7AHNz4=", "ref": "refs/heads/main", - "rev": "621ee66133831158329981b498b50b4342ed4339", - "revCount": 2237, + "rev": "ad8ed452fdf0c8cb6c8924b37f54eab58487e638", + "revCount": 2143, "type": "git", "url": "https://forge.darkest.space/hyperhive/hyperhive.git" }, @@ -451,11 +451,11 @@ ] }, "locked": { - "lastModified": 1782220280, - "narHash": "sha256-thLTFbp9D5Qknmh8q/v4FRpLGphUSijT3E86cbLYTXo=", + "lastModified": 1781258734, + "narHash": "sha256-rfZT1gFztHDqA4gcFLO/Qv74bulhW/mXYqIHYTmc1lA=", "owner": "nix-community", "repo": "naersk", - "rev": "9aa07bb0256d300219b30622d2454e85f7f3667e", + "rev": "3ddafa67a4c7d06483995c85c66a2d285b738833", "type": "github" }, "original": { @@ -478,11 +478,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1782904324, - "narHash": "sha256-u1SiMJLrf+iGykwXdu78xbizwkCb2r1aUMHfOgh7IG8=", + "lastModified": 1781795508, + "narHash": "sha256-VKrApQ3WCkEe9D8DbaeFjGqLAh7zqYGYjbQYtY5ikxc=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "c11048188f434263cf5c207ddef453984d1e02ba", + "rev": "493ce1e33e72f86312584f331c8cf52b3432ec99", "type": "github" }, "original": { @@ -546,11 +546,11 @@ ] }, "locked": { - "lastModified": 1782879771, - "narHash": "sha256-CEm+X6hosGyxp32UMt01xxa+Ei0c0NiIP2VqgxFDSwM=", + "lastModified": 1782017505, + "narHash": "sha256-6A1wbeFbopCVchDX5rjAxEyNCGgQcKye4ylhjfZdCdY=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "956507929a1cc152ec509e91765efe77f54297b5", + "rev": "714f957519be5fc35127e3eee99ffbb17ef6d98c", "type": "github" }, "original": { @@ -692,11 +692,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1782847225, - "narHash": "sha256-JC9PjqKYG9ve5U8aDOLQipp3+KLANBHUvGdLZlxzdKI=", + "lastModified": 1781216227, + "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "95ca1e203c0750115fd4a6f17d5a245dfe6b1edd", + "rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0", "type": "github" }, "original": { @@ -739,11 +739,11 @@ ] }, "locked": { - "lastModified": 1782918266, - "narHash": "sha256-EMBwRkkc1MRhP6PCkzt90uhXTBnnj9PrJWlfpNFAiJo=", + "lastModified": 1782082791, + "narHash": "sha256-IQnrmliRzw2nbDi7joXQEaBeTuO1/UZLIvfbAfjhg54=", "owner": "nix-community", "repo": "NUR", - "rev": "6dbf53fb2804bff202858a38c062153eb7968ddf", + "rev": "81884942443bffe20ec936b3876b2a2521e8a050", "type": "github" }, "original": { @@ -959,11 +959,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1782770679, - "narHash": "sha256-+8RpmHKn5n2tYmoRCwiKJ6PeU85q15qnXzGQ2WGMn9Q=", + "lastModified": 1780702455, + "narHash": "sha256-+srjPGNy67nKytYwdlepycL51IG6S34sS4MKRZXK8G0=", "owner": "nix-community", "repo": "stylix", - "rev": "3ed763829fc06d32cab3c1f31672379a1f53450e", + "rev": "54fa19702f4f2c7f6a981a92850678933588af9a", "type": "github" }, "original": { @@ -1107,11 +1107,11 @@ ] }, "locked": { - "lastModified": 1782845681, - "narHash": "sha256-LmeRThOfKFue2uhxkYfqnfXvjtc+cCwXznHY9KcpO78=", + "lastModified": 1782486048, + "narHash": "sha256-dwp9KR6wH1wC3z4YM97VILjNnii/njzkXPp8/NkDyDY=", "owner": "vibec0re", "repo": "trollshell", - "rev": "610a499a7921f36da6fb83a5587c996307c12f70", + "rev": "41f05b97057db1131fcee3b2e02f11e5425931da", "type": "github" }, "original": { diff --git a/nixosConfigurations/muede-lpt2/hyperhive.nix b/nixosConfigurations/muede-lpt2/hyperhive.nix index 049d127..9b16dfa 100644 --- a/nixosConfigurations/muede-lpt2/hyperhive.nix +++ b/nixosConfigurations/muede-lpt2/hyperhive.nix @@ -7,7 +7,6 @@ domain = "pr1ma.darkest.space"; hiveName = "pr1ma"; swarmName = "constellation"; - ruthless = true; matrix = { enable = true; gui.enable = true; diff --git a/nixosModules/distributed-builds.nix b/nixosModules/distributed-builds.nix index 8065255..e0f0e12 100644 --- a/nixosModules/distributed-builds.nix +++ b/nixosModules/distributed-builds.nix @@ -134,8 +134,6 @@ in Match originalhost ${lib.concatStringsSep "," names} user ${buildUser} IdentityFile ${clientSshKeyPath} IdentitiesOnly yes - IPQoS throughput - ServerAliveInterval 60 '' ) buildServerDevices );