From c3d25c50798d3dfd4bfc07c05506a618585226be Mon Sep 17 00:00:00 2001 From: Colin Powell Date: Tue, 31 Mar 2020 08:29:08 -0400 Subject: [PATCH] Remove fzf from #fishshell ... I never use it --- fish/.config/fish/conf.d/fzf.fish | 14 ------ .../.config/fish/conf.d/fzf_key_bindings.fish | 49 ------------------- fish/.config/fish/config.fish | 2 +- fish/.config/fish/fishfile | 1 - 4 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 fish/.config/fish/conf.d/fzf.fish delete mode 100644 fish/.config/fish/conf.d/fzf_key_bindings.fish diff --git a/fish/.config/fish/conf.d/fzf.fish b/fish/.config/fish/conf.d/fzf.fish deleted file mode 100644 index e88f48e..0000000 --- a/fish/.config/fish/conf.d/fzf.fish +++ /dev/null @@ -1,14 +0,0 @@ -set -q FZF_TMUX_HEIGHT; or set -U FZF_TMUX_HEIGHT "40%" -set -q FZF_DEFAULT_OPTS; or set -U FZF_DEFAULT_OPTS "--height $FZF_TMUX_HEIGHT" -set -q FZF_LEGACY_KEYBINDINGS; or set -U FZF_LEGACY_KEYBINDINGS 1 -set -q FZF_PREVIEW_FILE_CMD; or set -U FZF_PREVIEW_FILE_CMD "head -n 10" -set -q FZF_PREVIEW_DIR_CMD; or set -U FZF_PREVIEW_DIR_CMD "ls" - -function fzf_uninstall -e fzf_uninstall - # disabled until we figure out a sensible way to ensure user overrides - # are not erased - # set -l _vars (set | command grep -E "^FZF.*\$" | command awk '{print $1;}') - # for var in $_vars - # eval (set -e $var) - # end -end diff --git a/fish/.config/fish/conf.d/fzf_key_bindings.fish b/fish/.config/fish/conf.d/fzf_key_bindings.fish deleted file mode 100644 index e39ba94..0000000 --- a/fish/.config/fish/conf.d/fzf_key_bindings.fish +++ /dev/null @@ -1,49 +0,0 @@ -if test "$FZF_LEGACY_KEYBINDINGS" -eq 1 - bind \ct '__fzf_find_file' - bind \cr '__fzf_reverse_isearch' - bind \ec '__fzf_cd' - bind \eC '__fzf_cd --hidden' - bind \cg '__fzf_open' - bind \co '__fzf_open --editor' - - if bind -M insert >/dev/null 2>/dev/null - bind -M insert \ct '__fzf_find_file' - bind -M insert \cr '__fzf_reverse_isearch' - bind -M insert \ec '__fzf_cd' - bind -M insert \eC '__fzf_cd --hidden' - bind -M insert \cg '__fzf_open' - bind -M insert \co '__fzf_open --editor' - end -else - bind \co '__fzf_find_file' - bind \cr '__fzf_reverse_isearch' - bind \ec '__fzf_cd' - bind \eC '__fzf_cd --hidden' - bind \eO '__fzf_open' - bind \eo '__fzf_open --editor' - - if bind -M insert >/dev/null 2>/dev/null - bind -M insert \co '__fzf_find_file' - bind -M insert \cr '__fzf_reverse_isearch' - bind -M insert \ec '__fzf_cd' - bind -M insert \eC '__fzf_cd --hidden' - bind -M insert \eO '__fzf_open' - bind -M insert \eo '__fzf_open --editor' - end -end - -if set -q FZF_COMPLETE - bind \t '__fzf_complete' - if bind -M insert >/dev/null 2>/dev/null - bind -M insert \t '__fzf_complete' - end -end - -function fzf_key_bindings_uninstall -e fzf_key_bindings_uninstall - # disabled until we figure out a sensible way to ensure user overrides - # are not erased - # set -l _bindings (bind -a | sed -En "s/(')?__fzf.*\$//p" | sed 's/bind/bind -e/') - # for binding in $_bindings - # eval $binding - # end -end diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish index c3893a9..e3d25b0 100644 --- a/fish/.config/fish/config.fish +++ b/fish/.config/fish/config.fish @@ -3,7 +3,7 @@ set -gx PATH ~/.cargo/bin $PATH set -gx PATH ~/.bin $PATH set -gx PATH ~/.screenlayout $PATH set -gx PATH ~/.emacs.d/bin $PATH -set -gx PATH ~/.fzf/bin $PATH +#set -gx PATH ~/.fzf/bin $PATH set -gx PATH ~/.local/bin $PATH fzf_key_bindings set -gx EDITOR vi diff --git a/fish/.config/fish/fishfile b/fish/.config/fish/fishfile index 38bd484..a38cf3d 100644 --- a/fish/.config/fish/fishfile +++ b/fish/.config/fish/fishfile @@ -1,5 +1,4 @@ edc/bass -jethrokuan/fzf 2m/fish-gpg-tty oh-my-fish/plugin-direnv joseluisq/gitnow