refactor(systems): pull out inline modules

systems/default.nix

@@ -2,139 +2,17 @@
   # The purpose of this file is to set up the host module which allows assigning of the system, e.g. aarch64-linux and the builder used with less pain.
   lib = inputs.self.lib.nixlib;
   inherit (inputs.self.lib) meta std;
-  inherit (lib.modules) evalModules mkOptionDefault;
-  inherit (std) string set;
-  defaultSpecialArgs = {
-    inherit inputs std meta;
-  };
-  hostModule = {
-    config,
-    machine,
-    ...
-  }: {
-    options = let
-      inherit (inputs.self.lib.lib) json;
-      inherit (lib.types) str listOf attrs unspecified attrsOf nullOr;
-      inherit (lib.options) mkOption;
-    in {
-      arch = mkOption {
-        description = "Processor architecture of the host";
-        type = str;
-        default = "x86_64";
-      };
-      type = mkOption {
-        description = "Operating system type of the host";
-        type = nullOr str;
-        default = "NixOS";
-      };
-      folder = mkOption {
-        type = str;
-        internal = true;
-      };
-      system = mkOption {
-        type = str;
-        internal = true;
-      };
-      modules = mkOption {
-        type = listOf unspecified;
-      };
-      specialArgs = mkOption {
-        type = attrs;
-        internal = true;
-      };
-      builder = mkOption {
-        type = unspecified;
-        internal = true;
-      };
-      deploy = mkOption {
-        type = nullOr json.types.attrs;
-      };
-    };
-    config = {
-      deploy = let
-        nixos = inputs.self.nixosConfigurations.${machine};
-      in {
-        sshUser = mkOptionDefault "root";
-        user = mkOptionDefault "root";
-        sshOpts = mkOptionDefault ["-p" "${builtins.toString (builtins.head nixos.config.services.openssh.ports)}"];
-        autoRollback = mkOptionDefault true;
-        magicRollback = mkOptionDefault true;
-        fastConnection = mkOptionDefault false;
-        hostname = mkOptionDefault "${machine}.local.gensokyo.zone";
-        profiles.system = {
-          user = "root";
-          path = let
-            inherit (inputs.self.legacyPackages.${config.system}.deploy-rs) activate;
-          in
-            activate.nixos nixos;
-        };
-      };
-      system = let
-        kernel =
-          {
-            nixos = "linux";
-            macos = "darwin";
-            darwin = "darwin";
-            linux = "linux";
-          }
-          .${string.toLower config.type};
-      in "${config.arch}-${kernel}";
-      folder =
-        {
-          nixos = "nixos";
-          macos = "darwin";
-          darwin = "darwin";
-          linux = "linux";
-        }
-        .${string.toLower config.type};
-      modules = [
-        # per-OS modules
-        meta.modules.${config.folder}
-        # per-OS configuration
-        meta.${config.folder}.base
-      ];
-      builder =
-        {
-          nixos = let
-            lib = inputs.nixpkgs.lib.extend (self: super:
-              import (inputs.arcexprs + "/lib") {
-                inherit super;
-                lib = self;
-                isOverlayLib = true;
-              });
-            sys = args:
-              lib.nixosSystem ({
-                  inherit lib;
-                }
-                // args);
-          in
-            sys;
-          darwin = inputs.darwin.lib.darwinSystem;
-          macos = inputs.darwin.lib.darwinSystem;
-        }
-        .${string.toLower config.type};
-      specialArgs =
-        {
-          name = machine;
-          inherit machine;
-          systemType = config.folder;
-          inherit (config) system;
-        }
-        // defaultSpecialArgs;
-    };
-  };
+  inherit (lib.modules) evalModules;
+  inherit (std) set;
   hostConfigs = set.map (name: path:
     evalModules {
       modules = [
-        hostModule
         path
+        meta.modules.system
       ];
-      specialArgs =
-        defaultSpecialArgs
-        // {
-          inherit name;
-          machine = name;
-        };
+      specialArgs = {
+        inherit name inputs std meta;
+      };
     })
   (set.map (_: c: c) meta.systems);
   processHost = name: cfg: let
@@ -143,9 +21,10 @@
     set.optional (host.type != null) {
       deploy.nodes.${name} = host.deploy;
 
-      "${host.folder}Configurations".${name} = host.builder {
-        inherit (host) system modules specialArgs;
-      };
+      "${host.folder}Configurations".${name} = host.built;
     };
 in
-  set.merge (set.mapToValues processHost hostConfigs)
+  {
+    systems = hostConfigs;
+  }
+  // set.merge (set.mapToValues processHost hostConfigs)