Refactor user management functions to use inputs

Removed the `lib.nix` file and refactored various modules to utilize `inputs.self.lib` for user package and attribute management. This change enhances consistency and maintainability across the configuration files.

config/stylix.nix

@@ -23,7 +23,7 @@ in
       targets.qt.platform = lib.mkForce "qtct";
     }
     // lib.optionalAttrs (scheme ? base16Scheme) { inherit (scheme) base16Scheme; };
-    home-manager.users.jawz = {
+    home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.toggleUsers.stylix (user: {
       gtk = lib.mkIf (!cfg.enable && gnomeEnabled) {
         enable = true;
         iconTheme = {
@@ -44,9 +44,9 @@ in
         };
         targets.librewolf = {
           firefoxGnomeTheme.enable = true;
-          profileNames = [ "jawz" ];
+          profileNames = [ user ];
         };
       };
-    };
+    });
   };
 }

hosts/workstation/configuration.nix

@@ -32,6 +32,16 @@ in
       "nixserver"
       "nixminiserver"
     ];
+    # Example: Configure which user(s) get packages from each toggle category
+    # By default, all categories install to "jawz", but you can override:
+    # toggleUsers = {
+    #   apps = "jawz";        # Apps go to jawz (single user)
+    #   apps = [ "jawz" "bearded_dragonn" ];  # Or install to multiple users
+    #   dev = "bearded_dragonn";  # Dev tools go to bearded_dragonn
+    #   shell = "jawz";        # Shell tools go to jawz
+    #   scripts = "jawz";      # Scripts go to jawz
+    #   services = "jawz";     # Service user packages go to jawz
+    # };
   };
   home-manager.users.jawz.programs = {
     vscode = {

modules/apps/art.nix

@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
@@ -39,5 +40,7 @@ in
     apps.art.enable = lib.mkEnableOption "digital art and creative applications";
     dev.gameDev.enable = lib.mkEnableOption "game development tools and engines";
   };
-  config.users.users.jawz.packages = artPackages ++ gameDevPackages;
+  config.users.users = let
+    packages = artPackages ++ gameDevPackages;
+  in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.apps packages;
 }

modules/apps/dictionaries.nix

@@ -1,21 +1,25 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
 }:
+let
+  packages = builtins.attrValues {
+    inherit (pkgs)
+      hunspell
+      ;
+    inherit (pkgs.hunspellDicts)
+      it_IT
+      es_MX
+      en_CA-large
+      ;
+  };
+in
 {
   options.my.apps.dictionaries.enable = lib.mkEnableOption "dictionaries and language tools";
   config = lib.mkIf config.my.apps.dictionaries.enable {
-    users.users.jawz.packages = builtins.attrValues {
-      inherit (pkgs)
-        hunspell
-        ;
-      inherit (pkgs.hunspellDicts)
-        it_IT
-        es_MX
-        en_CA-large
-        ;
-    };
+    users.users = inputs.self.lib.mkUserPackages lib config.my.toggleUsers.apps packages;
   };
 }

modules/apps/gaming.nix

@@ -1,6 +1,6 @@
 {
-  inputs,
   config,
+  inputs,
   lib,
   pkgs,
   ...
@@ -50,23 +50,25 @@ in
       #   environmentFile = config.sops.secrets.switch-presence.path;
       # };
     };
-    users.users.jawz.packages = builtins.attrValues {
-      inherit retroarchWithCores;
-      inherit (pkgs)
-        shipwright # zelda OoT port
-        mangohud # fps & stats overlay
-        lutris # games launcher & emulator hub
-        cartridges # games launcher
-        gamemode # optimizes linux to have better gaming performance
-        heroic # install epic games
-        protonup-qt # update proton-ge
-        ns-usbloader # load games into my switch
-        # emulators
-        rpcs3 # ps3
-        cemu # wii u
-        ryubing # switch
-        prismlauncher # minecraft launcher with jdk overlays
-        ;
-    };
+    users.users = let
+      packages = builtins.attrValues {
+        inherit retroarchWithCores;
+        inherit (pkgs)
+          shipwright # zelda OoT port
+          mangohud # fps & stats overlay
+          lutris # games launcher & emulator hub
+          cartridges # games launcher
+          gamemode # optimizes linux to have better gaming performance
+          heroic # install epic games
+          protonup-qt # update proton-ge
+          ns-usbloader # load games into my switch
+          # emulators
+          rpcs3 # ps3
+          cemu # wii u
+          ryubing # switch
+          prismlauncher # minecraft launcher with jdk overlays
+          ;
+      };
+    in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.apps packages;
   };
 }

