diff --git a/modules/features/shell-tools.nix b/modules/features/shell-tools.nix
index b2cbcbe..715fc04 100644
--- a/modules/features/shell-tools.nix
+++ b/modules/features/shell-tools.nix
@@ -11,9 +11,6 @@
     imports = with inputs.self.modules.homeManager; [
       bash
       zsh
-
-      # Tools
-      eza
       files
     ];
 
@@ -21,21 +18,41 @@
       home.shell.enableShellIntegration = true;
       programs.zsh.enable  = lib.mkForce (config.shell.program == "zsh");
       home.packages = with pkgs; [
-        nh
-        nvd
-        nix-output-monitor
-        wget
-        curl
-        busybox
-        gnugrep
-        dig
         btop
         uv
         xclip
-        jq
-        ripgrep
-        (writeShellScriptBin "ds" ''${lib.getExe pkgs.gdu} -x -I /snap /'')
+        inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.shell-tools
       ];
     };
   };
+
+  perSystem = { system, pkgs, self', ... }: {
+    packages.shell-tools = inputs.wrappers.lib.wrapPackage { 
+      inherit pkgs; 
+      binName = "wrapped-hello";
+      package = (pkgs.symlinkJoin {
+        name = "shell-tools";
+        paths = with pkgs; [
+          nh
+          ripgrep
+          fd
+          jq
+          wget
+          curl
+          dig
+          self'.packages.gdu
+          self'.packages.my-eza
+          hostname
+          iproute2
+          direnv
+        ];
+      });
+    };
+
+    packages.gdu = inputs.wrappers.lib.wrapPackage {
+      inherit pkgs;
+      package = pkgs.gdu;
+      args = [ "-x" "--si" "--collapse-path" "--mouse" "$@" ];
+    };
+  };
 }
diff --git a/modules/hosts/john-p14s/configuration.nix b/modules/hosts/john-p14s/configuration.nix
index 2c1d49b..fd61dd2 100644
--- a/modules/hosts/john-p14s/configuration.nix
+++ b/modules/hosts/john-p14s/configuration.nix
@@ -36,10 +36,6 @@
       # List packages installed in system profile. To search, run:
       # $ nix search wget
       environment.systemPackages = with pkgs; [
-        wget
-        cacert
-        busybox
-        dig
         samba
         selfPkgs.my-neovim
         selfPkgs.wg-platform
diff --git a/modules/programs/files.nix b/modules/programs/files.nix
index 9a78a40..8a95fa6 100644
--- a/modules/programs/files.nix
+++ b/modules/programs/files.nix
@@ -14,12 +14,5 @@
         ignorecase = true;
       };
     };
-
-    home.packages = with pkgs; [
-      # gdu
-      # (writeShellScriptBin "lfcd" ''
-      #   . <(${lib.getExe pkgs.lf} -print-last-dir | sed 's/^/cd /')
-      # '')
-    ];
   };
 }
\ No newline at end of file
diff --git a/modules/programs/zsh.nix b/modules/programs/zsh.nix
index b75be0b..16d4923 100644
--- a/modules/programs/zsh.nix
+++ b/modules/programs/zsh.nix
@@ -108,46 +108,29 @@ in
 
           HOSTNAME=$(hostname -s)
 
-          ${aliasStr}
-
           eval "$(direnv hook zsh)"
+
+          ${aliasStr}
         '';
         extraPackages = with pkgs; [
-          self'.packages.my-eza
-          self'.packages.gdu
-          busybox
-          fd
-          ripgrep
-          hostname
-          iproute2
-          direnv
           lazydocker
-          nh
+          self'.packages.shell-tools
         ];
       }).wrapper;
 
     packages.starship = (inputs.wrappers.wrapperModules.starship.apply {
       inherit pkgs;
-      settings = lib.mkMerge [
-        (lib.importTOML (pkgs.fetchurl {
+      settings = lib.recursiveUpdate (lib.importTOML (pkgs.fetchurl {
           url = https://starship.rs/presets/toml/catppuccin-powerline.toml;
           sha256 = "0bd8zx0bpri63rnb9dva0rav75d3i2wrzw44h63m75hq5220r26g";
-        }))
-        {
+        })) {
           palette = "catppuccin_mocha";
-          add_newline = lib.mkForce true;
-          line_break.disabled = lib.mkForce false;
-          git_status.diverged = lib.mkForce "⇕⇡\${ahead_count}⇣\${behind_count}";
-          cmd_duration.format = lib.mkForce "󰔛 $duration";
-          python.disabled = lib.mkForce true;
-        }
-      ];
+          add_newline = true;
+          line_break.disabled = false;
+          git_status.diverged = "⇕⇡\${ahead_count}⇣\${behind_count}";
+          cmd_duration.format = "󰔛 $duration";
+          # python.disabled = true;
+        };
     }).wrapper;
-
-    packages.gdu = inputs.wrappers.lib.wrapPackage {
-      inherit pkgs;
-      package = pkgs.gdu;
-      args = [ "-x" "--si" "--collapse-path" "--mouse" "$@" ];
-    };
   };
 }
\ No newline at end of file