From 84d4660a8d9955c94298393eba54a892bd4d3715 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Sat, 11 Oct 2025 15:57:42 +0200 Subject: [PATCH] inventory: wrap autoloaded machines with correct file --- lib/modules/clan/module.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/modules/clan/module.nix b/lib/modules/clan/module.nix index 866233b3b..ed738b116 100644 --- a/lib/modules/clan/module.nix +++ b/lib/modules/clan/module.nix @@ -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;