diff --git a/.config/zsh/.zprofile b/.config/zsh/.zprofile index 7f7110a..3624bd5 100644 --- a/.config/zsh/.zprofile +++ b/.config/zsh/.zprofile @@ -116,14 +116,21 @@ export FZF_DEFAULT_COMMAND_FALLBACK # Ignore gitignore(5)d files, see also $XDG_CONFIG_HOME/git/ignore if (( $+commands[fd] )); then FZF_DEFAULT_COMMAND="fd -L --hidden --type f --no-require-git" + FZF_ALT_C_COMMAND="${FZF_DEFAULT_COMMAND/-type f/-type d}" elif (( $+commands[rg] )); then FZF_DEFAULT_COMMAND="rg -L --hidden --files --no-require-git" + FZF_ALT_C_COMMAND="${FZF_DEFAULT_COMMAND_FALLBACK/-type f/-type d}" else # Fallback to hardcoding the most important paths to prune FZF_DEFAULT_COMMAND="$FZF_DEFAULT_COMMAND_FALLBACK" + FZF_ALT_C_COMMAND="${FZF_DEFAULT_COMMAND_FALLBACK/-type f/-type d}" fi export FZF_DEFAULT_COMMAND +if (( $+commands[bfs] )); then + FZF_ALT_C_COMMAND="${${FZF_DEFAULT_COMMAND_FALLBACK/-type f/-type d}/#find/bfs}" +fi + typeset -A fzf_opts=( # Clear query if not empty, abort otherwise esc cancel diff --git a/.config/zsh/zshrc.d/60-keys.zsh b/.config/zsh/zshrc.d/60-keys.zsh index ed4fbb8..cef77d2 100644 --- a/.config/zsh/zshrc.d/60-keys.zsh +++ b/.config/zsh/zshrc.d/60-keys.zsh @@ -248,7 +248,6 @@ bindkey -M vicmd '^K' fzf-history-widget # ^R fzf-history-widget # TODO: ^R should insert the history line in BUFFER to differ from ctrl-up FZF_CTRL_T_COMMAND="${FZF_DEFAULT_COMMAND} 2>/dev/null" -# Use the fallback default command when ripgrep is not installed but with -# directories instead of files. -FZF_ALT_C_COMMAND="${FZF_DEFAULT_COMMAND_FALLBACK/-type f/-type d}" + +# See .zprofile for FZF_ALT_C_COMMAND comp-source "$ZDOTDIR/plugins/fzf/shell/key-bindings.zsh"