diff --git a/home-modules/fish.nix b/home-modules/fish.nix
index 3e315f2..17b4518 100755
--- a/home-modules/fish.nix
+++ b/home-modules/fish.nix
@@ -90,9 +90,14 @@ lib.mkIf (user != "tv")
       set -g fish_greeting
       if not set -q IN_NIX_SHELL
         nxfetch
+        # yazi
+        set tmp (mktemp -t "yazi-cwd.XXXXX")
+        yazi $argv --cwd-file="$tmp"
+        if set cwd (cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ]
+            cd -- "$cwd"
+        end
+        rm -f -- "$tmp"
       end
-      # ${pkgs.starship}/bin/starship init fish | source
-      # ${pkgs.any-nix-shell}/bin/any-nix-shell fish --info-right | source
     '';
     functions = {
       # gpg = '';