draft types

deployment/data-model.nix

@@ -4,19 +4,12 @@
   ...
 }:
 let
-  inherit (lib)
-    attrNames
-    mapAttrs
-    mkOption
-    genAttrs
-    ;
+  inherit (lib) attrNames mkOption genAttrs;
   inherit (lib.types)
     attrsOf
     attrTag
     deferredModule
-    mergeTypes
     submoduleWith
-    submodule
     ;
   runtime-configuration = mkOption {
     description = "The NixOS module of a run-time environment";
@@ -28,28 +21,26 @@ let
   runtime-environment = attrTag (
     mapAttrs
       (
-        name:
-        option@{ type, ... }:
-        mkOption (
-          option
-          // {
-            type = mergeTypes type (submodule {
-              options.module = mkOption {
+        name: options:
+        mkOption {
+          type = submoduleWith {
+            modules = [
+              {
+                options = options // {
+                  module = mkOption {
                     description = "The NixOS module of the run-time environment";
                     type = deferredModule;
                     default = config.runtime-configurations.${name};
                     readOnly = true;
                   };
-            });
+                };
+              }
+            ];
+          };
         }
       )
-      )
       {
-        nixos = {
-          description = "A NixOS instance to deploy to.";
-          type = submodule {
-          };
-        };
+        nixos = { };
       }
   );
   application = submoduleWith {