Merge remote-tracking branch 'origin/nixos' into nixos

hosts/nixos-laptop/default.nix

@@ -107,22 +107,6 @@
     wantedBy = [ "multi-user.target" ];
   };
 
-  nix = {
-    distributedBuilds = true;
-    buildMachines = [
-      {
-        hostName = "builder";
-        system = "x86_64-linux";
-        maxJobs = 6;
-        speedFactor = 2;
-        supportedFeatures = [ "nixos.test" "benchmark" "big-parallel" "kvm" ];
-      }
-    ];
-    extraOptions = ''
-      builders-use-substitutes = true
-    '';
-  };
-
   programs.ssh.extraConfig = ''
     Host builder
       Hostname 192.168.0.14