From c32b9ef765c029358c160cf0e9d695a5dd7eeb30 Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Thu, 16 Oct 2014 13:19:04 -0700
Subject: [PATCH] Make the prompt look nicer in my theme.

---
 zsh_custom/themes/matir.zsh-theme | 4 +++-
 zshrc                             | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/zsh_custom/themes/matir.zsh-theme b/zsh_custom/themes/matir.zsh-theme
index af564f4..1b7e6da 100644
--- a/zsh_custom/themes/matir.zsh-theme
+++ b/zsh_custom/themes/matir.zsh-theme
@@ -1 +1,3 @@
-PROMPT="%{%(!.$fg[red].$fg[green])%}%n%{$fg[white]%}@%{$fg[cyan]%}%m%{$fg[white]%}:%{$fg[green]%}%32<...<%~%<<%{$fg[white]%}%#%{$reset_color%} "
+PROMPT='%{%(!.$fg[red].$fg[green])%}%8>..>%n%>>%{$fg[white]%}@%{$fg[blue]%}%12>..>%m%>>%{$fg[white]%}:%{$fg[green]%}%32<...<%~%<<%{$fg[blue]%}$(git_prompt_info)%{$fg[white]%}%#%{$reset_color%} '
+ZSH_THEME_GIT_PROMPT_PREFIX=" ("
+ZSH_THEME_GIT_PROMPT_SUFFIX=")"
diff --git a/zshrc b/zshrc
index a5f370c..174ab21 100644
--- a/zshrc
+++ b/zshrc
@@ -32,7 +32,7 @@ alias ls='ls --color'
 if [ -d $HOME/.oh-my-zsh ] ; then
   ZSH=$HOME/.oh-my-zsh
   ZSH_THEME="matir"
-  ZSH_CUSTOM="$HOME/.dotfiles/zsh_custom"
+  ZSH_CUSTOM="$HOME/.zsh_custom"
   plugins=(git encode64 gpg-agent pep8 pip python tmux urltools extract sudo)
   source $ZSH/oh-my-zsh.sh
   unset ZSH_THEME
@@ -43,3 +43,6 @@ bindkey '^[[A' history-search-backward
 bindkey '^[[B' history-search-forward
 bindkey '^[[1;5C' forward-word
 bindkey '^[[1;5D' backward-word
+
+# Load any local settings
+if [ -e $HOME/.zsh_local ] ; then source $HOME/.zsh_local ; fi