diff --git a/zsh/.zshrc b/zsh/.zshrc index caf77a5..d8ab41f 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -20,11 +20,11 @@ zstyle ':completion:*' list-colors '' source $ZDOTDIR/aliases.zsh source $ZDOTDIR/keys.zsh +source $ZDOTDIR/fzf.zsh source $ZDOTDIR/ssh.zsh source $ZDOTDIR/cleanhome.zsh # modules -[ -f $XDG_CONFIG_HOME/fzf/fzf.zsh ] && source $ZDOTDIR/fzf.zsh source $XDG_DATA_HOME/repos/zsh_modules/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh source $XDG_DATA_HOME/repos/zsh_modules/wd/wd.plugin.zsh export WD_CONFIG=$XDG_CONFIG_HOME/wd_list diff --git a/zsh/fzf.zsh b/zsh/fzf.zsh index 591f78f..b872c43 100644 --- a/zsh/fzf.zsh +++ b/zsh/fzf.zsh @@ -1,11 +1,17 @@ -source $XDG_CONFIG_HOME/fzf/fzf.zsh -export FZF_DEFAULT_COMMAND='fd -H -L --ignore-file ~/.local/config/fd' -export FZF_CTRL_T_COMMAND='fd -H -L --ignore-file ~/.local/config/fd' -export FZF_DEFAULT_OPTS="--multi -e --ansi --layout=reverse --preview='bat --color=always --tabs=2 --style=plain --theme=Monokai\ Extended\ Bright {}'" -export FZF_CTRL_R_OPTS="-e --ansi --layout=reverse --preview=''" -_fzf_compgen_path() { - fd -H -L --ignore-file ~/.local/config/fd . "$1" -} -_fzf_compgen_dir() { - fd -H -L --ignore-file ~/.local/config/fd --type d . "$1" -} +if [ $(command -v fzf) ]; then + case $(lsb_release -i | awk '{print $3}') in + Gentoo) source /usr/share/zsh/site-functions/_fzf ;; + VoidLinux) source /usr/share/fzf/completion.zsh ;; + esac + source /usr/share/fzf/key-bindings.zsh + export FZF_DEFAULT_COMMAND='fd -H -L --ignore-file ~/.local/config/fd' + export FZF_CTRL_T_COMMAND='fd -H -L --ignore-file ~/.local/config/fd' + export FZF_DEFAULT_OPTS="--multi -e --ansi --layout=reverse --preview='bat --color=always --tabs=2 --style=plain --theme=Monokai\ Extended\ Bright {}'" + export FZF_CTRL_R_OPTS="-e --ansi --layout=reverse --preview=''" + _fzf_compgen_path() { + fd -H -L --ignore-file ~/.local/config/fd . "$1" + } + _fzf_compgen_dir() { + fd -H -L --ignore-file ~/.local/config/fd --type d . "$1" + } +fi