From 4d6947ca0fa93afdaf38fdefb4c1c7fb3ffe4a41 Mon Sep 17 00:00:00 2001
From: Carlos Cardoso <cadusk@yahoo.com.br>
Date: Sat, 7 Apr 2012 23:00:34 -0300
Subject: [PATCH 01/20] My zsh config

---
 lib/aliases.zsh              | 1 -
 templates/zshrc.zsh-template | 7 +++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index 0555be264..d2d3aed81 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -21,4 +21,3 @@ alias ll='ls -l'
 alias sl=ls # often screw this up
 
 alias afind='ack-grep -il'
-
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index e52553241..6f184c80e 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -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="robbyrussell"
+ZSH_THEME="gallifrey"
 
 # Example aliases
 # alias zshconfig="mate ~/.zshrc"
@@ -29,8 +29,11 @@ ZSH_THEME="robbyrussell"
 # 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/
 # Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git)
+plugins=(git osx python pip django)
 
 source $ZSH/oh-my-zsh.sh
 
 # Customize to your needs...
+
+# Themes override ls alias from aliases.zsh
+alias ls='ls -Ga'

From 6a10614609c756eb8b831f020ba2ebddff9674ad Mon Sep 17 00:00:00 2001
From: Carlos Cardoso <cadusk@yahoo.com.br>
Date: Sun, 8 Apr 2012 22:34:38 -0300
Subject: [PATCH 02/20] Added new virtualenvwrapper plugin

---
 plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh | 2 ++
 templates/zshrc.zsh-template                           | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh

diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
new file mode 100644
index 000000000..aa1ff17b4
--- /dev/null
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@@ -0,0 +1,2 @@
+export WORKON_HOME="/Volumes/Workspace/Envs"
+source /usr/local/share/python/virtualenvwrapper.sh
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 6f184c80e..175bface9 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -29,7 +29,7 @@ ZSH_THEME="gallifrey"
 # 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/
 # Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git osx python pip django)
+plugins=(git osx python virtualenvwrapper)
 
 source $ZSH/oh-my-zsh.sh
 

From 73321f3e7eb6fa30e45667b0e9d98e72dcb4fdc7 Mon Sep 17 00:00:00 2001
From: Carlos Cardoso <cadusk@yahoo.com.br>
Date: Tue, 1 May 2012 10:09:18 -0400
Subject: [PATCH 03/20] VirtualEnvWrapper plugin customization

---
 plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
index aa1ff17b4..7a181d5e4 100644
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@@ -1,2 +1,6 @@
-export WORKON_HOME="/Volumes/Workspace/Envs"
-source /usr/local/share/python/virtualenvwrapper.sh
+
+VW_SCRIPT=`which virtualenvwrapper.sh`
+if [ -f $VW_SCRIPT ]; then
+    export WORKON_HOME="~/virtualenvs"
+    source $VW_SCRIPT
+fi

From b62fd8020216680f14c943e06865a2e4d4665a96 Mon Sep 17 00:00:00 2001
From: Carlos Cardoso <cadusk@yahoo.com.br>
Date: Tue, 1 May 2012 10:16:00 -0400
Subject: [PATCH 04/20] Changed shell theme

---
 templates/zshrc.zsh-template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 175bface9..8993c2815 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -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="gallifrey"
+ZSH_THEME="jreese"
 
 # Example aliases
 # alias zshconfig="mate ~/.zshrc"
@@ -36,4 +36,3 @@ source $ZSH/oh-my-zsh.sh
 # Customize to your needs...
 
 # Themes override ls alias from aliases.zsh
-alias ls='ls -Ga'

From 029ad2828ce4e719dccff8958fe4c4f931fd19ab Mon Sep 17 00:00:00 2001
From: Carlos Cardoso <cadusk@yahoo.com.br>
Date: Mon, 14 May 2012 04:51:28 -0300
Subject: [PATCH 05/20] redirecionamento de vim para 7.3

