kylekrein/snowfall-lib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: rework home-manager modules to allow option merging

Browse source
This commit is contained in:
Jake Hamilton 2023-06-25 18:58:14 -07:00
parent 165d8bb203
commit cfaa78937e
No known key found for this signature in database
GPG key ID: 9762169A1B35EA68
4 changed files with 154 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/home/user/default.nix
View file

@ -9,6 +9,8 @@ let
# when being used in standalone home-manager. To remedy this, we have to refer to the arguments set directly.
os-user-home = inputs.osConfig.users.users.${cfg.name}.home or null;
has-user-name = (cfg.user.name or null) != null;
default-home-directory =
if (os-user-home != null) then
os-user-home
@ -43,8 +45,8 @@ in
config = mkIf cfg.user.enable {
home = {
username = mkIf (cfg.user.name or null != null) (mkDefault cfg.user.name);
homeDirectory = mkIf (cfg.user.name or null != null) (mkDefault cfg.user.home.directory);
username = mkIf has-user-name (mkDefault cfg.user.name);
homeDirectory = mkIf has-user-name (mkDefault cfg.user.home.directory);
};
};
}