hosts: refactor config generation

flake/hosts.nix

···
+{ inputs, config, ... }:
+let
+  inherit (inputs.nixpkgs) lib;
+  hostOptions = lib.types.submodule (
+    { name, config, ... }:
+    {
+      options.modules = lib.mkOption {
+        default = [
+          { networking.hostName = name; }
+          inputs.self.modules.nixos.core
+          inputs.self.modules.nixos.${name}
+          { local.home.imports = [ inputs.self.modules.homeManager.${name} or { } ]; }
+        ];
+      };
+      options.nixos = lib.mkOption { default = lib.nixosSystem { inherit (config) modules; }; };
+    }
+  );
+in
 {
-  self,
-  inputs,
-  config,
-  lib,
-  withSystem,
-  ...
-}:
-{
-  options.local.hosts = lib.mkOption {
-    type = lib.types.attrsOf (
-      lib.types.submodule {
-        options.system = lib.mkOption { default = "x86_64-linux"; };
-      }
-    );
-  };
-
-  config.flake.modules.nixos = builtins.mapAttrs (name: config: {
-    imports = [ self.modules.nixos.core ];
-    networking.hostName = name;
-    nixpkgs.system = config.system;
-    nixpkgs.overlays = withSystem config.system ({ pkgs, ... }: pkgs.overlays);
-    local.home.imports = [
-      (self.modules.homeManager.${name} or { })
-    ];
-  }) config.local.hosts;
-
-  config.flake.nixosConfigurations = builtins.mapAttrs (
-    name: _: inputs.nixpkgs.lib.nixosSystem { modules = [ self.modules.nixos.${name} ]; }
-  ) config.local.hosts;
+  options.local.hosts = lib.mkOption { type = lib.types.attrsOf hostOptions; };
+  config.flake.nixosConfigurations = builtins.mapAttrs (_: host: host.nixos) config.local.hosts;
 }

hosts/crossbell/hardware-configuration.nix

···
-{ inputs, ... }:
+{ lib, inputs, ... }:
 {
   flake.modules.nixos.crossbell = {
     imports = [ inputs.nixos-hardware.nixosModules.common-pc-ssd ];
+
+    nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 
     boot.initrd.availableKernelModules = [
       "ahci"

hosts/grancel/hardware-configuration.nix

···
-{ inputs, ... }:
+{ lib, inputs, ... }:
 {
   flake.modules.nixos.grancel =
     { pkgs, ... }:
···
         inputs.nixos-hardware.nixosModules.common-cpu-amd-zenpower
         inputs.nixos-hardware.nixosModules.common-gpu-amd
       ];
+
+      nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 
       hardware.enableRedistributableFirmware = true;
       hardware.amdgpu.initrd.enable = true;

hosts/jurai/default.nix

···
 { inputs, ... }:
 {
-  local.hosts.jurai = {
-    system = "aarch64-linux";
-  };
+  local.hosts.jurai = { };
 
   flake.modules.nixos.jurai =
     { lib, pkgs, ... }:

hosts/jurai/hardware-configuration.nix

···
     {
       imports = [ "${modulesPath}/profiles/qemu-guest.nix" ];
 
+      nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
+
       boot.initrd.availableKernelModules = [ "xhci_pci" ];
       boot.initrd.kernelModules = [ ];
       boot.kernelModules = [ ];

hosts/ruan/hardware-configuration.nix

···
-{ inputs, ... }:
+{ lib, inputs, ... }:
 {
   flake.modules.nixos.ruan = {
     imports = [
···
       inputs.nixos-hardware.nixosModules.common-cpu-amd-zenpower
       inputs.nixos-hardware.nixosModules.common-gpu-amd
     ];
+
+    nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 
     boot.initrd.availableKernelModules = [
       "xhci_pci"

modules/machines.nix

···
 { inputs, config, ... }:
 let
-  hosts = config.flake.nixosConfigurations;
+  hosts = config.local.hosts;
 in
 {
   flake.modules.nixos.machine =
···
         inherit (cfg) autoStart;
         privateNetwork = true;
         hostAddress = "192.168.100.100";
-        localAddress = "192.168.100.${toString host.config.local.id}";
+        localAddress = "192.168.100.${toString host.nixos.config.local.id}";
         hostAddress6 = "fc00::100";
-        localAddress6 = "fc00::${toString host.config.local.id}";
-        config.imports = [
+        localAddress6 = "fc00::${toString host.nixos.config.local.id}";
+        config.imports = host.modules ++ [
           inputs.self.modules.nixos.machine
-          inputs.self.modules.nixos.${hostname}
           { inherit options; }
           {
             disabledModules = [ { inherit key; } ];