feat: Added remotebuilder to nix-darwin

builders/mirai.nix

@@ -0,0 +1,7 @@
+{
+  hostName = "sh.darksailor.dev";
+  sshUser = "remotebuilder";
+  system = "x86_64-linux";
+  protocol = "ssh-ng";
+  supportedFeatures = ["nixos-test" "benchmark" "big-parallel" "kvm"];
+}

builders/shiro.nix

@@ -0,0 +1,7 @@
+{
+  hostName = "shiro";
+  sshUser = "remotebuilder";
+  system = "aarch64-darwin";
+  protocol = "ssh-ng";
+  supportedFeatures = ["benchmark" "big-parallel" "kvm"];
+}

darwin/shiro/configuration.nix

@@ -28,24 +28,17 @@
     '';
     package = pkgs.nixVersions.latest;
     buildMachines = [
-      {
+      ../../builders/mirai.nix
-        hostName = "sh.darksailor.dev";
+      ../../builders/shiro.nix
-        sshUser = "remotebuilder";
-        system = "x86_64-linux";
-        protocol = "ssh-ng";
-        supportedFeatures = ["nixos-test" "benchmark" "big-parallel" "kvm"];
-      }
-      # {
-      #   hostName = "shiro";
-      #   sshUser = "remotebuilder";
-      #   system = "aarch64-darwin";
-      #   protocol = "ssh-ng";
-      #   supportedFeatures = ["benchmark" "big-parallel" "kvm"];
-      # }
     ];
     distributedBuilds = true;
   };
 
+  users.users.remotebuilder = {
+    isNormalUser = true;
+    openssh.authorizedKeys.keyFiles = [../../secrets/id_ed25519.pub];
+  };
+
   # security.pam.enableSudoTouchIdAuth = true;
   # system.patches = [
   #   (pkgs.writeText "pam-reattach.patch"

nixos/ryu/configuration.nix

@@ -73,13 +73,8 @@
     };
     package = pkgs.nixVersions.latest;
     buildMachines = [
-      {
+      ../../builders/mirai.nix
-        hostName = "sh.darksailor.dev";
+      ../../builders/shiro.nix
-        sshUser = "remotebuilder";
-        system = "x86_64-linux";
-        protocol = "ssh-ng";
-        supportedFeatures = ["nixos-test" "benchmark" "big-parallel" "kvm"];
-      }
     ];
     distributedBuilds = true;
   };