inventory: unify modules

This commit is contained in:
Johannes Kirschbauer
2025-09-15 12:18:35 +02:00
parent 90ad8054d0
commit d3397af442
5 changed files with 12 additions and 9 deletions

View File

@@ -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 = ''

View File

@@ -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; };
};

View File

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

View File

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

View File

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