nixos/users-groups: allow changing default home directory

This commit is contained in:
Katalin Rebhan 2024-03-04 23:15:13 +01:00
parent 53187aeafe
commit 6f7d7cf76f
No known key found for this signature in database
2 changed files with 10 additions and 2 deletions

View file

@ -477,7 +477,7 @@ let
(mkIf config.isNormalUser { (mkIf config.isNormalUser {
group = mkDefault "users"; group = mkDefault "users";
createHome = mkDefault true; createHome = mkDefault true;
home = mkDefault "/home/${config.name}"; home = mkDefault "${cfg.defaultUserHome}/${config.name}";
homeMode = mkDefault "700"; homeMode = mkDefault "700";
useDefaultShell = mkDefault true; useDefaultShell = mkDefault true;
isSystemUser = mkDefault false; isSystemUser = mkDefault false;
@ -753,6 +753,14 @@ in
''; '';
}; };
users.defaultUserHome = mkOption {
type = types.str;
default = "/home";
description = ''
The default home directory for normal users.
'';
};
# systemd initrd # systemd initrd
boot.initrd.systemd.users = mkOption { boot.initrd.systemd.users = mkOption {
description = '' description = ''

View file

@ -217,7 +217,7 @@ in
# /etc/default/useradd: configuration for useradd. # /etc/default/useradd: configuration for useradd.
"default/useradd".source = pkgs.writeText "useradd" '' "default/useradd".source = pkgs.writeText "useradd" ''
GROUP=100 GROUP=100
HOME=/home HOME=${config.users.defaultUserHome}
SHELL=${utils.toShellPath config.users.defaultUserShell} SHELL=${utils.toShellPath config.users.defaultUserShell}
''; '';
}; };