dotfiles

commit 96817b658ad9b1229486da063a48d42b7f7eb475
parent 3fa6b87d1dd8ac0a864008cbb3b643143e19e524
Author: Anders Damsgaard <andersd@riseup.net>
Date:   Mon, 26 Mar 2018 10:28:27 -0400

Load fzf in bashrc or zshrc

Diffstat:
M
links/.bash_profile
 | 
4
----
M
links/.bashrc
 | 
2
++
M
links/.zshrc
 | 
2
++

3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/links/.bash_profile b/links/.bash_profile
@@ -46,10 +46,6 @@ export GPG_TTY=`tty`
 
 if _has fzf; then
 
-    # trigger fzf completion by entering **<TAB> or <Pattern>**<TAB>
-    [ $(echo $SHELL | grep zsh) ] && [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
-    [ $(echo $SHELL | grep bash) ] && [ -f ~/.fzf.bash ] && source ~/.fzf.bash
-
     export FZF_DEFAULT_OPTS="
     --preview '(highlight -O ansi -l {} || coderay {} || rougify {} || cat {}) 2> /dev/null | head -100'
     "
diff --git a/links/.bashrc b/links/.bashrc
@@ -69,6 +69,8 @@ if [[ "$ARCH" != 'Darwin' ]]; then
     function say() { echo "$@" | festival --tts; }
 fi
 
+[ -f ~/.fzf.bash ] && source ~/.fzf.bash
+
 # Dircolors
 export CLICOLOR=1
 
diff --git a/links/.zshrc b/links/.zshrc
@@ -291,6 +291,8 @@ fi
 
 [ -f ~/code/fzf-mpd/fzf-mpd.zsh ] && source ~/code/fzf-mpd/fzf-mpd.zsh
 
+[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
+
 if _has cabal && _has stack; then
     GIT_PROMPT_EXECUTABLE='haskell'
 fi