[add] Various config changes

.gitignore

@@ -3,3 +3,5 @@ emacs.d/auto-save-list/
 emacs.d/backups/
 emacs.d/elpa/
 emacs.d/places
+emacs.d/abbrev_defs
+emacs.d/eshell

_gitconfig

@@ -1,6 +1,6 @@
 [user]
 	name = Filipe A Moreira
-        email = famoreira@gmail.com
+	email = famoreira@gmail.com
 
 [color]
         diff = auto
@@ -32,6 +32,7 @@
 	quotepath = false
 	filemode = false
         editor =  /Applications/Emacs.app/Contents/MacOS/bin/emacsclient -nw
+	excludesfile = /Users/guto/.gitignore_global
 [alias]
        # I like using the interactive mode to make complex commits
        ai = add --interactive
@@ -67,6 +68,12 @@
        r = reset
        p = push
 [push]
-	default = tracking
+	default = upstream
 [merge]
 	stat = true
+[difftool "sourcetree"]
+	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
+	path = 
+[mergetool "sourcetree"]
+	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
+	trustExitCode = true

_tmux.conf

@@ -27,3 +27,19 @@ bind-key -n F6 detach
 
 set -g default-terminal "screen-256color"
 # set-option -g default-terminal "screen-256color"
+
+set -s escape-time 0
+
+setw -g aggressive-resize on
+
+set -g base-index 1
+
+bind-key l send-prefix
+
+set-option -g status-keys emacs
+set-option -gw mode-keys emacs
+
+bind-key -t emacs-copy C-v page-down
+bind-key -t emacs-copy M-v page-up
+
+new-session

_zshrc

@@ -25,10 +25,13 @@ then
 fi
 
 [[ $TERM == eterm-color ]] && export TERM=xterm
+[[ $EMACS = t ]] && unsetopt zle 
 
-export NODE_PATH=/usr/local/lib/node_modules
-export PATH=$HOME/.rbenv/bin:$HOME/.rbenv/shims:$HOME/bin:/usr/local/bin:/usr/local/sbin:$HOME/scm/svn/depot_tools/:/usr/local/n/current/bin:$PATH
-eval "$(rbenv init -)"
+export PATH=$HOME/.rbenv/bin:$HOME/.rbenv/shims:$HOME/bin:$PATH
 
 bindkey "^R" history-incremental-pattern-search-backward
 bindkey "^S" history-incremental-pattern-search-forward
+
+source /usr/local/Cellar/funcoeszz/10.12/funcoeszz-10.12.sh
+
+. ~/.nvm/nvm.sh