modules/nilla: configurations -> systems

hosts/default.nix

@@ -16,7 +16,7 @@ in
     ./youko
   ];
 
-  config.configBuilders =
+  config.systems.builders =
     let
       sharedOptions = {
         _file = ./default.nix;

hosts/hijiri-vm/default.nix

@@ -1,5 +1,5 @@
 {
-  config.configurations.nixos.hijiri-vm =
+  config.systems.nixos.hijiri-vm.module =
     {
       modulesPath,
       lib,

hosts/hijiri/default.nix

@@ -1,5 +1,5 @@
 {
-  config.configurations.darwin.hijiri =
+  config.systems.darwin.hijiri.module =
     {
       config,
       pkgs,

hosts/kazuki/default.nix

@@ -1,5 +1,5 @@
 {
-  config.configurations.nixos.kazuki =
+  config.systems.nixos.kazuki.module =
     {
       modulesPath,
       ...

hosts/kogata/default.nix

@@ -1,5 +1,5 @@
 {
-  config.configurations.darwin.kogata =
+  config.systems.darwin.kogata.module =
     { pkgs, ... }:
     {
       nixpkgs.system = "aarch64-darwin";

hosts/ude/default.nix

@@ -1,5 +1,5 @@
 {
-  config.configurations.nixos.ude =
+  config.systems.nixos.ude.module =
     {
       config,
       modulesPath,

hosts/youko/default.nix

@@ -1,5 +1,5 @@
 {
-  config.configurations.nixos.youko =
+  config.systems.nixos.youko.module =
     {
       config,
       lib,

modules/nilla/configurations.nix

@@ -1,47 +0,0 @@
-{ config, lib }:
-{
-  options = {
-    configBuilders = {
-      nixos = lib.options.create {
-        type = lib.types.function lib.types.raw;
-        default.value = _name: config.inputs.nixpkgs.result.lib.nixosSystem;
-      };
-      darwin = lib.options.create {
-        type = lib.types.function lib.types.raw;
-        default.value = _name: config.inputs.darwin.result.lib.darwinSystem;
-      };
-      home = lib.options.create {
-        type = lib.types.function lib.types.raw;
-        default.value = _name: config.inputs.home-manager.result.lib.homeManagerConfiguration;
-      };
-    };
-
-    configurations = {
-      nixos = lib.options.create {
-        type = lib.types.attrs.lazy lib.types.raw;
-        default.value = { };
-      };
-      darwin = lib.options.create {
-        type = lib.types.attrs.lazy lib.types.raw;
-        default.value = { };
-      };
-      home = lib.options.create {
-        type = lib.types.attrs.lazy lib.types.raw;
-        default.value = { };
-      };
-    };
-
-    nixosConfigurations = lib.options.create {
-      type = lib.types.attrs.lazy lib.types.raw;
-      default.value = builtins.mapAttrs config.configBuilders.nixos config.configurations.nixos;
-    };
-    darwinConfigurations = lib.options.create {
-      type = lib.types.attrs.lazy lib.types.raw;
-      default.value = builtins.mapAttrs config.configBuilders.darwin config.configurations.darwin;
-    };
-    homeConfigurations = lib.options.create {
-      type = lib.types.attrs.lazy lib.types.raw;
-      default.value = builtins.mapAttrs config.configBuilders.home config.configurations.home;
-    };
-  };
-}

modules/nilla/default.nix

@@ -2,7 +2,7 @@
   includes = [
     ./builders
     ./services.nix
-    ./configurations.nix
+    ./systems.nix
     ./modules.nix
     ./flake.nix
   ];

modules/nilla/flake.nix

@@ -18,11 +18,12 @@ in
       nixosModules
       darwinModules
       homeModules
-      nixosConfigurations
-      darwinConfigurations
-      homeConfigurations
       ;
 
+    nixosConfigurations = builtins.mapAttrs (_: system: system.result) config.systems.nixos;
+    darwinConfigurations = builtins.mapAttrs (_: system: system.result) config.systems.darwin;
+    homeConfigurations = builtins.mapAttrs (_: system: system.result) config.systems.home;
+
     devShells = transpose config.shells;
     packages = transpose config.packages;
 

modules/nilla/systems.nix

@@ -0,0 +1,52 @@
+{ config, lib }:
+let
+  mkBuilderOption =
+    typ:
+    lib.options.create {
+      type = lib.types.function (lib.types.function lib.types.raw);
+      default.value = _name: _module: throw "Builder for systems.${typ} is not implemented";
+    };
+  inherit (config.systems) builders;
+  mkSystemModule =
+    typ:
+    { config, name }:
+    {
+      options = {
+        name = lib.options.create {
+          type = lib.types.string;
+          default.value = name;
+        };
+        module = lib.options.create {
+          type = lib.types.raw;
+          default.value = { };
+        };
+        builder = lib.options.create {
+          type = lib.types.function (lib.types.function lib.types.raw);
+          default.value = builders.${typ};
+        };
+        result = lib.options.create {
+          type = lib.types.raw;
+          writable = false;
+          default.value = config.builder config.name config.module;
+        };
+      };
+    };
+  mkSystemOption =
+    typ:
+    lib.options.create {
+      type = lib.types.attrs.of (lib.types.submodule (mkSystemModule typ));
+      default.value = { };
+    };
+in
+{
+  options = {
+    systems = {
+      builders.nixos = mkBuilderOption "nixos";
+      builders.darwin = mkBuilderOption "darwin";
+      builders.home = mkBuilderOption "home";
+      nixos = mkSystemOption "nixos";
+      darwin = mkSystemOption "darwin";
+      home = mkSystemOption "home";
+    };
+  };
+}