Recent tweaks.

Author: rossmcf

git/gitconfig.symlink

@@ -14,6 +14,7 @@
         wtf     = !$ZSH/bin/git-wtf
         rank-contributors = !$ZSH/bin/git-rank-contributors
         count   = !git shortlog -sn
+	d = difftool
 [color]
         diff = auto
         status = auto
@@ -38,9 +39,14 @@
         default = simple
 [init]
 	templatedir = ~/.git-templates
+[difftool "neovim"]
+	cmd = nvim -d \"$LOCAL\" \"$REMOTE\"
+	path = 
 [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
+[diff]
+	tool = neovim

nvim/config.symlink/nvim/init.vim

@@ -213,6 +213,7 @@ imap <C-b> <esc>:CtrlPCurWD<cr>
 " Fat-fingered commands
 " Courtesy of github.com/captainsafia
 cnoreabbrev W! w!
+cnoreabbrev E! e!
 cnoreabbrev Q! q!
 cnoreabbrev Qall! qall!
 cnoreabbrev Wq wq

zsh/senseye-aliases.zsh

@@ -1,14 +1,17 @@
 # Jump to backend directory
 alias cdbe="cd ~/src/bitbucket.org/senseye/backend"
 
+# Jump to senseye dir.
+alias cds="cd ~/src/bitbucket.org/senseye"
+
 # sets GOPATH to the current work directory
 alias gohere="export GOPATH=\`pwd\`; echo \"GOPATH := '\$GOPATH'\"; PATH=\"$PATH:\$GOPATH/bin\"; echo \"PATH = \$PATH\""
 
 # runs go test and shows code coverage when complete
 alias gocover="go test -coverprofile=coverage.out && go tool cover -html=coverage.out"
 
-# build and run docker-compose
-alias figit="docker-compose build && docker-compose up"
+# run make test three times and tell me when it's done
+alias mt3="make test && make test && make test; tada"
 
 # prints out the greatest port number exposed in a docker-compose.yml across all services.
 alias last_port="find ${SENSEYE_BACKEND} -name 'fig.yml' -o -name 'docker-compose.yml' -exec cat {} \; | grep -E '\b5[0-9]+:[0-9]+' | sed -E 's/[^0-9]*([0-9]+):([0-9]+)[^0-9]*/\1/g' | sort -n | tail -1"

zsh/zshrc.symlink

@@ -46,3 +46,6 @@ DEFAULT_USER="rossmcf"
 plugins=(git osx golang z colorize docker)
 
 source $ZSH/oh-my-zsh.sh
+
+autoload -U +X bashcompinit && bashcompinit
+complete -o nospace -C /usr/local/bin/terraform terraform