---
 .gitignore                                   |  1 +
 plugins/vim-override/vim-override.plugin.zsh | 10 ++++++++++
 templates/zshrc.zsh-template                 |  4 ++--
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 plugins/vim-override/vim-override.plugin.zsh

diff --git a/.gitignore b/.gitignore
index 2e8db7341..c7ad5ca6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ custom/*
 !custom/example.zsh
 cache
 *.swp
+*.un~
diff --git a/plugins/vim-override/vim-override.plugin.zsh b/plugins/vim-override/vim-override.plugin.zsh
new file mode 100644
index 000000000..80ac92dbe
--- /dev/null
+++ b/plugins/vim-override/vim-override.plugin.zsh
@@ -0,0 +1,10 @@
+# try to replace OSX's default vim by MacVim's version
+RECENTVIM=`find /usr/local/Cellar/macvim -name Vim`
+
+# if mode indicator wasn't setup by theme, define default
+if [[ "$OSTYPE" == darwin* && -e $RECENTVIM ]]; then
+	echo "Redirecionando vim..."
+  alias vim="$RECENTVIM"
+else
+	echo "deu zica criando alias"
+fi
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 8993c2815..02e0e6cb1 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -15,7 +15,7 @@ ZSH_THEME="jreese"
 # CASE_SENSITIVE="true"
 
 # Comment this out to disable weekly auto-update checks
-# DISABLE_AUTO_UPDATE="true"
+DISABLE_AUTO_UPDATE="true"
 
 # Uncomment following line if you want to disable colors in ls
 # DISABLE_LS_COLORS="true"
@@ -29,7 +29,7 @@ ZSH_THEME="jreese"
 # 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/
 # Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git osx python virtualenvwrapper)
+plugins=(git osx python virtualenvwrapper vim-override)
 
 source $ZSH/oh-my-zsh.sh
 

From 454b685fd21b3ab0251346610bcbfd02cbc28b3b Mon Sep 17 00:00:00 2001
From: Carlos Cardoso <cadusk@yahoo.com.br>
Date: Tue, 15 May 2012 10:30:54 -0300
Subject: [PATCH 06/20] Atualizado script de override vim para Mac.

---
 plugins/vim-override/vim-override.plugin.zsh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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

From 0d0ae39af02e5d73613edb47ff33bd962ecf5cbb Mon Sep 17 00:00:00 2001
From: Carlos Cardoso <cadusk@yahoo.com.br>
Date: Sat, 19 May 2012 11:19:17 -0300
Subject: [PATCH 07/20] Atualizado default LC_ALL e LANG

---
 templates/zshrc.zsh-template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 02e0e6cb1..eba7bdd87 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -34,5 +34,7 @@ plugins=(git osx python virtualenvwrapper vim-override)
 source $ZSH/oh-my-zsh.sh
 
 # Customize to your needs...
+if [ -z "$LC_ALL" ]; then export LC_ALL=en_US.UTF-8; fi
+if [ -z "$LANG" ]; then export LANG=en_US.UTF-8; fi
 
 # Themes override ls alias from aliases.zsh

From 0222b0af116805db2c003070bdb644fc6ede6d0a Mon Sep 17 00:00:00 2001
From: "cadusk@yahoo.com.br" <cadusk@debn005.localdomain>
Date: Tue, 22 May 2012 13:47:50 -0300
Subject: [PATCH 08/20] Removido plugin 'osx' da inicializacao automatica.

---
 templates/zshrc.zsh-template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index eba7bdd87..5cc84c0cd 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -29,7 +29,7 @@ DISABLE_AUTO_UPDATE="true"
 # 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/
 # Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git osx python virtualenvwrapper vim-override)
+plugins=(git python virtualenvwrapper vim-override)
 
 source $ZSH/oh-my-zsh.sh
 

From aa709fd5f2c517b5578494eb8a305ab8dda1158c Mon Sep 17 00:00:00 2001
From: Carlos Cardoso <cadusk@yahoo.com.br>
Date: Fri, 29 Jun 2012 00:06:18 -0300
Subject: [PATCH 09/20] new plugin for pythonbrew

---
 plugins/pythonbrew/pythonbrew.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 plugins/pythonbrew/pythonbrew.plugin.zsh

diff --git a/plugins/pythonbrew/pythonbrew.plugin.zsh b/plugins/pythonbrew/pythonbrew.plugin.zsh
new file mode 100644
index 000000000..0fc3e9676
--- /dev/null
+++ b/plugins/pythonbrew/pythonbrew.plugin.zsh
@@ -0,0 +1,2 @@
+# Initialize pythonbrew if installed
+[[ -s $HOME/.pythonbrew/etc/bashrc ]] && source $HOME/.pythonbrew/etc/bashrc

From 73c69e7f1af9f72aa9dedd81e6124f25a54b33a7 Mon Sep 17 00:00:00 2001
From: Carlos Cardoso <cadusk@yahoo.com.br>
Date: Fri, 29 Jun 2012 00:06:57 -0300
Subject: [PATCH 10/20] set pythonbrew plugin as initializable.

---
 templates/zshrc.zsh-template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index f0192e5ec..b80d17548 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -29,7 +29,7 @@ DISABLE_AUTO_UPDATE="true"
 # 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/
 # Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git python virtualenvwrapper vim-override)
+plugins=(git python pythonbrew virtualenvwrapper vim-override)
 
 source $ZSH/oh-my-zsh.sh
 

From e7fcb090881edfe5729b1fb021d31280bbef39ee Mon Sep 17 00:00:00 2001
From: Carlos Cardoso <cadusk@yahoo.com.br>
Date: Thu, 5 Jul 2012 13:34:53 -0300
Subject: [PATCH 11/20] New customizations.

---
 templates/zshrc.zsh-template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index b80d17548..0c03d6ff5 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -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="robbyrussell"
+ZSH_THEME="miloshadzic" 
 
 # Example aliases
 # alias zshconfig="mate ~/.zshrc"
@@ -29,7 +29,7 @@ DISABLE_AUTO_UPDATE="true"
 # 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/
 # Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git python pythonbrew virtualenvwrapper vim-override)
+plugins=(git python virtualenvwrapper pythonbrew vim-override)
 
 source $ZSH/oh-my-zsh.sh
 

From 402053ff37160586c56dd82ba1680d3c384ecb60 Mon Sep 17 00:00:00 2001
From: Carlos Cardoso <cadusk@yahoo.com.br>
Date: Fri, 27 Jul 2012 01:06:57 -0300
Subject: [PATCH 12/20] Changed default theme.

---
 templates/zshrc.zsh-template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 0c03d6ff5..1f1513334 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -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="miloshadzic" 
+ZSH_THEME="mh"
 
 # Example aliases
 # alias zshconfig="mate ~/.zshrc"

From fe80ab4baa5902afe78d7683b269345395aa1d8d Mon Sep 17 00:00:00 2001
From: Carlos Cardoso <cadusk@yahoo.com.br>
Date: Tue, 25 Sep 2012 01:15:15 -0300
Subject: [PATCH 13/20] Updated virtualenv initialization.

---
 templates/zshrc.zsh-template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 1f1513334..62fbda14d 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -29,9 +29,10 @@ DISABLE_AUTO_UPDATE="true"
 # 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/
 # Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git python virtualenvwrapper pythonbrew vim-override)
+plugins=(git python pythonbrew vim-override)
 
 source $ZSH/oh-my-zsh.sh
+source `which virtualenvwrapper.sh`
 
 # Customize to your needs...
 if [ -z "$LC_ALL" ]; then export LC_ALL=en_US.UTF-8; fi

From 2230bea1d46b7d558f38cb072a077dcbb077a95e Mon Sep 17 00:00:00 2001
From: Carlos Cardoso <cadusk@yahoo.com.br>
Date: Wed, 3 Oct 2012 23:18:31 -0300
Subject: [PATCH 14/20] Disable correction suggestions.

---
 templates/zshrc.zsh-template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 62fbda14d..694122543 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -38,4 +38,7 @@ source `which virtualenvwrapper.sh`
 if [ -z "$LC_ALL" ]; then export LC_ALL=en_US.UTF-8; fi
 if [ -z "$LANG" ]; then export LANG=en_US.UTF-8; fi
 
+if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi
+unsetopt correctall
+
 # Themes override ls alias from aliases.zsh

From 6c10907143e50e1b013b24284b270e46a99bf3a7 Mon Sep 17 00:00:00 2001
From: Carlos Cardoso <cadusk@yahoo.com.br>
Date: Sat, 6 Oct 2012 10:32:40 -0300
Subject: [PATCH 15/20] My custom zshrc's

---
 templates/zshrc.zsh-cadusk-linux | 44 ++++++++++++++++++++++++++++++++
 templates/zshrc.zsh-cadusk-mac   | 44 ++++++++++++++++++++++++++++++++
 2 files changed, 88 insertions(+)
 create mode 100644 templates/zshrc.zsh-cadusk-linux
 create mode 100644 templates/zshrc.zsh-cadusk-mac

diff --git a/templates/zshrc.zsh-cadusk-linux b/templates/zshrc.zsh-cadusk-linux
new file mode 100644
index 000000000..694122543
--- /dev/null
+++ b/templates/zshrc.zsh-cadusk-linux
@@ -0,0 +1,44 @@
+# Path to your oh-my-zsh configuration.
+ZSH=$HOME/.oh-my-zsh
+
+# Set name of the theme to load.
+# 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"
+
+# Example aliases
+# alias zshconfig="mate ~/.zshrc"
+# alias ohmyzsh="mate ~/.oh-my-zsh"
+
+# Set to this to use case-sensitive completion
+# CASE_SENSITIVE="true"
+
+# Comment this out to disable weekly auto-update checks
+DISABLE_AUTO_UPDATE="true"
+
+# Uncomment following line if you want to disable colors in ls
+# DISABLE_LS_COLORS="true"
+
+# Uncomment following line if you want to disable autosetting terminal title.
+# DISABLE_AUTO_TITLE="true"
+
+# Uncomment following line if you want red dots to be displayed while waiting for completion
+# COMPLETION_WAITING_DOTS="true"
+
+# 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/
+# Example format: plugins=(rails git textmate ruby lighthouse)
+plugins=(git python pythonbrew vim-override)
+
+source $ZSH/oh-my-zsh.sh
+source `which virtualenvwrapper.sh`
+
+# Customize to your needs...
+if [ -z "$LC_ALL" ]; then export LC_ALL=en_US.UTF-8; fi
+if [ -z "$LANG" ]; then export LANG=en_US.UTF-8; fi
+
+if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi
+unsetopt correctall
+
+# Themes override ls alias from aliases.zsh
diff --git a/templates/zshrc.zsh-cadusk-mac b/templates/zshrc.zsh-cadusk-mac
new file mode 100644
index 000000000..694122543
--- /dev/null
+++ b/templates/zshrc.zsh-cadusk-mac
@@ -0,0 +1,44 @@
+# Path to your oh-my-zsh configuration.
+ZSH=$HOME/.oh-my-zsh
+
+# Set name of the theme to load.
+# 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"
+
+# Example aliases
+# alias zshconfig="mate ~/.zshrc"
+# alias ohmyzsh="mate ~/.oh-my-zsh"
+
+# Set to this to use case-sensitive completion
+# CASE_SENSITIVE="true"
+
+# Comment this out to disable weekly auto-update checks
+DISABLE_AUTO_UPDATE="true"
+
+# Uncomment following line if you want to disable colors in ls
+# DISABLE_LS_COLORS="true"
+
+# Uncomment following line if you want to disable autosetting terminal title.
+# DISABLE_AUTO_TITLE="true"
+
+# Uncomment following line if you want red dots to be displayed while waiting for completion
+# COMPLETION_WAITING_DOTS="true"
+
+# 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/
+# Example format: plugins=(rails git textmate ruby lighthouse)
+plugins=(git python pythonbrew vim-override)
+
+source $ZSH/oh-my-zsh.sh
+source `which virtualenvwrapper.sh`
+
+# Customize to your needs...
+if [ -z "$LC_ALL" ]; then export LC_ALL=en_US.UTF-8; fi
+if [ -z "$LANG" ]; then export LANG=en_US.UTF-8; fi
+
+if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi
+unsetopt correctall
+
+# Themes override ls alias from aliases.zsh

From 0a3db5bf2df0e14a07e8aac127ed671a5919c779 Mon Sep 17 00:00:00 2001
From: Carlos Cardoso <cadusk@yahoo.com.br>
Date: Wed, 24 Oct 2012 00:35:17 -0200
Subject: [PATCH 16/20] Updated repository references.

---
 README.textile                 | 10 +++++-----
 templates/zshrc.zsh-cadusk-mac |  1 +
 templates/zshrc.zsh-template   |  1 +
 tools/install.sh               |  2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/README.textile b/README.textile
index a38e2d7cf..70996fd54 100644
--- a/README.textile
+++ b/README.textile
@@ -13,18 +13,18 @@ You can install this via the command line with either `curl` or `wget`.
 
 h4. via `curl`
 
-@curl -L https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh | sh@
+@curl -L https://github.com/cadusk/oh-my-zsh/raw/master/tools/install.sh | sh@
 
 h4. via `wget`
 
-@wget --no-check-certificate https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh -O - | sh@
+@wget --no-check-certificate https://github.com/cadusk/oh-my-zsh/raw/master/tools/install.sh -O - | sh@
 
 h3. The manual way
 
 
 1. Clone the repository
 
-  @git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh@
+  @git clone git://github.com/cadusk/oh-my-zsh.git ~/.oh-my-zsh@
 
 2. Create a new zsh config by copying the zsh template we've provided.
 
@@ -47,7 +47,7 @@ h2. Usage
 * enable the plugins you want in your @~/.zshrc@ (take a look at @plugins/@ to see what's possible)
 ** example: @plugins=(git osx ruby)@
 * Theme support: Change the @ZSH_THEME@ environment variable in @~/.zshrc@.
-** Take a look at the "current themes":https://wiki.github.com/robbyrussell/oh-my-zsh/themes that come bundled with _Oh My Zsh_.
+** Take a look at the "current themes":https://wiki.github.com/cadusk/oh-my-zsh/themes that come bundled with _Oh My Zsh_.
 * much much more...  take a look at @lib/@ what _Oh My Zsh_ offers...
 
 h2. Useful
@@ -81,6 +81,6 @@ h2. Contributors
 
 This project wouldn't exist without all of our awesome users and contributors.
 
-* "View our growing list of contributors":https://github.com/robbyrussell/oh-my-zsh/contributors
+* "View our growing list of contributors":https://github.com/cadusk/oh-my-zsh/contributors
 
 Thank you so much!
diff --git a/templates/zshrc.zsh-cadusk-mac b/templates/zshrc.zsh-cadusk-mac
index 694122543..561564d9c 100644
--- a/templates/zshrc.zsh-cadusk-mac
+++ b/templates/zshrc.zsh-cadusk-mac
@@ -42,3 +42,4 @@ if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi
 unsetopt correctall
 
 # Themes override ls alias from aliases.zsh
+alias tmux 'tmux -u2'
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 694122543..95ced48f8 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -42,3 +42,4 @@ if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi
 unsetopt correctall
 
 # Themes override ls alias from aliases.zsh
+alias tmux='tmux -u2'
diff --git a/tools/install.sh b/tools/install.sh
index b080be3a1..89417989e 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -5,7 +5,7 @@ then
 fi
 
 echo "\033[0;34mCloning Oh My Zsh...\033[0m"
-hash git >/dev/null && /usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh || {
+hash git >/dev/null && /usr/bin/env git clone https://github.com/cadusk/oh-my-zsh.git ~/.oh-my-zsh || {
   echo "git not installed"
   exit
 }

From 623c4b2ac3f04a2a849e5e43cbd912818bba27e4 Mon Sep 17 00:00:00 2001
From: Carlos Cardoso <cadusk@yahoo.com.br>
Date: Thu, 25 Oct 2012 14:16:27 -0200
Subject: [PATCH 17/20] Fixed aliases and theme appearance.

---
 lib/aliases.zsh                               |  8 ++++
 lib/theme-and-appearance.zsh                  |  7 ---
 ...shrc.zsh-cadusk-linux => zshrc.zsh-cadusk} |  0
 templates/zshrc.zsh-cadusk-mac                | 45 -------------------
 4 files changed, 8 insertions(+), 52 deletions(-)
 rename templates/{zshrc.zsh-cadusk-linux => zshrc.zsh-cadusk} (100%)
 delete mode 100644 templates/zshrc.zsh-cadusk-mac

diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index d2d3aed81..73c38ddfa 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -14,6 +14,14 @@ alias _='sudo'
 # Show history
 alias history='fc -l 1'
 
+# Enable ls colors
+LS_OPTIONS='-hF'
+if [ "$DISABLE_LS_COLORS" != "true" ]
+then
+  # Find the option for using colors in ls, depending on the version: Linux or BSD
+  ls --color -d . &>/dev/null 2>&1 && alias ls="ls --color=tty $LS_OPTIONS" || alias ls="ls -G $LS_OPTIONS"
+fi
+
 # List direcory contents
 alias lsa='ls -lah'
 alias l='ls -la'
diff --git a/lib/theme-and-appearance.zsh b/lib/theme-and-appearance.zsh
index aec67721a..e70741b5c 100644
--- a/lib/theme-and-appearance.zsh
+++ b/lib/theme-and-appearance.zsh
@@ -3,13 +3,6 @@ autoload colors; colors;
 export LSCOLORS="Gxfxcxdxbxegedabagacad"
 #export LS_COLORS
 
-# Enable ls colors
-if [ "$DISABLE_LS_COLORS" != "true" ]
-then
-  # Find the option for using colors in ls, depending on the version: Linux or BSD
-  ls --color -d . &>/dev/null 2>&1 && alias ls='ls --color=tty' || alias ls='ls -G'
-fi
-
 #setopt no_beep
 setopt auto_cd
 setopt multios
diff --git a/templates/zshrc.zsh-cadusk-linux b/templates/zshrc.zsh-cadusk
similarity index 100%
rename from templates/zshrc.zsh-cadusk-linux
rename to templates/zshrc.zsh-cadusk
diff --git a/templates/zshrc.zsh-cadusk-mac b/templates/zshrc.zsh-cadusk-mac
deleted file mode 100644
index 561564d9c..000000000
--- a/templates/zshrc.zsh-cadusk-mac
+++ /dev/null
@@ -1,45 +0,0 @@
-# Path to your oh-my-zsh configuration.
-ZSH=$HOME/.oh-my-zsh
-
-# Set name of the theme to load.
-# 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"
-
-# Example aliases
-# alias zshconfig="mate ~/.zshrc"
-# alias ohmyzsh="mate ~/.oh-my-zsh"
-
-# Set to this to use case-sensitive completion
-# CASE_SENSITIVE="true"
-
-# Comment this out to disable weekly auto-update checks
-DISABLE_AUTO_UPDATE="true"
-
-# Uncomment following line if you want to disable colors in ls
-# DISABLE_LS_COLORS="true"
-
-# Uncomment following line if you want to disable autosetting terminal title.
-# DISABLE_AUTO_TITLE="true"
-
-# Uncomment following line if you want red dots to be displayed while waiting for completion
-# COMPLETION_WAITING_DOTS="true"
-
-# 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/
-# Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git python pythonbrew vim-override)
-
-source $ZSH/oh-my-zsh.sh
-source `which virtualenvwrapper.sh`
-
-# Customize to your needs...
-if [ -z "$LC_ALL" ]; then export LC_ALL=en_US.UTF-8; fi
-if [ -z "$LANG" ]; then export LANG=en_US.UTF-8; fi
-
-if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi
-unsetopt correctall
-
-# Themes override ls alias from aliases.zsh
-alias tmux 'tmux -u2'

From ba136bb773f6450de73f38d3f2000c52783fbd2e Mon Sep 17 00:00:00 2001
From: Carlos Cardoso <cadusk@yahoo.com.br>
Date: Thu, 25 Oct 2012 21:10:15 -0200
Subject: [PATCH 18/20] Fixed customizations for mac and linux environments.

---
 templates/zshrc-linux.zsh                     | 43 +++++++++++++++++++
 templates/{zshrc.zsh-cadusk => zshrc-mac.zsh} | 11 ++---
 2 files changed, 49 insertions(+), 5 deletions(-)
 create mode 100644 templates/zshrc-linux.zsh
 rename templates/{zshrc.zsh-cadusk => zshrc-mac.zsh} (84%)

diff --git a/templates/zshrc-linux.zsh b/templates/zshrc-linux.zsh
new file mode 100644
index 000000000..6f647174a
--- /dev/null
+++ b/templates/zshrc-linux.zsh
@@ -0,0 +1,43 @@
+# Path to your oh-my-zsh configuration.
+ZSH=$HOME/.oh-my-zsh
+
+# Set name of the theme to load.
+# 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"
+
+# Example aliases
+# alias zshconfig="mate ~/.zshrc"
+# alias ohmyzsh="mate ~/.oh-my-zsh"
+
+# Set to this to use case-sensitive completion
+# CASE_SENSITIVE="true"
+
+# Comment this out to disable weekly auto-update checks
+DISABLE_AUTO_UPDATE="true"
+
+# Uncomment following line if you want to disable colors in ls
+# DISABLE_LS_COLORS="true"
+
+# Uncomment following line if you want to disable autosetting terminal title.
+# DISABLE_AUTO_TITLE="true"
+
+# Uncomment following line if you want red dots to be displayed while waiting for completion
+COMPLETION_WAITING_DOTS="true"
+
+# Virtualenvwrapper plugin - Disable directory name discovery
+DISABLE_VENV_CD="true"
+
+# 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/
+# Example format: plugins=(rails git textmate ruby lighthouse)
+plugins=(git ssh-agent debian python pythonbrew vim-override virtualenvwrapper)
+
+source $ZSH/oh-my-zsh.sh
+# source `which virtualenvwrapper.sh`
+
+# Customize to your needs...
+
+if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi
+unsetopt correctall
diff --git a/templates/zshrc.zsh-cadusk b/templates/zshrc-mac.zsh
similarity index 84%
rename from templates/zshrc.zsh-cadusk
rename to templates/zshrc-mac.zsh
index 694122543..4a02a6839 100644
--- a/templates/zshrc.zsh-cadusk
+++ b/templates/zshrc-mac.zsh
@@ -24,15 +24,18 @@ DISABLE_AUTO_UPDATE="true"
 # DISABLE_AUTO_TITLE="true"
 
 # Uncomment following line if you want red dots to be displayed while waiting for completion
-# COMPLETION_WAITING_DOTS="true"
+COMPLETION_WAITING_DOTS="true"
+
+# Virtualenvwrapper plugin - Disable directory name discovery
+DISABLE_VENV_CD="true"
 
 # 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/
 # Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git python pythonbrew vim-override)
+plugins=(git ssh-agent python pythonbrew vim-override virtualenvwrapper)
 
 source $ZSH/oh-my-zsh.sh
-source `which virtualenvwrapper.sh`
+# source `which virtualenvwrapper.sh`
 
 # Customize to your needs...
 if [ -z "$LC_ALL" ]; then export LC_ALL=en_US.UTF-8; fi
@@ -40,5 +43,3 @@ if [ -z "$LANG" ]; then export LANG=en_US.UTF-8; fi
 
 if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi
 unsetopt correctall
-
-# Themes override ls alias from aliases.zsh

From c071030b6835d86c09c2ef393c5917649d4abde8 Mon Sep 17 00:00:00 2001
From: Carlos Cardoso <cadusk@yahoo.com.br>
Date: Thu, 25 Oct 2012 21:22:32 -0200
Subject: [PATCH 19/20] Added tmux plugin.

---
 plugins/tmux/tmux.plugin.zsh | 1 +
 templates/zshrc-linux.zsh    | 2 +-
 templates/zshrc-mac.zsh      | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 plugins/tmux/tmux.plugin.zsh

diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
new file mode 100644
index 000000000..c6f21c30a
--- /dev/null
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -0,0 +1 @@
+alias tmux="tmux -u2"
diff --git a/templates/zshrc-linux.zsh b/templates/zshrc-linux.zsh
index 6f647174a..7353f86bf 100644
--- a/templates/zshrc-linux.zsh
+++ b/templates/zshrc-linux.zsh
@@ -32,7 +32,7 @@ DISABLE_VENV_CD="true"
 # 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/
 # Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git ssh-agent debian python pythonbrew vim-override virtualenvwrapper)
+plugins=(git tmux ssh-agent debian python pythonbrew vim-override virtualenvwrapper)
 
 source $ZSH/oh-my-zsh.sh
 # source `which virtualenvwrapper.sh`
diff --git a/templates/zshrc-mac.zsh b/templates/zshrc-mac.zsh
index 4a02a6839..b6a1bb9b7 100644
--- a/templates/zshrc-mac.zsh
+++ b/templates/zshrc-mac.zsh
@@ -32,7 +32,7 @@ DISABLE_VENV_CD="true"
 # 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/
 # Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git ssh-agent python pythonbrew vim-override virtualenvwrapper)
+plugins=(git tmux ssh-agent python pythonbrew vim-override virtualenvwrapper)
 
 source $ZSH/oh-my-zsh.sh
 # source `which virtualenvwrapper.sh`

From 1ce42650726e28a1a0df546c4d63e5e457c35791 Mon Sep 17 00:00:00 2001
From: Carlos Cardoso <cadusk@yahoo.com.br>
Date: Sat, 27 Oct 2012 13:27:20 -0200
Subject: [PATCH 20/20] disable ssh-agent.

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

diff --git a/templates/zshrc-linux.zsh b/templates/zshrc-linux.zsh
index 7353f86bf..8a4339709 100644
--- a/templates/zshrc-linux.zsh
+++ b/templates/zshrc-linux.zsh
@@ -32,7 +32,7 @@ DISABLE_VENV_CD="true"
 # 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/
 # Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git tmux ssh-agent debian python pythonbrew vim-override virtualenvwrapper)
+plugins=(git tmux debian python pythonbrew vim-override virtualenvwrapper)
 
 source $ZSH/oh-my-zsh.sh
 # source `which virtualenvwrapper.sh`
diff --git a/templates/zshrc-mac.zsh b/templates/zshrc-mac.zsh
index b6a1bb9b7..82ffeec29 100644
--- a/templates/zshrc-mac.zsh
+++ b/templates/zshrc-mac.zsh
@@ -32,7 +32,7 @@ DISABLE_VENV_CD="true"
 # 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/
 # Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git tmux ssh-agent python pythonbrew vim-override virtualenvwrapper)
+plugins=(git tmux python pythonbrew vim-override virtualenvwrapper)
 
 source $ZSH/oh-my-zsh.sh
 # source `which virtualenvwrapper.sh`