From f89eb829876c0e6e097982caad3ccfe56f2d94fb Mon Sep 17 00:00:00 2001
From: Hakan Ensari <hakan.ensari@papercavalier.com>
Date: Mon, 20 Dec 2010 12:13:47 -0300
Subject: [PATCH 01/11] Aliased git checkout as `gco`

---
 plugins/git/git.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index d317d17..09b1f16 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -8,6 +8,7 @@ alias gd='git diff | mate'
 alias gdv='git diff -w "$@" | vim -R -'
 alias gc='git commit -v'
 alias gca='git commit -v -a'
+alias gco='git checkout'
 alias gb='git branch'
 alias gba='git branch -a'
 alias gcount='git shortlog -sn'

From 7eeb7d5ea7460a19ccefa7c892f7e40f820791a6 Mon Sep 17 00:00:00 2001
From: Hakan Ensari <hakan.ensari@papercavalier.com>
Date: Mon, 20 Dec 2010 12:19:59 -0300
Subject: [PATCH 02/11] A rails3 plugin based on the rails plugin

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

diff --git a/plugins/rails3/rails3.plugin.zsh b/plugins/rails3/rails3.plugin.zsh
new file mode 100644
index 0000000..5c1930a
--- /dev/null
+++ b/plugins/rails3/rails3.plugin.zsh
@@ -0,0 +1,12 @@
+alias rs='ruby script/rails server'
+alias rg='ruby script/rails generate'
+alias rd='ruby script/rails destroy'
+alias rp='ruby script/rails plugin'
+alias rdbm='rake db:migrate db:test:clone'
+alias rc='ruby script/rails console'
+alias rd='ruby script/rais server --debugger'
+alias devlog='tail -f log/development.log'
+
+function remote_console() {
+  /usr/bin/env ssh $1 "( cd $2 && ruby script/rails console production )"
+}

From 14628eef371a79df478973731ce49fc3eb45de36 Mon Sep 17 00:00:00 2001
From: Hakan Ensari <hakan.ensari@papercavalier.com>
Date: Mon, 20 Dec 2010 12:50:55 -0300
Subject: [PATCH 03/11] Removed remote_console. It doesn't handle rvm,
 capistrano, and so on.

---
 plugins/rails3/rails3.plugin.zsh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/plugins/rails3/rails3.plugin.zsh b/plugins/rails3/rails3.plugin.zsh
index 5c1930a..20ba040 100644
--- a/plugins/rails3/rails3.plugin.zsh
+++ b/plugins/rails3/rails3.plugin.zsh
@@ -6,7 +6,3 @@ alias rdbm='rake db:migrate db:test:clone'
 alias rc='ruby script/rails console'
 alias rd='ruby script/rais server --debugger'
 alias devlog='tail -f log/development.log'
-
-function remote_console() {
-  /usr/bin/env ssh $1 "( cd $2 && ruby script/rails console production )"
-}

From 088fae93f20ba78ce172b564bf1a1759875afa8c Mon Sep 17 00:00:00 2001
From: Hakan Ensari <hakan.ensari@papercavalier.com>
Date: Mon, 20 Dec 2010 12:57:23 -0300
Subject: [PATCH 04/11] Typo

