Merge pull request 'inventory: unify modules' (#5154) from inventory-unify into main

Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/5154

lib/modules/clan/interface.nix

@@ -231,11 +231,7 @@ in
     inventory = lib.mkOption {
       type = types.submoduleWith {
         modules = [
-          {
+          clanLib.inventory.inventoryModule
-            _module.args = { inherit clanLib; };
-            _file = "clan interface";
-          }
-          ../inventoryClass/interface.nix
         ];
       };
       description = ''

lib/modules/inventory/default.nix

@@ -7,10 +7,10 @@ let
 in
 {
   inherit (services) mapInstances;
-  interface = {
+  inventoryModule = {
-    _file = "clanLib.inventory.interface";
+    _file = "clanLib.inventory.module";
     imports = [
-      ../inventoryClass/interface.nix
+      ../inventoryClass/inventory.nix
     ];
     _module.args = { inherit clanLib; };
   };

lib/modules/inventory/distributed-service/tests/default.nix

@@ -13,7 +13,7 @@ let
     (evalModules {
       # Static modules
       modules = [
-        clanLib.inventory.interface
+        clanLib.inventory.inventoryModule
         {
           _file = "test file";
           tags.all = [ ];

lib/modules/inventoryClass/inventory.nix

@@ -1,3 +1,7 @@
+# This module describes
+# - clanInternals.inventoryClass.inventory
+# - clan.inventory
+# Which is the public interface for the inventory system
 {
   lib,
   clanLib,

lib/modules/inventoryClass/meta-interface.nix

@@ -1,3 +1,6 @@
+# This file is imported into:
+# - clan.meta
+# - clan.inventory.meta
 { lib, ... }:
 let
   types = lib.types;