From 244c60d9cdd08818867f5e51245d86a32cd3025d Mon Sep 17 00:00:00 2001
From: John Lancaster <32917998+jsl12@users.noreply.github.com>
Date: Wed, 10 Jun 2026 08:53:21 -0500
Subject: [PATCH] moved yazi to shell-tools

---
 modules/features/shell-tools.nix | 126 ++++++++++++++++++-------------
 modules/programs/zsh.nix         |   1 -
 2 files changed, 73 insertions(+), 54 deletions(-)

diff --git a/modules/features/shell-tools.nix b/modules/features/shell-tools.nix
index 13b73c9..c6e0b9f 100644
--- a/modules/features/shell-tools.nix
+++ b/modules/features/shell-tools.nix
@@ -1,63 +1,83 @@
 # This module provides all the shell options
-{ self, inputs, ... }: {
-  flake.modules.homeManager.shell-tools = { config, pkgs, ... }: {
-    imports = with inputs.self.modules.homeManager; [
-      # bash
-      zsh
-      files
-    ];
+{ self, inputs, ... }:
+{
+  flake.modules.homeManager.shell-tools =
+    { config, pkgs, ... }:
+    {
+      imports = with inputs.self.modules.homeManager; [
+        # bash
+        zsh
+        files
+      ];
 
-    home.packages = with pkgs; [
-      btop
-      uv
-      xclip
-      inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.shell-tools
-    ];
+      home.packages = with pkgs; [
+        btop
+        uv
+        xclip
+        inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.shell-tools
+      ];
 
-    home.shell.enableShellIntegration = true;
-  };
+      home.shell.enableShellIntegration = true;
+    };
 
-  perSystem = { system, pkgs, self', ... }: {
-    packages.shell-tools = inputs.wrappers.lib.wrapPackage { 
-      inherit pkgs;
-      # binName = "show-tools";
-      package = (pkgs.symlinkJoin {
-        name = "show-tools";
-        meta.mainProgram = "show-tools";
-        paths = with pkgs; [
-          nh
-          ripgrep
-          fd
-          jq
-          wget
-          curl
-          dig
-          self'.packages.gdu
-          self'.packages.my-eza
-          hostname
-          iproute2
-          direnv
-          (writeShellApplication {
+  perSystem =
+    {
+      system,
+      pkgs,
+      self',
+      ...
+    }:
+    {
+      packages.shell-tools = inputs.wrappers.lib.wrapPackage {
+        inherit pkgs;
+        # binName = "show-tools";
+        package = (
+          pkgs.symlinkJoin {
             name = "show-tools";
-            text = ''
-              IFS=':' read -r -a path_dirs <<< "''${PATH:-}"
+            meta.mainProgram = "show-tools";
+            paths = with pkgs; [
+              nh
+              ripgrep
+              fd
+              jq
+              wget
+              curl
+              dig
+              bat
+              self'.packages.gdu
+              self'.packages.my-eza
+              self'.packages.yazi
+              hostname
+              iproute2
+              direnv
+              (writeShellApplication {
+                name = "show-tools";
+                text = ''
+                  IFS=':' read -r -a path_dirs <<< "''${PATH:-}"
 
-              for dir in "''${path_dirs[@]}"; do
-                [[ "$dir" == */bin ]] || continue
-                [[ -d "$dir" ]] || continue
+                  for dir in "''${path_dirs[@]}"; do
+                    [[ "$dir" == */bin ]] || continue
+                    [[ -d "$dir" ]] || continue
 
-                printf '%s\n' "$dir"/*
-              done
-            '';
-          })
+                    printf '%s\n' "$dir"/*
+                  done
+                '';
+              })
+            ];
+          }
+        );
+      };
+
+      packages.gdu = inputs.wrappers.lib.wrapPackage {
+        inherit pkgs;
+        package = pkgs.gdu;
+        args = [
+          "-x"
+          "--si"
+          "--collapse-path"
+          "--mouse"
+          "$@"
         ];
-      });
+      };
     };
-
-    packages.gdu = inputs.wrappers.lib.wrapPackage {
-      inherit pkgs;
-      package = pkgs.gdu;
-      args = [ "-x" "--si" "--collapse-path" "--mouse" "$@" ];
-    };
-  };
 }
diff --git a/modules/programs/zsh.nix b/modules/programs/zsh.nix
index ce3891c..6de4ab4 100644
--- a/modules/programs/zsh.nix
+++ b/modules/programs/zsh.nix
@@ -143,7 +143,6 @@ in
           devenv
           self'.packages.shell-tools
           self'.packages.neovim-min
-          self'.packages.yazi
         ];
       }).wrapper;
   };