Regenerated
This commit is contained in:
@@ -11,19 +11,35 @@ let
|
||||
|
||||
allModules = hostModules.imports ++ globalUsers.imports;
|
||||
|
||||
#########################################################
|
||||
# Merge all _module.args.hmUsers from your modules
|
||||
#########################################################
|
||||
mergedHmUsers = lib.mkMerge (map (_: _.args?.hmUsers or {}) allModules);
|
||||
|
||||
#########################################################
|
||||
# Add single activation to ensure all parent dirs exist
|
||||
#########################################################
|
||||
mergedHmUsersWithDirs = lib.mapAttrs (_: userCfg: userCfg // {
|
||||
home.activation.ensureDirs = lib.hm.dag.entryAfter ["writeBoundary"] (let
|
||||
ensureDirs = files: lib.mapAttrs (_: path: ''
|
||||
mkdir -p $(dirname $HOME/${path})
|
||||
'') files;
|
||||
in
|
||||
ensureDirs (builtins.attrNames (userCfg.home.file or {}))
|
||||
);
|
||||
}) mergedHmUsers;
|
||||
|
||||
in
|
||||
{
|
||||
#################################
|
||||
# Core system config
|
||||
#################################
|
||||
|
||||
networking.hostName = hostname;
|
||||
system.stateVersion = "26.05";
|
||||
|
||||
#################################
|
||||
# Imports
|
||||
#################################
|
||||
|
||||
imports =
|
||||
[ ../../../generated/users/henrov.nix
|
||||
./boot.nix
|
||||
@@ -35,15 +51,18 @@ in
|
||||
#################################
|
||||
# Home Manager integration
|
||||
#################################
|
||||
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
|
||||
# Install dconf for the system/user
|
||||
environment.systemPackages = [
|
||||
pkgs.dconf
|
||||
];
|
||||
# Pass the merged user definitions with automatic dir creation
|
||||
home-manager.users = mergedHmUsersWithDirs;
|
||||
|
||||
# Ensure Home Manager writes dconf safely
|
||||
programs.dconf.enable = true;
|
||||
#################################
|
||||
# System packages & programs
|
||||
#################################
|
||||
environment.systemPackages = [
|
||||
pkgs.dconf
|
||||
];
|
||||
|
||||
programs.dconf.enable = true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user