jawz/NixOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor user option types across modules for consistency

Browse Source 
Updated multiple configuration files to replace the user option type with a unified `usersOptionType`, enhancing consistency in user management across applications and services. This change simplifies the user configuration process and improves maintainability.
This commit is contained in:
Danilo Reyes
2026-01-16 13:40:44 -06:00
parent f1e6015d39
commit 6573392c3b
29 changed files with 43 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/shell/config.nix
View File

@@ -16,9 +16,8 @@
description = "The shell to use system-wide (bash or zsh)";
};
users = lib.mkOption {
type = lib.types.either lib.types.str (lib.types.listOf lib.types.str);
type = inputs.self.lib.usersOptionType lib;
default = config.my.toggleUsers.shell;
merge = inputs.self.lib.mergeUsersOption lib;
description = "Users to configure shell for";
};
};

3
modules/shell/exercism.nix
View File

@@ -9,9 +9,8 @@
options.my.shell.exercism = {
enable = lib.mkEnableOption "Exercism coding practice platform";
users = lib.mkOption {
type = lib.types.either lib.types.str (lib.types.listOf lib.types.str);
type = inputs.self.lib.usersOptionType lib;
default = config.my.toggleUsers.shell;
merge = inputs.self.lib.mergeUsersOption lib;
description = "Users to install Exercism for";
};
};

3
modules/shell/multimedia.nix
View File

@@ -9,9 +9,8 @@
options.my.shell.multimedia = {
enable = lib.mkEnableOption "multimedia CLI tools and codecs";
users = lib.mkOption {
type = lib.types.either lib.types.str (lib.types.listOf lib.types.str);
type = inputs.self.lib.usersOptionType lib;
default = config.my.toggleUsers.shell;
merge = inputs.self.lib.mergeUsersOption lib;
description = "Users to install multimedia shell tools for";
};
};

3
modules/shell/tools.nix
View File

@@ -12,9 +12,8 @@ in
options.my.shell.tools = {
enable = lib.mkEnableOption "shell tools and utilities";
users = lib.mkOption {
type = lib.types.either lib.types.str (lib.types.listOf lib.types.str);
type = inputs.self.lib.usersOptionType lib;
default = config.my.toggleUsers.shell;
merge = inputs.self.lib.mergeUsersOption lib;
description = "Users to install shell tools for";
};
};