diff options
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | shell/key-bindings.bash | 94 |
2 files changed, 46 insertions, 52 deletions
@@ -340,10 +340,6 @@ If you're on a tmux session, you can start fzf in a split pane by setting `FZF_TMUX` to 1, and change the height of the pane with `FZF_TMUX_HEIGHT` (e.g. `20`, `50%`). -If you use vi mode on bash, you need to add `set -o vi` *before* `source -~/.fzf.bash` in your .bashrc, so that it correctly sets up key bindings for vi -mode. - More tips can be found on [the wiki page](https://github.com/junegunn/fzf/wiki/Configuring-shell-key-bindings). Fuzzy completion for bash and zsh diff --git a/shell/key-bindings.bash b/shell/key-bindings.bash index 2ecf685f..d411992d 100644 --- a/shell/key-bindings.bash +++ b/shell/key-bindings.bash @@ -65,57 +65,55 @@ __fzf_history__() ( fi ) -if [[ ! -o vi ]]; then - # Required to refresh the prompt after fzf - bind '"\er": redraw-current-line' - bind '"\e^": history-expand-line' - - # CTRL-T - Paste the selected file path into the command line - if [ $BASH_VERSINFO -gt 3 ]; then - bind -x '"\C-t": "fzf-file-widget"' - elif __fzf_use_tmux__; then - bind '"\C-t": " \C-u \C-a\C-k`__fzf_select_tmux__`\e\C-e\C-y\C-a\C-d\C-y\ey\C-h"' - else - bind '"\C-t": " \C-u \C-a\C-k`__fzf_select__`\e\C-e\C-y\C-a\C-y\ey\C-h\C-e\er \C-h"' - fi - - # CTRL-R - Paste the selected command from history into the command line - bind '"\C-r": " \C-e\C-u\C-y\ey\C-u`__fzf_history__`\e\C-e\er\e^"' +# Required to refresh the prompt after fzf +bind -m emacs-standard '"\er": redraw-current-line' +bind -m emacs-standard '"\e^": history-expand-line' + +# CTRL-T - Paste the selected file path into the command line +if [ $BASH_VERSINFO -gt 3 ]; then + bind -m emacs-standard -x '"\C-t": "fzf-file-widget"' +elif __fzf_use_tmux__; then + bind -m emacs-standard '"\C-t": " \C-u \C-a\C-k`__fzf_select_tmux__`\e\C-e\C-y\C-a\C-d\C-y\ey\C-h"' +else + bind -m emacs-standard '"\C-t": " \C-u \C-a\C-k`__fzf_select__`\e\C-e\C-y\C-a\C-y\ey\C-h\C-e\er \C-h"' +fi - # ALT-C - cd into the selected directory - bind '"\ec": " \C-e\C-u`__fzf_cd__`\e\C-e\er\C-m"' +# CTRL-R - Paste the selected command from history into the command line +bind -m emacs-standard '"\C-r": " \C-e\C-u\C-y\ey\C-u`__fzf_history__`\e\C-e\er\e^"' + +# ALT-C - cd into the selected directory +bind -m emacs-standard '"\ec": " \C-e\C-u`__fzf_cd__`\e\C-e\er\C-m"' + +# We'd usually use "\e" to enter vi-movement-mode so we can do our magic, +# but this incurs a very noticeable delay of a half second or so, +# because many other commands start with "\e". +# Instead, we bind an unused key, "\C-x\C-a", +# to also enter vi-movement-mode, +# and then use that thereafter. +# (We imagine that "\C-x\C-a" is relatively unlikely to be in use.) +bind -m vi-insert '"\C-x\C-a": vi-movement-mode' + +bind -m vi-insert '"\C-x\C-e": shell-expand-line' +bind -m vi-insert '"\C-x\C-r": redraw-current-line' +bind -m vi-insert '"\C-x^": history-expand-line' + +# CTRL-T - Paste the selected file path into the command line +# - FIXME: Selected items are attached to the end regardless of cursor position +if [ $BASH_VERSINFO -gt 3 ]; then + bind -m vi-insert -x '"\C-t": "fzf-file-widget"' +elif __fzf_use_tmux__; then + bind -m vi-insert '"\C-t": "\C-x\C-a$a \C-x\C-addi`__fzf_select_tmux__`\C-x\C-e\C-x\C-a0P$xa"' else - # We'd usually use "\e" to enter vi-movement-mode so we can do our magic, - # but this incurs a very noticeable delay of a half second or so, - # because many other commands start with "\e". - # Instead, we bind an unused key, "\C-x\C-a", - # to also enter vi-movement-mode, - # and then use that thereafter. - # (We imagine that "\C-x\C-a" is relatively unlikely to be in use.) - bind '"\C-x\C-a": vi-movement-mode' - - bind '"\C-x\C-e": shell-expand-line' - bind '"\C-x\C-r": redraw-current-line' - bind '"\C-x^": history-expand-line' - - # CTRL-T - Paste the selected file path into the command line - # - FIXME: Selected items are attached to the end regardless of cursor position - if [ $BASH_VERSINFO -gt 3 ]; then - bind -x '"\C-t": "fzf-file-widget"' - elif __fzf_use_tmux__; then - bind '"\C-t": "\C-x\C-a$a \C-x\C-addi`__fzf_select_tmux__`\C-x\C-e\C-x\C-a0P$xa"' - else - bind '"\C-t": "\C-x\C-a$a \C-x\C-addi`__fzf_select__`\C-x\C-e\C-x\C-a0Px$a \C-x\C-r\C-x\C-axa "' - fi - bind -m vi-command '"\C-t": "i\C-t"' + bind -m vi-insert '"\C-t": "\C-x\C-a$a \C-x\C-addi`__fzf_select__`\C-x\C-e\C-x\C-a0Px$a \C-x\C-r\C-x\C-axa "' +fi +bind -m vi-command '"\C-t": "i\C-t"' - # CTRL-R - Paste the selected command from history into the command line - bind '"\C-r": "\C-x\C-addi`__fzf_history__`\C-x\C-e\C-x\C-r\C-x^\C-x\C-a$a"' - bind -m vi-command '"\C-r": "i\C-r"' +# CTRL-R - Paste the selected command from history into the command line +bind -m vi-insert '"\C-r": "\C-x\C-addi`__fzf_history__`\C-x\C-e\C-x\C-r\C-x^\C-x\C-a$a"' +bind -m vi-command '"\C-r": "i\C-r"' - # ALT-C - cd into the selected directory - bind '"\ec": "\C-x\C-addi`__fzf_cd__`\C-x\C-e\C-x\C-r\C-m"' - bind -m vi-command '"\ec": "ddi`__fzf_cd__`\C-x\C-e\C-x\C-r\C-m"' -fi +# ALT-C - cd into the selected directory +bind -m vi-insert '"\ec": "\C-x\C-addi`__fzf_cd__`\C-x\C-e\C-x\C-r\C-m"' +bind -m vi-command '"\ec": "ddi`__fzf_cd__`\C-x\C-e\C-x\C-r\C-m"' fi |