modules/apps/internet.nix

@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
@@ -29,24 +30,28 @@ in
 {
   options.my.apps.internet.enable = lib.mkEnableOption "internet browsers and communication apps";
   config = lib.mkIf config.my.apps.internet.enable {
-    home-manager.users.jawz.programs.librewolf = import ./librewolf.nix;
+    home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.toggleUsers.apps (user: {
+      programs.librewolf = import ./librewolf.nix;
+    });
     programs.geary.enable = true;
-    users.users.jawz.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
-        ;
-    };
+    users.users = let
+      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
+          ;
+      };
+    in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.apps packages;
   };
 }

modules/apps/misc.nix

@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
@@ -7,13 +8,15 @@
 {
   options.my.apps.misc.enable = lib.mkEnableOption "miscellaneous desktop applications";
   config = lib.mkIf config.my.apps.misc.enable {
-    users.users.jawz.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
-        ;
-    };
+    users.users = let
+      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
+          ;
+      };
+    in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.apps packages;
   };
 }

modules/apps/multimedia.nix

@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
@@ -7,15 +8,17 @@
 {
   options.my.apps.multimedia.enable = lib.mkEnableOption "multimedia applications and media players";
   config = lib.mkIf config.my.apps.multimedia.enable {
-    users.users.jawz.packages = builtins.attrValues {
-      inherit (pkgs)
-        curtail # image compressor
-        easyeffects # equalizer
-        identity # compare images or videos
-        mousai # poor man shazam
-        shortwave # listen to world radio
-        tagger # tag music files
-        ;
-    };
+    users.users = let
+      packages = builtins.attrValues {
+        inherit (pkgs)
+          curtail # image compressor
+          easyeffects # equalizer
+          identity # compare images or videos
+          mousai # poor man shazam
+          shortwave # listen to world radio
+          tagger # tag music files
+          ;
+      };
+    in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.apps packages;
   };
 }

modules/apps/music.nix

@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
@@ -7,12 +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.jawz.packages = builtins.attrValues {
-      inherit (pkgs)
-        neothesia
-        linthesia
-        timidity
-        ;
-    };
+    users.users = let
+      packages = builtins.attrValues {
+        inherit (pkgs)
+          neothesia
+          linthesia
+          timidity
+          ;
+      };
+    in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.apps packages;
   };
 }

modules/apps/office.nix

@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
@@ -8,15 +9,17 @@
   options.my.apps.office.enable = lib.mkEnableOption "office applications and productivity tools";
   config = lib.mkIf config.my.apps.office.enable {
     environment.variables.CALIBRE_USE_SYSTEM_THEME = "1";
-    users.users.jawz.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
-        ;
-    };
+    users.users = let
+      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
+          ;
+      };
+    in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.apps packages;
   };
 }

modules/dev/cc.nix

@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
@@ -31,6 +32,6 @@ in
     };
   };
   config = lib.mkIf config.my.dev.cc.enable {
-    users.users.jawz = { inherit packages; };
+    users.users = inputs.self.lib.mkUserAttrs lib config.my.toggleUsers.dev { inherit packages; };
   };
 }

modules/dev/docker.nix

