From f5259b5505a12466672fe4f8d94eebf8946ce92b Mon Sep 17 00:00:00 2001 From: druckdev <63563978+druckdev@users.noreply.github.com> Date: Tue, 4 Aug 2020 02:54:05 +0200 Subject: [PATCH] Add fuzzy finder Add fzf as submodule. Source it keybindings and completion files. Adjust dotbot install config to pull fzf binary. Add symlink to its binary. --- .config/zsh/.zshrc | 1 + .config/zsh/plugins/fzf | 1 + .config/zsh/plugins/keys.zsh | 5 +++++ .gitmodules | 3 +++ .local/bin/fzf | 1 + install.conf.yaml | 1 + 6 files changed, 12 insertions(+) create mode 160000 .config/zsh/plugins/fzf create mode 120000 .local/bin/fzf diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 30174b0..83de47c 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -131,6 +131,7 @@ comp-source "$ZSH_CONF/transfer.zsh" comp-source "$ZSH_CONF/zsh-autosuggestions/zsh-autosuggestions.zsh" comp-source "$ZSH_CONF/completion.zsh" # comp-source "$ZSH_CONF/zsh-async/async.zsh" +comp-source "$ZSH_CONF/fzf/shell/completion.zsh" # async_init ### syntax-highlight > history-substring > keys # syntax highlighting diff --git a/.config/zsh/plugins/fzf b/.config/zsh/plugins/fzf new file mode 160000 index 0000000..e2ae1b2 --- /dev/null +++ b/.config/zsh/plugins/fzf @@ -0,0 +1 @@ +Subproject commit e2ae1b249cf2d5258b552cfd682c7c0911981e9b diff --git a/.config/zsh/plugins/keys.zsh b/.config/zsh/plugins/keys.zsh index 737a9f0..c0512bb 100644 --- a/.config/zsh/plugins/keys.zsh +++ b/.config/zsh/plugins/keys.zsh @@ -88,3 +88,8 @@ zle -N ls-on-enter bindkey "^M" ls-on-enter ZSH_AUTOSUGGEST_CLEAR_WIDGETS+=(ls-on-enter) +# Fuzzy finder bindings: +# ^T fzf-file-widget +# \ec (Alt-C) fzf-cd-widget +# ^R fzf-history-widget +comp-source "$ZSH_CONF/fzf/shell/key-bindings.zsh" diff --git a/.gitmodules b/.gitmodules index ed13e25..4f3a8c5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -40,3 +40,6 @@ [submodule ".config/tmux/plugins/tmux-sensible"] path = .config/tmux/plugins/tmux-sensible url = https://github.com/tmux-plugins/tmux-sensible +[submodule ".config/zsh/plugins/fzf"] + path = .config/zsh/plugins/fzf + url = git@github.com:junegunn/fzf diff --git a/.local/bin/fzf b/.local/bin/fzf new file mode 120000 index 0000000..802d228 --- /dev/null +++ b/.local/bin/fzf @@ -0,0 +1 @@ +../../.config/zsh/plugins/fzf/bin/fzf \ No newline at end of file diff --git a/install.conf.yaml b/install.conf.yaml index 1e7960e..5aa4be6 100644 --- a/install.conf.yaml +++ b/install.conf.yaml @@ -1,6 +1,7 @@ - shell: - git submodule update --init --recursive --jobs 8 - /bin/sh -c 'tmpd="$(mktemp -d)"; for file in .config/*; do [ ! -e "$HOME/$file" ] || mv "$HOME/$file" "$tmpd"; done; rmdir "$tmpd" 2>/dev/null || { tar czvf "existing-$(date +"%s").tar.gz" "$tmpd" && rm -rf "$tmpd"; }' + - .config/zsh/plugins/fzf/install --bin - link: ~/.Xresources: .Xresources