From 1e0b942c1fd24d990538cf6022e1307ca999f3ca Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Fri, 27 Mar 2026 08:39:30 +0000 Subject: [PATCH] Regenerated --- Droidnix/README.org | 14 ++++++++------ Droidnix/generated/hosts/traveldroid/host.nix | 14 ++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/Droidnix/README.org b/Droidnix/README.org index 751222869..27978f143 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -172,12 +172,14 @@ in # 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; + let + hmUsers = if (builtins.hasAttr "_module" m) && + (builtins.hasAttr "args" m._module) && + (builtins.hasAttr "hmUsers" m._module.args) + then m._module.args.hmUsers + else {}; + in acc // hmUsers + ) {} allModules; ################################# # System packages & helpers diff --git a/Droidnix/generated/hosts/traveldroid/host.nix b/Droidnix/generated/hosts/traveldroid/host.nix index 44a15055b..5ffe9d4e4 100644 --- a/Droidnix/generated/hosts/traveldroid/host.nix +++ b/Droidnix/generated/hosts/traveldroid/host.nix @@ -42,12 +42,14 @@ in # 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; + let + hmUsers = if (builtins.hasAttr "_module" m) && + (builtins.hasAttr "args" m._module) && + (builtins.hasAttr "hmUsers" m._module.args) + then m._module.args.hmUsers + else {}; + in acc // hmUsers + ) {} allModules; ################################# # System packages & helpers