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 ];
-        };
         };
       };
+    });
   };
 }

modules/apps/art.nix

@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
@@ -40,7 +41,6 @@ in
     dev.gameDev.enable = lib.mkEnableOption "game development tools and engines";
   };
   config.users.users = let
-    userLib = import ../lib.nix { inherit lib; };
     packages = artPackages ++ gameDevPackages;
-  in userLib.mkUserPackages config.my.toggleUsers.apps packages;
+  in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.apps packages;
 }

modules/apps/dictionaries.nix

@@ -1,11 +1,11 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
 }:
 let
-  userLib = import ../lib.nix { inherit lib; };
   packages = builtins.attrValues {
     inherit (pkgs)
       hunspell
@@ -20,6 +20,6 @@ in
 {
   options.my.apps.dictionaries.enable = lib.mkEnableOption "dictionaries and language tools";
   config = lib.mkIf config.my.apps.dictionaries.enable {
-    users.users = userLib.mkUserPackages config.my.toggleUsers.apps packages;
+    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,
   ...
@@ -51,7 +51,6 @@ in
       # };
     };
     users.users = let
-      userLib = import ../lib.nix { inherit lib; };
       packages = builtins.attrValues {
         inherit retroarchWithCores;
         inherit (pkgs)
@@ -70,6 +69,6 @@ in
           prismlauncher # minecraft launcher with jdk overlays
           ;
       };
-    in userLib.mkUserPackages config.my.toggleUsers.apps packages;
+    in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.apps packages;
   };
 }

modules/apps/internet.nix

@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
@@ -29,14 +30,11 @@ 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
+    home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.toggleUsers.apps (user: {
-      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
-      userLib = import ../lib.nix { inherit lib; };
       packages = builtins.attrValues {
         # inherit (inputs.zen-browser.packages.x86_64-linux) twilight;
         inherit krisp-patcher;
@@ -54,6 +52,6 @@ in
           fractal # matrix client
           ;
       };
-    in userLib.mkUserPackages config.my.toggleUsers.apps packages;
+    in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.apps packages;
   };
 }

modules/apps/misc.nix

@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
@@ -8,7 +9,6 @@
   options.my.apps.misc.enable = lib.mkEnableOption "miscellaneous desktop applications";
   config = lib.mkIf config.my.apps.misc.enable {
     users.users = let
-      userLib = import ../lib.nix { inherit lib; };
       packages = builtins.attrValues {
         inherit (pkgs)
           blanket # background noise
@@ -17,6 +17,6 @@
           gnome-obfuscate # censor private information
           ;
       };
-    in userLib.mkUserPackages config.my.toggleUsers.apps packages;
+    in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.apps packages;
   };
 }

modules/apps/multimedia.nix

@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
@@ -8,7 +9,6 @@
   options.my.apps.multimedia.enable = lib.mkEnableOption "multimedia applications and media players";
   config = lib.mkIf config.my.apps.multimedia.enable {
     users.users = let
-      userLib = import ../lib.nix { inherit lib; };
       packages = builtins.attrValues {
         inherit (pkgs)
           curtail # image compressor
@@ -19,6 +19,6 @@
           tagger # tag music files
           ;
       };
-    in userLib.mkUserPackages config.my.toggleUsers.apps packages;
+    in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.apps packages;
   };
 }

modules/apps/music.nix

@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
@@ -8,7 +9,6 @@
   options.my.apps.piano.enable = lib.mkEnableOption "piano learning and music theory apps";
   config = lib.mkIf config.my.apps.piano.enable {
     users.users = let
-      userLib = import ../lib.nix { inherit lib; };
       packages = builtins.attrValues {
         inherit (pkgs)
           neothesia
@@ -16,6 +16,6 @@
           timidity
           ;
       };
-    in userLib.mkUserPackages config.my.toggleUsers.apps packages;
+    in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.apps packages;
   };
 }

modules/apps/office.nix

@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
@@ -9,7 +10,6 @@
   config = lib.mkIf config.my.apps.office.enable {
     environment.variables.CALIBRE_USE_SYSTEM_THEME = "1";
     users.users = let
-      userLib = import ../lib.nix { inherit lib; };
       packages = builtins.attrValues {
         inherit (pkgs)
           jre17_minimal # for libreoffice extensions
@@ -20,6 +20,6 @@
           # planify # let's pretend I will organize my tasks
           ;
       };
-    in userLib.mkUserPackages config.my.toggleUsers.apps packages;
+    in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.apps packages;
   };
 }

modules/dev/cc.nix

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

modules/dev/docker.nix

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

