Add helper functions for multi-user toggle support

Introduced a new file `lib.nix` containing helper functions to streamline user package management and attributes for multi-user configurations. Updated various modules to utilize these functions, enhancing code maintainability and readability.

modules/apps/art.nix

@@ -40,9 +40,7 @@ in
     dev.gameDev.enable = lib.mkEnableOption "game development tools and engines";
   };
   config.users.users = let
-    users = if lib.isString config.my.toggleUsers.apps then [ config.my.toggleUsers.apps ] else config.my.toggleUsers.apps;
+    userLib = import ../lib.nix { inherit lib; };
     packages = artPackages ++ gameDevPackages;
-  in lib.mkMerge (map (user: {
-    ${user}.packages = packages;
-  }) users);
+  in userLib.mkUserPackages config.my.toggleUsers.apps packages;
 }

modules/apps/dictionaries.nix

@@ -5,7 +5,7 @@
   ...
 }:
 let
-  users = if lib.isString config.my.toggleUsers.apps then [ config.my.toggleUsers.apps ] else config.my.toggleUsers.apps;
+  userLib = import ../lib.nix { inherit lib; };
   packages = builtins.attrValues {
     inherit (pkgs)
       hunspell
@@ -20,8 +20,6 @@ in
 {
   options.my.apps.dictionaries.enable = lib.mkEnableOption "dictionaries and language tools";
   config = lib.mkIf config.my.apps.dictionaries.enable {
-    users.users = lib.mkMerge (map (user: {
-      ${user}.packages = packages;
-    }) users);
+    users.users = userLib.mkUserPackages config.my.toggleUsers.apps packages;
   };
 }

modules/apps/gaming.nix

@@ -51,7 +51,7 @@ in
       # };
     };
     users.users = let
-      users = if lib.isString config.my.toggleUsers.apps then [ config.my.toggleUsers.apps ] else config.my.toggleUsers.apps;
+      userLib = import ../lib.nix { inherit lib; };
       packages = builtins.attrValues {
         inherit retroarchWithCores;
         inherit (pkgs)
@@ -70,8 +70,6 @@ in
           prismlauncher # minecraft launcher with jdk overlays
           ;
       };
-    in lib.mkMerge (map (user: {
-      ${user}.packages = packages;
-    }) users);
+    in userLib.mkUserPackages config.my.toggleUsers.apps packages;
   };
 }

modules/apps/internet.nix

@@ -30,32 +30,30 @@ in
   options.my.apps.internet.enable = lib.mkEnableOption "internet browsers and communication apps";
   config = lib.mkIf config.my.apps.internet.enable {
     home-manager.users = let
-      users = if lib.isString config.my.toggleUsers.apps then [ config.my.toggleUsers.apps ] else config.my.toggleUsers.apps;
-    in lib.mkMerge (map (user: {
-      ${user}.programs.librewolf = import ./librewolf.nix;
-    }) users);
+      userLib = import ../lib.nix { inherit lib; };
+    in userLib.mkHomeManagerUsers config.my.toggleUsers.apps (user: {
+      programs.librewolf = import ./librewolf.nix;
+    });
     programs.geary.enable = true;
     users.users = let
-      users = if lib.isString config.my.toggleUsers.apps then [ config.my.toggleUsers.apps ] else config.my.toggleUsers.apps;
+      userLib = import ../lib.nix { inherit lib; };
       packages = builtins.attrValues {
-      # inherit (inputs.zen-browser.packages.x86_64-linux) twilight;
-      inherit krisp-patcher;
-      inherit (pkgs)
-        # thunderbird # email client
-        warp # transfer files with based ppl
-        nextcloud-client # self-hosted google-drive alternative
-        fragments # beautiful torrent client
-        tor-browser # dark web, so dark!
-        telegram-desktop # furry chat
-        nicotine-plus # remember Ares?
-        discord # :3
-        vdhcoapp # video download helper assistant
-        nextcloud-talk-desktop # nextcloud talk client
-        fractal # matrix client
-        ;
+        # inherit (inputs.zen-browser.packages.x86_64-linux) twilight;
+        inherit krisp-patcher;
+        inherit (pkgs)
+          # thunderbird # email client
+          warp # transfer files with based ppl
+          nextcloud-client # self-hosted google-drive alternative
+          fragments # beautiful torrent client
+          tor-browser # dark web, so dark!
+          telegram-desktop # furry chat
+          nicotine-plus # remember Ares?
+          discord # :3
+          vdhcoapp # video download helper assistant
+          nextcloud-talk-desktop # nextcloud talk client
+          fractal # matrix client
+          ;
       };
-    in lib.mkMerge (map (user: {
-      ${user}.packages = packages;
-    }) users);
+    in userLib.mkUserPackages config.my.toggleUsers.apps packages;
   };
 }

