manuth/PortValhalla
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove unnecessary options from Win users

Browse source
This commit is contained in:
Manuel Thalmann 2024-08-08 15:32:05 +02:00
parent b28a38b191
commit db38cf2207
2 changed files with 29 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
lib/modules/users.nix
View file

@ -8,6 +8,22 @@
cfg = config.valhalla;
capitalize = (import ../text.nix { inherit lib; }).capitalize;
linuxOptions = {
defaultShell = mkOption {
type = types.nullOr types.str;
description = "The default shell of the user.";
default = null;
};
rclone = {
configurations = mkOption {
type = types.attrsOf syncType;
description = "The configurations of the rclone mounts.";
default = {};
};
};
};
syncType = types.submodule (
{ ... }: {
options = {
@ -46,25 +62,13 @@
default = [];
};
defaultShell = mkOption {
type = types.nullOr types.str;
description = "The default shell of the user.";
default = null;
};
rclone = {
configurations = mkOption {
type = types.attrsOf syncType;
description = "The configurations of the rclone mounts.";
default = {};
};
};
git = (import ./git/options.nix) { inherit lib; };
} // options;
}));
userType = mkUserType { options = {}; };
userType = mkUserType {
options = linuxOptions;
};
winUserType = mkUserType {
options = {
@ -88,9 +92,12 @@
type = types.attrsOf winUserType;
description = "The users to create on the Windows machine.";
default = lib.attrsets.concatMapAttrs (
name: options: {
${capitalize name} = options;
}) cfg.users;
name: options:
if builtins.elem name (builtins.attrNames linuxOptions)
then {}
else {
${capitalize name} = options;
}) cfg.users;
};
};
};

4
profiles/DerGeret/config.nix
View file

@ -10,6 +10,10 @@
enable = true;
linuxPercentage = 70; # better safe than sorry
};
users.Manuel = {
microsoftAccount = true;
};
};
partition.os.partitions = {