Regenerated
This commit is contained in:
+8
-2
@@ -170,8 +170,14 @@ 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 a single users attribute
|
# Merge all _module.args.hmUsers from modules into Home Manager users
|
||||||
home-manager.users = lib.foldl' (acc m: acc // (m._module.args.hmUsers or {})) {} allModules;
|
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
|
# System packages & helpers
|
||||||
|
|||||||
@@ -40,8 +40,14 @@ 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 a single users attribute
|
# Merge all _module.args.hmUsers from modules into Home Manager users
|
||||||
home-manager.users = lib.foldl' (acc m: acc // (m._module.args.hmUsers or {})) {} allModules;
|
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
|
# System packages & helpers
|
||||||
|
|||||||
Reference in New Issue
Block a user