diff options
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/completion.bash | 125 | ||||
| -rw-r--r-- | shell/completion.zsh | 47 | ||||
| -rw-r--r-- | shell/key-bindings.bash | 34 | ||||
| -rw-r--r-- | shell/key-bindings.fish | 18 | ||||
| -rw-r--r-- | shell/key-bindings.zsh | 30 |
5 files changed, 142 insertions, 112 deletions
diff --git a/shell/completion.bash b/shell/completion.bash index 5786d046..9cd5b217 100644 --- a/shell/completion.bash +++ b/shell/completion.bash @@ -4,10 +4,12 @@ # / __/ / /_/ __/ # /_/ /___/_/ completion.bash # -# - $FZF_TMUX (default: 0) -# - $FZF_TMUX_OPTS (default: empty) -# - $FZF_COMPLETION_TRIGGER (default: '**') -# - $FZF_COMPLETION_OPTS (default: empty) +# - $FZF_TMUX (default: 0) +# - $FZF_TMUX_OPTS (default: empty) +# - $FZF_COMPLETION_TRIGGER (default: '**') +# - $FZF_COMPLETION_OPTS (default: empty) +# - $FZF_COMPLETION_PATH_OPTS (default: empty) +# - $FZF_COMPLETION_DIR_OPTS (default: empty) if [[ $- =~ i ]]; then @@ -32,6 +34,14 @@ if [[ $- =~ i ]]; then # To redraw line after fzf closes (printf '\e[5n') bind '"\e[0n": redraw-current-line' 2> /dev/null +__fzf_defaults() { + # $1: Prepend to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS + # $2: Append to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS + echo "--height ${FZF_TMUX_HEIGHT:-40%} --bind=ctrl-z:ignore $1" + command cat "${FZF_DEFAULT_OPTS_FILE-}" 2> /dev/null + echo "${FZF_DEFAULT_OPTS-} $2" +} + __fzf_comprun() { if [[ "$(type -t _fzf_comprun 2>&1)" = function ]]; then _fzf_comprun "$@" @@ -92,128 +102,77 @@ _fzf_opts_completion() { prev="${COMP_WORDS[COMP_CWORD-1]}" opts=" -h --help - -x --extended -e --exact - --extended-exact +x --no-extended - +e --no-exact -q --query -f --filter --literal - --no-literal - --algo --scheme --expect - --no-expect - --enabled --no-phony - --disabled --phony + --disabled --tiebreak --bind --color - --toggle-sort -d --delimiter -n --nth --with-nth - -s --sort +s --no-sort --track - --no-track --tac - --no-tac - -i - +i + -i --ignore-case + +i --no-ignore-case -m --multi - +m --no-multi --ansi - --no-ansi --no-mouse +c --no-color - +2 --no-256 - --black - --no-black - --bold --no-bold --layout --reverse - --no-reverse --cycle - --no-cycle --keep-right - --no-keep-right - --hscroll --no-hscroll --hscroll-off --scroll-off --filepath-word - --no-filepath-word --info - --no-info - --inline-info - --no-inline-info --separator --no-separator - --scrollbar --no-scrollbar --jump-labels -1 --select-1 - +1 --no-select-1 -0 --exit-0 - +0 --no-exit-0 --read0 - --no-read0 --print0 - --no-print0 --print-query - --no-print-query --prompt --pointer --marker --sync - --no-sync - --async - --no-history --history --history-size - --no-header - --no-header-lines --header --header-lines --header-first - --no-header-first --ellipsis --preview - --no-preview --preview-window --height --min-height - --no-height - --no-margin - --no-padding - --no-border --border - --no-border-label --border-label --border-label-pos - --no-preview-label --preview-label --preview-label-pos --no-unicode - --unicode --margin --padding --tabstop --listen - --no-listen - --clear --no-clear --version --" case "${prev}" in - --algo) - COMPREPLY=( $(compgen -W "v1 v2" -- "$cur") ) - return 0 - ;; --scheme) COMPREPLY=( $(compgen -W "default path history" -- "$cur") ) return 0 @@ -335,13 +294,19 @@ __fzf_generic_path_completion() { [[ -z "$dir" ]] && dir='.' [[ "$dir" != "/" ]] && dir="${dir/%\//}" matches=$( - unset FZF_DEFAULT_COMMAND - export FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse --scheme=path --bind=ctrl-z:ignore ${FZF_DEFAULT_OPTS-} ${FZF_COMPLETION_OPTS-} $2" + export FZF_DEFAULT_OPTS=$(__fzf_defaults "--reverse --scheme=path" "${FZF_COMPLETION_OPTS-} $2") + unset FZF_DEFAULT_COMMAND FZF_DEFAULT_OPTS_FILE if declare -F "$1" > /dev/null; then eval "$1 $(printf %q "$dir")" | __fzf_comprun "$4" -q "$leftover" else - [[ $1 =~ dir ]] && walker=dir,follow || walker=file,dir,follow,hidden - __fzf_comprun "$4" -q "$leftover" --walker "$walker" --walker-root="$dir" + if [[ $1 =~ dir ]]; then + walker=dir,follow + rest=${FZF_COMPLETION_DIR_OPTS-} + else + walker=file,dir,follow,hidden + rest=${FZF_COMPLETION_PATH_OPTS-} + fi + __fzf_comprun "$4" -q "$leftover" --walker "$walker" --walker-root="$dir" $rest fi | while read -r item; do printf "%q " "${item%$3}$3" done @@ -399,7 +364,10 @@ _fzf_complete() { if [[ "$cur" == *"$trigger" ]] && [[ $cur != *'$('* ]] && [[ $cur != *':='* ]] && [[ $cur != *'`'* ]]; then cur=${cur:0:${#cur}-${#trigger}} - selected=$(FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse --bind=ctrl-z:ignore ${FZF_DEFAULT_OPTS-} ${FZF_COMPLETION_OPTS-} $str_arg" __fzf_comprun "${rest[0]}" "${args[@]}" -q "$cur" | $post | command tr '\n' ' ') + selected=$( + FZF_DEFAULT_OPTS=$(__fzf_defaults "--reverse" "${FZF_COMPLETION_OPTS-} $str_arg") \ + FZF_DEFAULT_OPTS_FILE='' \ + __fzf_comprun "${rest[0]}" "${args[@]}" -q "$cur" | $post | command tr '\n' ' ') selected=${selected% } # Strip trailing space not to repeat "-o nospace" if [[ -n "$selected" ]]; then COMPREPLY=("$selected") @@ -503,8 +471,11 @@ complete -o default -F _fzf_opts_completion fzf # fzf-tmux specific options (like `-w WIDTH`) are left as a future patch. complete -o default -F _fzf_opts_completion fzf-tmux -d_cmds="${FZF_COMPLETION_DIR_COMMANDS:-cd pushd rmdir}" -a_cmds=" +d_cmds="${FZF_COMPLETION_DIR_COMMANDS-cd pushd rmdir}" + +# NOTE: $FZF_COMPLETION_PATH_COMMANDS and $FZF_COMPLETION_VAR_COMMANDS are +# undocumented and subject to change in the future. +a_cmds="${FZF_COMPLETION_PATH_COMMANDS-" awk bat cat diff diff3 emacs emacsclient ex file ftp g++ gcc gvim head hg hx java javac ld less more mvim nvim patch perl python ruby @@ -512,10 +483,11 @@ a_cmds=" basename bunzip2 bzip2 chmod chown curl cp dirname du find git grep gunzip gzip hg jar ln ls mv open rm rsync scp - svn tar unzip zip" + svn tar unzip zip"}" +v_cmds="${FZF_COMPLETION_VAR_COMMANDS-export unset printenv}" # Preserve existing completion -__fzf_orig_completion < <(complete -p $d_cmds $a_cmds ssh 2> /dev/null) +__fzf_orig_completion < <(complete -p $d_cmds $a_cmds $v_cmds unalias kill ssh 2> /dev/null) if type _comp_load > /dev/null 2>&1; then # _comp_load was added in bash-completion 2.12 to replace _completion_loader. @@ -551,10 +523,21 @@ for cmd in $d_cmds; do __fzf_defc "$cmd" _fzf_dir_completion "-o bashdefault -o nospace -o dirnames" done +# Variables +for cmd in $v_cmds; do + __fzf_defc "$cmd" _fzf_var_completion "-o default -o nospace -v" +done + +# Aliases +__fzf_defc unalias _fzf_alias_completion "-a" + +# Processes +__fzf_defc kill _fzf_proc_completion "-o default -o bashdefault" + # ssh __fzf_defc ssh _fzf_complete_ssh "-o default -o bashdefault" -unset cmd d_cmds a_cmds +unset cmd d_cmds a_cmds v_cmds _fzf_setup_completion() { local kind fn cmd @@ -576,10 +559,4 @@ _fzf_setup_completion() { done } -# Environment variables / Aliases / Hosts / Process -_fzf_setup_completion 'var' export unset printenv -_fzf_setup_completion 'alias' unalias -_fzf_setup_completion 'host' telnet -_fzf_setup_completion 'proc' kill - fi diff --git a/shell/completion.zsh b/shell/completion.zsh index 7067b06f..3634a0b1 100644 --- a/shell/completion.zsh +++ b/shell/completion.zsh @@ -4,12 +4,12 @@ # / __/ / /_/ __/ # /_/ /___/_/ completion.zsh # -# - $FZF_TMUX (default: 0) -# - $FZF_TMUX_OPTS (default: '-d 40%') -# - $FZF_COMPLETION_TRIGGER (default: '**') -# - $FZF_COMPLETION_OPTS (default: empty) - -if [[ -o interactive ]]; then +# - $FZF_TMUX (default: 0) +# - $FZF_TMUX_OPTS (default: empty) +# - $FZF_COMPLETION_TRIGGER (default: '**') +# - $FZF_COMPLETION_OPTS (default: empty) +# - $FZF_COMPLETION_PATH_OPTS (default: empty) +# - $FZF_COMPLETION_DIR_OPTS (default: empty) # Both branches of the following `if` do the same thing -- define @@ -75,6 +75,9 @@ fi # This brace is the start of try-always block. The `always` part is like # `finally` in lesser languages. We use it to *always* restore user options. { +# The 'emulate' command should not be placed inside the interactive if check; +# placing it there fails to disable alias expansion. See #3731. +if [[ -o interactive ]]; then # To use custom commands instead of find, override _fzf_compgen_{path,dir} # @@ -93,6 +96,14 @@ fi ########################################################### +__fzf_defaults() { + # $1: Prepend to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS + # $2: Append to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS + echo "--height ${FZF_TMUX_HEIGHT:-40%} --bind=ctrl-z:ignore $1" + command cat "${FZF_DEFAULT_OPTS_FILE-}" 2> /dev/null + echo "${FZF_DEFAULT_OPTS-} $2" +} + __fzf_comprun() { if [[ "$(type _fzf_comprun 2>&1)" =~ function ]]; then _fzf_comprun "$@" @@ -146,13 +157,19 @@ __fzf_generic_path_completion() { [ -z "$dir" ] && dir='.' [ "$dir" != "/" ] && dir="${dir/%\//}" matches=$( - unset FZF_DEFAULT_COMMAND - export FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse --scheme=path --bind=ctrl-z:ignore ${FZF_DEFAULT_OPTS-} ${FZF_COMPLETION_OPTS-}" + export FZF_DEFAULT_OPTS=$(__fzf_defaults "--reverse --scheme=path" "${FZF_COMPLETION_OPTS-}") + unset FZF_DEFAULT_COMMAND FZF_DEFAULT_OPTS_FILE if declare -f "$compgen" > /dev/null; then eval "$compgen $(printf %q "$dir")" | __fzf_comprun "$cmd" ${(Q)${(Z+n+)fzf_opts}} -q "$leftover" else - [[ $compgen =~ dir ]] && walker=dir,follow || walker=file,dir,follow,hidden - __fzf_comprun "$cmd" ${(Q)${(Z+n+)fzf_opts}} -q "$leftover" --walker "$walker" --walker-root="$dir" < /dev/tty + if [[ $compgen =~ dir ]]; then + walker=dir,follow + rest=${FZF_COMPLETION_DIR_OPTS-} + else + walker=file,dir,follow,hidden + rest=${FZF_COMPLETION_PATH_OPTS-} + fi + __fzf_comprun "$cmd" ${(Q)${(Z+n+)fzf_opts}} -q "$leftover" --walker "$walker" --walker-root="$dir" ${(Q)${(Z+n+)rest}} < /dev/tty fi | while read item; do item="${item%$suffix}$suffix" echo -n "${(q)item} " @@ -217,7 +234,10 @@ _fzf_complete() { type $post > /dev/null 2>&1 || post=cat _fzf_feed_fifo "$fifo" - matches=$(FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse --bind=ctrl-z:ignore ${FZF_DEFAULT_OPTS-} ${FZF_COMPLETION_OPTS-} $str_arg" __fzf_comprun "$cmd" "${args[@]}" -q "${(Q)prefix}" < "$fifo" | $post | tr '\n' ' ') + matches=$( + FZF_DEFAULT_OPTS=$(__fzf_defaults "--reverse" "${FZF_COMPLETION_OPTS-} $str_arg") \ + FZF_DEFAULT_OPTS_FILE='' \ + __fzf_comprun "$cmd" "${args[@]}" -q "${(Q)prefix}" < "$fifo" | $post | tr '\n' ' ') if [ -n "$matches" ]; then LBUFFER="$lbuf$matches" fi @@ -315,7 +335,7 @@ fzf-completion() { # Trigger sequence given if [ ${#tokens} -gt 1 -a "$tail" = "$trigger" ]; then - d_cmds=(${=FZF_COMPLETION_DIR_COMMANDS:-cd pushd rmdir}) + d_cmds=(${=FZF_COMPLETION_DIR_COMMANDS-cd pushd rmdir}) [ -z "$trigger" ] && prefix=${tokens[-1]} || prefix=${tokens[-1]:0:-${#trigger}} if [[ $prefix = *'$('* ]] || [[ $prefix = *'<('* ]] || [[ $prefix = *'>('* ]] || [[ $prefix = *':='* ]] || [[ $prefix = *'`'* ]]; then @@ -345,11 +365,10 @@ fzf-completion() { zle -N fzf-completion bindkey '^I' fzf-completion +fi } always { # Restore the original options. eval $__fzf_completion_options 'unset' '__fzf_completion_options' } - -fi diff --git a/shell/key-bindings.bash b/shell/key-bindings.bash index 9a3dff71..a789b19d 100644 --- a/shell/key-bindings.bash +++ b/shell/key-bindings.bash @@ -16,10 +16,19 @@ if [[ $- =~ i ]]; then # Key bindings # ------------ + +__fzf_defaults() { + # $1: Prepend to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS + # $2: Append to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS + echo "--height ${FZF_TMUX_HEIGHT:-40%} --bind=ctrl-z:ignore $1" + command cat "${FZF_DEFAULT_OPTS_FILE-}" 2> /dev/null + echo "${FZF_DEFAULT_OPTS-} $2" +} + __fzf_select__() { - local opts - opts="--height ${FZF_TMUX_HEIGHT:-40%} --bind=ctrl-z:ignore --reverse --walker=file,dir,follow,hidden --scheme=path ${FZF_DEFAULT_OPTS-} ${FZF_CTRL_T_OPTS-} -m" - FZF_DEFAULT_COMMAND=${FZF_CTRL_T_COMMAND:-} FZF_DEFAULT_OPTS="$opts" $(__fzfcmd) "$@" | + FZF_DEFAULT_COMMAND=${FZF_CTRL_T_COMMAND:-} \ + FZF_DEFAULT_OPTS=$(__fzf_defaults "--reverse --walker=file,dir,follow,hidden --scheme=path" "${FZF_CTRL_T_OPTS-} -m") \ + FZF_DEFAULT_OPTS_FILE='' $(__fzfcmd) "$@" | while read -r item; do printf '%q ' "$item" # escape special chars done @@ -37,23 +46,24 @@ fzf-file-widget() { } __fzf_cd__() { - local opts dir - opts="--height ${FZF_TMUX_HEIGHT:-40%} --bind=ctrl-z:ignore --reverse --walker=dir,follow,hidden --scheme=path ${FZF_DEFAULT_OPTS-} ${FZF_ALT_C_OPTS-} +m" + local dir dir=$( - FZF_DEFAULT_COMMAND=${FZF_ALT_C_COMMAND:-} FZF_DEFAULT_OPTS="$opts" $(__fzfcmd) + FZF_DEFAULT_COMMAND=${FZF_ALT_C_COMMAND:-} \ + FZF_DEFAULT_OPTS=$(__fzf_defaults "--reverse --walker=dir,follow,hidden --scheme=path" "${FZF_ALT_C_OPTS-} +m") \ + FZF_DEFAULT_OPTS_FILE='' $(__fzfcmd) ) && printf 'builtin cd -- %q' "$(builtin unset CDPATH && builtin cd -- "$dir" && builtin pwd)" } if command -v perl > /dev/null; then __fzf_history__() { - local output opts script - opts="--height ${FZF_TMUX_HEIGHT:-40%} --bind=ctrl-z:ignore ${FZF_DEFAULT_OPTS-} -n2..,.. --scheme=history --bind=ctrl-r:toggle-sort ${FZF_CTRL_R_OPTS-} +m --read0" + local output script script='BEGIN { getc; $/ = "\n\t"; $HISTCOUNT = $ENV{last_hist} + 1 } s/^[ *]//; print $HISTCOUNT - $. . "\t$_" if !$seen{$_}++' output=$( set +o pipefail builtin fc -lnr -2147483648 | last_hist=$(HISTTIMEFORMAT='' builtin history 1) command perl -n -l0 -e "$script" | - FZF_DEFAULT_OPTS="$opts" $(__fzfcmd) --query "$READLINE_LINE" + FZF_DEFAULT_OPTS=$(__fzf_defaults "" "-n2..,.. --scheme=history --bind=ctrl-r:toggle-sort ${FZF_CTRL_R_OPTS-} +m --read0") \ + FZF_DEFAULT_OPTS_FILE='' $(__fzfcmd) --query "$READLINE_LINE" ) || return READLINE_LINE=${output#*$'\t'} if [[ -z "$READLINE_POINT" ]]; then @@ -64,14 +74,13 @@ if command -v perl > /dev/null; then } else # awk - fallback for POSIX systems __fzf_history__() { - local output opts script n x y z d + local output script n x y z d if [[ -z $__fzf_awk ]]; then __fzf_awk=awk # choose the faster mawk if: it's installed && build date >= 20230322 && version >= 1.3.4 IFS=' .' read n x y z d <<< $(command mawk -W version 2> /dev/null) [[ $n == mawk ]] && (( d >= 20230302 && (x *1000 +y) *1000 +z >= 1003004 )) && __fzf_awk=mawk fi - opts="--height ${FZF_TMUX_HEIGHT:-40%} --bind=ctrl-z:ignore ${FZF_DEFAULT_OPTS-} -n2..,.. --scheme=history --bind=ctrl-r:toggle-sort ${FZF_CTRL_R_OPTS-} +m --read0" [[ $(HISTTIMEFORMAT='' builtin history 1) =~ [[:digit:]]+ ]] # how many history entries script='function P(b) { ++n; sub(/^[ *]/, "", b); if (!seen[b]++) { printf "%d\t%s%c", '$((BASH_REMATCH + 1))' - n, b, 0 } } NR==1 { b = substr($0, 2); next } @@ -82,7 +91,8 @@ else # awk - fallback for POSIX systems set +o pipefail builtin fc -lnr -2147483648 2> /dev/null | # ( $'\t '<lines>$'\n' )* ; <lines> ::= [^\n]* ( $'\n'<lines> )* command $__fzf_awk "$script" | # ( <counter>$'\t'<lines>$'\000' )* - FZF_DEFAULT_OPTS="$opts" $(__fzfcmd) --query "$READLINE_LINE" + FZF_DEFAULT_OPTS=$(__fzf_defaults "" "-n2..,.. --scheme=history --bind=ctrl-r:toggle-sort ${FZF_CTRL_R_OPTS-} +m --read0") \ + FZF_DEFAULT_OPTS_FILE='' $(__fzfcmd) --query "$READLINE_LINE" ) || return READLINE_LINE=${output#*$'\t'} if [[ -z "$READLINE_POINT" ]]; then diff --git a/shell/key-bindings.fish b/shell/key-bindings.fish index 95934714..4c780ce8 100644 --- a/shell/key-bindings.fish +++ b/shell/key-bindings.fish @@ -18,6 +18,15 @@ status is-interactive; or exit 0 # ------------ function fzf_key_bindings + function __fzf_defaults + # $1: Prepend to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS + # $2: Append to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS + test -n "$FZF_TMUX_HEIGHT"; or set FZF_TMUX_HEIGHT 40% + echo "--height $FZF_TMUX_HEIGHT --bind=ctrl-z:ignore" $argv[1] + command cat "$FZF_DEFAULT_OPTS_FILE" 2> /dev/null + echo $FZF_DEFAULT_OPTS $argv[2] + end + # Store current token in $dir as root for the 'find' command function fzf-file-widget -d "List files and folders" set -l commandline (__fzf_parse_commandline) @@ -27,8 +36,9 @@ function fzf_key_bindings test -n "$FZF_TMUX_HEIGHT"; or set FZF_TMUX_HEIGHT 40% begin - set -lx FZF_DEFAULT_OPTS "--height $FZF_TMUX_HEIGHT --reverse --walker=file,dir,follow,hidden --walker-root='$dir' --scheme=path --bind=ctrl-z:ignore $FZF_DEFAULT_OPTS $FZF_CTRL_T_OPTS" + set -lx FZF_DEFAULT_OPTS (__fzf_defaults "--reverse --walker=file,dir,follow,hidden --scheme=path --walker-root='$dir'" "$FZF_CTRL_T_OPTS") set -lx FZF_DEFAULT_COMMAND "$FZF_CTRL_T_COMMAND" + set -lx FZF_DEFAULT_OPTS_FILE '' eval (__fzfcmd)' -m --query "'$fzf_query'"' | while read -l r; set result $result $r; end end if [ -z "$result" ] @@ -49,7 +59,8 @@ function fzf_key_bindings function fzf-history-widget -d "Show command history" test -n "$FZF_TMUX_HEIGHT"; or set FZF_TMUX_HEIGHT 40% begin - set -lx FZF_DEFAULT_OPTS "--height $FZF_TMUX_HEIGHT $FZF_DEFAULT_OPTS --scheme=history --bind=ctrl-r:toggle-sort,ctrl-z:ignore $FZF_CTRL_R_OPTS +m" + set -lx FZF_DEFAULT_OPTS (__fzf_defaults "" "--scheme=history --bind=ctrl-r:toggle-sort $FZF_CTRL_R_OPTS +m") + set -lx FZF_DEFAULT_OPTS_FILE '' set -l FISH_MAJOR (echo $version | cut -f1 -d.) set -l FISH_MINOR (echo $version | cut -f2 -d.) @@ -76,7 +87,8 @@ function fzf_key_bindings test -n "$FZF_TMUX_HEIGHT"; or set FZF_TMUX_HEIGHT 40% begin - set -lx FZF_DEFAULT_OPTS "--height $FZF_TMUX_HEIGHT --reverse --walker=dir,follow,hidden --walker-root='$dir' --scheme=path --bind=ctrl-z:ignore $FZF_DEFAULT_OPTS $FZF_ALT_C_OPTS" + set -lx FZF_DEFAULT_OPTS (__fzf_defaults "--reverse --walker=dir,follow,hidden --scheme=path --walker-root='$dir'" "$FZF_ALT_C_OPTS") + set -lx FZF_DEFAULT_OPTS_FILE '' set -lx FZF_DEFAULT_COMMAND "$FZF_ALT_C_COMMAND" eval (__fzfcmd)' +m --query "'$fzf_query'"' | read -l result diff --git a/shell/key-bindings.zsh b/shell/key-bindings.zsh index a75f4beb..56e3ae5c 100644 --- a/shell/key-bindings.zsh +++ b/shell/key-bindings.zsh @@ -11,8 +11,6 @@ # - $FZF_ALT_C_COMMAND # - $FZF_ALT_C_OPTS -if [[ -o interactive ]]; then - # Key bindings # ------------ @@ -38,12 +36,23 @@ fi 'builtin' 'emulate' 'zsh' && 'builtin' 'setopt' 'no_aliases' { +if [[ -o interactive ]]; then + +__fzf_defaults() { + # $1: Prepend to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS + # $2: Append to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS + echo "--height ${FZF_TMUX_HEIGHT:-40%} --bind=ctrl-z:ignore $1" + command cat "${FZF_DEFAULT_OPTS_FILE-}" 2> /dev/null + echo "${FZF_DEFAULT_OPTS-} $2" +} # CTRL-T - Paste the selected file path(s) into the command line -__fsel() { +__fzf_select() { setopt localoptions pipefail no_aliases 2> /dev/null local item - FZF_DEFAULT_COMMAND=${FZF_CTRL_T_COMMAND:-} FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse --walker=file,dir,follow,hidden --scheme=path --bind=ctrl-z:ignore ${FZF_DEFAULT_OPTS-} ${FZF_CTRL_T_OPTS-}" $(__fzfcmd) -m "$@" < /dev/tty | while read item; do + FZF_DEFAULT_COMMAND=${FZF_CTRL_T_COMMAND:-} \ + FZF_DEFAULT_OPTS=$(__fzf_defaults "--reverse --walker=file,dir,follow,hidden --scheme=path" "${FZF_CTRL_T_OPTS-} -m") \ + FZF_DEFAULT_OPTS_FILE='' $(__fzfcmd) "$@" < /dev/tty | while read item; do echo -n "${(q)item} " done local ret=$? @@ -57,7 +66,7 @@ __fzfcmd() { } fzf-file-widget() { - LBUFFER="${LBUFFER}$(__fsel)" + LBUFFER="${LBUFFER}$(__fzf_select)" local ret=$? zle reset-prompt return $ret @@ -72,7 +81,10 @@ fi # ALT-C - cd into the selected directory fzf-cd-widget() { setopt localoptions pipefail no_aliases 2> /dev/null - local dir="$(FZF_DEFAULT_COMMAND=${FZF_ALT_C_COMMAND:-} FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse --walker=dir,follow,hidden --scheme=path --bind=ctrl-z:ignore ${FZF_DEFAULT_OPTS-} ${FZF_ALT_C_OPTS-}" $(__fzfcmd) +m < /dev/tty)" + local dir="$( + FZF_DEFAULT_COMMAND=${FZF_ALT_C_COMMAND:-} \ + FZF_DEFAULT_OPTS=$(__fzf_defaults "--reverse --walker=dir,follow,hidden --scheme=path" "${FZF_ALT_C_OPTS-} +m") \ + FZF_DEFAULT_OPTS_FILE='' $(__fzfcmd) < /dev/tty)" if [[ -z "$dir" ]]; then zle redisplay return 0 @@ -97,7 +109,8 @@ fzf-history-widget() { local selected num setopt localoptions noglobsubst noposixbuiltins pipefail no_aliases 2> /dev/null selected="$(fc -rl 1 | awk '{ cmd=$0; sub(/^[ \t]*[0-9]+\**[ \t]+/, "", cmd); if (!seen[cmd]++) print $0 }' | - FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} ${FZF_DEFAULT_OPTS-} -n2..,.. --scheme=history --bind=ctrl-r:toggle-sort,ctrl-z:ignore ${FZF_CTRL_R_OPTS-} --query=${(qqq)LBUFFER} +m" $(__fzfcmd))" + FZF_DEFAULT_OPTS=$(__fzf_defaults "" "-n2..,.. --scheme=history --bind=ctrl-r:toggle-sort ${FZF_CTRL_R_OPTS-} --query=${(qqq)LBUFFER} +m") \ + FZF_DEFAULT_OPTS_FILE='' $(__fzfcmd))" local ret=$? if [ -n "$selected" ]; then num=$(awk '{print $1}' <<< "$selected") @@ -114,10 +127,9 @@ zle -N fzf-history-widget bindkey -M emacs '^R' fzf-history-widget bindkey -M vicmd '^R' fzf-history-widget bindkey -M viins '^R' fzf-history-widget +fi } always { eval $__fzf_key_bindings_options 'unset' '__fzf_key_bindings_options' } - -fi |