docs/TODO.md

@@ -128,7 +128,6 @@ Review Nix files in entrypoint order:
 - [x] `src/dotfiles/default.nix`
 - [x] `src/dotfiles/util.nix`
 - [ ] `src/dotfiles/registry.nix`
-- [ ] `src/dotfiles/registry/options.nix`
 - [ ] `src/dotfiles/registry/definitions.nix`
 - [ ] `src/dotfiles/registry/schema.nix`
 - [ ] `src/dotfiles/registry/collection.nix`

src/dotfiles/registry.nix

@@ -5,17 +5,26 @@
   util,
 }:
 let
-  options = import ./registry/options.nix {
-    inherit definitions lib;
-  };
-
   definitions = import ./registry/definitions.nix {
     inherit lib root util;
   };
 
 in
 {
-  inherit (options) types module;
+  types = lib.mapAttrs (_name: definition: definition.type) definitions;
+
+  module = {
+    options.registry = lib.mapAttrs (
+      _name: registry:
+      lib.mkOption {
+        type = lib.types.attrsOf (lib.types.attrsOf registry.type);
+        default = { };
+        description = ''
+          Lazily collected fleet-visible registry entries, nested by host and entry name.
+        '';
+      }
+    ) definitions;
+  };
 
   collected = import ./registry/collection.nix {
     inherit definitions hosts lib;

src/dotfiles/registry/options.nix

@@ -1,22 +0,0 @@
-{
-  definitions,
-  lib,
-}:
-let
-  registryOption =
-    registry:
-    lib.mkOption {
-      type = lib.types.attrsOf (lib.types.attrsOf registry.type);
-      default = { };
-      description = ''
-        Lazily collected fleet-visible registry entries, nested by host and entry name.
-      '';
-    };
-in
-{
-  types = lib.mapAttrs (_name: definition: definition.type) definitions;
-
-  module = {
-    options.registry = lib.mapAttrs (_name: registryOption) definitions;
-  };
-}