Regenerated
This commit is contained in:
+8
-6
@@ -172,12 +172,14 @@ in
|
|||||||
|
|
||||||
# Merge all _module.args.hmUsers from modules into Home Manager users
|
# Merge all _module.args.hmUsers from modules into Home Manager users
|
||||||
home-manager.users = lib.foldl' (acc: m:
|
home-manager.users = lib.foldl' (acc: m:
|
||||||
acc // (builtins.getAttr "_module" m
|
let
|
||||||
? args && m._module.args ? hmUsers
|
hmUsers = if (builtins.hasAttr "_module" m) &&
|
||||||
then m._module.args.hmUsers
|
(builtins.hasAttr "args" m._module) &&
|
||||||
else {}))
|
(builtins.hasAttr "hmUsers" m._module.args)
|
||||||
{}
|
then m._module.args.hmUsers
|
||||||
allModules;
|
else {};
|
||||||
|
in acc // hmUsers
|
||||||
|
) {} allModules;
|
||||||
|
|
||||||
#################################
|
#################################
|
||||||
# System packages & helpers
|
# System packages & helpers
|
||||||
|
|||||||
@@ -42,12 +42,14 @@ in
|
|||||||
|
|
||||||
# Merge all _module.args.hmUsers from modules into Home Manager users
|
# Merge all _module.args.hmUsers from modules into Home Manager users
|
||||||
home-manager.users = lib.foldl' (acc: m:
|
home-manager.users = lib.foldl' (acc: m:
|
||||||
acc // (builtins.getAttr "_module" m
|
let
|
||||||
? args && m._module.args ? hmUsers
|
hmUsers = if (builtins.hasAttr "_module" m) &&
|
||||||
then m._module.args.hmUsers
|
(builtins.hasAttr "args" m._module) &&
|
||||||
else {}))
|
(builtins.hasAttr "hmUsers" m._module.args)
|
||||||
{}
|
then m._module.args.hmUsers
|
||||||
allModules;
|
else {};
|
||||||
|
in acc // hmUsers
|
||||||
|
) {} allModules;
|
||||||
|
|
||||||
#################################
|
#################################
|
||||||
# System packages & helpers
|
# System packages & helpers
|
||||||
|
|||||||
Reference in New Issue
Block a user