@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
@@ -29,7 +30,7 @@ in
   };
   config = lib.mkMerge [
     (lib.mkIf config.my.dev.docker.enable {
-      users.users.jawz = { inherit packages; };
+      users.users = inputs.self.lib.mkUserAttrs lib config.my.toggleUsers.dev { inherit packages; };
     })
     {
       environment.variables.DOCKER_CONFIG = "\${XDG_CONFIG_HOME}/docker";

modules/dev/emacs.nix

@@ -8,7 +8,7 @@
 {
   options.my.emacs.enable = lib.mkEnableOption "Doom Emacs configuration";
   config = lib.mkIf config.my.emacs.enable {
-    home-manager.users.jawz = {
+    home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.toggleUsers.dev (user: {
       xdg.dataFile = {
         "doom/templates/events.org".source = ../../dotfiles/doom/templates/events.org;
         "doom/templates/default.org".source = ../../dotfiles/doom/templates/default.org;
@@ -21,8 +21,9 @@
             edit = "emacsclient -t";
             e = "edit";
           };
-    };
-    users.users.jawz.packages = builtins.attrValues {
+    });
+    users.users = let
+      packages = builtins.attrValues {
       inherit (pkgs.xorg) xwininfo;
       inherit (pkgs)
         #emacs everywhere
@@ -44,7 +45,8 @@
         vscode-json-languageserver
         prettier # multi-language linter
         ;
-    };
+      };
+    in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.dev packages;
     services.emacs = {
       enable = true;
       defaultEditor = true;
@@ -55,7 +57,7 @@
         extraPackages =
           epkgs:
           let
-            inherit (config.home-manager.users.jawz.programs.emacs)
+            inherit (config.home-manager.users.${inputs.self.lib.getFirstUser config.my.toggleUsers.dev}.programs.emacs)
               extraPackages
               extraConfig
               ;

modules/dev/go.nix

@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
@@ -38,7 +39,7 @@ in
       environment.variables = { inherit GOPATH; };
     }
     (lib.mkIf config.my.dev.go.enable {
-      users.users.jawz = { inherit packages; };
+      users.users = inputs.self.lib.mkUserAttrs lib config.my.toggleUsers.dev { inherit packages; };
     })
   ];
 }

modules/dev/haskell.nix

@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
@@ -33,7 +34,7 @@ in
   };
   config = lib.mkMerge [
     (lib.mkIf config.my.dev.haskell.enable {
-      users.users.jawz = { inherit packages; };
+      users.users = inputs.self.lib.mkUserAttrs lib config.my.toggleUsers.dev { inherit packages; };
     })
     {
       environment.variables = {

modules/dev/javascript.nix

@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
@@ -27,16 +28,18 @@ in
   };
   config = lib.mkMerge [
     (lib.mkIf config.my.dev.javascript.enable {
-      users.users.jawz = { inherit packages; };
+      users.users = inputs.self.lib.mkUserAttrs lib config.my.toggleUsers.dev { inherit packages; };
     })
     {
-      home-manager.users.jawz.xdg.configFile = {
-        "npm/npmrc".source = ../../dotfiles/npmrc;
-        "configstore/update-notifier-npm-check.json".text = builtins.toJSON {
-          optOut = false;
-          lastUpdateCheck = 1646662583446;
+      home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.toggleUsers.dev (user: {
+        xdg.configFile = {
+          "npm/npmrc".source = ../../dotfiles/npmrc;
+          "configstore/update-notifier-npm-check.json".text = builtins.toJSON {
+            optOut = false;
+            lastUpdateCheck = 1646662583446;
+          };
         };
-      };
+      });
       environment.variables = {
         NPM_CONFIG_USERCONFIG = "\${XDG_CONFIG_HOME}/npm/npmrc";
         PNPM_HOME = "\${XDG_DATA_HOME}/pnpm";

modules/dev/julia.nix

@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
@@ -25,6 +26,6 @@ in
     };
   };
   config = lib.mkIf config.my.dev.julia.enable {
-    users.users.jawz = { inherit packages; };
+    users.users = inputs.self.lib.mkUserAttrs lib config.my.toggleUsers.dev { inherit packages; };
   };
 }

modules/dev/nix.nix

@@ -33,20 +33,22 @@ in
     };
   };
   config = lib.mkIf config.my.dev.nix.enable {
-    users.users.jawz = { inherit packages; };
-    home-manager.users.jawz.programs.${shellType}.shellAliases =
-      inputs.self.lib.mergeAliases inputs.self.lib.commonAliases
-        {
-          nixformat = ''
-            deadnix -e && \
-            nix run nixpkgs#nixfmt-tree && \
-            statix fix
-          '';
-          nix-push-cache = ''
-            nix build $NH_FLAKE#nixosConfigurations.${config.networking.hostName}.config.system.build.toplevel \
-            --print-out-paths --fallback --max-jobs 100 --cores 0 |
-            nix run nixpkgs#attic-client -- push lan:nixos --stdin
-          '';
-        };
+    users.users = inputs.self.lib.mkUserAttrs lib config.my.toggleUsers.dev { inherit packages; };
+    home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.toggleUsers.dev (user: {
+      programs.${shellType}.shellAliases =
+        inputs.self.lib.mergeAliases inputs.self.lib.commonAliases
+          {
+            nixformat = ''
+              deadnix -e && \
+              nix run nixpkgs#nixfmt-tree && \
+              statix fix
+            '';
+            nix-push-cache = ''
+              nix build $NH_FLAKE#nixosConfigurations.${config.networking.hostName}.config.system.build.toplevel \
+              --print-out-paths --fallback --max-jobs 100 --cores 0 |
+              nix run nixpkgs#attic-client -- push lan:nixos --stdin
+            '';
+          };
+    });
   };
 }

modules/dev/python.nix

@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
@@ -46,10 +47,12 @@ in
   };
   config = lib.mkMerge [
     (lib.mkIf config.my.dev.python.enable {
-      users.users.jawz = { inherit packages; };
+      users.users = inputs.self.lib.mkUserAttrs lib config.my.toggleUsers.dev { inherit packages; };
     })
     {
-      home-manager.users.jawz.xdg.configFile."python/pythonrc".source = ../../dotfiles/pythonrc;
+      home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.toggleUsers.dev (user: {
+        xdg.configFile."python/pythonrc".source = ../../dotfiles/pythonrc;
+      });
       environment.variables.PYTHONSTARTUP = "\${XDG_CONFIG_HOME}/python/pythonrc";
     }
   ];

