From 457cac8be916329d862df6c4a9c828c4cfee9aeb Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Tue, 25 Jun 2024 12:35:21 +0200 Subject: [PATCH] Add machinesDirs with default --- lib/build-clan/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/build-clan/default.nix b/lib/build-clan/default.nix index 0425930a0..33dea9040 100644 --- a/lib/build-clan/default.nix +++ b/lib/build-clan/default.nix @@ -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: