Refactor user option types across modules for consistency

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.

config/stylix.nix

@@ -17,9 +17,8 @@ in
   options.my.stylix = {
     enable = lib.mkEnableOption "system-wide theming with Stylix";
     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.stylix;
-      merge = inputs.self.lib.mergeUsersOption lib;
       description = "Users to apply Stylix theming for";
     };
   };

modules/apps/art.nix

@@ -40,9 +40,8 @@ in
     apps.art = {
       enable = lib.mkEnableOption "digital art and creative applications";
       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.apps;
-        merge = inputs.self.lib.mergeUsersOption lib;
         description = "Users to install art packages for";
       };
     };

modules/apps/dictionaries.nix

@@ -21,9 +21,8 @@ in
   options.my.apps.dictionaries = {
     enable = lib.mkEnableOption "dictionaries and language tools";
     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.apps;
-      merge = inputs.self.lib.mergeUsersOption lib;
       description = "Users to install dictionaries packages for";
     };
   };

modules/apps/gaming.nix

@@ -26,9 +26,8 @@ in
     gaming = {
       enable = lib.mkEnableOption "gaming applications and emulators";
       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.apps;
-        merge = inputs.self.lib.mergeUsersOption lib;
         description = "Users to install gaming packages for";
       };
     };

modules/apps/internet.nix

@@ -31,9 +31,8 @@ in
   options.my.apps.internet = {
     enable = lib.mkEnableOption "internet browsers and communication apps";
     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.apps;
-      merge = inputs.self.lib.mergeUsersOption lib;
       description = "Users to install internet packages for";
     };
   };

modules/apps/misc.nix

@@ -9,9 +9,8 @@
   options.my.apps.misc = {
     enable = lib.mkEnableOption "miscellaneous desktop applications";
     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.apps;
-      merge = inputs.self.lib.mergeUsersOption lib;
       description = "Users to install misc packages for";
     };
   };

modules/apps/multimedia.nix

@@ -33,17 +33,15 @@ in
   options.my.apps.multimedia = {
     enable = lib.mkEnableOption "multimedia applications and media players";
     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.apps;
-      merge = inputs.self.lib.mergeUsersOption lib;
       description = "Users to install multimedia packages for";
     };
     videoEditing = {
       enable = lib.mkEnableOption "video editing applications";
       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.apps;
-        merge = inputs.self.lib.mergeUsersOption lib;
         description = "Users to install video editing packages for";
       };
     };

modules/apps/music.nix

@@ -9,9 +9,8 @@
   options.my.apps.piano = {
     enable = lib.mkEnableOption "piano learning and music theory apps";
     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.apps;
-      merge = inputs.self.lib.mergeUsersOption lib;
       description = "Users to install piano packages for";
     };
   };

modules/apps/office.nix

@@ -9,9 +9,8 @@
   options.my.apps.office = {
     enable = lib.mkEnableOption "office applications and productivity tools";
     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.apps;
-      merge = inputs.self.lib.mergeUsersOption lib;
       description = "Users to install office packages for";
     };
   };

modules/dev/cc.nix

@@ -21,9 +21,8 @@ in
     my.dev.cc = {
       enable = lib.mkEnableOption "Install C/C++ tooling globally";
       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.dev;
-        merge = inputs.self.lib.mergeUsersOption lib;
         description = "Users to install C/C++ packages for";
       };
     };

modules/dev/docker.nix

@@ -18,9 +18,8 @@ in
     my.dev.docker = {
       enable = lib.mkEnableOption "Install Docker tooling globally";
       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.dev;
-        merge = inputs.self.lib.mergeUsersOption lib;
         description = "Users to install Docker packages for";
       };
     };

modules/dev/emacs.nix

@@ -9,9 +9,8 @@
   options.my.emacs = {
     enable = lib.mkEnableOption "Doom Emacs configuration";
     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.dev;
-      merge = inputs.self.lib.mergeUsersOption lib;
       description = "Users to install Emacs packages for";
     };
   };

modules/dev/go.nix

@@ -24,9 +24,8 @@ in
     my.dev.go = {
       enable = lib.mkEnableOption "Install Go tooling globally";
       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.dev;
-        merge = inputs.self.lib.mergeUsersOption lib;
         description = "Users to install Go packages for";
       };
     };

modules/dev/haskell.nix

@@ -22,9 +22,8 @@ in
     my.dev.haskell = {
       enable = lib.mkEnableOption "Install Haskell tooling globally";
       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.dev;
-        merge = inputs.self.lib.mergeUsersOption lib;
         description = "Users to install Haskell packages for";
       };
     };

