colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

cleanup: modules/users.nix: allow explicitly setting home, if needed

Browse Source
This commit is contained in:
Colin 2023-01-30 11:06:47 +00:00
parent e4bff9b5ef
commit 3653776399
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/users.nix
View File

@ -27,7 +27,7 @@ let
}; };
}; };
}; };
userModule = types.submodule ({ config, ... }: { userModule = types.submodule ({ name, config, ... }: {
options = userOptions.options // { options = userOptions.options // {
default = mkOption { default = mkOption {
type = types.bool; type = types.bool;
@ -37,6 +37,13 @@ let
this option determines what the `sane.user` shorthand evaluates to. this option determines what the `sane.user` shorthand evaluates to.
''; '';
}; };
home = mkOption {
type = types.str;
# XXX: we'd prefer to set this to `config.users.users.home`, but that causes infinite recursion...
# TODO: maybe assert that this matches the actual home?
default = "/home/${name}";
};
}; };
# if we're the default user, inherit whatever settings were routed to the default user # if we're the default user, inherit whatever settings were routed to the default user
@ -45,8 +52,7 @@ let
processUser = user: defn: processUser = user: defn:
let let
prefixWithHome = mapAttrs' (path: value: { prefixWithHome = mapAttrs' (path: value: {
# TODO: query the user's home dir! name = path-lib.concat [ defn.home path ];
name = path-lib.concat [ "/home/${user}" path ];
inherit value; inherit value;
}); });
in in