From 86b8196f54b5aa9a5dac9b2b1efc538d5203b034 Mon Sep 17 00:00:00 2001 From: Arti Zirk Date: Wed, 2 Jun 2021 16:53:22 +0300 Subject: [PATCH] Universal fzf loader on Arch and Debian * tries loading on both distro locations * only overrides fzf-history-widget if it was defined previously --- .zshrc | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/.zshrc b/.zshrc index f86d9d0..da20f45 100644 --- a/.zshrc +++ b/.zshrc @@ -96,15 +96,20 @@ xsource /usr/share/zsh/site-functions/git-flow-completion.zsh xsource /usr/share/doc/pkgfile/command-not-found.zsh -# fzf history search with support for Ctrl+E history edit like with zaw widget before -if [[ -f /usr/share/fzf/key-bindings.zsh && -f /usr/share/fzf/completion.zsh ]]; then - source /usr/share/fzf/key-bindings.zsh - source /usr/share/fzf/completion.zsh - # default is 40%, and that is too much, limit to less lines - FZF_TMUX_HEIGHT=6 - # other shortcuts already use reverse, except history search for some reason.. - FZF_CTRL_R_OPTS="--reverse" +# default is 40%, and that is too much, limit to less lines +FZF_TMUX_HEIGHT=6 +# other shortcuts already use reverse, except history search for some reason.. +FZF_CTRL_R_OPTS="--reverse" + +# Arch Linux +xsource /usr/share/fzf/key-bindings.zsh +xsource /usr/share/fzf/completion.zsh +# Debian +xsource /usr/share/doc/fzf/examples/key-bindings.zsh + +# fzf history search with support for Ctrl+E history edit like with zaw widget before +if typeset -f fzf-history-widget > /dev/null; then # Copied form key-bindings.zsh # CTRL-R - Paste the selected command from history into the command line fzf-history-widget() {