modules/dev/ruby.nix

@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
@@ -27,7 +28,7 @@ in
   };
   config = lib.mkMerge [
     (lib.mkIf config.my.dev.ruby.enable {
-      users.users.jawz = { inherit packages; };
+      users.users = inputs.self.lib.mkUserAttrs lib config.my.toggleUsers.dev { inherit packages; };
     })
     {
       environment.variables = {

modules/dev/rust.nix

@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
@@ -32,7 +33,7 @@ in
   };
   config = lib.mkMerge [
     (lib.mkIf config.my.dev.rust.enable {
-      users.users.jawz = { inherit packages; };
+      users.users = inputs.self.lib.mkUserAttrs lib config.my.toggleUsers.dev { inherit packages; };
     })
     {
       environment.variables.CARGO_HOME = "\${XDG_DATA_HOME}/cargo";

modules/dev/sh.nix

@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
@@ -30,6 +31,6 @@ in
     };
   };
   config = lib.mkIf config.my.dev.sh.enable {
-    users.users.jawz = { inherit packages; };
+    users.users = inputs.self.lib.mkUserAttrs lib config.my.toggleUsers.dev { inherit packages; };
   };
 }

modules/dev/zig.nix

@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
@@ -28,6 +29,6 @@ in
     };
   };
   config = lib.mkIf config.my.dev.zig.enable {
-    users.users.jawz = { inherit packages; };
+    users.users = inputs.self.lib.mkUserAttrs lib config.my.toggleUsers.dev { inherit packages; };
   };
 }

modules/factories/mkscript.nix

@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
@@ -36,10 +37,11 @@
     description = "Configuration for multiple scripts.";
   };
   config = lib.mkIf (lib.any (s: s.enable) (lib.attrValues config.my.scripts)) {
-    users.users.jawz.packages =
-      config.my.scripts
-      |> lib.mapAttrsToList (_name: script: lib.optional (script.enable && script.install) script.package)
-      |> lib.flatten;
+    users.users = let
+      packages = config.my.scripts
+        |> lib.mapAttrsToList (_name: script: lib.optional (script.enable && script.install) script.package)
+        |> lib.flatten;
+    in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.scripts packages;
     systemd.user.services =
       config.my.scripts
       |> lib.mapAttrs' (

modules/modules.nix

@@ -103,6 +103,25 @@ in
     };
     enableContainers = lib.mkEnableOption "container services (Docker/Podman)";
     enableProxy = lib.mkEnableOption "nginx reverse proxy for services";
