chore: dynamic hosts, builder targets

Make hosts read from directories, to limit manual changes
Rename vm-gitlab -> gitlab
A few reformatting and lint changes due to altered files
Create builder targets for Darwin builders

darwin/baseline.nix

@@ -1,25 +1,13 @@
 {
-  lib,
   pkgs,
   top,
   ...
 }:
 let
-  darwin-aarch-builder = top.nixunstable.lib.nixosSystem {
+  #darwin-aarch-builder = top.self.nixosConfigurations.builder-aarch;
-    system = "aarch64-linux";
+  darwin-x86-builder = top.self.nixosConfigurations.builder-x86;
-    modules = [
+in
-      "${top.nixunstable}/nixos/modules/profiles/nix-builder-vm.nix"
+{
-      { virtualisation.host.pkgs = import top.nixunstable { system = "aarch64-darwin"; }; }
-    ];
-  };
-  darwin-x86-builder = top.nixunstable.lib.nixosSystem {
-    system = "x86_64-linux";
-    modules = [
-      "${top.nixunstable}/nixos/modules/profiles/nix-builder-vm.nix"
-      { virtualisation.host.pkgs = import top.nixunstable { system = "aarch64-darwin"; }; }
-    ];
-  };
-in {
   environment.systemPackages = with pkgs; [
     hms
   ];
@@ -41,12 +29,18 @@ in {
 
   nix = {
     enable = true;
-    buildMachines = [{
+    buildMachines = [
-      hostName = "ssh-ng://builder@localhost";
+      {
-      system = "aarch64-linux";
+        hostName = "ssh-ng://builder@localhost";
-      maxJobs = 4;
+        system = "aarch64-linux";
-      supportedFeatures = ["kvm" "benchmarch" "big-parallel"];
+        maxJobs = 4;
-    }];
+        supportedFeatures = [
+          "kvm"
+          "benchmarch"
+          "big-parallel"
+        ];
+      }
+    ];
     gc.interval.Hour = 3;
     settings.auto-optimise-store = false; # Darwin bugs?
   };

garnix.yaml

@@ -19,3 +19,5 @@ builds:
     - homeConfigurations.exodus
     - darwinConfigurations.MacBook-Pro
     - darwinConfigurations.MacBook-Prolocal
+    - nixosConfigurations.builder-x86
+    - nixosConfigurations.builder-aarch

home/default.nix

@@ -41,5 +41,5 @@ in
   jeremiah = greg "jeremiah";
   linode = greg "linode";
   hosea = greg "hosea";
-  vm-gitlab = greg "vm-gitlab";
+  gitlab = greg "gitlab";
 }

hosts/default.nix

@@ -4,7 +4,7 @@
   nixpkgs,
 }:
 let
-  vm = args: (unstable (args // { extraMods = [ top.nixos-generators.nixosModules.all-formats ]; }));
+  inherit (top.nixunstable) lib;
   wsl = args: (unstable (args // { extraMods = [ top.wsl.nixosModules.wsl ]; }));
   unstable =
     {
@@ -31,30 +31,58 @@ let
         # Local ones
         ./baseline.nix
         top.self.modules.nixosModule
-        ./${name}
       ]
       ++ extraMods;
     };
 in
-{
+(lib.genAttrs
-  genesis = unstable { name = "genesis"; };
+  (builtins.attrNames (lib.filterAttrs (_: v: v == "directory") (builtins.readDir ./unstable)))
-  exodus = unstable { name = "exodus"; };
+  (
-  zeke = unstable { name = "zeke"; };
+    name:
-  icdm-root = unstable { name = "icdm-root"; };
+    (unstable {
-  linode = unstable { name = "linode"; };
+      inherit name;
-  hosea = unstable { name = "hosea"; };
+      extraMods = [ ./unstable/${name} ];
-  jeremiah = unstable { name = "jeremiah"; };
+    })
-  isaiah = unstable { name = "isaiah"; };
+  )
-
+)
-  vm-gitlab = vm { name = "vm-gitlab"; };
+// (lib.genAttrs
-  proxmoxtemplate = unstable { name = "proxmoxtemplate"; };
+  (builtins.attrNames (lib.filterAttrs (_: v: v == "directory") (builtins.readDir ./vm)))
-
+  (
-  iso = unstable { name = "iso"; };
+    name:
+    (unstable {
+      inherit name;
+      extraMods = [ ./vm/${name} ];
+    })
+  )
+)
+// {
   # nix build '.#nixosConfigurations.wsl.config.system.build.installer'
   nixos = wsl { name = "wsl"; };
   # nix build '.#nixosConfigurations.wsl-aarch.config.system.build.installer'
   #nixos-arm = wsl {
-  #name = "wsl";
+  #  name = "wsl";
-  #system = "aarch64-linux";
+  #  system = "aarch64-linux";
   #};
+
+  builder-aarch = lib.nixosSystem {
+    system = "aarch64-linux";
+    modules = [
+      "${top.nixunstable}/nixos/modules/profiles/nix-builder-vm.nix"
+      {
+        virtualisation.host.pkgs = import top.nixunstable { system = "aarch64-darwin"; };
+        boot.loader.grub.devices = [ "/dev/vda" ];
+      }
+    ];
+  };
+
+  builder-x86 = lib.nixosSystem {
+    system = "x86_64-linux";
+    modules = [
+      "${top.nixunstable}/nixos/modules/profiles/nix-builder-vm.nix"
+      {
+        virtualisation.host.pkgs = import top.nixunstable { system = "aarch64-darwin"; };
+        boot.loader.grub.devices = [ "/dev/vda" ];
+      }
+    ];
+  };
 }

hosts/vm/gitlab/default.nix

@@ -66,7 +66,7 @@ in
   };
 
   networking = {
-    hostName = "vm-gitlab"; # Define your hostname.
+    hostName = "gitlab"; # Define your hostname.
     firewall.allowedTCPPorts = [
       80
       registryPort

network.json

@@ -95,7 +95,7 @@
       "external": true,
       "system": "x86_64-linux"
     },
-    "vm-gitlab": {
+    "gitlab": {
       "system": "x86_64-linux"
     },
     "wsl": {