Merge

davidjb · May 6, 2019 · fc33b22 · fc33b22
1 parent bbc73c9
commit fc33b22
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/bashrc b/bashrc
@@ -107,3 +107,5 @@ export POWERLINE_BASH_SELECT=1
 
 # Enable autoenv on `cd`
 . ~/.autoenv/activate.sh
+
+[ -f ~/.fzf.bash ] && source ~/.fzf.bash
diff --git a/environment b/environment
@@ -12,9 +12,13 @@ export GIT_AUTHOR_EMAIL="d""a""v""i""d""@""d""a""v""i""d""j""b"".""c""o""m"
 export PIP_DOWNLOAD_CACHE="$HOME/.pip/download-cache"
 export PATH="/usr/local/bin:/usr/local/sbin:$HOME/dotfiles/tools/python/bin:$HOME/dotfiles/tools/nodejs/bin:$HOME/dotfiles/tools/nodejs/node_modules/.bin:$HOME/dotfiles/tools/ruby/bin:$PATH"
 export PYTHONSTARTUP="$HOME/.pythonstartup"
+
 # Node.js - disable update-notifier system-wide
 export NO_UPDATE_NOTIFIER=1
 
+# fzf
+export FZF_DEFAULT_COMMAND='fd --type f --hidden --exclude .git --exclude .wine --exclude node_modules'
+
 # Mac specific
 export CLICOLOR=1
 export HOMEBREW_NO_ANALYTICS=1