Regenerated

This commit is contained in:
2026-03-27 08:40:43 +00:00
parent 1e0b942c1f
commit 2c0c6b5dd2
2 changed files with 10 additions and 4 deletions
+5 -2
View File
@@ -170,7 +170,10 @@ in
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = 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: home-manager.users = lib.foldl' (acc: m:
let let
hmUsers = if (builtins.hasAttr "_module" m) && hmUsers = if (builtins.hasAttr "_module" m) &&
@@ -179,7 +182,7 @@ in
then m._module.args.hmUsers then m._module.args.hmUsers
else {}; else {};
in acc // hmUsers in acc // hmUsers
) {} allModules; ) {} allModulesEval;
################################# #################################
# System packages & helpers # System packages & helpers
@@ -40,7 +40,10 @@ in
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = 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: home-manager.users = lib.foldl' (acc: m:
let let
hmUsers = if (builtins.hasAttr "_module" m) && hmUsers = if (builtins.hasAttr "_module" m) &&
@@ -49,7 +52,7 @@ in
then m._module.args.hmUsers then m._module.args.hmUsers
else {}; else {};
in acc // hmUsers in acc // hmUsers
) {} allModules; ) {} allModulesEval;
################################# #################################
# System packages & helpers # System packages & helpers