From bd78c3b2bfadc3e713a7952e3c0d525bb242705a Mon Sep 17 00:00:00 2001
From: Carlos Cardoso <cadusk@yahoo.com.br>
Date: Sun, 10 Mar 2013 22:31:49 -0300
Subject: [PATCH 1/4] Disable VENV on change directory.

---
 templates/zshrc-linux.zsh | 4 ++--
 templates/zshrc-mac.zsh   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/zshrc-linux.zsh b/templates/zshrc-linux.zsh
index 8a4339709..90b081064 100644
--- a/templates/zshrc-linux.zsh
+++ b/templates/zshrc-linux.zsh
@@ -5,7 +5,7 @@ ZSH=$HOME/.oh-my-zsh
 # Look in ~/.oh-my-zsh/themes/
 # Optionally, if you set this to "random", it'll load a random theme each
 # time that oh-my-zsh is loaded.
-ZSH_THEME="mh"
+ZSH_THEME="afowler"
 
 # Example aliases
 # alias zshconfig="mate ~/.zshrc"
@@ -27,7 +27,7 @@ DISABLE_AUTO_UPDATE="true"
 COMPLETION_WAITING_DOTS="true"
 
 # Virtualenvwrapper plugin - Disable directory name discovery
-DISABLE_VENV_CD="true"
+DISABLE_VENV_CD="1"
 
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
diff --git a/templates/zshrc-mac.zsh b/templates/zshrc-mac.zsh
index 82ffeec29..4b0b36acd 100644
--- a/templates/zshrc-mac.zsh
+++ b/templates/zshrc-mac.zsh
@@ -5,7 +5,7 @@ ZSH=$HOME/.oh-my-zsh
 # Look in ~/.oh-my-zsh/themes/
 # Optionally, if you set this to "random", it'll load a random theme each
 # time that oh-my-zsh is loaded.
-ZSH_THEME="mh"
+ZSH_THEME="afowler"
 
 # Example aliases
 # alias zshconfig="mate ~/.zshrc"
@@ -27,7 +27,7 @@ DISABLE_AUTO_UPDATE="true"
 COMPLETION_WAITING_DOTS="true"
 
 # Virtualenvwrapper plugin - Disable directory name discovery
-DISABLE_VENV_CD="true"
+DISABLE_VENV_CD="1"
 
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/

From cd3e41ac4b1522f3f953d43b11215fa0138648a0 Mon Sep 17 00:00:00 2001
From: Carlos Cardoso <cadusk@yahoo.com.br>
Date: Thu, 28 Mar 2013 17:43:05 -0300
Subject: [PATCH 2/4] Force xterm to behave like xterm-256color.

---
 templates/zshrc-linux.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/zshrc-linux.zsh b/templates/zshrc-linux.zsh
index 90b081064..46ebe3e4f 100644
--- a/templates/zshrc-linux.zsh
+++ b/templates/zshrc-linux.zsh
@@ -41,3 +41,4 @@ source $ZSH/oh-my-zsh.sh
 
 if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi
 unsetopt correctall
+[ "$TERM" = "xterm" ] && TERM="xterm-256color"

From 52498671f4e8da32ce9581d1766b4faa97c32374 Mon Sep 17 00:00:00 2001
From: Carlos Cardoso <cadusk@yahoo.com.br>
Date: Mon, 3 Jun 2013 21:28:03 -0300
Subject: [PATCH 3/4] Updated vim to alias mvim -v

---
 plugins/vim-override/vim-override.plugin.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/vim-override/vim-override.plugin.zsh b/plugins/vim-override/vim-override.plugin.zsh
index e92ffbab0..ec5f6bbc6 100644
--- a/plugins/vim-override/vim-override.plugin.zsh
+++ b/plugins/vim-override/vim-override.plugin.zsh
@@ -1,7 +1,7 @@
 # try to replace OSX's default vim by MacVim's version
-RECENTVIM=`test -e /usr/local/Cellar/macvim && find /usr/local/Cellar/macvim -name Vim`
+MACVIM="/usr/local/bin/mvim"
 
 # if mode indicator wasn't setup by theme, define default
-if [[ "$OSTYPE" == darwin* && -e $RECENTVIM ]]; then
-  alias vim="$RECENTVIM"
+if [[ "$OSTYPE" == darwin* && -e $MACVIM ]]; then
+  alias vim="$MACVIM -v"
 fi

From b501522a21b3ddb0c8af133908db654b7711e009 Mon Sep 17 00:00:00 2001
From: Carlos Cardoso <cadusk@yahoo.com.br>
Date: Mon, 3 Jun 2013 23:09:42 -0300
Subject: [PATCH 4/4] Changing theme.

---
 templates/zshrc-linux.zsh | 3 ++-
 templates/zshrc-mac.zsh   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/templates/zshrc-linux.zsh b/templates/zshrc-linux.zsh
index 5c0660c1d..0a1e264b7 100644
--- a/templates/zshrc-linux.zsh
+++ b/templates/zshrc-linux.zsh
@@ -5,7 +5,8 @@ ZSH=$HOME/.oh-my-zsh
 # Look in ~/.oh-my-zsh/themes/
 # Optionally, if you set this to "random", it'll load a random theme each
 # time that oh-my-zsh is loaded.
-ZSH_THEME="afowler"
+# ZSH_THEME="afowler"
+ZSH_THEME="mh"
 
 # Example aliases
 # alias zshconfig="mate ~/.zshrc"
diff --git a/templates/zshrc-mac.zsh b/templates/zshrc-mac.zsh
index 4b0b36acd..9af8f7c17 100644
--- a/templates/zshrc-mac.zsh
+++ b/templates/zshrc-mac.zsh
@@ -5,7 +5,8 @@ ZSH=$HOME/.oh-my-zsh
 # Look in ~/.oh-my-zsh/themes/
 # Optionally, if you set this to "random", it'll load a random theme each
 # time that oh-my-zsh is loaded.
-ZSH_THEME="afowler"
+# ZSH_THEME="afowler"
+ZSH_THEME="mh"
 
 # Example aliases
 # alias zshconfig="mate ~/.zshrc"