From 50ebf7313f008d1645815911025bd48e0c8a0b66 Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Fri, 27 Mar 2026 08:38:18 +0000 Subject: [PATCH] Regenerated --- Droidnix/README.org | 10 ++++++++-- Droidnix/generated/hosts/traveldroid/host.nix | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Droidnix/README.org b/Droidnix/README.org index b7822083e..751222869 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -170,8 +170,14 @@ in home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - # Merge all _module.args.hmUsers from modules into a single users attribute - home-manager.users = lib.foldl' (acc m: acc // (m._module.args.hmUsers or {})) {} allModules; + # Merge all _module.args.hmUsers from modules into Home Manager users + home-manager.users = lib.foldl' (acc: m: + acc // (builtins.getAttr "_module" m + ? args && m._module.args ? hmUsers + then m._module.args.hmUsers + else {})) + {} + allModules; ################################# # System packages & helpers diff --git a/Droidnix/generated/hosts/traveldroid/host.nix b/Droidnix/generated/hosts/traveldroid/host.nix index 432b104cd..44a15055b 100644 --- a/Droidnix/generated/hosts/traveldroid/host.nix +++ b/Droidnix/generated/hosts/traveldroid/host.nix @@ -40,8 +40,14 @@ in home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - # Merge all _module.args.hmUsers from modules into a single users attribute - home-manager.users = lib.foldl' (acc m: acc // (m._module.args.hmUsers or {})) {} allModules; + # Merge all _module.args.hmUsers from modules into Home Manager users + home-manager.users = lib.foldl' (acc: m: + acc // (builtins.getAttr "_module" m + ? args && m._module.args ? hmUsers + then m._module.args.hmUsers + else {})) + {} + allModules; ################################# # System packages & helpers