modules/apps/misc.nix

@@ -8,17 +8,15 @@
   options.my.apps.misc.enable = lib.mkEnableOption "miscellaneous desktop applications";
   config = lib.mkIf config.my.apps.misc.enable {
     users.users = let
-      users = if lib.isString config.my.toggleUsers.apps then [ config.my.toggleUsers.apps ] else config.my.toggleUsers.apps;
+      userLib = import ../lib.nix { inherit lib; };
       packages = builtins.attrValues {
-      inherit (pkgs)
-        blanket # background noise
-        metadata-cleaner # remove any metadata and geolocation from files
-        pika-backup # backups
-        gnome-obfuscate # censor private information
-        ;
+        inherit (pkgs)
+          blanket # background noise
+          metadata-cleaner # remove any metadata and geolocation from files
+          pika-backup # backups
+          gnome-obfuscate # censor private information
+          ;
       };
-    in lib.mkMerge (map (user: {
-      ${user}.packages = packages;
-    }) users);
+    in userLib.mkUserPackages config.my.toggleUsers.apps packages;
   };
 }

modules/apps/multimedia.nix

@@ -8,7 +8,7 @@
   options.my.apps.multimedia.enable = lib.mkEnableOption "multimedia applications and media players";
   config = lib.mkIf config.my.apps.multimedia.enable {
     users.users = let
-      users = if lib.isString config.my.toggleUsers.apps then [ config.my.toggleUsers.apps ] else config.my.toggleUsers.apps;
+      userLib = import ../lib.nix { inherit lib; };
       packages = builtins.attrValues {
         inherit (pkgs)
           curtail # image compressor
@@ -19,8 +19,6 @@
           tagger # tag music files
           ;
       };
-    in lib.mkMerge (map (user: {
-      ${user}.packages = packages;
-    }) users);
+    in userLib.mkUserPackages config.my.toggleUsers.apps packages;
   };
 }

modules/apps/music.nix

@@ -8,16 +8,14 @@
   options.my.apps.piano.enable = lib.mkEnableOption "piano learning and music theory apps";
   config = lib.mkIf config.my.apps.piano.enable {
     users.users = let
-      users = if lib.isString config.my.toggleUsers.apps then [ config.my.toggleUsers.apps ] else config.my.toggleUsers.apps;
+      userLib = import ../lib.nix { inherit lib; };
       packages = builtins.attrValues {
-      inherit (pkgs)
-        neothesia
-        linthesia
-        timidity
-        ;
+        inherit (pkgs)
+          neothesia
+          linthesia
+          timidity
+          ;
       };
-    in lib.mkMerge (map (user: {
-        ${user}.packages = packages;
-      }) users);
+    in userLib.mkUserPackages config.my.toggleUsers.apps packages;
   };
 }

modules/apps/office.nix

@@ -9,19 +9,17 @@
   config = lib.mkIf config.my.apps.office.enable {
     environment.variables.CALIBRE_USE_SYSTEM_THEME = "1";
     users.users = let
-      users = if lib.isString config.my.toggleUsers.apps then [ config.my.toggleUsers.apps ] else config.my.toggleUsers.apps;
+      userLib = import ../lib.nix { inherit lib; };
       packages = builtins.attrValues {
-      inherit (pkgs)
-        jre17_minimal # for libreoffice extensions
-        libreoffice # office, but based & european
-        calibre # ugly af eBook library manager
-        newsflash # feed reader, syncs with nextcloud
-        furtherance # I packaged this one tehee track time utility
-        # planify # let's pretend I will organize my tasks
-        ;
+        inherit (pkgs)
+          jre17_minimal # for libreoffice extensions
+          libreoffice # office, but based & european
+          calibre # ugly af eBook library manager
+          newsflash # feed reader, syncs with nextcloud
+          furtherance # I packaged this one tehee track time utility
+          # planify # let's pretend I will organize my tasks
+          ;
       };
-    in lib.mkMerge (map (user: {
-        ${user}.packages = packages;
-      }) users);
+    in userLib.mkUserPackages config.my.toggleUsers.apps packages;
   };
 }