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: {
+  in userLib.mkUserPackages config.my.toggleUsers.apps packages;
-    ${user}.packages = packages;
-  }) users);
 }

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: {
+    users.users = userLib.mkUserPackages config.my.toggleUsers.apps packages;
-      ${user}.packages = packages;
-    }) users);
   };
 }

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: {
+    in userLib.mkUserPackages config.my.toggleUsers.apps packages;
-      ${user}.packages = packages;
-    }) users);
   };
 }

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;
+      userLib = import ../lib.nix { inherit lib; };
-    in lib.mkMerge (map (user: {
+    in userLib.mkHomeManagerUsers config.my.toggleUsers.apps (user: {
-      ${user}.programs.librewolf = import ./librewolf.nix;
+      programs.librewolf = import ./librewolf.nix;
-    }) users);
+    });
     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 (inputs.zen-browser.packages.x86_64-linux) twilight;
-      inherit krisp-patcher;
+        inherit krisp-patcher;
-      inherit (pkgs)
+        inherit (pkgs)
-        # thunderbird # email client
+          # thunderbird # email client
-        warp # transfer files with based ppl
+          warp # transfer files with based ppl
-        nextcloud-client # self-hosted google-drive alternative
+          nextcloud-client # self-hosted google-drive alternative
-        fragments # beautiful torrent client
+          fragments # beautiful torrent client
-        tor-browser # dark web, so dark!
+          tor-browser # dark web, so dark!
-        telegram-desktop # furry chat
+          telegram-desktop # furry chat
-        nicotine-plus # remember Ares?
+          nicotine-plus # remember Ares?
-        discord # :3
+          discord # :3
-        vdhcoapp # video download helper assistant
+          vdhcoapp # video download helper assistant
-        nextcloud-talk-desktop # nextcloud talk client
+          nextcloud-talk-desktop # nextcloud talk client
-        fractal # matrix client
+          fractal # matrix client
-        ;
+          ;
       };
-    in lib.mkMerge (map (user: {
+    in userLib.mkUserPackages config.my.toggleUsers.apps packages;
-      ${user}.packages = packages;
-    }) users);
   };
 }

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)
+        inherit (pkgs)
-        blanket # background noise
+          blanket # background noise
-        metadata-cleaner # remove any metadata and geolocation from files
+          metadata-cleaner # remove any metadata and geolocation from files
-        pika-backup # backups
+          pika-backup # backups
-        gnome-obfuscate # censor private information
+          gnome-obfuscate # censor private information
-        ;
+          ;
       };
-    in lib.mkMerge (map (user: {
+    in userLib.mkUserPackages config.my.toggleUsers.apps packages;
-      ${user}.packages = packages;
-    }) users);
   };
 }

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: {
+    in userLib.mkUserPackages config.my.toggleUsers.apps packages;
-      ${user}.packages = packages;
-    }) users);
   };
 }

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)
+        inherit (pkgs)
-        neothesia
+          neothesia
-        linthesia
+          linthesia
-        timidity
+          timidity
-        ;
+          ;
       };
-    in lib.mkMerge (map (user: {
+    in userLib.mkUserPackages config.my.toggleUsers.apps packages;
-        ${user}.packages = packages;
-      }) users);
   };
 }

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)
+        inherit (pkgs)
-        jre17_minimal # for libreoffice extensions
+          jre17_minimal # for libreoffice extensions
-        libreoffice # office, but based & european
+          libreoffice # office, but based & european
-        calibre # ugly af eBook library manager
+          calibre # ugly af eBook library manager
-        newsflash # feed reader, syncs with nextcloud
+          newsflash # feed reader, syncs with nextcloud
-        furtherance # I packaged this one tehee track time utility
+          furtherance # I packaged this one tehee track time utility
-        # planify # let's pretend I will organize my tasks
+          # planify # let's pretend I will organize my tasks
-        ;
+          ;
       };