---
 plugins/git/git.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 09b1f16..71a6281 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -27,7 +27,7 @@ function current_branch() {
   echo ${ref#refs/heads/}
 }
 
-# these aliases take advangate of the previous function
+# these aliases take advantage of the previous function
 alias ggpull='git pull origin $(current_branch)'
 alias ggpush='git push origin $(current_branch)'
-alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
\ No newline at end of file
+alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'

From 5f0afcdd3cd8870954087c7c05dd40ae5ed0ef4e Mon Sep 17 00:00:00 2001
From: Derek Prior <derekprior@gmail.com>
Date: Tue, 21 Dec 2010 14:28:40 -0500
Subject: [PATCH 05/11] Added function to mkdir and immediately change to it

---
 lib/directories.zsh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/directories.zsh b/lib/directories.zsh
index 56d7a23..bb114f6 100644
--- a/lib/directories.zsh
+++ b/lib/directories.zsh
@@ -36,5 +36,9 @@ cd () {
 
 alias md='mkdir -p'
 alias rd=rmdir
+alias d='dirs -v'
 
-alias d='dirs -v'
\ No newline at end of file
+# mkdir & cd to it
+function mcd() { 
+  mkdir -p "$1" && cd "$1"; 
+}
\ No newline at end of file

From 6f0001c579dbd464e31902bb44b05f69facdaefd Mon Sep 17 00:00:00 2001
From: "Suraj N. Kurapati" <sunaku@gmail.com>
Date: Tue, 28 Dec 2010 20:36:29 -0800
Subject: [PATCH 06/11] add "fishy" theme to emulate Fish shell's prompt

---
 themes/fishy.zsh-theme | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 themes/fishy.zsh-theme

diff --git a/themes/fishy.zsh-theme b/themes/fishy.zsh-theme
new file mode 100644
index 0000000..f22eda8
--- /dev/null
+++ b/themes/fishy.zsh-theme
@@ -0,0 +1,9 @@
+# ZSH Theme emulating the Fish shell's default prompt.
+
+local user_color='green'; [ $UID -eq 0 ] && user_color='red'
+PROMPT='%n@%m %{$fg[$user_color]%}%~%{$reset_color%}%(!.#.>) '
+PROMPT2='%{$fg[red]%}\ %{$reset_color%}'
+RPS1='%(?..%{$fg[red]%}%? ↵%{$reset_color%})$(git_prompt_info)'
+
+ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[cyan]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"

From c56082c6905836e5436c036562249cfabe6cf0f0 Mon Sep 17 00:00:00 2001
From: "Suraj N. Kurapati" <sunaku@gmail.com>
Date: Sat, 8 Jan 2011 18:15:57 -0800
Subject: [PATCH 07/11] avoid forking subshell to test if user is root

---
 themes/afowler.zsh-theme | 2 +-
 themes/arrow.zsh-theme   | 2 +-
 themes/clean.zsh-theme   | 2 +-
 themes/dst.zsh-theme     | 2 +-
 themes/jreese.zsh-theme  | 2 +-
 themes/philips.zsh-theme | 2 +-
 themes/pmcgee.zsh-theme  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/themes/afowler.zsh-theme b/themes/afowler.zsh-theme
index b5a9bb1..3a4753f 100644
--- a/themes/afowler.zsh-theme
+++ b/themes/afowler.zsh-theme
@@ -1,4 +1,4 @@
-if [ "$(whoami)" = "root" ]; then CARETCOLOR="red"; else CARETCOLOR="blue"; fi
+if [ $UID -eq 0 ]; then CARETCOLOR="red"; else CARETCOLOR="blue"; fi
 
 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
 
diff --git a/themes/arrow.zsh-theme b/themes/arrow.zsh-theme
index a23efd1..d62dcdc 100644
--- a/themes/arrow.zsh-theme
+++ b/themes/arrow.zsh-theme
@@ -1,4 +1,4 @@
-if [ "$(whoami)" = "root" ]; then NCOLOR="red"; else NCOLOR="yellow"; fi
+if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="yellow"; fi
 
 PROMPT='%{$fg[$NCOLOR]%}%c ➤ %{$reset_color%}'
 RPROMPT='%{$fg[$NCOLOR]%}%p $(git_prompt_info)%{$reset_color%}'
diff --git a/themes/clean.zsh-theme b/themes/clean.zsh-theme
index 95f532a..7ee29cb 100644
--- a/themes/clean.zsh-theme
+++ b/themes/clean.zsh-theme
@@ -1,4 +1,4 @@
-if [ "$(whoami)" = "root" ]; then NCOLOR="red"; else NCOLOR="white"; fi
+if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="white"; fi
 
 PROMPT='%{$fg[$NCOLOR]%}%B%n%b%{$reset_color%}:%{$fg[blue]%}%B%c/%b%{$reset_color%} $(git_prompt_info)%(!.#.$) '
 RPROMPT='[%*]'
diff --git a/themes/dst.zsh-theme b/themes/dst.zsh-theme
index fa0d9cb..3e2539d 100644
--- a/themes/dst.zsh-theme
+++ b/themes/dst.zsh-theme
@@ -5,7 +5,7 @@ ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}!"
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 
 function prompt_char {
-	if [ "$(whoami)" = "root" ]; then echo "%{$fg[red]%}#%{$reset_color%}"; else echo $; fi
+	if [ $UID -eq 0 ]; then echo "%{$fg[red]%}#%{$reset_color%}"; else echo $; fi
 }
 
 PROMPT='%(?, ,%{$fg[red]%}FAIL%{$reset_color%}
diff --git a/themes/jreese.zsh-theme b/themes/jreese.zsh-theme
index 534664f..0fa6b4e 100644
--- a/themes/jreese.zsh-theme
+++ b/themes/jreese.zsh-theme
@@ -1,6 +1,6 @@
 # ZSH Theme - Preview: http://dl.dropbox.com/u/1552408/Screenshots/2010-04-08-oh-my-zsh.png
 
-if [ "$(whoami)" = "root" ]; then NCOLOR="red"; else NCOLOR="green"; fi
+if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi
 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
 
 PROMPT='%{$fg[$NCOLOR]%}%n%{$fg[green]%}@%m%{$reset_color%} %~ \
diff --git a/themes/philips.zsh-theme b/themes/philips.zsh-theme
index fa7c590..e7ea51a 100644
--- a/themes/philips.zsh-theme
+++ b/themes/philips.zsh-theme
@@ -1,4 +1,4 @@
-if [ "$(whoami)" = "root" ]; then NCOLOR="red"; else NCOLOR="green"; fi
+if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi
 
 PROMPT='%{$fg[$NCOLOR]%}%B%n%b%{$reset_color%}:%{$fg[blue]%}%B%c/%b%{$reset_color%} $(git_prompt_info)%(!.#.$) '
 RPROMPT='[%*]'
diff --git a/themes/pmcgee.zsh-theme b/themes/pmcgee.zsh-theme
index 4eb54df..e4e45c7 100644
--- a/themes/pmcgee.zsh-theme
+++ b/themes/pmcgee.zsh-theme
@@ -1,4 +1,4 @@
-if [ "$(whoami)" = "root" ]; then NCOLOR="red"; else NCOLOR="green"; fi
+if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi
 
 PROMPT='
 %{$fg[$NCOLOR]%}%B%n@%m%b%{$reset_color%} %{$fg[white]%}%B${PWD/#$HOME/~}%b%{$reset_color%}

From 515a86ef799a3588116bbd80223fe3e411901c94 Mon Sep 17 00:00:00 2001
From: Danny Tatom <dannytatom@gmail.com>
Date: Sat, 8 Jan 2011 21:07:03 -0800
Subject: [PATCH 08/11] Added lambda theme

---
 themes/lambda.zsh-theme | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 themes/lambda.zsh-theme

diff --git a/themes/lambda.zsh-theme b/themes/lambda.zsh-theme
new file mode 100644
index 0000000..63292d3
--- /dev/null
+++ b/themes/lambda.zsh-theme
@@ -0,0 +1,6 @@
+# ZSH Theme - Preview: http://cl.ly/350F0F0k1M2y3A2i3p1S
+
+PROMPT='λ %~/ $(git_prompt_info)%{$reset_color%}'
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "

From 74b066485619736ed7e0e04fff6778492913d073 Mon Sep 17 00:00:00 2001
From: Francesco Lazzarino <flazzarino@gmail.com>
Date: Mon, 10 Jan 2011 10:16:04 -0500
Subject: [PATCH 09/11] theme based on afowler with vi-mode support

---
 themes/flazz.zsh-theme | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 themes/flazz.zsh-theme

diff --git a/themes/flazz.zsh-theme b/themes/flazz.zsh-theme
new file mode 100644
index 0000000..280794f
--- /dev/null
+++ b/themes/flazz.zsh-theme
@@ -0,0 +1,19 @@
+if [ "$(whoami)" = "root" ]
+then CARETCOLOR="red"
+else CARETCOLOR="blue"
+fi
+
+local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
+
+PROMPT='%m%{${fg_bold[magenta]}%} :: %{$reset_color%}%{${fg[green]}%}%3~ $(git_prompt_info)%{${fg_bold[$CARETCOLOR]}%}%#%{${reset_color}%} '
+
+RPS1='$(vi_mode_prompt_info) ${return_code}'
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[cyan]%}‹"
+ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}"
+
+MODE_INDICATOR="%{$fg_bold[magenta]%}<%{$reset_color%}%{$fg[magenta]%}<<%{$reset_color%}"
+
+# TODO use 265 colors
+#MODE_INDICATOR="$FX[bold]$FG[020]<$FX[no_bold]%{$fg[blue]%}<<%{$reset_color%}"
+# TODO use two lines if git

