From 44d3d31ffe4a0bc692224ebaeb3f489328a4258d Mon Sep 17 00:00:00 2001
From: Dan Buch <daniel.buch@gmail.com>
Date: Tue, 18 Aug 2015 20:14:39 -0400
Subject: [PATCH] What even is a commit message

---
 git-global-ignores    |  1 +
 gitconfig             |  3 ++-
 meatballhat.zsh-theme |  7 +++++++
 vimrc                 |  1 +
 zshrc                 | 24 +++++++++++++++++-------
 5 files changed, 28 insertions(+), 8 deletions(-)
 create mode 100644 meatballhat.zsh-theme

diff --git a/git-global-ignores b/git-global-ignores
index a3e3f8c..1905e5c 100644
--- a/git-global-ignores
+++ b/git-global-ignores
@@ -8,3 +8,4 @@ TAGS
 .vagrant
 *.swp
 .DS_Store
+.~lock*
diff --git a/gitconfig b/gitconfig
index 8184b63..6de28c9 100644
--- a/gitconfig
+++ b/gitconfig
@@ -10,7 +10,7 @@
 	editor = vim
 	filemode = true
 	autocrlf = false
-	pager = less -FRX
+	pager = less -FRXx2
 
 [clean]
 	requireForce = false
@@ -89,6 +89,7 @@
 
 	logv = log --name-status
 	hug = blame
+	lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
 
 # vim: set filetype=cfg noexpandtab:
 [commit]
diff --git a/meatballhat.zsh-theme b/meatballhat.zsh-theme
new file mode 100644
index 0000000..283563e
--- /dev/null
+++ b/meatballhat.zsh-theme
@@ -0,0 +1,7 @@
+local ret_status="%(?:%{$fg_bold[green]%}➜ :%{$fg_bold[red]%}➜ %s)"
+PROMPT='$(date -u +%Y-%m-%dT%H:%M:%S) ${ret_status}%{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
+
+ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}🙀 %{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})"
diff --git a/vimrc b/vimrc
index 5bdda52..2f9d28c 100644
--- a/vimrc
+++ b/vimrc
@@ -18,6 +18,7 @@ set textwidth=67
 
 map ,t :w<CR>
 map ,- :nohl<CR>
+map ,w :%s/  *$//<CR>
 
 let g:go_fmt_command = "goimports"
 
diff --git a/zshrc b/zshrc
index 77bc328..aecce74 100644
--- a/zshrc
+++ b/zshrc
@@ -1,5 +1,5 @@
 ZSH=$HOME/.oh-my-zsh
-ZSH_THEME=robbyrussell
+ZSH_THEME=meatballhat
 
 CASE_SENSITIVE="true"
 
@@ -40,6 +40,8 @@ plugins=(
     git-hubflow
     golang
     heroku
+    hk
+    knife
     osx
     pip
     postgres
@@ -59,6 +61,8 @@ fpath=(/usr/local/share/zsh/site-functions $fpath)
 
 source $ZSH/oh-my-zsh.sh
 
+unalias gb
+
 # 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
@@ -72,6 +76,7 @@ path=(
     $HOME/gopath/bin
     $HOME/.rbenv/bin
     $HOME/.rbenv/shims
+    $HOME/.phpenv/bin
     /usr/local/sbin
     /usr/local/bin
     /usr/sbin
@@ -82,7 +87,14 @@ path=(
     /usr/local/games
 )
 
-eval "$(gimme 1.4.1)" 2>/dev/null
+if which pyenv > /dev/null ; then
+  eval "$(pyenv init -)"
+fi
+export PYENV_ROOT='/usr/local/var/pyenv'
+
+eval "$(phpenv init -)"
+
+eval "$(gimme 1.4.2)" 2>/dev/null
 export GOPATH="$HOME/gopath"
 
 CDPATH="$HOME/workspace:$HOME/src:$HOME/Development/src:$HOME/repos"
@@ -108,8 +120,6 @@ function load-ssh-agent() {
 
 [[ -e ~/.zshenv ]] && source ~/.zshenv
 
-# added by travis gem
-[[ -f ~/.travis/travis.sh ]] && source ~/.travis/travis.sh
-
-# added by travis gem
-[ -f /Users/me/.travis/travis.sh ] && source /Users/me/.travis/travis.sh
+[ -f ~/.travis/travis.sh ] && source ~/.travis/travis.sh
+[ -f ~/google-cloud-sdk/path.zsh.inc ] && source ~/google-cloud-sdk/path.zsh.inc
+[ -f ~/google-cloud-sdk/completion.zsh.inc ] && source ~/google-cloud-sdk/completion.zsh.inc