From cd16afbc9bfd2da7bd29cc1ad4fc83283494a044 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Wed, 8 Nov 2017 10:31:21 -0800 Subject: replace anyframe with the fzf history search plugin it works with zsh and bash --- .gitmodules | 6 +++--- bashrc | 2 ++ sh/fzf | 1 + zsh/anyframe | 1 - zshrc | 10 +++------- 5 files changed, 9 insertions(+), 11 deletions(-) create mode 160000 sh/fzf delete mode 160000 zsh/anyframe diff --git a/.gitmodules b/.gitmodules index d29c40d..144a519 100644 --- a/.gitmodules +++ b/.gitmodules @@ -64,9 +64,6 @@ [submodule "zsh/zsh-completions"] path = zsh/zsh-completions url = git://github.com/zsh-users/zsh-completions -[submodule "zsh/anyframe"] - path = zsh/anyframe - url = git://github.com/mollifier/anyframe [submodule "vim/bundle/ledger"] path = vim/pack/filetype/start/ledger url = git://github.com/ledger/vim-ledger @@ -91,3 +88,6 @@ [submodule "vim/pack/plugins/start/vader"] path = vim/pack/plugins/start/vader url = git://github.com/junegunn/vader.vim +[submodule "zsh/fzf"] + path = sh/fzf + url = git://github.com/junegunn/fzf diff --git a/bashrc b/bashrc index a02ab57..afc77ba 100644 --- a/bashrc +++ b/bashrc @@ -50,6 +50,8 @@ else fi # plugins {{{ source ~/.sh/cdhist.sh +source ~/.sh/fzf/shell/completion.bash +source ~/.sh/fzf/shell/key-bindings.bash # }}} # prompt {{{ export PROMPT_COMMAND="__err=\$?;$PROMPT_COMMAND;PS1=\"\$(fancy-prompt --prompt-escape bash "\$__err")\"" diff --git a/sh/fzf b/sh/fzf new file mode 160000 index 0000000..8068c97 --- /dev/null +++ b/sh/fzf @@ -0,0 +1 @@ +Subproject commit 8068c975c2ee812ef1762bf2c21b948f03da210d diff --git a/zsh/anyframe b/zsh/anyframe deleted file mode 160000 index 5986753..0000000 --- a/zsh/anyframe +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 598675303044df8e9d04722f3adff4f63a238922 diff --git a/zshrc b/zshrc index 25bc92e..1655fb0 100644 --- a/zshrc +++ b/zshrc @@ -87,13 +87,9 @@ ZSH_HIGHLIGHT_STYLES[assign]='fg=cyan' source ~/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=black,bold' # }}} -# anyframe {{{ -fpath=(~/.zsh/anyframe $fpath) -autoload -Uz anyframe-init -anyframe-init -bindkey '^R' anyframe-widget-put-history -zstyle ":anyframe:selector:" use fzf -zstyle ":anyframe:selector:fzf:" command 'fzf --no-sort --exact' +# fzf {{{ +source ~/.sh/fzf/shell/completion.zsh +source ~/.sh/fzf/shell/key-bindings.zsh # }}} # }}} # prompt {{{ -- cgit v1.2.3-54-g00ecf