From 0608baceb56e2c5c83e5aa849b5830bab57b6869 Mon Sep 17 00:00:00 2001
From: Robin Ramael <robin.ramael@gmail.com>
Date: Mon, 10 Jan 2011 17:01:11 +0100
Subject: [PATCH 10/11] Made git ignore everything  in custom, not only the
 .zsh files.

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index f84db6d..8d19d10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 locals.zsh
 log/.zsh_history
 projects.zsh
-custom/*.zsh
+custom/*
 !custom/example.zsh
\ No newline at end of file

From a42aea147dc2b32a9992cae4f3c9d4decf2d33d8 Mon Sep 17 00:00:00 2001
From: Robin Ramael <robin.ramael@gmail.com>
Date: Mon, 10 Jan 2011 18:18:31 +0100
Subject: [PATCH 11/11] Added svn info in prompt with plugin.

If the svn plugin is used, svn info (repo name and wether the repo is dirty) is displayed in the prompt like with git. Just lke with git, the colors can be manipulated with variables (see awesomepanda theme for example).
---
 plugins/svn/svn.plugin.zsh    | 42 +++++++++++++++++++++++++++++++++++
 themes/awesomepanda.zsh-theme | 18 +++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 plugins/svn/svn.plugin.zsh
 create mode 100644 themes/awesomepanda.zsh-theme

diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
new file mode 100644
index 0000000..45d4613
--- /dev/null
+++ b/plugins/svn/svn.plugin.zsh
@@ -0,0 +1,42 @@
+function svn_prompt_info {
+    if [[ -d .svn ]]; then
+        echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\
+$ZSH_THEME_REPO_NAME_COLOR$(svn_get_repo_name)$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(svn_dirty)$ZSH_PROMPT_BASE_COLOR"
+    fi
+}
+
+
+function in_svn() {
+    if [[ -d .svn ]]; then
+        echo 1
+    fi
+}
+
+function svn_get_repo_name {
+    if [ is_svn ]; then
+        svn info | sed -n 's/Repository\ Root:\ .*\///p' | read SVN_ROOT
+    
+        svn info | sed -n "s/URL:\ .*$SVN_ROOT\///p" | sed "s/\/.*$//"
+    fi
+}
+
+function svn_get_rev_nr {
+    if [ is_svn ]; then
+        svn info 2> /dev/null | sed -n s/Revision:\ //p
+    fi
+}
+
+function svn_dirty_choose {
+    if [ is_svn ]; then
+        s=$(svn status 2>/dev/null)
+        if [ $s ]; then 
+            echo $1
+        else 
+            echo $2
+        fi
+    fi
+}
+
+function svn_dirty {
+    svn_dirty_choose $ZSH_THEME_SVN_PROMPT_DIRTY $ZSH_THEME_SVN_PROMPT_CLEAN
+}
\ No newline at end of file
diff --git a/themes/awesomepanda.zsh-theme b/themes/awesomepanda.zsh-theme
new file mode 100644
index 0000000..411b898
--- /dev/null
+++ b/themes/awesomepanda.zsh-theme
@@ -0,0 +1,18 @@
+# the svn plugin has to be activated for this to work.
+
+PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%}$(svn_prompt_info)%{$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]%}) "
+
+
+
+ZSH_PROMPT_BASE_COLOR="%{$fg_bold[blue]%}"
+ZSH_THEME_REPO_NAME_COLOR="%{$fg_bold[red]%}"
+
+ZSH_THEME_SVN_PROMPT_PREFIX="svn:("
+ZSH_THEME_SVN_PROMPT_SUFFIX=")"
+ZSH_THEME_SVN_PROMPT_DIRTY="%{$fg[red]%} ✘ %{$reset_color%}"
+ZSH_THEME_SVN_PROMPT_CLEAN=" "
\ No newline at end of file