diff --git a/install.sh b/install.sh index 061adfa0..8656698b 100755 --- a/install.sh +++ b/install.sh @@ -15,15 +15,3 @@ do [ "$1" == "--force" ] && rm -f "$filep" [ -e "$filep" ] || ln -vs "$rcfile" "$filep" done - -# Install fzf and fasd -case $OSTYPE in - darwin*) - brew install fzf fasd - ;; - linux*) - _clone https://github.com/junegunn/fzf ~/.fzf - _clone https://github.com/clvv/fasd ~/fasd && \ - cd ~/fasd && make install && rm -rf ~/fasd - ;; -esac diff --git a/zsh/fzf b/zsh/fzf deleted file mode 100644 index a77d666c..00000000 --- a/zsh/fzf +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env zsh - -local fzf_path="/usr/local/opt/fzf" -if [[ ! -d "$fzf_path" && -d "$HOME/.fzf" ]]; then - fzf_path="$HOME/.fzf" -else - return -fi - -export FZF_DEFAULT_COMMAND='ag -g ""' -export FZF_DEFAULT_OPTS='--reverse --inline-info' - -if [[ ! "$PATH" == *$fzf_path/bin* ]]; then - export PATH="$PATH:$fzf_path/bin" -fi - -if [[ ! "$MANPATH" == *$fzf_path/man* && -d "$fzf_path/man" ]]; then - export MANPATH="$MANPATH:$fzf_path/man" -fi - -is-interactive && source "$fzf_path/shell/completion.zsh" 2> /dev/null - -source "$fzf_path/shell/key-bindings.zsh" diff --git a/zshrc b/zshrc index 58c5e814..e74125f9 100644 --- a/zshrc +++ b/zshrc @@ -29,10 +29,11 @@ fi cache rbenv init - --no-rehash cache pyenv init - --no-rehash -is-interactive && cache fasd --init posix-alias zsh-hook zsh-ccomp zsh-ccomp-install zsh-wcomp zsh-wcomp-install -is-callable tmuxifier && is-interactive && cache tmuxifier init - +if is-interative; then + is-callable fasd && cache fasd --init posix-alias zsh-hook zsh-ccomp zsh-ccomp-install zsh-wcomp zsh-wcomp-install + is-callable tmuxifier && cache tmuxifier init - +fi -iload zsh/fzf load zsh/config iload zsh/keybinds iload zsh/prompt