Add multi-user support for package installations across various modules

Updated multiple configuration files to include a `merge` option for user management, enhancing the ability to handle multi-user setups for applications and services. This change improves flexibility in managing user-specific package installations, ensuring a more streamlined configuration process.

config/base.nix

@@ -168,37 +168,38 @@
   };
   fonts = {
     fontconfig.enable = true;
-    packages = let
+    packages =
-      customFonts = pkgs.stdenvNoCC.mkDerivation {
+      let
-        name = "custom-fonts";
+        customFonts = pkgs.stdenvNoCC.mkDerivation {
-        src = inputs.fonts;
+          name = "custom-fonts";
-        installPhase = ''
+          src = inputs.fonts;
-          mkdir -p $out/share/fonts
+          installPhase = ''
-          find $src -type f \( \
+            mkdir -p $out/share/fonts
-            -name "*.ttf" -o \
+            find $src -type f \( \
-            -name "*.otf" -o \
+              -name "*.ttf" -o \
-            -name "*.woff" -o \
+              -name "*.otf" -o \
-            -name "*.woff2" \
+              -name "*.woff" -o \
-          \) -exec cp {} $out/share/fonts/ \;
+              -name "*.woff2" \
-        '';
+            \) -exec cp {} $out/share/fonts/ \;
+          '';
+        };
+      in
+      builtins.attrValues {
+        inherit customFonts;
+        inherit (pkgs)
+          symbola
+          comic-neue
+          cascadia-code
+          corefonts
+          ;
+        inherit (pkgs.nerd-fonts)
+          caskaydia-cove
+          open-dyslexic
+          comic-shanns-mono
+          iosevka
+          agave
+          ;
       };
-    in
-    builtins.attrValues {
-      inherit customFonts;
-      inherit (pkgs)
-        symbola
-        comic-neue
-        cascadia-code
-        corefonts
-        ;
-      inherit (pkgs.nerd-fonts)
-        caskaydia-cove
-        open-dyslexic
-        comic-shanns-mono
-        iosevka
-        agave
-        ;
-    };
   };
   powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
 }

config/stylix.nix

@@ -19,6 +19,7 @@ in
     users = lib.mkOption {
       type = lib.types.either lib.types.str (lib.types.listOf lib.types.str);
       default = config.my.toggleUsers.stylix;
+      merge = inputs.self.lib.mergeUsersOption lib;
       description = "Users to apply Stylix theming for";
     };
   };

modules/apps/art.nix

@@ -42,6 +42,7 @@ in
       users = lib.mkOption {
         type = lib.types.either lib.types.str (lib.types.listOf lib.types.str);
         default = config.my.toggleUsers.apps;
+        merge = inputs.self.lib.mergeUsersOption lib;
         description = "Users to install art packages for";
       };
     };

modules/apps/dictionaries.nix

@@ -23,6 +23,7 @@ in
     users = lib.mkOption {
       type = lib.types.either lib.types.str (lib.types.listOf lib.types.str);
       default = config.my.toggleUsers.apps;
+      merge = inputs.self.lib.mergeUsersOption lib;
       description = "Users to install dictionaries packages for";
     };
   };

modules/apps/gaming.nix

@@ -28,6 +28,7 @@ in
       users = lib.mkOption {
         type = lib.types.either lib.types.str (lib.types.listOf lib.types.str);
         default = config.my.toggleUsers.apps;
+        merge = inputs.self.lib.mergeUsersOption lib;
         description = "Users to install gaming packages for";
       };
     };

modules/apps/internet.nix

@@ -33,6 +33,7 @@ in
     users = lib.mkOption {
       type = lib.types.either lib.types.str (lib.types.listOf lib.types.str);
       default = config.my.toggleUsers.apps;
+      merge = inputs.self.lib.mergeUsersOption lib;
       description = "Users to install internet packages for";
     };
   };

modules/apps/misc.nix

@@ -11,6 +11,7 @@
     users = lib.mkOption {
       type = lib.types.either lib.types.str (lib.types.listOf lib.types.str);
       default = config.my.toggleUsers.apps;
+      merge = inputs.self.lib.mergeUsersOption lib;
       description = "Users to install misc packages for";
     };
   };

