format

config/stylix.nix

@@ -9,7 +9,7 @@ let
   schemesFile = import ./schemes.nix {
     inherit pkgs inputs;
   };
-  scheme = schemesFile.schemes.jesus;
+  scheme = schemesFile.schemes.paul;
   cfg = config.my.stylix;
   gnomeEnabled = config.services.desktopManager.gnome.enable;
 in

modules/apps/art.nix

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

modules/apps/gaming.nix

@@ -50,25 +50,27 @@ in
       #   environmentFile = config.sops.secrets.switch-presence.path;
       # };
     };
-    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;
+    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

@@ -30,28 +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 = inputs.self.lib.mkHomeManagerUsers lib config.my.toggleUsers.apps (user: {
+    home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.toggleUsers.apps (_user: {
       programs.librewolf = import ./librewolf.nix;
     });
     programs.geary.enable = true;
-    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;
+    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

@@ -8,15 +8,17 @@
 {
   options.my.apps.misc.enable = lib.mkEnableOption "miscellaneous desktop applications";
   config = lib.mkIf config.my.apps.misc.enable {
-    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;
+    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

@@ -8,17 +8,19 @@
 {
   options.my.apps.multimedia.enable = lib.mkEnableOption "multimedia applications and media players";
   config = lib.mkIf config.my.apps.multimedia.enable {
-    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;
+    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

@@ -8,14 +8,16 @@
 {
   options.my.apps.piano.enable = lib.mkEnableOption "piano learning and music theory apps";
   config = lib.mkIf config.my.apps.piano.enable {
-    users.users = let
-      packages = builtins.attrValues {
-        inherit (pkgs)
-          neothesia
-          linthesia
-          timidity
-          ;
-      };
-    in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.apps packages;
+    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

@@ -9,17 +9,19 @@
   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 = 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;
+    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/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 = inputs.self.lib.mkHomeManagerUsers lib config.my.toggleUsers.dev (user: {
+    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;
@@ -22,31 +22,33 @@
             e = "edit";
           };
     });
-    users.users = let
-      packages = builtins.attrValues {
-      inherit (pkgs.xorg) xwininfo;
-      inherit (pkgs)
-        #emacs everywhere
-        xdotool
-        xclip
-        wl-clipboard-rs
-        fd # modern find, faster searches
-        fzf # fuzzy finder! super cool and useful
-        ripgrep # modern grep
-        tree-sitter # code parsing based on symbols and shit, I do not get it
-        graphviz # graphs
-        tetex # export pdf
-        languagetool # proofreader for English
-        # lsps
-        yaml-language-server
-        markdownlint-cli
-        ;
-      inherit (pkgs.nodePackages)
-        vscode-json-languageserver
-        prettier # multi-language linter
-        ;
-      };
-    in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.dev packages;
+    users.users =
+      let
+        packages = builtins.attrValues {
+          inherit (pkgs.xorg) xwininfo;
+          inherit (pkgs)
+            #emacs everywhere
+            xdotool
+            xclip
+            wl-clipboard-rs
+            fd # modern find, faster searches
+            fzf # fuzzy finder! super cool and useful
+            ripgrep # modern grep
+            tree-sitter # code parsing based on symbols and shit, I do not get it
+            graphviz # graphs
+            tetex # export pdf
+            languagetool # proofreader for English
+            # lsps
+            yaml-language-server
+            markdownlint-cli
+            ;
+          inherit (pkgs.nodePackages)
+            vscode-json-languageserver
+            prettier # multi-language linter
+            ;
+        };
+      in
+      inputs.self.lib.mkUserPackages lib config.my.toggleUsers.dev packages;
     services.emacs = {
       enable = true;
       defaultEditor = true;
@@ -57,7 +59,8 @@
         extraPackages =
           epkgs:
           let
-            inherit (config.home-manager.users.${inputs.self.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/javascript.nix

@@ -31,7 +31,7 @@ in
       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: {
+      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 {

modules/dev/nix.nix

@@ -34,21 +34,19 @@ in
   };
   config = lib.mkIf config.my.dev.nix.enable {
     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
-            '';
-          };
+    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

@@ -50,7 +50,7 @@ in
       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: {
+      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/factories/mkscript.nix

@@ -37,11 +37,14 @@
     description = "Configuration for multiple scripts.";
   };
   config = lib.mkIf (lib.any (s: s.enable) (lib.attrValues config.my.scripts)) {
-    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;
+    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

@@ -118,8 +118,14 @@ in
         apps = "jawz";
         dev = "bearded_dragonn";
         shell = "jawz";
-        gaming = [ "jawz" "bearded_dragonn" ];
-        stylix = [ "jawz" "bearded_dragonn" ];
+        gaming = [
+          "jawz"
+          "bearded_dragonn"
+        ];
+        stylix = [
+          "jawz"
+          "bearded_dragonn"
+        ];
       };
     };
   };

modules/services/printing.nix

@@ -14,9 +14,11 @@ in
 {
   options.my.services.printing.enable = lib.mkEnableOption "printing services and drivers";
   config = lib.mkIf config.my.services.printing.enable {
-    users.users = let
-      packages = [ pkgs.simple-scan ];
-    in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.services packages;
+    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

@@ -15,9 +15,11 @@
     description = "The shell to use system-wide (bash or zsh)";
   };
   config = {
-    users.users = lib.mkMerge (map (user: {
-      ${user}.shell = pkgs.${config.my.shell.type};
-    }) (inputs.self.lib.normalizeUsers config.my.toggleUsers.shell));
+    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

@@ -8,13 +8,15 @@
 {
   options.my.shell.exercism.enable = lib.mkEnableOption "Exercism coding practice platform";
   config = lib.mkIf config.my.shell.exercism.enable {
-    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;
+    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,14 +8,16 @@
 {
   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
-      # Use first user for secret ownership
-      user = inputs.self.lib.getFirstUser config.my.toggleUsers.shell;
-    in {
-      sopsFile = ../../secrets/gallery.yaml;
-      owner = user;
-      mode = "0400";
-    };
+    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 = user;
+        mode = "0400";
+      };
     home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.toggleUsers.shell (user: {
       programs = {
         yt-dlp = {
@@ -42,14 +44,16 @@
         };
       };
     });
-    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
-          ;
-      };
-    in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.shell packages;
+    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
+            ;
+        };
+      in
+      inputs.self.lib.mkUserPackages lib config.my.toggleUsers.shell packages;
   };
 }

modules/shell/tools.nix

@@ -13,78 +13,78 @@ in
   config = lib.mkIf config.my.shell.tools.enable {
     home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.toggleUsers.shell (user: {
       programs = {
-      hstr.enable = true;
-      htop = {
-        enable = true;
-        package = pkgs.htop-vim;
-      };
-      eza = {
-        enable = true;
-        git = true;
-        icons = "auto";
-      };
-      zoxide = {
-        enable = true;
-        enableBashIntegration = shellType == "bash";
-        enableZshIntegration = shellType == "zsh";
-      };
-      bat = {
-        enable = true;
-        config.pager = "less -FR";
-        extraPackages = builtins.attrValues {
-          inherit (pkgs.bat-extras)
-            batman # man pages
-            batpipe # piping
-            batgrep # ripgrep
-            batdiff # this is getting crazy!
-            batwatch # probably my next best friend
-            prettybat # trans your sourcecode!
-            ;
+        hstr.enable = true;
+        htop = {
+          enable = true;
+          package = pkgs.htop-vim;
         };
-      };
-      password-store = {
-        enable = false;
-        package = pkgs.gopass;
-        settings = {
-          PASSWORD_STORE_AUTOCLIP = "true";
-          PASSWORD_STORE_AUTOIMPORT = "false";
-          PASSWORD_STORE_CLIPTIMEOUT = "45";
-          PASSWORD_STORE_EXPORTKEYS = "false";
-          PASSWORD_STORE_NOPAGER = "false";
-          PASSWORD_STORE_NOTIFICATIONS = "false";
-          PASSWORD_STORE_PARSING = "true";
-          PASSWORD_STORE_PATH = "/home/${user}/.local/share/pass";
-          PASSWORD_STORE_SAFECONTENT = "true";
+        eza = {
+          enable = true;
+          git = true;
+          icons = "auto";
         };
-      };
-      ${shellType} = {
-        shellAliases = inputs.self.lib.mergeAliases inputs.self.lib.commonAliases {
-          cd = "z";
-          hh = "hstr";
-          ls = "eza --icons --group-directories-first";
-          rm = "trash";
-          b = "bat";
-          f = "fzf --multi --exact -i";
-          unique-extensions = ''
-            fd -tf | rev | cut -d. -f1 | rev |
-            tr '[:upper:]' '[:lower:]' | sort |
-            uniq --count | sort -rn'';
+        zoxide = {
+          enable = true;
+          enableBashIntegration = shellType == "bash";
+          enableZshIntegration = shellType == "zsh";
         };
-      }
-      //
-        inputs.self.lib.shellConditional shellType
-          ''
-            if command -v fzf-share >/dev/null; then
-            source "$(fzf-share)/key-bindings.bash"
-            source "$(fzf-share)/completion.bash"
-            fi
-          ''
-          ''
-            if command -v fzf-share >/dev/null; then
-            source "$(fzf-share)/key-bindings.bash"
-            source "$(fzf-share)/completion.bash"
-            fi
-          '';
+        bat = {
+          enable = true;
+          config.pager = "less -FR";
+          extraPackages = builtins.attrValues {
+            inherit (pkgs.bat-extras)
+              batman # man pages
+              batpipe # piping
+              batgrep # ripgrep
+              batdiff # this is getting crazy!
+              batwatch # probably my next best friend
+              prettybat # trans your sourcecode!
+              ;
+          };
+        };
+        password-store = {
+          enable = false;
+          package = pkgs.gopass;
+          settings = {
+            PASSWORD_STORE_AUTOCLIP = "true";
+            PASSWORD_STORE_AUTOIMPORT = "false";
+            PASSWORD_STORE_CLIPTIMEOUT = "45";
+            PASSWORD_STORE_EXPORTKEYS = "false";
+            PASSWORD_STORE_NOPAGER = "false";
+            PASSWORD_STORE_NOTIFICATIONS = "false";
+            PASSWORD_STORE_PARSING = "true";
+            PASSWORD_STORE_PATH = "/home/${user}/.local/share/pass";
+            PASSWORD_STORE_SAFECONTENT = "true";
+          };
+        };
+        ${shellType} = {
+          shellAliases = inputs.self.lib.mergeAliases inputs.self.lib.commonAliases {
+            cd = "z";
+            hh = "hstr";
+            ls = "eza --icons --group-directories-first";
+            rm = "trash";
+            b = "bat";
+            f = "fzf --multi --exact -i";
+            unique-extensions = ''
+              fd -tf | rev | cut -d. -f1 | rev |
+              tr '[:upper:]' '[:lower:]' | sort |
+              uniq --count | sort -rn'';
+          };
+        }
+        //
+          inputs.self.lib.shellConditional shellType
+            ''
+              if command -v fzf-share >/dev/null; then
+              source "$(fzf-share)/key-bindings.bash"
+              source "$(fzf-share)/completion.bash"
+              fi
+            ''
+            ''
+              if command -v fzf-share >/dev/null; then
+              source "$(fzf-share)/key-bindings.bash"
+              source "$(fzf-share)/completion.bash"
+              fi
+            '';
       };
     });
     programs = {
@@ -96,23 +96,25 @@ in
         vimAlias = true;
       };
     };
-    users.users = let
-      packages = builtins.attrValues {
-      inherit (pkgs)
-        ripgrep # modern grep
-        dust # rusty du similar to gdu
-        fd # modern find, faster searches
-        fzf # fuzzy finder! super cool and useful
-        gdu # disk-space utility checker, somewhat useful
-        tealdeer # man for retards
-        trash-cli # oop! did not meant to delete that
-        jq # json parser
-        yq # yaml parser
-        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;
+    users.users =
+      let
+        packages = builtins.attrValues {
+          inherit (pkgs)
+            ripgrep # modern grep
+            dust # rusty du similar to gdu
+            fd # modern find, faster searches
+            fzf # fuzzy finder! super cool and useful
+            gdu # disk-space utility checker, somewhat useful
+            tealdeer # man for retards
+            trash-cli # oop! did not meant to delete that
+            jq # json parser
+            yq # yaml parser
+            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

@@ -214,22 +214,29 @@ in
       };
       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);
+      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);
     };
   };
 }