From 2c0c6b5dd273dd6e73dcb2da4a4cbdc6eb49e0df Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Fri, 27 Mar 2026 08:40:43 +0000 Subject: [PATCH] Regenerated --- Droidnix/README.org | 7 +++++-- Droidnix/generated/hosts/traveldroid/host.nix | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Droidnix/README.org b/Droidnix/README.org index 27978f143..2b1faf2bc 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -170,7 +170,10 @@ in home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - # Merge all _module.args.hmUsers from modules into Home Manager users + # Evaluate all modules from import-tree + allModulesEval = lib.mapAttrsToList (_: mod: mod { lib = lib; pkgs = pkgs; config = config; flakeRoot = flakeRoot; home-manager = home-manager; }) hostModules; + + # Then fold home-manager.users = lib.foldl' (acc: m: let hmUsers = if (builtins.hasAttr "_module" m) && @@ -179,7 +182,7 @@ in then m._module.args.hmUsers else {}; in acc // hmUsers - ) {} allModules; + ) {} allModulesEval; ################################# # System packages & helpers diff --git a/Droidnix/generated/hosts/traveldroid/host.nix b/Droidnix/generated/hosts/traveldroid/host.nix index 5ffe9d4e4..3699bd640 100644 --- a/Droidnix/generated/hosts/traveldroid/host.nix +++ b/Droidnix/generated/hosts/traveldroid/host.nix @@ -40,7 +40,10 @@ in home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - # Merge all _module.args.hmUsers from modules into Home Manager users + # Evaluate all modules from import-tree + allModulesEval = lib.mapAttrsToList (_: mod: mod { lib = lib; pkgs = pkgs; config = config; flakeRoot = flakeRoot; home-manager = home-manager; }) hostModules; + + # Then fold home-manager.users = lib.foldl' (acc: m: let hmUsers = if (builtins.hasAttr "_module" m) && @@ -49,7 +52,7 @@ in then m._module.args.hmUsers else {}; in acc // hmUsers - ) {} allModules; + ) {} allModulesEval; ################################# # System packages & helpers