summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules6
-rw-r--r--bashrc2
m---------sh/fzf0
m---------zsh/anyframe0
-rw-r--r--zshrc10
5 files changed, 8 insertions, 10 deletions
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
+Subproject 8068c975c2ee812ef1762bf2c21b948f03da210
diff --git a/zsh/anyframe b/zsh/anyframe
deleted file mode 160000
-Subproject 598675303044df8e9d04722f3adff4f63a23892
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 {{{