From a36582e9e4d8f16a30a0f5310b1503f9ba98ab34 Mon Sep 17 00:00:00 2001 From: Ein Verne Date: Wed, 29 Jul 2020 19:50:59 +0800 Subject: [PATCH] Update fzf zshrc --- .zshrc | 3 ++- Brewfile | 3 +++ zsh/env.zsh | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.zshrc b/.zshrc index a9647f6..db97280 100644 --- a/.zshrc +++ b/.zshrc @@ -154,7 +154,8 @@ alias adbcap="adb shell screencap -p" # fzf config [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh -export FZF_DEFAULT_COMMAND='ag --hidden --ignore .git --ignore .idea -l -g ""' +# export FZF_DEFAULT_COMMAND='ag --hidden --ignore .git --ignore .idea -l -g ""' +export FZF_DEFAULT_COMMAND='fd --type f --hidden --exclude .git --exclude .idea ""' #export FZF_DEFAULT_OPTS="--reverse --inline-info" export FZF_DEFAULT_OPTS="--height 40% --layout=reverse --preview '(highlight -O ansi {} || cat {}) 2> /dev/null | head -500'" diff --git a/Brewfile b/Brewfile index e52a4b3..a75206f 100644 --- a/Brewfile +++ b/Brewfile @@ -17,7 +17,10 @@ brew "zsh-completions" brew "tmux" brew "gnupg" brew "gnupg2" +# https://github.com/junegunn/fzf brew "fzf" +# https://github.com/ggreer/the_silver_searcher +brew "the_silver_searcher" brew "hub" brew "tmux" brew "tree" diff --git a/zsh/env.zsh b/zsh/env.zsh index bd1194a..36f6afa 100644 --- a/zsh/env.zsh +++ b/zsh/env.zsh @@ -33,6 +33,10 @@ if [[ -d "/usr/local/jdk1.8.0_131" ]]; then fi # export JAVA_HOME="$HOME/.jenv/versions/`jenv version-name`" +if [[ -d "~/.asdf/plugins/java/" ]]; then + . ~/.asdf/plugins/java/set-java-home.zsh +fi + # Maven if [[ -d "/opt/maven" ]]; then export M2_HOME=/opt/maven