modules/dev/javascript.nix

@@ -16,9 +16,8 @@ in
     my.dev.javascript = {
       enable = lib.mkEnableOption "Install JavaScript tooling globally";
       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.dev;
-        merge = inputs.self.lib.mergeUsersOption lib;
         description = "Users to install JavaScript packages for";
       };
     };

modules/dev/julia.nix

@@ -15,9 +15,8 @@ in
     my.dev.julia = {
       enable = lib.mkEnableOption "Install Julia globally";
       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.dev;
-        merge = inputs.self.lib.mergeUsersOption lib;
         description = "Users to install Julia packages for";
       };
     };

modules/dev/nix.nix

@@ -22,9 +22,8 @@ in
     my.dev.nix = {
       enable = lib.mkEnableOption "Install Nix tooling globally";
       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.dev;
-        merge = inputs.self.lib.mergeUsersOption lib;
         description = "Users to install Nix packages for";
       };
     };

modules/dev/python.nix

@@ -34,9 +34,8 @@ in
     my.dev.python = {
       enable = lib.mkEnableOption "Install Python tools globally";
       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.dev;
-        merge = inputs.self.lib.mergeUsersOption lib;
         description = "Users to install Python packages for";
       };
     };

modules/dev/ruby.nix

@@ -16,9 +16,8 @@ in
     my.dev.ruby = {
       enable = lib.mkEnableOption "Install Ruby tooling globally";
       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.dev;
-        merge = inputs.self.lib.mergeUsersOption lib;
         description = "Users to install Ruby packages for";
       };
     };

modules/dev/rust.nix

@@ -21,9 +21,8 @@ in
     my.dev.rust = {
       enable = lib.mkEnableOption "Install Rust tooling globally";
       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.dev;
-        merge = inputs.self.lib.mergeUsersOption lib;
         description = "Users to install Rust packages for";
       };
     };

modules/dev/sh.nix

@@ -20,9 +20,8 @@ in
     my.dev.sh = {
       enable = lib.mkEnableOption "Install shell scripting tools globally";
       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.dev;
-        merge = inputs.self.lib.mergeUsersOption lib;
         description = "Users to install shell scripting packages for";
       };
     };

modules/dev/zig.nix

@@ -18,9 +18,8 @@ in
     my.dev.zig = {
       enable = lib.mkEnableOption "Install Zig tooling globally";
       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.dev;
-        merge = inputs.self.lib.mergeUsersOption lib;
         description = "Users to install Zig packages for";
       };
     };

modules/factories/mkscript.nix

@@ -14,9 +14,8 @@
           install = lib.mkEnableOption "Whether to install the script package";
           service = lib.mkEnableOption "Whether to enable the script service";
           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.scripts;
-            merge = inputs.self.lib.mergeUsersOption lib;
             description = "Users to install this script for";
           };
           name = lib.mkOption {

modules/services/printing.nix

@@ -15,9 +15,8 @@ in
   options.my.services.printing = {
     enable = lib.mkEnableOption "printing services and drivers";
     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.services;
-      merge = inputs.self.lib.mergeUsersOption lib;
       description = "Users to install printing packages for";
     };
   };

modules/shell/config.nix

@@ -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";
     };
   };

modules/shell/exercism.nix

@@ -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";
     };
   };

modules/shell/multimedia.nix

@@ -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";
     };
   };

modules/shell/tools.nix

@@ -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";
     };
   };

parts/core.nix

@@ -237,13 +237,20 @@ in
           }) (inputs.self.lib.normalizeUsers users)
         );
       getFirstUser = users: if builtins.isString users then users else (builtins.head users);
-      mergeUsersOption =
+      usersOptionType =
-        lib: _loc: defs:
+        lib:
-        let
+        lib.mkOptionType {
-          normalize = users: if builtins.isString users then [ users ] else users;
+          name = "usersOption";
-          allUsers = lib.foldl' (acc: def: acc ++ (normalize def.value)) [ ] defs;
+          description = "Either a single user (string) or multiple users (list of strings)";
-        in
+          check = x: builtins.isString x || (builtins.isList x && lib.all builtins.isString x);
-        lib.unique allUsers;
+          merge =
+            _loc: defs:
+            let
+              normalize = users: if builtins.isString users then [ users ] else users;
+              allUsers = lib.foldl' (acc: def: acc ++ (normalize def.value)) [ ] defs;
+            in
+            lib.unique allUsers;
+        };
     };
   };
 }