Regenerated
This commit is contained in:
@@ -11,6 +11,9 @@ let
|
||||
|
||||
allModules = hostModules.imports ++ globalUsers.imports;
|
||||
|
||||
# Merge all _module.args.hmUsers from each module
|
||||
allHmUsers = lib.foldl' (acc m: acc // (m._module.args.hmUsers or {})) {} allModules;
|
||||
|
||||
in
|
||||
{
|
||||
#################################
|
||||
@@ -28,8 +31,6 @@ in
|
||||
[
|
||||
./boot.nix
|
||||
./hardware-configuration.nix
|
||||
|
||||
# REQUIRED for Home Manager
|
||||
home-manager.nixosModules.home-manager
|
||||
]
|
||||
++ allModules;
|
||||
@@ -41,6 +42,9 @@ in
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
|
||||
# Inject the merged hmUsers into Home Manager
|
||||
_module.args.hmUsers = allHmUsers;
|
||||
|
||||
# Install dconf for the system/user
|
||||
environment.systemPackages = [
|
||||
pkgs.dconf
|
||||
|
||||
Reference in New Issue
Block a user