From d9940eb52e4623aa6af83526aadfefa5a68246c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Wed, 29 Oct 2025 21:05:32 +0800 Subject: [PATCH] home/fish: disable patdiff for fzf.fish --- nix/homeModules/common/fish/default.nix | 2 +- nix/homeModules/common/fish/shellInit.fish | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nix/homeModules/common/fish/default.nix b/nix/homeModules/common/fish/default.nix index a09b371d..240a6c29 100644 --- a/nix/homeModules/common/fish/default.nix +++ b/nix/homeModules/common/fish/default.nix @@ -10,7 +10,7 @@ # # Script dependencies # - home.packages = [pkgs.vivid pkgs.patdiff]; + home.packages = [pkgs.vivid]; programs = { fd.enable = true; fzf.enable = true; diff --git a/nix/homeModules/common/fish/shellInit.fish b/nix/homeModules/common/fish/shellInit.fish index 8cb17970..0a1cfd24 100644 --- a/nix/homeModules/common/fish/shellInit.fish +++ b/nix/homeModules/common/fish/shellInit.fish @@ -80,7 +80,8 @@ end set -x fzf_preview_file_cmd 'cat -n' # fzf-fish search hidden files set -x fzf_fd_opts --hidden --exclude=.git -set -x fzf_diff_highlighter patdiff +# fzf-fish using patdiff would show incomplete diff, it is a bug +# don't do it # fd uses LS_COLORS set -x LS_COLORS (vivid -m 24-bit generate solarized-light) # similar to milou