modules/apps/multimedia.nix

@@ -35,6 +35,7 @@ in
     users = lib.mkOption {
       type = lib.types.either lib.types.str (lib.types.listOf lib.types.str);
       default = config.my.toggleUsers.apps;
+      merge = inputs.self.lib.mergeUsersOption lib;
       description = "Users to install multimedia packages for";
     };
     videoEditing = {
@@ -42,6 +43,7 @@ in
       users = lib.mkOption {
         type = lib.types.either lib.types.str (lib.types.listOf lib.types.str);
         default = config.my.toggleUsers.apps;
+        merge = inputs.self.lib.mergeUsersOption lib;
         description = "Users to install video editing packages for";
       };
     };

modules/apps/music.nix

@@ -11,6 +11,7 @@
     users = lib.mkOption {
       type = lib.types.either lib.types.str (lib.types.listOf lib.types.str);
       default = config.my.toggleUsers.apps;
+      merge = inputs.self.lib.mergeUsersOption lib;
       description = "Users to install piano packages for";
     };
   };

modules/apps/office.nix

@@ -11,6 +11,7 @@
     users = lib.mkOption {
       type = lib.types.either lib.types.str (lib.types.listOf lib.types.str);
       default = config.my.toggleUsers.apps;
+      merge = inputs.self.lib.mergeUsersOption lib;
       description = "Users to install office packages for";
     };
   };

modules/dev/cc.nix

@@ -23,6 +23,7 @@ in
       users = lib.mkOption {
         type = lib.types.either lib.types.str (lib.types.listOf lib.types.str);
         default = config.my.toggleUsers.dev;
+        merge = inputs.self.lib.mergeUsersOption lib;
         description = "Users to install C/C++ packages for";
       };
     };

modules/dev/docker.nix

@@ -20,6 +20,7 @@ in
       users = lib.mkOption {
         type = lib.types.either lib.types.str (lib.types.listOf lib.types.str);
         default = config.my.toggleUsers.dev;
+        merge = inputs.self.lib.mergeUsersOption lib;
         description = "Users to install Docker packages for";
       };
     };

modules/dev/emacs.nix

@@ -11,6 +11,7 @@
     users = lib.mkOption {
       type = lib.types.either lib.types.str (lib.types.listOf lib.types.str);
       default = config.my.toggleUsers.dev;
+      merge = inputs.self.lib.mergeUsersOption lib;
       description = "Users to install Emacs packages for";
     };
   };

modules/dev/go.nix

@@ -26,6 +26,7 @@ in
       users = lib.mkOption {
         type = lib.types.either lib.types.str (lib.types.listOf lib.types.str);
         default = config.my.toggleUsers.dev;
+        merge = inputs.self.lib.mergeUsersOption lib;
         description = "Users to install Go packages for";
       };
     };

modules/dev/haskell.nix

@@ -24,6 +24,7 @@ in
       users = lib.mkOption {
         type = lib.types.either lib.types.str (lib.types.listOf lib.types.str);
         default = config.my.toggleUsers.dev;
+        merge = inputs.self.lib.mergeUsersOption lib;
         description = "Users to install Haskell packages for";
       };
     };

modules/dev/javascript.nix

@@ -18,6 +18,7 @@ in
       users = lib.mkOption {
         type = lib.types.either lib.types.str (lib.types.listOf lib.types.str);
         default = config.my.toggleUsers.dev;
+        merge = inputs.self.lib.mergeUsersOption lib;
         description = "Users to install JavaScript packages for";
       };
     };

modules/dev/julia.nix

@@ -17,6 +17,7 @@ in
       users = lib.mkOption {
         type = lib.types.either lib.types.str (lib.types.listOf lib.types.str);
         default = config.my.toggleUsers.dev;
+        merge = inputs.self.lib.mergeUsersOption lib;
         description = "Users to install Julia packages for";
       };
     };

modules/dev/nix.nix

