From 10e4fad35d2eb6d037ccb4cacb8a0675f33eb6fa Mon Sep 17 00:00:00 2001
From: Dan Buch <daniel.buch@gmail.com>
Date: Wed, 12 Nov 2014 11:00:11 -0500
Subject: [PATCH] Yet more changes changes changes wat

---
 gemrc       | 2 +-
 gitconfig   | 2 ++
 gittemplate | 9 +++++++++
 vimrc       | 4 ++++
 zshrc       | 9 +++++++++
 5 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 gittemplate

diff --git a/gemrc b/gemrc
index 4635fc5..882316e 100644
--- a/gemrc
+++ b/gemrc
@@ -1 +1 @@
-gem: --no-rdoc --ri
+gem: --no-rdoc --no-ri
diff --git a/gitconfig b/gitconfig
index b7f6857..d4ab999 100644
--- a/gitconfig
+++ b/gitconfig
@@ -90,3 +90,5 @@
 	logv = log --name-status
 
 # vim: set filetype=cfg noexpandtab:
+[commit]
+	template = /Users/me/.gittemplate
diff --git a/gittemplate b/gittemplate
new file mode 100644
index 0000000..da61024
--- /dev/null
+++ b/gittemplate
@@ -0,0 +1,9 @@
+# 50-character subject line
+#
+# 72-character wrapped longer description. This should answer:
+#
+# - Why was this change necessary?
+# - How does it address the problem?
+# - Are there any side effects?
+#
+# Include a link to the ticket, if any.
diff --git a/vimrc b/vimrc
index 87e4709..5bdda52 100644
--- a/vimrc
+++ b/vimrc
@@ -19,4 +19,8 @@ set textwidth=67
 map ,t :w<CR>
 map ,- :nohl<CR>
 
+let g:go_fmt_command = "goimports"
+
 call pathogen#infect()
+
+colo summerfruit256
diff --git a/zshrc b/zshrc
index f9fc88c..834a65f 100644
--- a/zshrc
+++ b/zshrc
@@ -37,8 +37,15 @@ plugins=(
     rbenv
 )
 
+fpath=(/usr/local/share/zsh/site-functions $fpath)
+
 source $ZSH/oh-my-zsh.sh
 
+# The completion for aws is not compatible with $fpath :scream_cat:
+if [[ -f /usr/local/share/zsh/site-functions/_aws ]] ; then
+  source /usr/local/share/zsh/site-functions/_aws
+fi
+
 unsetopt correct_all
 bindkey '^R' history-incremental-search-backward
 
@@ -66,6 +73,8 @@ for prefix in github.com code.google.com/p ; do
   CDPATH="$HOME/gopath/src/$prefix:$CDPATH"
 done
 
+export GPG_TTY=$(tty)
+
 source ~/.bash_aliases
 
 function dump-ssh-agent() {