Regenerated
This commit is contained in:
+5
-2
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user