+    toggleUsers = lib.mkOption {
+      type = lib.types.attrsOf (lib.types.either lib.types.str (lib.types.listOf lib.types.str));
+      default = {
+        apps = "jawz";
+        dev = "jawz";
+        shell = "jawz";
+        scripts = "jawz";
+        services = "jawz";
+        stylix = "jawz";
+      };
+      description = "Map toggle categories to users. Can be a single user (string) or multiple users (list). Determines which user(s) get packages from each toggle category.";
+      example = {
+        apps = "jawz";
+        dev = "bearded_dragonn";
+        shell = "jawz";
+        gaming = [ "jawz" "bearded_dragonn" ];
+        stylix = [ "jawz" "bearded_dragonn" ];
+      };
+    };
   };
   config = {
     assertions =

modules/scripts/update-dns.nix

@@ -11,8 +11,8 @@
       cloudflare-api.sopsFile = ../../secrets/env.yaml;
       dns = {
         sopsFile = ../../secrets/env.yaml;
-        owner = config.users.users.jawz.name;
-        inherit (config.users.users.jawz) group;
+        owner = config.users.users.${config.my.toggleUsers.scripts}.name;
+        inherit (config.users.users.${config.my.toggleUsers.scripts}) group;
       };
     };
     services.cloudflare-dyndns = {

modules/services/printing.nix

@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
@@ -13,7 +14,9 @@ in
 {
   options.my.services.printing.enable = lib.mkEnableOption "printing services and drivers";
   config = lib.mkIf config.my.services.printing.enable {
-    users.users.jawz.packages = [ pkgs.simple-scan ];
+    users.users = let
+      packages = [ pkgs.simple-scan ];
+    in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.services packages;
     services.printing = {
       enable = true;
       drivers = printingDrivers;

modules/shell/config.nix

@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
@@ -14,7 +15,9 @@
     description = "The shell to use system-wide (bash or zsh)";
   };
   config = {
-    users.users.jawz.shell = pkgs.${config.my.shell.type};
+    users.users = lib.mkMerge (map (user: {
+      ${user}.shell = pkgs.${config.my.shell.type};
+    }) (inputs.self.lib.normalizeUsers config.my.toggleUsers.shell));
     programs.zsh.enable = config.my.shell.type == "zsh";
   };
 }

modules/shell/exercism.nix

@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
@@ -7,11 +8,13 @@
 {
   options.my.shell.exercism.enable = lib.mkEnableOption "Exercism coding practice platform";
   config = lib.mkIf config.my.shell.exercism.enable {
-    users.users.jawz.packages = builtins.attrValues {
-      inherit (pkgs)
-        exercism # learn to code
-        bats # testing system, required by Exercism
-        ;
-    };
+    users.users = let
+      packages = builtins.attrValues {
+        inherit (pkgs)
+          exercism # learn to code
+          bats # testing system, required by Exercism
+          ;
+      };
+    in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.shell packages;
   };
 }

modules/shell/multimedia.nix

@@ -8,41 +8,48 @@
 {
   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" = {
+    sops.secrets."gallery-dl/secrets" = let
+      # Use first user for secret ownership
+      user = inputs.self.lib.getFirstUser config.my.toggleUsers.shell;
+    in {
       sopsFile = ../../secrets/gallery.yaml;
-      owner = "jawz";
+      owner = user;
       mode = "0400";
     };
-    home-manager.users.jawz.programs = {
-      yt-dlp = {
-        enable = true;
-        settings = {
-          embed-thumbnail = true;
-          embed-subs = true;
-          sub-langs = "all";
-          cookies-from-browser = "firefox+gnomekeyring:/home/jawz/.librewolf/jawz";
+    home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.toggleUsers.shell (user: {
+      programs = {
+        yt-dlp = {
+          enable = true;
+          settings = {
+            embed-thumbnail = true;
+            embed-subs = true;
+            sub-langs = "all";
+            cookies-from-browser = "firefox+gnomekeyring:/home/${user}/.librewolf/${user}";
+          };
+        };
+        gallery-dl = {
+          enable = true;
+          settings = inputs.self.lib.importDotfile ../../dotfiles/gallery-dl.nix;
+        };
+        ${config.my.shell.type} = {
+          initExtra = lib.mkAfter ''
+            if [ -r "${config.sops.secrets."gallery-dl/secrets".path}" ]; then
+              set -a  # automatically export all variables
+              source "${config.sops.secrets."gallery-dl/secrets".path}"
+              set +a  # stop automatically exporting
+            fi
+          '';
         };
       };
-      gallery-dl = {
-        enable = true;
-        settings = inputs.self.lib.importDotfile ../../dotfiles/gallery-dl.nix;
+    });
+    users.users = let
+      packages = builtins.attrValues {
+        inherit (pkgs)
+          ffmpeg # not ffmpreg, the coolest video conversion tool!
+          imagemagick # photoshop what??
+          ffpb # make ffmpeg encoding... a bit fun
+          ;
       };
-      ${config.my.shell.type} = {
-        initExtra = lib.mkAfter ''
-          if [ -r "${config.sops.secrets."gallery-dl/secrets".path}" ]; then
-            set -a  # automatically export all variables
-            source "${config.sops.secrets."gallery-dl/secrets".path}"
-            set +a  # stop automatically exporting
-          fi
-        '';
-      };
-    };
-    users.users.jawz.packages = builtins.attrValues {
-      inherit (pkgs)
-        ffmpeg # not ffmpreg, the coolest video conversion tool!
-        imagemagick # photoshop what??
-        ffpb # make ffmpeg encoding... a bit fun
-        ;
-    };
+    in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.shell packages;
   };
 }

modules/shell/tools.nix

@@ -11,7 +11,8 @@ in
 {
   options.my.shell.tools.enable = lib.mkEnableOption "shell tools and utilities";
   config = lib.mkIf config.my.shell.tools.enable {
-    home-manager.users.jawz.programs = {
+    home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.toggleUsers.shell (user: {
+      programs = {
       hstr.enable = true;
       htop = {
         enable = true;
@@ -52,7 +53,7 @@ in
           PASSWORD_STORE_NOPAGER = "false";
           PASSWORD_STORE_NOTIFICATIONS = "false";
           PASSWORD_STORE_PARSING = "true";
-          PASSWORD_STORE_PATH = "/home/jawz/.local/share/pass";
+          PASSWORD_STORE_PATH = "/home/${user}/.local/share/pass";
           PASSWORD_STORE_SAFECONTENT = "true";
         };
       };
@@ -84,7 +85,8 @@ in
             source "$(fzf-share)/completion.bash"
             fi
           '';
-    };
+      };
+    });
     programs = {
       starship.enable = true;
       tmux.enable = true;
@@ -94,7 +96,8 @@ in
         vimAlias = true;
       };
     };
-    users.users.jawz.packages = builtins.attrValues {
+    users.users = let
+      packages = builtins.attrValues {
       inherit (pkgs)
         ripgrep # modern grep
         dust # rusty du similar to gdu
@@ -108,7 +111,8 @@ in
         smartmontools # check hard drie health
         rmlint # amazing dupe finder that integrates well with BTRFS
         ;
-    };
+      };
+    in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.shell packages;
     environment.variables = {
       HISTFILE = "\${XDG_STATE_HOME}/bash/history";
       LESSHISTFILE = "-";

parts/core.nix

@@ -213,6 +213,23 @@ in
         windows_vm = ../secrets/ssh/ed25519_windows_vm.pub;
       };
       getSshKeys = keyNames: keyNames |> map (name: inputs.self.lib.sshKeys.${name});
+      # Helper functions for multi-user toggle support
+      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);
     };
   };
 }