From 3a4654aab4762e1b2013c515ed6ca810cd92eb7d Mon Sep 17 00:00:00 2001 From: ViViDboarder Date: Thu, 20 Feb 2020 14:12:29 -0800 Subject: [PATCH] Improve fzf detection of grep tools Prefer faster tools, if found. First rg, then ag, then default --- assets/default/dotfiles/bash_profile | 13 +++++++++++-- assets/default/dotfiles/bashrc | 2 ++ assets/default/fish/init/env.fish | 11 +++++++++-- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/assets/default/dotfiles/bash_profile b/assets/default/dotfiles/bash_profile index ead3e90..9063eca 100644 --- a/assets/default/dotfiles/bash_profile +++ b/assets/default/dotfiles/bash_profile @@ -76,5 +76,14 @@ export LSCOLORS=ExFxCxDxBxegedabagacad # Vim colors [ -n "$VIM_COLOR" ] || export VIM_COLOR="$(eval "$HOME/bin/get_vim_colorscheme.sh")" || export VIM_COLOR='wombat256mod' -export FZF_DEFAULT_COMMAND='ag -g ""' -export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND \$dir" +if type rg &> /dev/null; then + export FZF_DEFAULT_COMMAND='rg --files' + # export FZF_DEFAULT_COMMAND='rg --files --no-ignore-vcs --hidden' +elif type ag &> /dev/null; then + export FZF_DEFAULT_COMMAND='ag -g ""' +fi +if [ -n "$FZF_DEFAULT_COMMAND" ]; then + export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND \$dir" +fi + +# vim: set filetype=sh: diff --git a/assets/default/dotfiles/bashrc b/assets/default/dotfiles/bashrc index ab658d0..b40a79e 100644 --- a/assets/default/dotfiles/bashrc +++ b/assets/default/dotfiles/bashrc @@ -87,3 +87,5 @@ if [ -n "$PS1" ] && [ -z "$IS_BASH_PROFILE_LOADED" ] ; then # shellcheck source=bash_profile source "$HOME/.bash_profile" fi + +# vim: set filetype=sh: diff --git a/assets/default/fish/init/env.fish b/assets/default/fish/init/env.fish index 2c2f2be..3c97abf 100644 --- a/assets/default/fish/init/env.fish +++ b/assets/default/fish/init/env.fish @@ -7,8 +7,15 @@ set -gx XDG_CACHE_HOME "$HOME/.cache" set -gx ANT_OPTS "-Xmx2048m -Xms512m" # FZF -set -gx FZF_DEFAULT_COMMAND 'ag -g ""' -set -gx FZF_CTRL_T_COMMAND "$FZF_DEFAULT_COMMAND \$dir" +if type -q rg + set -gx FZF_DEFAULT_COMMAND 'rg --files' + # set -gx FZF_DEFAULT_COMMAND 'rg --files --no-ignore-vcs --hidden' +else if type -q ag + set -gx FZF_DEFAULT_COMMAND 'ag -g ""' +end +if [ -n "$FZF_DEFAULT_COMMAND" ] + set -gx FZF_CTRL_T_COMMAND "$FZF_DEFAULT_COMMAND \$dir" +end # Vim Colors so that they can be set by env set -q VIM_COLOR; set -gx VIM_COLOR (eval $HOME/bin/get_vim_colorscheme.sh); or set -gx VIM_COLOR wombat256mod