@@ -24,6 +24,7 @@ in
       users = lib.mkOption {
         type = lib.types.either lib.types.str (lib.types.listOf lib.types.str);
         default = config.my.toggleUsers.dev;
+        merge = inputs.self.lib.mergeUsersOption lib;
         description = "Users to install Nix packages for";
       };
     };

modules/dev/python.nix

@@ -36,6 +36,7 @@ in
       users = lib.mkOption {
         type = lib.types.either lib.types.str (lib.types.listOf lib.types.str);
         default = config.my.toggleUsers.dev;
+        merge = inputs.self.lib.mergeUsersOption lib;
         description = "Users to install Python packages for";
       };
     };

modules/dev/ruby.nix

@@ -18,6 +18,7 @@ in
       users = lib.mkOption {
         type = lib.types.either lib.types.str (lib.types.listOf lib.types.str);
         default = config.my.toggleUsers.dev;
+        merge = inputs.self.lib.mergeUsersOption lib;
         description = "Users to install Ruby packages for";
       };
     };

modules/dev/rust.nix

@@ -23,6 +23,7 @@ in
       users = lib.mkOption {
         type = lib.types.either lib.types.str (lib.types.listOf lib.types.str);
         default = config.my.toggleUsers.dev;
+        merge = inputs.self.lib.mergeUsersOption lib;
         description = "Users to install Rust packages for";
       };
     };

modules/dev/sh.nix

@@ -22,6 +22,7 @@ in
       users = lib.mkOption {
         type = lib.types.either lib.types.str (lib.types.listOf lib.types.str);
         default = config.my.toggleUsers.dev;
+        merge = inputs.self.lib.mergeUsersOption lib;
         description = "Users to install shell scripting packages for";
       };
     };

modules/dev/zig.nix

@@ -20,6 +20,7 @@ in
       users = lib.mkOption {
         type = lib.types.either lib.types.str (lib.types.listOf lib.types.str);
         default = config.my.toggleUsers.dev;
+        merge = inputs.self.lib.mergeUsersOption lib;
         description = "Users to install Zig packages for";
       };
     };

modules/factories/mkscript.nix

@@ -16,6 +16,7 @@
           users = lib.mkOption {
             type = lib.types.either lib.types.str (lib.types.listOf lib.types.str);
             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

@@ -17,6 +17,7 @@ in
     users = lib.mkOption {
       type = lib.types.either lib.types.str (lib.types.listOf lib.types.str);
       default = config.my.toggleUsers.services;
+      merge = inputs.self.lib.mergeUsersOption lib;
       description = "Users to install printing packages for";
     };
   };

modules/shell/config.nix

@@ -18,6 +18,7 @@
     users = lib.mkOption {
       type = lib.types.either lib.types.str (lib.types.listOf lib.types.str);
       default = config.my.toggleUsers.shell;
+      merge = inputs.self.lib.mergeUsersOption lib;
       description = "Users to configure shell for";
     };
   };

modules/shell/exercism.nix

@@ -11,6 +11,7 @@
     users = lib.mkOption {
       type = lib.types.either lib.types.str (lib.types.listOf lib.types.str);
       default = config.my.toggleUsers.shell;
+      merge = inputs.self.lib.mergeUsersOption lib;
       description = "Users to install Exercism for";
     };
   };

modules/shell/multimedia.nix

@@ -11,6 +11,7 @@
     users = lib.mkOption {
       type = lib.types.either lib.types.str (lib.types.listOf lib.types.str);
       default = config.my.toggleUsers.shell;
+      merge = inputs.self.lib.mergeUsersOption lib;
       description = "Users to install multimedia shell tools for";
     };
   };

modules/shell/tools.nix

@@ -14,6 +14,7 @@ in
     users = lib.mkOption {
       type = lib.types.either lib.types.str (lib.types.listOf lib.types.str);
       default = config.my.toggleUsers.shell;
+      merge = inputs.self.lib.mergeUsersOption lib;
       description = "Users to install shell tools for";
     };
   };

parts/core.nix

@@ -237,6 +237,13 @@ in
           }) (inputs.self.lib.normalizeUsers users)
         );
       getFirstUser = users: if builtins.isString users then users else (builtins.head users);
+      mergeUsersOption =
+        lib: _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;
     };
   };
 }