add Puenktchen builder

hosts/Anton/default.nix

@@ -21,13 +21,18 @@
 
   server.enable = true;
 
-  common.syncthing = {
+  common = {
-    enable = true;
+
-    basePath = "/mnt/data/services/syncthing/data";
+    builder.enable = true;
-    devices = {
+
-      Lenni = { id = "NDERY5Q-N7L6CPD-RMIFA65-OC3HP6T-ONZOB7Y-7FLS4VR-UWBKBZV-XJJVGQG"; };
+    syncthing = {
-      Puenktchen = { id = "REVJKI3-3QYKRZN-QDKQ24V-UNZQ4L2-R7XHQCE-N4H3FSY-IARCHM3-PMWBJQP"; };
+      enable = true;
-      Damin = { id = "HAGKFGG-EMCPKHG-Y7V2ACJ-DJVAIIA-A6TNGTQ-VWPB3F5-PES673W-W2YBJAD"; };
+      basePath = "/mnt/data/services/syncthing/data";
+      devices = {
+        Lenni = { id = "NDERY5Q-N7L6CPD-RMIFA65-OC3HP6T-ONZOB7Y-7FLS4VR-UWBKBZV-XJJVGQG"; };
+        Puenktchen = { id = "REVJKI3-3QYKRZN-QDKQ24V-UNZQ4L2-R7XHQCE-N4H3FSY-IARCHM3-PMWBJQP"; };
+        Damin = { id = "HAGKFGG-EMCPKHG-Y7V2ACJ-DJVAIIA-A6TNGTQ-VWPB3F5-PES673W-W2YBJAD"; };
+      };
     };
   };
 

hosts/Puenktchen/default.nix

@@ -20,10 +20,15 @@
     };
   };
 
-  common.syncthing = {
+  common = {
-    enable = true;
+
-    devices = {
+    builder.enable = true;
-      Anton = { id = "SIMFE5V-UHVQLHM-3ES7TAM-XIGP6TL-WCC37VY-B5ET6LJ-LPC2QIL-MYG4OQR"; };
+
+    syncthing = {
+      enable = true;
+      devices = {
+        Anton = { id = "SIMFE5V-UHVQLHM-3ES7TAM-XIGP6TL-WCC37VY-B5ET6LJ-LPC2QIL-MYG4OQR"; };
+      };
     };
   };
 

modules/default/common/builder.nix

@@ -1,5 +1,5 @@
 { lib, config, ... }:
-lib.mkIf config.server.enable {
+lib.mkIf config.common.builder.enable {
   users.users.builder = {
     group = "builder";
     isNormalUser = true;

modules/default/common/default.nix

@@ -10,6 +10,7 @@
 
     ./autoupdate.nix
     ./boot.nix
+    ./builder.nix
     ./envvar.nix
     ./garbage-collect.nix
     ./keyd.nix

modules/default/common/desktop/remoteBuilder.nix

@@ -1,18 +1,33 @@
 { lib, config, ... }:
 lib.mkIf config.desktop.enable {
-	nix.buildMachines = [ {
+	nix.buildMachines = [
+  {
 	  hostName = "Anton";
     sshUser = "builder";
 	  systems = [ "x86_64-linux" "aarch64-linux" ];
-    protocol = "ssh";
+    protocol = "ssh-ng";
 	  # if the builder supports building for multiple architectures, 
 	  # replace the previous line by, e.g.
 	  # systems = ["x86_64-linux" "aarch64-linux"];
-	  maxJobs = 1;
+	  maxJobs = 4;
 	  speedFactor = 2;
 	  supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
 	  mandatoryFeatures = [ ];
-	}];
+	}
+  {
+	  hostName = "Puenktchen";
+    sshUser = "builder";
+	  systems = [ "x86_64-linux" "aarch64-linux" ];
+    protocol = "ssh-ng";
+	  # if the builder supports building for multiple architectures, 
+	  # replace the previous line by, e.g.
+	  # systems = ["x86_64-linux" "aarch64-linux"];
+	  maxJobs = 8;
+	  speedFactor = 4;
+	  supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
+	  mandatoryFeatures = [ ];
+  }
+  ];
 	nix.distributedBuilds = true;
 	# optional, useful when the builder has a faster internet connection than yours
 	nix.extraOptions = ''

modules/default/common/options.nix

@@ -1,6 +1,16 @@
 { lib, ... }:
 {
   options = {
+
+    common = {
+
+      builder.enable = lib.mkOption {
+        default = false;
+        type = lib.types.bool;
+      };
+
+    };
+
     desktop = {
 
       enable = lib.mkOption {

modules/default/common/server/default.nix

@@ -2,7 +2,6 @@
 {
 
   imports = [
-    ./builder.nix
     ./ssh-server.nix
   ];
 }