Use automatic resource allocation on nixbuild.net

utdemir · Jun 1, 2020 · c3421bf · c3421bf
1 parent f1aead2
commit c3421bf
Showing 1 changed file with 3 additions and 18 deletions.
diff --git a/hardware.nix b/hardware.nix
@@ -18,39 +18,24 @@ in
   boot.kernelModules = [ "kvm-intel" ];
 
   programs.ssh.extraConfig = ''
-    Host beta.nixbuild.net nxb-*
+    Host beta.nixbuild.net
       StrictHostKeyChecking no
       UserKnownHostsFile /dev/null
       PubkeyAcceptedKeyTypes ssh-ed25519
       IdentityFile /root/.ssh/nixbuild
       ControlMaster auto
       ControlPersist yes
       ControlPath ~/.ssh/socket-%r@%h:%p
-
-    Host nxb-4
-      HostName beta.nixbuild.net
-      SetEnv CPU=4
-
-    Host nxb-16
-      HostName beta.nixbuild.net
-      SetEnv CPU=16
   '';
 
   nix = {
     distributedBuilds = true;
     buildMachines = [
       {
-        hostName = "nxb-4";
-        system = "x86_64-linux";
-        maxJobs = 100;
-        supportedFeatures = [ "benchmark" ];
-      }
-      {
-        hostName = "nxb-16";
+        hostName = "beta.nixbuild.net";
         system = "x86_64-linux";
         maxJobs = 100;
-        supportedFeatures = [ "benchmark" ];
-        mandatoryFeatures = [ "big-parallel" ];
+        supportedFeatures = [ "benchmark" "big-parallel" ];
       }
     ];
     extraOptions = ''