clan/clan-core
11
2
Fork 13
Code Issues 91 Pull Requests 5 Actions Packages Projects 1 Releases Wiki Activity

Add machinesDirs with default

Browse Source
This commit is contained in:
Johannes Kirschbauer 2024-06-25 12:35:21 +02:00 committed by hsjobeki
parent 26c655ff3c
commit c0293b889c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/build-clan/default.nix
View File

@ -71,7 +71,7 @@ let
) machines;
}
# Will be deprecated
# {machines = lib.mapAttrs (n: _: {}) machinesDirs;}
{ machines = lib.mkDefault (lib.mapAttrs (_n: _: { }) machinesDirs); }
# Deprecated interface
(if clanName != null then { meta.name = clanName; } else { })
@ -85,9 +85,9 @@ let
# { ${machineName} :: Config }
serviceConfigs = buildInventory mergedInventory;
# machinesDirs = lib.optionalAttrs (builtins.pathExists "${directory}/machines") (
# builtins.readDir (directory + /machines)
# );
machinesDirs = lib.optionalAttrs (builtins.pathExists "${directory}/machines") (
builtins.readDir (directory + /machines)
);
machineSettings =
machineName: