summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Luehrs <doy@stripe.com>2017-11-09 11:55:33 -0800
committerJesse Luehrs <doy@tozt.net>2017-11-09 11:57:24 -0800
commitd4bc861bdc79ad7f07cf87109d0fd380e241d8e3 (patch)
treea80dfd2fb8ae4645843fcbeb326fcdd8b6781525
parentdb4b016d28792a1499b3e50f2b31a2f956b536fd (diff)
downloadconf-d4bc861bdc79ad7f07cf87109d0fd380e241d8e3.tar.gz
conf-d4bc861bdc79ad7f07cf87109d0fd380e241d8e3.zip
make ^R also work in command mode
this should probably be submitted as a bug report
-rw-r--r--zshcomplete2
-rw-r--r--zshinput6
-rw-r--r--zshrc4
3 files changed, 6 insertions, 6 deletions
diff --git a/zshcomplete b/zshcomplete
index 4140f58..a1ebb7a 100644
--- a/zshcomplete
+++ b/zshcomplete
@@ -17,3 +17,5 @@ compinit
autoload -Uz bashcompinit
bashcompinit
# End of lines added by compinstall
+
+source ~/.sh/fzf/shell/completion.zsh
diff --git a/zshinput b/zshinput
index 51cae68..94f5558 100644
--- a/zshinput
+++ b/zshinput
@@ -1,5 +1,7 @@
bindkey -v
+source ~/.sh/fzf/shell/key-bindings.zsh
+
autoload history-search-end
zle -N history-beginning-search-backward-end history-search-end
zle -N history-beginning-search-forward-end history-search-end
@@ -8,8 +10,8 @@ bindkey "^[[B" history-beginning-search-forward-end
bindkey "^[OA" history-beginning-search-backward-end
bindkey "^[OB" history-beginning-search-forward-end
-bindkey -M viins '^R' history-incremental-search-backward
-bindkey -M vicmd '^R' history-incremental-search-backward
+bindkey -M viins '^R' fzf-history-widget
+bindkey -M vicmd '^R' fzf-history-widget
bindkey -M vicmd '/' history-incremental-search-backward
bindkey -M vicmd '?' history-incremental-search-forward
bindkey -rM viins '^[/'
diff --git a/zshrc b/zshrc
index 1655fb0..1e9d84e 100644
--- a/zshrc
+++ b/zshrc
@@ -87,10 +87,6 @@ ZSH_HIGHLIGHT_STYLES[assign]='fg=cyan'
source ~/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh
ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=black,bold'
# }}}
-# fzf {{{
-source ~/.sh/fzf/shell/completion.zsh
-source ~/.sh/fzf/shell/key-bindings.zsh
-# }}}
# }}}
# prompt {{{
function shell_prompt_precmd () {