diff --git a/lib/modules/clan/interface.nix b/lib/modules/clan/interface.nix index a097f7344..9a4088034 100644 --- a/lib/modules/clan/interface.nix +++ b/lib/modules/clan/interface.nix @@ -231,11 +231,7 @@ in inventory = lib.mkOption { type = types.submoduleWith { modules = [ - { - _module.args = { inherit clanLib; }; - _file = "clan interface"; - } - ../inventoryClass/interface.nix + clanLib.inventory.inventoryModule ]; }; description = '' diff --git a/lib/modules/inventory/default.nix b/lib/modules/inventory/default.nix index 7904d0ebe..88fd45506 100644 --- a/lib/modules/inventory/default.nix +++ b/lib/modules/inventory/default.nix @@ -7,10 +7,10 @@ let in { inherit (services) mapInstances; - interface = { - _file = "clanLib.inventory.interface"; + inventoryModule = { + _file = "clanLib.inventory.module"; imports = [ - ../inventoryClass/interface.nix + ../inventoryClass/inventory.nix ]; _module.args = { inherit clanLib; }; }; diff --git a/lib/modules/inventory/distributed-service/tests/default.nix b/lib/modules/inventory/distributed-service/tests/default.nix index 00f96ddac..9183ea644 100644 --- a/lib/modules/inventory/distributed-service/tests/default.nix +++ b/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 = [ ]; diff --git a/lib/modules/inventoryClass/interface.nix b/lib/modules/inventoryClass/inventory.nix similarity index 98% rename from lib/modules/inventoryClass/interface.nix rename to lib/modules/inventoryClass/inventory.nix index 16f8f54d3..31eab4124 100644 --- a/lib/modules/inventoryClass/interface.nix +++ b/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, diff --git a/lib/modules/inventoryClass/meta-interface.nix b/lib/modules/inventoryClass/meta-interface.nix index 558201234..5bf12be26 100644 --- a/lib/modules/inventoryClass/meta-interface.nix +++ b/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;