modules/dev/emacs.nix

@@ -8,9 +8,7 @@
 {
   options.my.emacs.enable = lib.mkEnableOption "Doom Emacs configuration";
   config = lib.mkIf config.my.emacs.enable {
-    home-manager.users = let
+    home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.toggleUsers.dev (user: {
-      userLib = import ../lib.nix { inherit lib; };
-    in userLib.mkHomeManagerUsers 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;
@@ -25,7 +23,6 @@
           };
     });
     users.users = let
-      userLib = import ../lib.nix { inherit lib; };
       packages = builtins.attrValues {
       inherit (pkgs.xorg) xwininfo;
       inherit (pkgs)
@@ -49,7 +46,7 @@
         prettier # multi-language linter
         ;
       };
-    in userLib.mkUserPackages config.my.toggleUsers.dev packages;
+    in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.dev packages;
     services.emacs = {
       enable = true;
       defaultEditor = true;
@@ -60,7 +57,7 @@
         extraPackages =
           epkgs:
           let
-            inherit (config.home-manager.users.${(import ../lib.nix { inherit lib; }).getFirstUser config.my.toggleUsers.dev}.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,9 +39,7 @@ in
       environment.variables = { inherit GOPATH; };
     }
     (lib.mkIf config.my.dev.go.enable {
-      users.users = let
+      users.users = inputs.self.lib.mkUserAttrs lib config.my.toggleUsers.dev { inherit packages; };
-        userLib = import ../lib.nix { inherit lib; };
-      in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
     })
   ];
 }

modules/dev/haskell.nix

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

modules/dev/javascript.nix