-    in lib.mkMerge (map (user: {
+    in userLib.mkUserPackages config.my.toggleUsers.apps packages;
-        ${user}.packages = packages;
-      }) users);
   };
 }

modules/dev/cc.nix

@@ -32,9 +32,7 @@ in
   };
   config = lib.mkIf config.my.dev.cc.enable {
     users.users = let
-      users = if lib.isString config.my.toggleUsers.dev then [ config.my.toggleUsers.dev ] else config.my.toggleUsers.dev;
+      userLib = import ../lib.nix { inherit lib; };
-    in lib.mkMerge (map (user: {
+    in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
-      ${user} = { inherit packages; };
-    }) users);
   };
 }

modules/dev/docker.nix

@@ -30,10 +30,8 @@ in
   config = lib.mkMerge [
     (lib.mkIf config.my.dev.docker.enable {
       users.users = let
-        users = if lib.isString config.my.toggleUsers.dev then [ config.my.toggleUsers.dev ] else config.my.toggleUsers.dev;
+        userLib = import ../lib.nix { inherit lib; };
-      in lib.mkMerge (map (user: {
+      in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
-        ${user} = { inherit packages; };
-      }) users);
     })
     {
       environment.variables.DOCKER_CONFIG = "\${XDG_CONFIG_HOME}/docker";

modules/dev/emacs.nix

@@ -9,9 +9,8 @@
   options.my.emacs.enable = lib.mkEnableOption "Doom Emacs configuration";
   config = lib.mkIf config.my.emacs.enable {
     home-manager.users = let
-      users = if lib.isString config.my.toggleUsers.dev then [ config.my.toggleUsers.dev ] else config.my.toggleUsers.dev;
+      userLib = import ../lib.nix { inherit lib; };
-    in lib.mkMerge (map (user: {
+    in userLib.mkHomeManagerUsers config.my.toggleUsers.dev (user: {
-      ${user} = {
       xdg.dataFile = {
         "doom/templates/events.org".source = ../../dotfiles/doom/templates/events.org;
         "doom/templates/default.org".source = ../../dotfiles/doom/templates/default.org;
@@ -24,9 +23,9 @@
             edit = "emacsclient -t";
             e = "edit";
           };
-    }) users));
+    });
     users.users = let
-      users = if lib.isString config.my.toggleUsers.dev then [ config.my.toggleUsers.dev ] else config.my.toggleUsers.dev;
+      userLib = import ../lib.nix { inherit lib; };
       packages = builtins.attrValues {
       inherit (pkgs.xorg) xwininfo;
       inherit (pkgs)
@@ -50,9 +49,7 @@
         prettier # multi-language linter
         ;
       };
-    in lib.mkMerge (map (user: {
+    in userLib.mkUserPackages config.my.toggleUsers.dev packages;
-      ${user}.packages = packages;
-    }) users);
     services.emacs = {
       enable = true;
       defaultEditor = true;
@@ -63,7 +60,7 @@
         extraPackages =
           epkgs:
           let
-            inherit (config.home-manager.users.${(if lib.isString config.my.toggleUsers.dev then [ config.my.toggleUsers.dev ] else config.my.toggleUsers.dev)[0]}.programs.emacs)
+            inherit (config.home-manager.users.${(import ../lib.nix { inherit lib; }).getFirstUser config.my.toggleUsers.dev}.programs.emacs)
               extraPackages
               extraConfig
               ;

modules/dev/go.nix

@@ -39,10 +39,8 @@ in
     }
     (lib.mkIf config.my.dev.go.enable {
       users.users = let
-        users = if lib.isString config.my.toggleUsers.dev then [ config.my.toggleUsers.dev ] else config.my.toggleUsers.dev;
+        userLib = import ../lib.nix { inherit lib; };
-      in lib.mkMerge (map (user: {
+      in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
-        ${user} = { inherit packages; };
-      }) users);
     })
   ];
 }

modules/dev/haskell.nix

@@ -34,10 +34,8 @@ in
   config = lib.mkMerge [
     (lib.mkIf config.my.dev.haskell.enable {
       users.users = let
-        users = if lib.isString config.my.toggleUsers.dev then [ config.my.toggleUsers.dev ] else config.my.toggleUsers.dev;
+        userLib = import ../lib.nix { inherit lib; };
-      in lib.mkMerge (map (user: {
+      in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
-        ${user} = { inherit packages; };
-      }) users);
     })
     {
       environment.variables = {

modules/dev/javascript.nix

@@ -28,23 +28,21 @@ in
   config = lib.mkMerge [
     (lib.mkIf config.my.dev.javascript.enable {
       users.users = let
-        users = if lib.isString config.my.toggleUsers.dev then [ config.my.toggleUsers.dev ] else config.my.toggleUsers.dev;
+        userLib = import ../lib.nix { inherit lib; };
-      in lib.mkMerge (map (user: {
+      in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
-        ${user} = { inherit packages; };
-      }) users);
     })
     {
       home-manager.users = let
-        users = if lib.isString config.my.toggleUsers.dev then [ config.my.toggleUsers.dev ] else config.my.toggleUsers.dev;
+        userLib = import ../lib.nix { inherit lib; };
-      in lib.mkMerge (map (user: {
+      in userLib.mkHomeManagerUsers config.my.toggleUsers.dev (user: {
-        ${user}.xdg.configFile = {
+        xdg.configFile = {
-        "npm/npmrc".source = ../../dotfiles/npmrc;
+          "npm/npmrc".source = ../../dotfiles/npmrc;
-        "configstore/update-notifier-npm-check.json".text = builtins.toJSON {
+          "configstore/update-notifier-npm-check.json".text = builtins.toJSON {
-          optOut = false;
+            optOut = false;
-          lastUpdateCheck = 1646662583446;
+            lastUpdateCheck = 1646662583446;
+          };
         };
-      };
+      });
-    }) users);
       environment.variables = {
         NPM_CONFIG_USERCONFIG = "\${XDG_CONFIG_HOME}/npm/npmrc";
         PNPM_HOME = "\${XDG_DATA_HOME}/pnpm";

modules/dev/julia.nix

@@ -26,9 +26,7 @@ in
   };
   config = lib.mkIf config.my.dev.julia.enable {
     users.users = let
-      users = if lib.isString config.my.toggleUsers.dev then [ config.my.toggleUsers.dev ] else config.my.toggleUsers.dev;
+      userLib = import ../lib.nix { inherit lib; };
-    in lib.mkMerge (map (user: {
+    in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
-      ${user} = { inherit packages; };
-    }) users);
   };
 }

modules/dev/nix.nix

@@ -34,27 +34,25 @@ in
   };
   config = lib.mkIf config.my.dev.nix.enable {
     users.users = let
-      users = if lib.isString config.my.toggleUsers.dev then [ config.my.toggleUsers.dev ] else config.my.toggleUsers.dev;
+      userLib = import ../lib.nix { inherit lib; };
-    in lib.mkMerge (map (user: {
+    in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
-      ${user} = { inherit packages; };
-    }) users);
     home-manager.users = let
-      users = if lib.isString config.my.toggleUsers.dev then [ config.my.toggleUsers.dev ] else config.my.toggleUsers.dev;
+      userLib = import ../lib.nix { inherit lib; };
-    in lib.mkMerge (map (user: {
+    in userLib.mkHomeManagerUsers config.my.toggleUsers.dev (user: {
-      ${user}.programs.${shellType}.shellAliases =
+      programs.${shellType}.shellAliases =
-      inputs.self.lib.mergeAliases inputs.self.lib.commonAliases
+        inputs.self.lib.mergeAliases inputs.self.lib.commonAliases
-        {
+          {
-          nixformat = ''
+            nixformat = ''
-            deadnix -e && \
+              deadnix -e && \
-            nix run nixpkgs#nixfmt-tree && \
+              nix run nixpkgs#nixfmt-tree && \
-            statix fix
+              statix fix
-          '';
+            '';
-          nix-push-cache = ''
+            nix-push-cache = ''
-            nix build $NH_FLAKE#nixosConfigurations.${config.networking.hostName}.config.system.build.toplevel \
+              nix build $NH_FLAKE#nixosConfigurations.${config.networking.hostName}.config.system.build.toplevel \
-            --print-out-paths --fallback --max-jobs 100 --cores 0 |
+              --print-out-paths --fallback --max-jobs 100 --cores 0 |
-            nix run nixpkgs#attic-client -- push lan:nixos --stdin
+              nix run nixpkgs#attic-client -- push lan:nixos --stdin
-          '';
+            '';
-        };
+          };
-    }) users);
+    });
   };
 }

modules/dev/python.nix

@@ -47,17 +47,15 @@ in
   config = lib.mkMerge [
     (lib.mkIf config.my.dev.python.enable {
       users.users = let
-        users = if lib.isString config.my.toggleUsers.dev then [ config.my.toggleUsers.dev ] else config.my.toggleUsers.dev;
+        userLib = import ../lib.nix { inherit lib; };
-      in lib.mkMerge (map (user: {
+      in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
-        ${user} = { inherit packages; };
-      }) users);
     })
     {
       home-manager.users = let
-        users = if lib.isString config.my.toggleUsers.dev then [ config.my.toggleUsers.dev ] else config.my.toggleUsers.dev;
+        userLib = import ../lib.nix { inherit lib; };
-      in lib.mkMerge (map (user: {
+      in userLib.mkHomeManagerUsers config.my.toggleUsers.dev (user: {
-        ${user}.xdg.configFile."python/pythonrc".source = ../../dotfiles/pythonrc;
+        xdg.configFile."python/pythonrc".source = ../../dotfiles/pythonrc;
-      }) users);
+      });
       environment.variables.PYTHONSTARTUP = "\${XDG_CONFIG_HOME}/python/pythonrc";
     }
   ];

modules/dev/ruby.nix

@@ -28,10 +28,8 @@ in
   config = lib.mkMerge [
     (lib.mkIf config.my.dev.ruby.enable {
       users.users = let
-        users = if lib.isString config.my.toggleUsers.dev then [ config.my.toggleUsers.dev ] else config.my.toggleUsers.dev;
+        userLib = import ../lib.nix { inherit lib; };
-      in lib.mkMerge (map (user: {
+      in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
-        ${user} = { inherit packages; };
-      }) users);
     })
     {
       environment.variables = {

modules/dev/rust.nix

@@ -33,10 +33,8 @@ in
   config = lib.mkMerge [
     (lib.mkIf config.my.dev.rust.enable {
       users.users = let
-        users = if lib.isString config.my.toggleUsers.dev then [ config.my.toggleUsers.dev ] else config.my.toggleUsers.dev;
+        userLib = import ../lib.nix { inherit lib; };
-      in lib.mkMerge (map (user: {
+      in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
-        ${user} = { inherit packages; };
-      }) users);
     })
     {
       environment.variables.CARGO_HOME = "\${XDG_DATA_HOME}/cargo";

modules/dev/sh.nix

@@ -31,9 +31,7 @@ in
   };
   config = lib.mkIf config.my.dev.sh.enable {
     users.users = let
-      users = if lib.isString config.my.toggleUsers.dev then [ config.my.toggleUsers.dev ] else config.my.toggleUsers.dev;
+      userLib = import ../lib.nix { inherit lib; };
-    in lib.mkMerge (map (user: {
+    in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
-      ${user} = { inherit packages; };
-    }) users);
   };
 }

modules/dev/zig.nix

@@ -29,9 +29,7 @@ in
   };
   config = lib.mkIf config.my.dev.zig.enable {
     users.users = let
-      users = if lib.isString config.my.toggleUsers.dev then [ config.my.toggleUsers.dev ] else config.my.toggleUsers.dev;
+      userLib = import ../lib.nix { inherit lib; };
-    in lib.mkMerge (map (user: {
+    in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
-      ${user} = { inherit packages; };
-    }) users);
   };
 }

modules/factories/mkscript.nix

@@ -37,13 +37,11 @@
   };
   config = lib.mkIf (lib.any (s: s.enable) (lib.attrValues config.my.scripts)) {
     users.users = let
-      users = if lib.isString config.my.toggleUsers.scripts then [ config.my.toggleUsers.scripts ] else config.my.toggleUsers.scripts;
+      userLib = import ../lib.nix { inherit lib; };
       packages = config.my.scripts
         |> lib.mapAttrsToList (_name: script: lib.optional (script.enable && script.install) script.package)
         |> lib.flatten;
-    in lib.mkMerge (map (user: {
+    in userLib.mkUserPackages config.my.toggleUsers.scripts packages;
-      ${user}.packages = packages;
-    }) users);
     systemd.user.services =
       config.my.scripts
       |> lib.mapAttrs' (

modules/lib.nix

@@ -0,0 +1,25 @@
+# Helper functions for multi-user toggle support
+# Usage: import this file in your module and use the helpers
+{ lib }:
+let
+  normalizeUsers = users:
+    if lib.isString users then [ users ] else users;
+  mkUserPackages = users: packages:
+    lib.mkMerge (map (user: {
+      ${user}.packages = packages;
+    }) (normalizeUsers users));
+  mkUserAttrs = users: attrs:
+    lib.mkMerge (map (user: {
+      ${user} = attrs;
+    }) (normalizeUsers users));
+  mkHomeManagerUsers = users: fn:
+    lib.mkMerge (map (user: {
+      ${user} = fn user;
+    }) (normalizeUsers users));
+  getFirstUser = users:
+    if lib.isString users then users else (builtins.head users);
+in
+{
+  inherit normalizeUsers mkUserPackages mkUserAttrs mkHomeManagerUsers getFirstUser;
+}
+

modules/services/printing.nix

@@ -14,11 +14,9 @@ in
   options.my.services.printing.enable = lib.mkEnableOption "printing services and drivers";
   config = lib.mkIf config.my.services.printing.enable {
     users.users = let
-      users = if lib.isString config.my.toggleUsers.services then [ config.my.toggleUsers.services ] else config.my.toggleUsers.services;
+      userLib = import ../lib.nix { inherit lib; };
       packages = [ pkgs.simple-scan ];
-    in lib.mkMerge (map (user: {
+    in userLib.mkUserPackages config.my.toggleUsers.services packages;
-      ${user}.packages = packages;
-    }) users);
     services.printing = {
       enable = true;
       drivers = printingDrivers;

modules/services/syncthing.nix

@@ -16,32 +16,26 @@ in
 {
   options.my.services.syncthing.enable = lib.mkEnableOption "Syncthing file synchronization";
   config = lib.mkIf (config.my.services.syncthing.enable && config.my.secureHost) {
-    sops.secrets = let
+    sops.secrets = {
-      # Syncthing runs as a single user service, so use the first user if a list is provided
-      user = if lib.isString config.my.toggleUsers.services then config.my.toggleUsers.services else (lib.head config.my.toggleUsers.services);
-    in {
       "syncthing_keys/${hostName}" = {
         sopsFile = ../../secrets/keys.yaml;
-        owner = config.users.users.${user}.name;
+        owner = config.users.users.jawz.name;
-        inherit (config.users.users.${user}) group;
+        inherit (config.users.users.jawz) group;
-        path = "/home/${user}/.config/syncthing/key.pem";
+        path = "/home/jawz/.config/syncthing/key.pem";
       };
       "syncthing_certs/${hostName}" = {
         sopsFile = ../../secrets/keys.yaml;
-        owner = config.users.users.${user}.name;
+        owner = config.users.users.jawz.name;
-        inherit (config.users.users.${user}) group;
+        inherit (config.users.users.jawz) group;
-        path = "/home/${user}/.config/syncthing/cert.pem";
+        path = "/home/jawz/.config/syncthing/cert.pem";
       };
       "syncthing_password" = {
         sopsFile = ../../secrets/keys.yaml;
       };
     };
-    services.syncthing = let
+    services.syncthing = {
-      # Syncthing runs as a single user service, so use the first user if a list is provided
-      user = if lib.isString config.my.toggleUsers.services then config.my.toggleUsers.services else (lib.head config.my.toggleUsers.services);
-    in {
       enable = true;
-      user = user;
+      user = "jawz";
       group = "users";
       overrideDevices = true;
       overrideFolders = true;
@@ -56,7 +50,7 @@ in
           globalAnnounceEnabled = false;
         };
         gui = {
-          user = if lib.isString config.my.toggleUsers.services then config.my.toggleUsers.services else (lib.head config.my.toggleUsers.services);
+          user = "jawz";
           password = config.sops.secrets.syncthing_password.path;
         };
         devices = {

modules/shell/config.nix

@@ -15,10 +15,10 @@
   };
   config = {
     users.users = let
-      users = if lib.isString config.my.toggleUsers.shell then [ config.my.toggleUsers.shell ] else config.my.toggleUsers.shell;
+      userLib = import ../lib.nix { inherit lib; };
     in lib.mkMerge (map (user: {
       ${user}.shell = pkgs.${config.my.shell.type};
-    }) users);
+    }) (userLib.normalizeUsers config.my.toggleUsers.shell));
     programs.zsh.enable = config.my.shell.type == "zsh";
   };
 }

modules/shell/exercism.nix

@@ -8,15 +8,13 @@
   options.my.shell.exercism.enable = lib.mkEnableOption "Exercism coding practice platform";
   config = lib.mkIf config.my.shell.exercism.enable {
     users.users = let
-      users = if lib.isString config.my.toggleUsers.shell then [ config.my.toggleUsers.shell ] else config.my.toggleUsers.shell;
+      userLib = import ../lib.nix { inherit lib; };
       packages = builtins.attrValues {
-      inherit (pkgs)
+        inherit (pkgs)
-        exercism # learn to code
+          exercism # learn to code
-        bats # testing system, required by Exercism
+          bats # testing system, required by Exercism
-        ;
+          ;
       };
-    in lib.mkMerge (map (user: {
+    in userLib.mkUserPackages config.my.toggleUsers.shell packages;
-      ${user}.packages = packages;
-    }) users);
   };
 }

modules/shell/multimedia.nix

@@ -9,17 +9,18 @@
   options.my.shell.multimedia.enable = lib.mkEnableOption "multimedia CLI tools and codecs";
   config = lib.mkIf config.my.shell.multimedia.enable {
     sops.secrets."gallery-dl/secrets" = let
+      userLib = import ../lib.nix { inherit lib; };
       # Use first user for secret ownership
-      user = if lib.isString config.my.toggleUsers.shell then config.my.toggleUsers.shell else (lib.head config.my.toggleUsers.shell);
+      user = userLib.getFirstUser config.my.toggleUsers.shell;
     in {
       sopsFile = ../../secrets/gallery.yaml;
       owner = user;
       mode = "0400";
     };
     home-manager.users = let
-      users = if lib.isString config.my.toggleUsers.shell then [ config.my.toggleUsers.shell ] else config.my.toggleUsers.shell;
+      userLib = import ../lib.nix { inherit lib; };
-    in lib.mkMerge (map (user: {
+    in userLib.mkHomeManagerUsers config.my.toggleUsers.shell (user: {
-      ${user}.programs = {
+      programs = {
         yt-dlp = {
           enable = true;
           settings = {
@@ -43,18 +44,16 @@
           '';
         };
       };
-    }) users);
+    });
     users.users = let
-      users = if lib.isString config.my.toggleUsers.shell then [ config.my.toggleUsers.shell ] else config.my.toggleUsers.shell;
+      userLib = import ../lib.nix { inherit lib; };
       packages = builtins.attrValues {
-      inherit (pkgs)
+        inherit (pkgs)
-        ffmpeg # not ffmpreg, the coolest video conversion tool!
+          ffmpeg # not ffmpreg, the coolest video conversion tool!
-        imagemagick # photoshop what??
+          imagemagick # photoshop what??
-        ffpb # make ffmpeg encoding... a bit fun
+          ffpb # make ffmpeg encoding... a bit fun
-        ;
+          ;
       };
-    in lib.mkMerge (map (user: {
+    in userLib.mkUserPackages config.my.toggleUsers.shell packages;
-      ${user}.packages = packages;
-    }) users);
   };
 }

modules/shell/tools.nix

@@ -12,9 +12,9 @@ in
   options.my.shell.tools.enable = lib.mkEnableOption "shell tools and utilities";
   config = lib.mkIf config.my.shell.tools.enable {
     home-manager.users = let
-      users = if lib.isString config.my.toggleUsers.shell then [ config.my.toggleUsers.shell ] else config.my.toggleUsers.shell;
+      userLib = import ../lib.nix { inherit lib; };
-    in lib.mkMerge (map (user: {
+    in userLib.mkHomeManagerUsers config.my.toggleUsers.shell (user: {
-      ${user}.programs = {
+      programs = {
       hstr.enable = true;
       htop = {
         enable = true;
@@ -88,7 +88,7 @@ in
             fi
           '';
       };
-    }) users);
+    });
     programs = {
       starship.enable = true;
       tmux.enable = true;
@@ -99,7 +99,7 @@ in
       };
     };
     users.users = let
-      users = if lib.isString config.my.toggleUsers.shell then [ config.my.toggleUsers.shell ] else config.my.toggleUsers.shell;
+      userLib = import ../lib.nix { inherit lib; };
       packages = builtins.attrValues {
       inherit (pkgs)
         ripgrep # modern grep
@@ -115,9 +115,7 @@ in
         rmlint # amazing dupe finder that integrates well with BTRFS
         ;
       };
-    in lib.mkMerge (map (user: {
+    in userLib.mkUserPackages config.my.toggleUsers.shell packages;
-      ${user}.packages = packages;
-    }) users);
     environment.variables = {
       HISTFILE = "\${XDG_STATE_HOME}/bash/history";
       LESSHISTFILE = "-";

parts/core.nix

@@ -213,6 +213,22 @@ in
         windows_vm = ../secrets/ssh/ed25519_windows_vm.pub;
       };
       getSshKeys = keyNames: keyNames |> map (name: inputs.self.lib.sshKeys.${name});
+      normalizeUsers = users:
+        if builtins.isString users then [ users ] else users;
+      mkUserPackages = lib: users: packages:
+        lib.mkMerge (map (user: {
+          ${user}.packages = packages;
+        }) (inputs.self.lib.normalizeUsers users));
+      mkUserAttrs = lib: users: attrs:
+        lib.mkMerge (map (user: {
+          ${user} = attrs;
+        }) (inputs.self.lib.normalizeUsers users));
+      mkHomeManagerUsers = lib: users: fn:
+        lib.mkMerge (map (user: {
+          ${user} = fn user;
+        }) (inputs.self.lib.normalizeUsers users));
+      getFirstUser = users:
+        if builtins.isString users then users else (builtins.head users);
     };
   };
 }