Inventory: move to lib.inventory

flake.nix

@@ -53,8 +53,6 @@
           ./nixosModules/flake-module.nix
           ./pkgs/flake-module.nix
           ./templates/flake-module.nix
-
-          ./inventory/flake-module.nix
         ];
       }
     );

lib/build-clan/default.nix

@@ -33,7 +33,7 @@ let
   mergedInventory =
     (lib.evalModules {
       modules = [
-        ./interface.nix
+        clan-core.lib.inventory.interface
         { inherit meta; }
         (
           if
@@ -77,7 +77,7 @@ let
       ];
     }).config;
 
-  buildInventory = import ./inventory.nix { inherit lib clan-core; };
+  inherit (clan-core.lib.inventory) buildInventory;
 
   # map from machine name to service configuration
   # { ${machineName} :: Config }

lib/default.nix

@@ -6,6 +6,7 @@
 }:
 {
   evalClanModules = import ./eval-clan-modules { inherit clan-core nixpkgs lib; };
+  inventory = import ./inventory { inherit lib clan-core; };
   jsonschema = import ./jsonschema { inherit lib; };
   modules = import ./description.nix { inherit clan-core lib; };
   buildClan = import ./build-clan { inherit clan-core lib nixpkgs; };

lib/inventory/build-inventory/interface.nix

@@ -78,6 +78,7 @@ in
   };
 
   options.services = lib.mkOption {
+    default = { };
     type = t.attrsOf (
       t.attrsOf (
         t.submodule {

lib/inventory/default.nix

@@ -0,0 +1,5 @@
+{ lib, clan-core }:
+{
+  buildInventory = import ./build-inventory { inherit lib clan-core; };
+  interface = ./build-inventory/interface.nix;
+}

lib/inventory/flake-module.nix

@@ -1,11 +1,6 @@
+{ ... }:
 {
-  inputs,
+  # flake.inventory = import ./default.nix { inherit inputs self lib; };
-  self,
-  lib,
-  ...
-}:
-{
-  flake.inventory = import ./default.nix { inherit inputs self lib; };
   perSystem =
     { pkgs, config, ... }:
     {