@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
@@ -27,14 +28,10 @@ in
   };
   config = lib.mkMerge [
     (lib.mkIf config.my.dev.javascript.enable {
-      users.users = let
+      users.users = inputs.self.lib.mkUserAttrs lib config.my.toggleUsers.dev { inherit packages; };
-        userLib = import ../lib.nix { inherit lib; };
-      in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
     })
     {
-      home-manager.users = let
+      home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.toggleUsers.dev (user: {
-        userLib = import ../lib.nix { inherit lib; };
-      in userLib.mkHomeManagerUsers config.my.toggleUsers.dev (user: {
         xdg.configFile = {
           "npm/npmrc".source = ../../dotfiles/npmrc;
           "configstore/update-notifier-npm-check.json".text = builtins.toJSON {

modules/dev/julia.nix

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

modules/dev/nix.nix

@@ -33,12 +33,8 @@ in
     };
   };
   config = lib.mkIf config.my.dev.nix.enable {
-    users.users = let
+    users.users = inputs.self.lib.mkUserAttrs lib config.my.toggleUsers.dev { inherit packages; };
-      userLib = import ../lib.nix { inherit lib; };
+    home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.toggleUsers.dev (user: {
-    in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
-    home-manager.users = let
-      userLib = import ../lib.nix { inherit lib; };
-    in userLib.mkHomeManagerUsers config.my.toggleUsers.dev (user: {
       programs.${shellType}.shellAliases =
         inputs.self.lib.mergeAliases inputs.self.lib.commonAliases
           {

modules/dev/python.nix

@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
@@ -46,14 +47,10 @@ in
   };
   config = lib.mkMerge [
     (lib.mkIf config.my.dev.python.enable {
-      users.users = let
+      users.users = inputs.self.lib.mkUserAttrs lib config.my.toggleUsers.dev { inherit packages; };
-        userLib = import ../lib.nix { inherit lib; };
-      in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
     })
     {
-      home-manager.users = let
+      home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.toggleUsers.dev (user: {
-        userLib = import ../lib.nix { inherit lib; };
-      in userLib.mkHomeManagerUsers 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,9 +28,7 @@ in
   };
   config = lib.mkMerge [
     (lib.mkIf config.my.dev.ruby.enable {
-      users.users = let
+      users.users = inputs.self.lib.mkUserAttrs lib config.my.toggleUsers.dev { inherit packages; };
-        userLib = import ../lib.nix { inherit lib; };
-      in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
     })
     {
       environment.variables = {

modules/dev/rust.nix

@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
@@ -32,9 +33,7 @@ in
   };
   config = lib.mkMerge [
     (lib.mkIf config.my.dev.rust.enable {
-      users.users = let
+      users.users = inputs.self.lib.mkUserAttrs lib config.my.toggleUsers.dev { inherit packages; };
-        userLib = import ../lib.nix { inherit lib; };
-      in userLib.mkUserAttrs 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,8 +31,6 @@ in
     };
   };
   config = lib.mkIf config.my.dev.sh.enable {
-    users.users = let
+    users.users = inputs.self.lib.mkUserAttrs lib config.my.toggleUsers.dev { inherit packages; };
-      userLib = import ../lib.nix { inherit lib; };
-    in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
   };
 }

modules/dev/zig.nix

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

modules/factories/mkscript.nix

@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
@@ -37,11 +38,10 @@
   };
   config = lib.mkIf (lib.any (s: s.enable) (lib.attrValues config.my.scripts)) {
     users.users = let
-      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 userLib.mkUserPackages config.my.toggleUsers.scripts packages;
+    in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.scripts packages;
     systemd.user.services =
       config.my.scripts
       |> lib.mapAttrs' (

modules/lib.nix

@@ -1,25 +0,0 @@
-# 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/modules.nix

@@ -111,13 +111,15 @@ in
         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" ];  # Install gaming on both users
+        gaming = [ "jawz" "bearded_dragonn" ];
+        stylix = [ "jawz" "bearded_dragonn" ];
       };
     };
   };

modules/services/printing.nix

@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
@@ -14,9 +15,8 @@ in
   options.my.services.printing.enable = lib.mkEnableOption "printing services and drivers";
   config = lib.mkIf config.my.services.printing.enable {
     users.users = let
-      userLib = import ../lib.nix { inherit lib; };
       packages = [ pkgs.simple-scan ];
-    in userLib.mkUserPackages config.my.toggleUsers.services packages;
+    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,11 +15,9 @@
     description = "The shell to use system-wide (bash or zsh)";
   };
   config = {
-    users.users = let
+    users.users = lib.mkMerge (map (user: {
-      userLib = import ../lib.nix { inherit lib; };
-    in lib.mkMerge (map (user: {
       ${user}.shell = pkgs.${config.my.shell.type};
-    }) (userLib.normalizeUsers config.my.toggleUsers.shell));
+    }) (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,
   ...
@@ -8,13 +9,12 @@
   options.my.shell.exercism.enable = lib.mkEnableOption "Exercism coding practice platform";
   config = lib.mkIf config.my.shell.exercism.enable {
     users.users = let
-      userLib = import ../lib.nix { inherit lib; };
       packages = builtins.attrValues {
         inherit (pkgs)
           exercism # learn to code
           bats # testing system, required by Exercism
           ;
       };
-    in userLib.mkUserPackages config.my.toggleUsers.shell packages;
+    in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.shell packages;
   };
 }

modules/shell/multimedia.nix

@@ -9,17 +9,14 @@
   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 = userLib.getFirstUser config.my.toggleUsers.shell;
+      user = inputs.self.lib.getFirstUser config.my.toggleUsers.shell;
     in {
       sopsFile = ../../secrets/gallery.yaml;
       owner = user;
       mode = "0400";
     };
-    home-manager.users = let
+    home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.toggleUsers.shell (user: {
-      userLib = import ../lib.nix { inherit lib; };
-    in userLib.mkHomeManagerUsers config.my.toggleUsers.shell (user: {
       programs = {
         yt-dlp = {
           enable = true;
@@ -46,7 +43,6 @@
       };
     });
     users.users = let
-      userLib = import ../lib.nix { inherit lib; };
       packages = builtins.attrValues {
         inherit (pkgs)
           ffmpeg # not ffmpreg, the coolest video conversion tool!
@@ -54,6 +50,6 @@
           ffpb # make ffmpeg encoding... a bit fun
           ;
       };
-    in userLib.mkUserPackages config.my.toggleUsers.shell packages;
+    in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.shell packages;
   };
 }

modules/shell/tools.nix

@@ -11,9 +11,7 @@ in
 {
   options.my.shell.tools.enable = lib.mkEnableOption "shell tools and utilities";
   config = lib.mkIf config.my.shell.tools.enable {
-    home-manager.users = let
+    home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.toggleUsers.shell (user: {
-      userLib = import ../lib.nix { inherit lib; };
-    in userLib.mkHomeManagerUsers config.my.toggleUsers.shell (user: {
       programs = {
       hstr.enable = true;
       htop = {
@@ -99,7 +97,6 @@ in
       };
     };
     users.users = let
-      userLib = import ../lib.nix { inherit lib; };
       packages = builtins.attrValues {
       inherit (pkgs)
         ripgrep # modern grep
@@ -115,7 +112,7 @@ in
         rmlint # amazing dupe finder that integrates well with BTRFS
         ;
       };
-    in userLib.mkUserPackages config.my.toggleUsers.shell packages;
+    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,7 @@ 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: