From bb519ae3afb871394df8724a5fa8a02a46b0ca1d Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Sat, 5 Apr 2014 23:34:21 -0700
Subject: [PATCH] Selectively enable oh-my-zsh.

---
 zshrc | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/zshrc b/zshrc
index e93b6b7..615304e 100644
--- a/zshrc
+++ b/zshrc
@@ -2,7 +2,7 @@
 HISTFILE=~/.histfile
 HISTSIZE=1000
 SAVEHIST=1000
-setopt appendhistory autocd autopushd extendedglob nomatch
+setopt appendhistory autocd autopushd extendedglob nohup nomatch
 unsetopt beep
 bindkey -e
 # End of lines configured by zsh-newuser-install
@@ -13,7 +13,6 @@ autoload -Uz compinit
 compinit
 # End of lines added by compinstall
 
-setopt nohup autopushd
 DIRSTACKSIZE=16
 case $TERM in
   xterm*)
@@ -24,6 +23,15 @@ esac
 PS1='%n@%m:%32<...<%~%<<%# '
 
 . ~/.profile
+# Deduplicate the path
 typeset -U path
 
 alias ls='ls --color'
+
+# Load oh-my-zsh
+if [ -d $HOME/.oh-my-zsh ] ; then
+  ZSH=$HOME/.oh-my-zsh
+  ZSH_THEME="matir"
+  plugins=(git)
+  source $ZSH/oh-my-zsh.sh
+fi