yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'inventory: wrap autoloaded machines with correct file' (#5474) from fix-a into main

Browse Source 
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/5474
This commit is contained in:
hsjobeki
2025-10-11 16:00:37 +00:00
parent 67fab4b11d 84d4660a8d
commit 1f7bfa4e34
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/modules/clan/module.nix
View File

@@ -134,11 +134,12 @@ in
)
{
# TODO: Figure out why this causes infinite recursion
inventory.machines = lib.optionalAttrs (builtins.pathExists "${directory}/machines") (
builtins.mapAttrs (_n: _v: { }) (
lib.filterAttrs (_: t: t == "directory") (builtins.readDir "${directory}/machines")
)
);
inventory = lib.optionalAttrs (builtins.pathExists "${directory}/machines") ({
imports = lib.mapAttrsToList (name: _t: {
_file = "${directory}/machines/${name}";
machines.${name} = { };
}) ((lib.filterAttrs (_: t: t == "directory") (builtins.readDir "${directory}/machines")));
});
}
{
inventory.machines = lib.mapAttrs (_n: _: { }) config.machines;