From 6213f3304f945b56dfea30d6e11e4c860afdbbc9 Mon Sep 17 00:00:00 2001
From: Andy Fowler <andy@andyfowler.com>
Date: Wed, 5 May 2010 04:19:09 +0800
Subject: [PATCH 01/34] my WIP theme

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

diff --git a/themes/afowler.zsh-theme b/themes/afowler.zsh-theme
new file mode 100644
index 000000000..f82e7bc25
--- /dev/null
+++ b/themes/afowler.zsh-theme
@@ -0,0 +1,8 @@
+local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
+
+PROMPT='%m %{${fg_bold[blue]}%}:: %{$reset_color%}%{${fg[green]}%}%3~ $(git_prompt_info)%{${fg[blue]}%}»%{${reset_color}%} '
+
+RPS1="${return_code}"
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}‹"
+ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}"

From a649b2d410e3f3cd2b5749d199da03168d0c3920 Mon Sep 17 00:00:00 2001
From: Andy Fowler <andy@andyfowler.com>
Date: Wed, 5 May 2010 04:58:10 +0800
Subject: [PATCH 02/34] happy with my theme. caret turns red for root

---
 themes/afowler.zsh-theme | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/themes/afowler.zsh-theme b/themes/afowler.zsh-theme
index f82e7bc25..b5a9bb173 100644
--- a/themes/afowler.zsh-theme
+++ b/themes/afowler.zsh-theme
@@ -1,6 +1,8 @@
+if [ "$(whoami)" = "root" ]; then CARETCOLOR="red"; else CARETCOLOR="blue"; fi
+
 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
 
-PROMPT='%m %{${fg_bold[blue]}%}:: %{$reset_color%}%{${fg[green]}%}%3~ $(git_prompt_info)%{${fg[blue]}%}»%{${reset_color}%} '
+PROMPT='%m %{${fg_bold[blue]}%}:: %{$reset_color%}%{${fg[green]}%}%3~ $(git_prompt_info)%{${fg_bold[$CARETCOLOR]}%}»%{${reset_color}%} '
 
 RPS1="${return_code}"
 

From d8a10dbba5cff634193a9a957833ad0f395d7a7d Mon Sep 17 00:00:00 2001
From: Parker McGee <pmcgee@twistingmaze.com>
Date: Fri, 30 Apr 2010 00:12:26 +0800
Subject: [PATCH 03/34] added my own theme

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

diff --git a/themes/pmcgee.zsh-theme b/themes/pmcgee.zsh-theme
new file mode 100644
index 000000000..4eb54df5b
--- /dev/null
+++ b/themes/pmcgee.zsh-theme
@@ -0,0 +1,16 @@
+if [ "$(whoami)" = "root" ]; then NCOLOR="red"; else NCOLOR="green"; fi
+
+PROMPT='
+%{$fg[$NCOLOR]%}%B%n@%m%b%{$reset_color%} %{$fg[white]%}%B${PWD/#$HOME/~}%b%{$reset_color%}
+$(git_prompt_info)%(!.#.$) '
+RPROMPT='[%*]'
+
+# git theming
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_no_bold[yellow]%}%B"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[red]%}*"
+
+# LS colors, made with http://geoff.greer.fm/lscolors/
+export LSCOLORS="Gxfxcxdxbxegedabagacad"
+export LS_COLORS='no=00:fi=00:di=01;34:ln=00;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=41;33;01:ex=00;32:*.cmd=00;32:*.exe=01;32:*.com=01;32:*.bat=01;32:*.btm=01;32:*.dll=01;32:*.tar=00;31:*.tbz=00;31:*.tgz=00;31:*.rpm=00;31:*.deb=00;31:*.arj=00;31:*.taz=00;31:*.lzh=00;31:*.lzma=00;31:*.zip=00;31:*.zoo=00;31:*.z=00;31:*.Z=00;31:*.gz=00;31:*.bz2=00;31:*.tb2=00;31:*.tz2=00;31:*.tbz2=00;31:*.avi=01;35:*.bmp=01;35:*.fli=01;35:*.gif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mng=01;35:*.mov=01;35:*.mpg=01;35:*.pcx=01;35:*.pbm=01;35:*.pgm=01;35:*.png=01;35:*.ppm=01;35:*.tga=01;35:*.tif=01;35:*.xbm=01;35:*.xpm=01;35:*.dl=01;35:*.gl=01;35:*.wmv=01;35:*.aiff=00;32:*.au=00;32:*.mid=00;32:*.mp3=00;32:*.ogg=00;32:*.voc=00;32:*.wav=00;32:'

From 97aac4acb5913a042a12a4797f5cc1894f2e21f5 Mon Sep 17 00:00:00 2001
From: Dave Verwer <dave.verwer@shinydevelopment.com>
Date: Thu, 22 Apr 2010 17:32:36 +0800
Subject: [PATCH 04/34] New theme "daveverwer", based on "geoffgarside".

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

diff --git a/themes/daveverwer.zsh-theme b/themes/daveverwer.zsh-theme
new file mode 100644
index 000000000..89aef926e
--- /dev/null
+++ b/themes/daveverwer.zsh-theme
@@ -0,0 +1,7 @@
+# Copied and modified from the oh-my-zsh theme from geoffgarside
+# Red server name, green cwd, blue git status
+
+PROMPT='%{$fg[red]%}%m%{$reset_color%}:%{$fg[green]%}%c%{$reset_color%}$(git_prompt_info) %(!.#.$) '
+
+ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[blue]%}("
+ZSH_THEME_GIT_PROMPT_SUFFIX=")%{$reset_color%}"

From 081deba3c4971a2a9af8c185f01ee9ea6754fdcb Mon Sep 17 00:00:00 2001
From: Edvard Majakari <edvard.majakari@leonidasoy.fi>
Date: Wed, 14 Apr 2010 04:44:51 +0800
Subject: [PATCH 05/34] added my theme

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

diff --git a/themes/edvardm.zsh-theme b/themes/edvardm.zsh-theme
new file mode 100644
index 000000000..f9ca1a9e2
--- /dev/null
+++ b/themes/edvardm.zsh-theme
@@ -0,0 +1,6 @@
+PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg_bold[white]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$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]%})"

From 456834b9ea5aca1a7727f7070681e5d0336e3893 Mon Sep 17 00:00:00 2001
From: Doug Fritz <doug@media.mit.edu>
Date: Sat, 3 Apr 2010 15:48:35 +0800
Subject: [PATCH 06/34] added skaro theme

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

diff --git a/themes/skaro.zsh-theme b/themes/skaro.zsh-theme
new file mode 100644
index 000000000..84b7b11b0
--- /dev/null
+++ b/themes/skaro.zsh-theme
@@ -0,0 +1,7 @@
+PROMPT='%{$fg_bold[green]%}%h %{$fg[cyan]%}%2~ %{$fg_bold[blue]%}$(git_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]%})"
+

From 5a3bde78d804a0c20a18f7de02e60f1c835a3f28 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Fri, 7 May 2010 15:35:03 -0700
Subject: [PATCH 07/34] Sprinkling some candy on this muffin.

---
 tools/install.sh | 9 ++++++++-
 tools/upgrade.sh | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/tools/install.sh b/tools/install.sh
index 5a7c00950..004b252f4 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -24,6 +24,13 @@ echo "export PATH=$PATH" >> ~/.zshrc
 echo "Time to change your default shell to zsh!"
 chsh -s /bin/zsh
 
-echo "Hooray! Oh My Zsh has been installed."
+echo '         __                                     __  '
+echo '  ____  / /_     ____ ___  __  __   ____  _____/ /_ '
+echo ' / __ \/ __ \   / __ `__ \/ / / /  /_  / / ___/ __ \ '
+echo '/ /_/ / / / /  / / / / / / /_/ /    / /_(__  ) / / / '
+echo '\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '
+echo '                        /____/'
+
+echo "\n\n ....is now installed."
 /bin/zsh
 source ~/.zshrc
diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index f749404e9..6dee42c25 100644
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -2,4 +2,5 @@ current_path=`pwd`
 echo "Upgrading Oh My Zsh"
 ( cd $ZSH && git pull origin master )
 echo "Hooray! Oh My Zsh has been updated and/or is at the current version. \nAny new updates will be reflected when you start your next terminal session."
+echo "To keep up on the latest, be sure to follow Oh My Zsh on twitter: http://twitter.com/ohmyzsh"
 cd $current_path
\ No newline at end of file

From 0a2a981dfeadf0e8cfcf361e792a3e3872f1aef4 Mon Sep 17 00:00:00 2001
From: Hayes Williams <hwpi31@gmail.com>
Date: Wed, 26 May 2010 21:49:55 -0700
Subject: [PATCH 08/34] Adds a new theme that only seems to work on Linux

---
 themes/linuxonly | 80 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 themes/linuxonly

diff --git a/themes/linuxonly b/themes/linuxonly
new file mode 100644
index 000000000..a11b80d7f
--- /dev/null
+++ b/themes/linuxonly
@@ -0,0 +1,80 @@
+# vim: set ts=2 textwidth=0
+
+autoload -U add-zsh-hook
+autoload -Uz vcs_info
+local c0=$(printf "\033[0m")
+local c1=$(printf "\033[38;5;215m")
+local c2=$(printf "\033[38;5;209m")
+local c3=$(printf "\033[38;5;203m")
+local c4=$(printf "\033[33;4m")
+local c5=$(printf "\033[38;5;137m")
+local c6=$(printf "\033[38;5;240m")
+local c7=$(printf "\033[38;5;149m")
+local c8=$(printf "\033[38;5;126m")
+local c9=$(printf "\033[38;5;162m")
+
+local foopath=$(perl /home/scp1/bin/foopath)
+
+if [ "$TERM" = "linux" ]; then
+    c1=$(printf "\033[34;1m")
+    c2=$(printf "\033[35m")
+    c3=$(printf "\033[31m")
+    c4=$(printf "\033[31;1m")
+    c5=$(printf "\033[32m")
+    c6=$(printf "\033[32;1m")
+    c7=$(printf "\033[33m")
+    c8=$(printf "\033[33;1m")
+    c9=$(printf "\033[34m")
+fi
+
+#local newtv=$(perl $HOME/devel/newtv.pl)
+local newtv=''
+
+zstyle ':vcs_info:*' actionformats \
+    '%{$c8%}(%f%s)%{$c7%}-%F{5}[%F{2}%b%F{3}|%F{1}%a%F{5}]%f '
+zstyle ':vcs_info:*' formats \
+    "%{$c8%}%s%{$c7%}:%{$c7%}(%{$c9%}%b%{$c7%})%f "
+zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{3}%r'
+zstyle ':vcs_info:*' enable git
+
+add-zsh-hook precmd prompt_jnrowe_precmd
+
+prompt_jnrowe_precmd () {
+    vcs_info
+
+    if [ "${vcs_info_msg_0_}" = "" ]; then
+        #dir_status="|%F{3}%n%F{7}@%F{3}%m%F{7}:%F{9}%l%f"
+        #dir_status="$c1%n%F{7}@%F{9}%m%F{7}:%F{12}%/"
+        dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$c4%}%/ %{$c0%}(%{$c5%}%?%{$c0%})"
+        #dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$foopath%} %{$c0%}(%{$c5%}%?%{$c0%})"
+        
+        PROMPT='%{$fg_bold[green]%}%p%{$reset_color%}${vcs_info_msg_0_}${dir_status} ${ret_status}%{$reset_color%}
+> '
+    elif [[ $(git diff --cached --name-status 2>/dev/null ) != "" ]]; then
+        dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$c4%}%/ %{$c0%}(%{$c5%}%?%{$c0%})"
+        PROMPT='${vcs_info_msg_0_}
+%{$fg_bold[green]%}%p%{$reset_color%}${dir_status} ${vcs_info_msg_0_}%{$reset_color%}
+> '
+    
+    elif [[ $(git diff --name-status 2>/dev/null ) != "" ]]; then
+        dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$c4%}%/ %{$c0%}(%{$c5%}%?%{$c0%})"
+
+        PROMPT='${vcs_info_msg_0_}
+%{$fg_bold[green]%}%p%{$reset_color%}${dir_status}%{$reset_color%}
+%{$c9%}·>%{$c0%} '
+    else
+        dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$c4%}%/ %{$c0%}(%{$c5%}%?%{$c0%})"
+        PROMPT='${vcs_info_msg_0_}
+%{$fg_bold[green]%}%p%{$reset_color%}${dir_status} ${vcs_info_msg_0_}%{$reset_color%}
+> '
+        
+    fi
+}
+
+
+#PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$reset_color%} ${vcs_info_msg_0_}${dir_status}%{$reset_color%}
+#> '
+
+# vim: set ft=zsh ts=4 sw=4 et:
+
+

From 8247cbf8b56ebd5915813bb1fafb72e71fc06c8f Mon Sep 17 00:00:00 2001
From: lunks <pnascimento@gmail.com>
Date: Fri, 14 May 2010 04:42:24 +0800
Subject: [PATCH 09/34] modified macovsky to support ruby version

---
 themes/macovsky.zsh-theme | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/macovsky.zsh-theme b/themes/macovsky.zsh-theme
index db7f9148c..4eb410233 100644
--- a/themes/macovsky.zsh-theme
+++ b/themes/macovsky.zsh-theme
@@ -1,8 +1,8 @@
 # ZSH Theme - Preview: http://gyazo.com/8becc8a7ed5ab54a0262a470555c3eed.png
 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
 
-PROMPT='%{$fg[green]%}%~%{$reset_color%} $(git_prompt_info)%{$reset_color%}%B$%b '
+PROMPT='%{$fg[green]%}%~%{$reset_color%} %{$fg[red]%}‹$(~/.rvm/bin/rvm-prompt i v)› %{$reset_color%} $(git_prompt_info)%{$reset_color%}%B$%b '
 RPS1="${return_code}"
 
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}‹"
-ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}"
\ No newline at end of file
+ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}"

From f02c9560b3089fae2639a466ea39263553619df5 Mon Sep 17 00:00:00 2001
From: lunks <pnascimento@gmail.com>
Date: Fri, 14 May 2010 07:15:31 +0800
Subject: [PATCH 10/34] macowsky modified theme with ruby version on prompt

---
 themes/macovsky-ruby.zsh-theme | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 themes/macovsky-ruby.zsh-theme

diff --git a/themes/macovsky-ruby.zsh-theme b/themes/macovsky-ruby.zsh-theme
new file mode 100644
index 000000000..4eb410233
--- /dev/null
+++ b/themes/macovsky-ruby.zsh-theme
@@ -0,0 +1,8 @@
+# ZSH Theme - Preview: http://gyazo.com/8becc8a7ed5ab54a0262a470555c3eed.png
+local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
+
+PROMPT='%{$fg[green]%}%~%{$reset_color%} %{$fg[red]%}‹$(~/.rvm/bin/rvm-prompt i v)› %{$reset_color%} $(git_prompt_info)%{$reset_color%}%B$%b '
+RPS1="${return_code}"
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}‹"
+ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}"

From ba9c78fc9b83752e970f7a1bc1b16a582672bd58 Mon Sep 17 00:00:00 2001
From: Alan Harper <alan@aussiegeek.net>
Date: Wed, 19 May 2010 14:53:16 +0800
Subject: [PATCH 11/34] Import rvm prompt

---
 lib/rvm.zsh | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 lib/rvm.zsh

diff --git a/lib/rvm.zsh b/lib/rvm.zsh
new file mode 100644
index 000000000..597be1b33
--- /dev/null
+++ b/lib/rvm.zsh
@@ -0,0 +1,7 @@
+# get the name of the branch we are on
+function rvm_prompt_info() {
+  ruby_version=$(~/.rvm/bin/rvm-prompt 2> /dev/null) || return
+  echo "($ruby_version)"
+}
+
+

From 0dbfeb9c23cfd3bffd2f744a5db17c3613ea44d2 Mon Sep 17 00:00:00 2001
From: Alan Harper <alan@aussiegeek.net>
Date: Wed, 19 May 2010 14:53:38 +0800
Subject: [PATCH 12/34] aussiegeek theme (include showing rvm prompt)

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

diff --git a/themes/aussiegeek.zsh-theme b/themes/aussiegeek.zsh-theme
new file mode 100644
index 000000000..c2c7f65b9
--- /dev/null
+++ b/themes/aussiegeek.zsh-theme
@@ -0,0 +1,8 @@
+
+PROMPT='$fg_bold[blue][ $fg[red]%t $fg_bold[blue]] $fg_bold[blue] [ $fg[red]%n@%m:%~$(git_prompt_info)$fg[yellow]$(rvm_prompt_info)$fg_bold[blue] ]$reset_color
+ $ '
+# git theming
+ZSH_THEME_GIT_PROMPT_PREFIX="$fg_bold[green]("
+ZSH_THEME_GIT_PROMPT_SUFFIX=")"
+ZSH_THEME_GIT_PROMPT_CLEAN="✔"
+ZSH_THEME_GIT_PROMPT_DIRTY="✗"

From f2f34f5404e8ab674a0e345a709783b6c56a3b72 Mon Sep 17 00:00:00 2001
From: Thomas J Bradley <theman@thomasjbradley.ca>
Date: Thu, 27 May 2010 06:37:52 +0800
Subject: [PATCH 13/34] Added my zsh theme file, heavily based on sjl's

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

diff --git a/themes/thomasjbradley.zsh-theme b/themes/thomasjbradley.zsh-theme
new file mode 100644
index 000000000..857301d19
--- /dev/null
+++ b/themes/thomasjbradley.zsh-theme
@@ -0,0 +1,29 @@
+function prompt_char {
+    git branch >/dev/null 2>/dev/null && echo '±' && return
+    hg root >/dev/null 2>/dev/null && echo '☿' && return
+    echo '○'
+}
+
+function virtualenv_info {
+    [ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') '
+}
+
+function hg_prompt_info {
+    hg prompt --angle-brackets "\
+< on %{$fg[magenta]%}<branch>%{$reset_color%}>\
+< at %{$fg[yellow]%}<tags|%{$reset_color%}, %{$fg[yellow]%}>%{$reset_color%}>\
+%{$fg[green]%}<status|modified|unknown><update>%{$reset_color%}<
+patches: <patches|join( → )|pre_applied(%{$fg[yellow]%})|post_applied(%{$reset_color%})|pre_unapplied(%{$fg_bold[black]%})|post_unapplied(%{$reset_color%})>>" 2>/dev/null
+}
+
+PROMPT='
+%{$fg[magenta]%}%n%{$reset_color%} at %{$fg[yellow]%}%m%{$reset_color%} in %{$fg_bold[green]%}${PWD/#$HOME/~}%{$reset_color%}$(hg_prompt_info)$(git_prompt_info)
+$(virtualenv_info)$(prompt_char) '
+
+ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%}!"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[green]%}?"
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+. ~/bin/dotfiles/zsh/aliases

From c5c870ac0556467a1b21f4298fda6aeefcc93ecd Mon Sep 17 00:00:00 2001
From: Vincent Driessen <vincent@datafox.nl>
Date: Fri, 28 May 2010 03:20:27 +0800
Subject: [PATCH 14/34] Added customized version of the wezm theme (mainly
 added username/host in the prompt).

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

diff --git a/themes/wezm+.zsh-theme b/themes/wezm+.zsh-theme
new file mode 100644
index 000000000..fee3eb08e
--- /dev/null
+++ b/themes/wezm+.zsh-theme
@@ -0,0 +1,7 @@
+PROMPT='%{${fg_bold[yellow]}%}%n%{$reset_color%}%{${fg[yellow]}%}@%m%{$reset_color%} $(git_prompt_info)%(?,,%{${fg_bold[white]}%}[%?]%{$reset_color%} )%{$fg[yellow]%}%#%{$reset_color%} '
+RPROMPT='%{$fg[green]%}%~%{$reset_color%}'
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[blue]%}("
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%})%{$fg[red]%}✗%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})"

From eb0f3c0234e88bbbf5ca014ace8d8d801207c222 Mon Sep 17 00:00:00 2001
From: Joseph Bergantine <jbergantine@gmail.com>
Date: Mon, 24 May 2010 04:03:27 +0800
Subject: [PATCH 15/34] adding my zsh theme -- only difference from robby's
 being that i'm using white instead of blue for legibility over brown

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

diff --git a/themes/jbergantine.zsh-theme b/themes/jbergantine.zsh-theme
new file mode 100644
index 000000000..d84247cff
--- /dev/null
+++ b/themes/jbergantine.zsh-theme
@@ -0,0 +1,6 @@
+PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[white]%}$(git_prompt_info)%{$fg_bold[white]%} % %{$reset_color%}'
+
+ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[white]%}) %{$fg[yellow]%}✗%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[white]%})"

From 81aa74b73cc221b5050e28ccf35d29317812edf9 Mon Sep 17 00:00:00 2001
From: MasterLambaster <MasterLambaster@gmail.com>
Date: Mon, 31 May 2010 17:09:45 +0800
Subject: [PATCH 16/34] Eastwood theme with optional RVM support

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

diff --git a/themes/eastwood.zsh-theme b/themes/eastwood.zsh-theme
new file mode 100644
index 000000000..83664515a
--- /dev/null
+++ b/themes/eastwood.zsh-theme
@@ -0,0 +1,19 @@
+#RVM settings
+if [[ -s ~/.rvm/scripts/rvm ]] ; then 
+  RPS1="%{$fg[yellow]%}rvm:%{$reset_color%}%{$fg[red]%}\$(~/.rvm/bin/rvm-prompt)%{$reset_color%} $EPS1"
+fi
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}["
+ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+#Customized git status, oh-my-zsh currently does not allow render dirty status before branch
+git_custom_status() {
+  local cb=$(current_branch)
+  if [ -n "$cb" ]; then
+    echo "$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_PREFIX$(current_branch)$ZSH_THEME_GIT_PROMPT_SUFFIX"
+  fi
+}
+
+PROMPT='$(git_custom_status)%{$fg[cyan]%}[%~% ]%{$reset_color%}%B$%b '

From 3cf9ab722e7c0829727f548c7d05a0d96055f707 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Thu, 3 Jun 2010 12:03:26 -0700
Subject: [PATCH 17/34] Initial implementation of a new plugin system, so that
 people can managed which aliases/functions they want.

---
 lib/aliases.zsh               | 28 ----------------------------
 lib/functions.zsh             | 21 ---------------------
 lib/git.zsh                   | 15 ---------------
 oh-my-zsh.sh                  |  4 ++++
 plugins/git.plugin.zsh        | 21 +++++++++++++++++++++
 plugins/lighthouse.plugin.zsh | 16 ++++++++++++++++
 plugins/rails.plugin.zsh      | 10 ++++++++++
 plugins/ruby.plugin.zsh       |  4 ++++
 plugins/textmate.plugin.zsh   | 14 ++++++++++++++
 9 files changed, 69 insertions(+), 64 deletions(-)
 create mode 100644 plugins/git.plugin.zsh
 create mode 100644 plugins/lighthouse.plugin.zsh
 create mode 100644 plugins/rails.plugin.zsh
 create mode 100644 plugins/ruby.plugin.zsh
 create mode 100644 plugins/textmate.plugin.zsh

diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index d891cc0a8..89c904a7e 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -1,19 +1,7 @@
-#!/bin/zsh
-
 # Push and pop directories on directory stack
 alias pu='pushd'
 alias po='popd'
 
-alias ss='thin --stats "/thin/stats" start'
-alias sg='ruby script/generate'
-alias sd='ruby script/destroy'
-alias sp='ruby script/plugin'
-alias ssp='ruby script/spec'
-alias rdbm='rake db:migrate'
-alias sc='ruby script/console'
-alias sd='ruby script/server --debugger'
-alias devlog='tail -f log/development.log'
-
 # Basic directory operations
 alias .='pwd'
 alias ...='cd ../..'
@@ -33,20 +21,4 @@ alias l='ls -la'
 alias ll='ls -alr'
 alias sl=ls # often screw this up
 
-alias sgem='sudo gem'
-
-# Find ruby file
-alias rfind='find . -name *.rb | xargs grep -n'
 alias afind='ack-grep -il'
-
-# Git and svn mix
-alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
-
-# TextMate
-alias et='mate . &'
-alias ett='mate app config lib db public spec test Rakefile Capfile Todo &'
-alias etp='mate app config lib db public spec test vendor/plugins vendor/gems Rakefile Capfile Todo &'
-alias etts='mate app config lib db public script spec test vendor/plugins vendor/gems Rakefile Capfile Todo &'
-
-# Editor Ruby file in TextMate
-alias mr='mate CHANGELOG app config db lib public script spec test'
diff --git a/lib/functions.zsh b/lib/functions.zsh
index 74b93f00e..35c3f3ce7 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -54,24 +54,3 @@ function take() {
   cd $1
 }
 
-function tm() {
-  cd $1
-  mate $1
-}
-
-# To use: add a .lighthouse file into your directory with the URL to the
-# individual project. For example:
-# https://rails.lighthouseapp.com/projects/8994
-# Example usage: http://screencast.com/t/ZDgwNDUwNT
-open_lighthouse_ticket () {
-  if [ ! -f .lighthouse-url ]; then
-    echo "There is no .lighthouse file in the current directory..."
-    return 0;
-  else
-    lighthouse_url=$(cat .lighthouse-url);
-    echo "Opening ticket #$1";
-    `open $lighthouse_url/tickets/$1`;
-  fi
-}
-
-alias lho='open_lighthouse_ticket'
diff --git a/lib/git.zsh b/lib/git.zsh
index 1d1d24deb..a54e5bcbb 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -20,18 +20,3 @@ function current_branch() {
   ref=$(git symbolic-ref HEAD 2> /dev/null) || return
   echo ${ref#refs/heads/}
 }
-
-# Aliases
-alias g='git'
-alias gst='git status'
-alias gl='git pull'
-alias gup='git fetch && git rebase'
-alias gp='git push'
-alias gd='git diff | mate'
-alias gdv='git diff -w "$@" | vim -R -'
-alias gc='git commit -v'
-alias gca='git commit -v -a'
-alias gb='git branch'
-alias gba='git branch -a'
-alias gcount='git shortlog -sn'
-alias gcp='git cherry-pick'
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index a41f3d89e..bb45c71eb 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -10,6 +10,10 @@ for config_file ($ZSH/lib/*.zsh) source $config_file
 # Load all of your custom configurations from custom/
 for config_file ($ZSH/custom/*.zsh) source $config_file
 
+# Load all of the plugins that were defined in ~/.zshrc
+plugin=${plugin:=()}
+for plugin ($plugins) source $ZSH/plugins/$plugin.plugin.zsh
+
 # Check for updates on initial load...
 if [ "$DISABLE_AUTO_UPDATE" = "true" ]
 then
diff --git a/plugins/git.plugin.zsh b/plugins/git.plugin.zsh
new file mode 100644
index 000000000..26777a62a
--- /dev/null
+++ b/plugins/git.plugin.zsh
@@ -0,0 +1,21 @@
+# Aliases
+alias g='git'
+alias gst='git status'
+alias gl='git pull'
+alias gup='git fetch && git rebase'
+alias gp='git push'
+alias gd='git diff | mate'
+alias gdv='git diff -w "$@" | vim -R -'
+alias gc='git commit -v'
+alias gca='git commit -v -a'
+alias gb='git branch'
+alias gba='git branch -a'
+alias gcount='git shortlog -sn'
+alias gcp='git cherry-pick'
+
+
+# Git and svn mix
+alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
+
+alias ggpull='git pull origin $(current_branch)'
+alias ggpush='git push origin $(current_branch)'
diff --git a/plugins/lighthouse.plugin.zsh b/plugins/lighthouse.plugin.zsh
new file mode 100644
index 000000000..4eb06a997
--- /dev/null
+++ b/plugins/lighthouse.plugin.zsh
@@ -0,0 +1,16 @@
+# To use: add a .lighthouse file into your directory with the URL to the
+# individual project. For example:
+# https://rails.lighthouseapp.com/projects/8994
+# Example usage: http://screencast.com/t/ZDgwNDUwNT
+open_lighthouse_ticket () {
+  if [ ! -f .lighthouse-url ]; then
+    echo "There is no .lighthouse file in the current directory..."
+    return 0;
+  else
+    lighthouse_url=$(cat .lighthouse-url);
+    echo "Opening ticket #$1";
+    `open $lighthouse_url/tickets/$1`;
+  fi
+}
+
+alias lho='open_lighthouse_ticket'
\ No newline at end of file
diff --git a/plugins/rails.plugin.zsh b/plugins/rails.plugin.zsh
new file mode 100644
index 000000000..fb21da846
--- /dev/null
+++ b/plugins/rails.plugin.zsh
@@ -0,0 +1,10 @@
+
+alias ss='thin --stats "/thin/stats" start'
+alias sg='ruby script/generate'
+alias sd='ruby script/destroy'
+alias sp='ruby script/plugin'
+alias ssp='ruby script/spec'
+alias rdbm='rake db:migrate'
+alias sc='ruby script/console'
+alias sd='ruby script/server --debugger'
+alias devlog='tail -f log/development.log'
\ No newline at end of file
diff --git a/plugins/ruby.plugin.zsh b/plugins/ruby.plugin.zsh
new file mode 100644
index 000000000..82bf5d49d
--- /dev/null
+++ b/plugins/ruby.plugin.zsh
@@ -0,0 +1,4 @@
+alias sgem='sudo gem'
+
+# Find ruby file
+alias rfind='find . -name *.rb | xargs grep -n'
\ No newline at end of file
diff --git a/plugins/textmate.plugin.zsh b/plugins/textmate.plugin.zsh
new file mode 100644
index 000000000..7b73e2751
--- /dev/null
+++ b/plugins/textmate.plugin.zsh
@@ -0,0 +1,14 @@
+
+# TextMate
+alias et='mate . &'
+alias ett='mate app config lib db public spec test Rakefile Capfile Todo &'
+alias etp='mate app config lib db public spec test vendor/plugins vendor/gems Rakefile Capfile Todo &'
+alias etts='mate app config lib db public script spec test vendor/plugins vendor/gems Rakefile Capfile Todo &'
+
+# Editor Ruby file in TextMate
+alias mr='mate CHANGELOG app config db lib public script spec test'
+
+function tm() {
+  cd $1
+  mate $1
+}

From 31dace882969e04e0256dac4ddb333f648707106 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Thu, 3 Jun 2010 12:05:12 -0700
Subject: [PATCH 18/34] Updating default .zshrc template file to include
 plugins declaration

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

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index d905be04b..8022b3506 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -14,6 +14,10 @@ export ZSH_THEME="robbyrussell"
 # Uncomment following line if you want to disable colors in ls
 # export DISABLE_LS_COLORS="true"
 
+# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
+# Example format: plugins=(rails git textmate ruby lighthouse)
+plugins=(git)
+
 source $ZSH/oh-my-zsh.sh
 
 # Customize to your needs...

From c21d3775a9663daf69133ae8dcd0a2697ef694fa Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Thu, 3 Jun 2010 12:32:55 -0700
Subject: [PATCH 19/34] Moving capistrano functions to rails plugin

---
 plugins/rails.plugin.zsh | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/plugins/rails.plugin.zsh b/plugins/rails.plugin.zsh
index fb21da846..b7f62a0c6 100644
--- a/plugins/rails.plugin.zsh
+++ b/plugins/rails.plugin.zsh
@@ -7,4 +7,26 @@ alias ssp='ruby script/spec'
 alias rdbm='rake db:migrate'
 alias sc='ruby script/console'
 alias sd='ruby script/server --debugger'
-alias devlog='tail -f log/development.log'
\ No newline at end of file
+alias devlog='tail -f log/development.log'
+
+function _cap_does_task_list_need_generating () {
+  if [ ! -f .cap_tasks~ ]; then return 0;
+  else
+    accurate=$(stat -f%m .cap_tasks~)
+    changed=$(stat -f%m config/deploy.rb)
+    return $(expr $accurate '>=' $changed)
+  fi
+}
+
+function _cap () {
+  if [ -f config/deploy.rb ]; then
+    if _cap_does_task_list_need_generating; then
+      echo "\nGenerating .cap_tasks~..." > /dev/stderr
+      cap show_tasks -q | cut -d " " -f 1 | sed -e '/^ *$/D' -e '1,2D'
+> .cap_tasks~
+    fi
+    compadd `cat .cap_tasks~`
+  fi
+}
+
+compctl -K _cap cap

From ab2c0744abc648da9c35dc52f4c0b3c0623b989d Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Thu, 3 Jun 2010 12:33:15 -0700
Subject: [PATCH 20/34] Removing rake completion from lib/ as it was moved to
 rails plugin

---
 lib/rake_completion.zsh | 21 ---------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 lib/rake_completion.zsh

diff --git a/lib/rake_completion.zsh b/lib/rake_completion.zsh
deleted file mode 100644
index 8336182d5..000000000
--- a/lib/rake_completion.zsh
+++ /dev/null
@@ -1,21 +0,0 @@
-function _cap_does_task_list_need_generating () {
-  if [ ! -f .cap_tasks~ ]; then return 0;
-  else
-    accurate=$(stat -f%m .cap_tasks~)
-    changed=$(stat -f%m config/deploy.rb)
-    return $(expr $accurate '>=' $changed)
-  fi
-}
-
-function _cap () {
-  if [ -f config/deploy.rb ]; then
-    if _cap_does_task_list_need_generating; then
-      echo "\nGenerating .cap_tasks~..." > /dev/stderr
-      cap show_tasks -q | cut -d " " -f 1 | sed -e '/^ *$/D' -e '1,2D'
-> .cap_tasks~
-    fi
-    compadd `cat .cap_tasks~`
-  fi
-}
-
-compctl -K _cap cap

From 455669e97606bb512b9f69fc1ed9b8fea5105a33 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Thu, 3 Jun 2010 12:54:40 -0700
Subject: [PATCH 21/34] Removing legacy completion code

---
 lib/completion.zsh | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/lib/completion.zsh b/lib/completion.zsh
index b627ef878..cba90179f 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -27,8 +27,6 @@ zstyle ':completion:*' list-colors ''
 bindkey -M menuselect '^o' accept-and-infer-next-history
 
 zstyle ':completion:*:*:*:*:*' menu select
-# zstyle ':completion:*:*:*:*:processes' force-list always
-
 zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;34=0=01'
 zstyle ':completion:*:*:*:*:processes' command "ps -u `whoami` -o pid,user,comm -w -w"
 
@@ -37,9 +35,3 @@ if [ -f ~/.ssh/known_hosts ]; then
   zstyle ':completion:*' hosts $( sed 's/[, ].*$//' $HOME/.ssh/known_hosts )
   zstyle ':completion:*:*:(ssh|scp):*:*' hosts `sed 's/^\([^ ,]*\).*$/\1/' ~/.ssh/known_hosts`
 fi
-
-# Complete on history
-#zstyle ':completion:*:history-words' stop yes
-#zstyle ':completion:*:history-words' remove-all-dups yes
-#zstyle ':completion:*:history-words' list false
-#zstyle ':completion:*:history-words' menu yes

From 89bd2bf317fe458c6a6154824823670dd2d32660 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Thu, 3 Jun 2010 12:55:07 -0700
Subject: [PATCH 22/34] Moving some rails and osx-specific functions to their
 corresponding plugin files

---
 lib/functions.zsh        | 16 ----------------
 plugins/osx.plugin.zsh   | 11 +++++++++++
 plugins/rails.plugin.zsh |  4 ++++
 3 files changed, 15 insertions(+), 16 deletions(-)
 create mode 100644 plugins/osx.plugin.zsh

diff --git a/lib/functions.zsh b/lib/functions.zsh
index 35c3f3ce7..fcbe994be 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -21,10 +21,6 @@ function preexec {
   title $cmd[1]:t "$cmd[2,-1]"
 }
 
-function remote_console() {
-  /usr/bin/env ssh $1 "( cd $2 && ruby script/console production )"
-}
-
 function zsh_stats() {
   history | awk '{print $2}' | sort | uniq -c | sort -rn | head
 }
@@ -37,18 +33,6 @@ function upgrade_oh_my_zsh() {
   /bin/sh $ZSH/tools/upgrade.sh
 }
 
-function tab() {
-  osascript 2>/dev/null <<EOF
-    tell application "System Events"
-      tell process "Terminal" to keystroke "t" using command down
-    end
-    tell application "Terminal"
-      activate
-      do script with command "cd \"$PWD\"; $*" in window 1
-    end tell
-EOF
-}
-
 function take() {
   mkdir -p $1
   cd $1
diff --git a/plugins/osx.plugin.zsh b/plugins/osx.plugin.zsh
new file mode 100644
index 000000000..fce88c796
--- /dev/null
+++ b/plugins/osx.plugin.zsh
@@ -0,0 +1,11 @@
+function tab() {
+  osascript 2>/dev/null <<EOF
+    tell application "System Events"
+      tell process "Terminal" to keystroke "t" using command down
+    end
+    tell application "Terminal"
+      activate
+      do script with command "cd \"$PWD\"; $*" in window 1
+    end tell
+EOF
+}
\ No newline at end of file
diff --git a/plugins/rails.plugin.zsh b/plugins/rails.plugin.zsh
index b7f62a0c6..45bebb722 100644
--- a/plugins/rails.plugin.zsh
+++ b/plugins/rails.plugin.zsh
@@ -30,3 +30,7 @@ function _cap () {
 }
 
 compctl -K _cap cap
+
+function remote_console() {
+  /usr/bin/env ssh $1 "( cd $2 && ruby script/console production )"
+}

From 27904c117c3ee70938edbac45cee7a44ced5c38b Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Thu, 3 Jun 2010 12:56:11 -0700
Subject: [PATCH 23/34] Moving current_branch() to git plugin

---
 lib/git.zsh            |  9 ---------
 plugins/git.plugin.zsh | 10 ++++++++++
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index a54e5bcbb..889dd98df 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -11,12 +11,3 @@ parse_git_dirty () {
     echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
   fi
 }
-
-#
-# Will return the current branch name
-# Usage example: git pull origin $(current_branch)
-#
-function current_branch() {
-  ref=$(git symbolic-ref HEAD 2> /dev/null) || return
-  echo ${ref#refs/heads/}
-}
diff --git a/plugins/git.plugin.zsh b/plugins/git.plugin.zsh
index 26777a62a..e0d967056 100644
--- a/plugins/git.plugin.zsh
+++ b/plugins/git.plugin.zsh
@@ -17,5 +17,15 @@ alias gcp='git cherry-pick'
 # Git and svn mix
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
 
+#
+# Will return the current branch name
+# Usage example: git pull origin $(current_branch)
+#
+function current_branch() {
+  ref=$(git symbolic-ref HEAD 2> /dev/null) || return
+  echo ${ref#refs/heads/}
+}
+
+# these aliases take advangate of the previous function
 alias ggpull='git pull origin $(current_branch)'
 alias ggpush='git push origin $(current_branch)'

From dea166411f134b33ae36c4ec4c51e71248dfa2a3 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Thu, 3 Jun 2010 12:59:49 -0700
Subject: [PATCH 24/34] Moving brew functions to it's own plugin

---
 functions/_brew => plugins/brew.plugin.zsh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename functions/_brew => plugins/brew.plugin.zsh (100%)

diff --git a/functions/_brew b/plugins/brew.plugin.zsh
similarity index 100%
rename from functions/_brew
rename to plugins/brew.plugin.zsh

From 59bfd87e08c127e6aacf473e99d2ebbc20e633ff Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Thu, 3 Jun 2010 13:01:41 -0700
Subject: [PATCH 25/34] Adding some candy to the upgrade script

---
 tools/upgrade.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 6dee42c25..6bdd02e38 100644
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -1,6 +1,12 @@
 current_path=`pwd`
 echo "Upgrading Oh My Zsh"
 ( cd $ZSH && git pull origin master )
+echo '         __                                     __  '
+echo '  ____  / /_     ____ ___  __  __   ____  _____/ /_ '
+echo ' / __ \/ __ \   / __ `__ \/ / / /  /_  / / ___/ __ \ '
+echo '/ /_/ / / / /  / / / / / / /_/ /    / /_(__  ) / / / '
+echo '\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '
+echo '                        /____/'
 echo "Hooray! Oh My Zsh has been updated and/or is at the current version. \nAny new updates will be reflected when you start your next terminal session."
 echo "To keep up on the latest, be sure to follow Oh My Zsh on twitter: http://twitter.com/ohmyzsh"
 cd $current_path
\ No newline at end of file

From 6774490a467016db70e9ec1ddd1bab6fe37a722a Mon Sep 17 00:00:00 2001
From: James Rowe <jnrowe@gmail.com>
Date: Sun, 9 May 2010 21:17:20 +0800
Subject: [PATCH 26/34] Don't auto-correct ebuild commands.

It breaks "ebuild <foo> manifest", as there are Manifest files in the directory.
---
 lib/correction.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/correction.zsh b/lib/correction.zsh
index a96f7ffd8..043320a6d 100644
--- a/lib/correction.zsh
+++ b/lib/correction.zsh
@@ -6,3 +6,4 @@ alias mysql='nocorrect mysql'
 alias mkdir='nocorrect mkdir'
 alias gist='nocorrect gist'
 alias heroku='nocorrect heroku'
+alias ebuild='nocorrect ebuild'

From edc8e3d092bc758fa9dd4f3472d2c6ec9d03b737 Mon Sep 17 00:00:00 2001
From: James Rowe <jnrowe@gmail.com>
Date: Sun, 9 May 2010 21:16:33 +0800
Subject: [PATCH 27/34] Ignore commands that start with a space.

This is useful when you want to use a dangerous command, as it won't be
available with history searching.
---
 lib/history.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/history.zsh b/lib/history.zsh
index 509be8f09..ca6f57079 100644
--- a/lib/history.zsh
+++ b/lib/history.zsh
@@ -10,6 +10,7 @@ setopt hist_verify
 setopt inc_append_history
 setopt extended_history
 setopt hist_expire_dups_first
+setopt hist_ignore_space
 
 setopt SHARE_HISTORY
 setopt APPEND_HISTORY

From f9fbd079832637c192e35fe65532495a37a3e3d3 Mon Sep 17 00:00:00 2001
From: James Rowe <jnrowe@gmail.com>
Date: Sun, 9 May 2010 22:23:11 +0800
Subject: [PATCH 28/34] Don't display dotfiles or reverse sort with ll alias.

The ll alias is a very common default for bash in Linux distributions, so use
that definition.
---
 lib/aliases.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index 89c904a7e..80760a1f5 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -18,7 +18,7 @@ alias history='fc -l 1'
 # List direcory contents
 alias lsa='ls -lah'
 alias l='ls -la'
-alias ll='ls -alr'
+alias ll='ls -l'
 alias sl=ls # often screw this up
 
 alias afind='ack-grep -il'

From 3bc73012041c8762fa0276c6e02ac46fb3698a32 Mon Sep 17 00:00:00 2001
From: James Rowe <jnrowe@gmail.com>
Date: Thu, 12 Nov 2009 14:52:53 +0800
Subject: [PATCH 29/34] Added a minimum zsh version note.

---
 README.textile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.textile b/README.textile
index 950f8861b..23d8b5390 100644
--- a/README.textile
+++ b/README.textile
@@ -4,6 +4,8 @@ bq. "OH MY ZSHELL!"
 
 h2. Setup
 
+@oh-my-zsh@ should work with any recent release of "zsh":http://www.zsh.org/, the minimum recommended version is 4.3.9.
+
 h3. The automatic installer... (do you trust me?)
 
 @wget http://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh -O - | sh@

From 6efc79c74edbc8cfbb5cdc438332eeae9b950508 Mon Sep 17 00:00:00 2001
From: James Rowe <jnrowe@gmail.com>
Date: Sun, 22 Nov 2009 01:38:55 +0800
Subject: [PATCH 30/34] Don't correct hpodder commands.

---
 lib/correction.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/correction.zsh b/lib/correction.zsh
index 043320a6d..fc60dcdbd 100644
--- a/lib/correction.zsh
+++ b/lib/correction.zsh
@@ -7,3 +7,4 @@ alias mkdir='nocorrect mkdir'
 alias gist='nocorrect gist'
 alias heroku='nocorrect heroku'
 alias ebuild='nocorrect ebuild'
+alias hpodder='nocorrect hpodder'

From 47e9914529e0807681c3c6dd2c11187ee67f0326 Mon Sep 17 00:00:00 2001
From: Takashi Yoshida <takashi@takashiyoshida.org>
Date: Mon, 31 May 2010 00:56:26 +0800
Subject: [PATCH 31/34] Added my own theme.

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

diff --git a/themes/takashiyoshida.zsh-theme b/themes/takashiyoshida.zsh-theme
new file mode 100644
index 000000000..419a8cf3f
--- /dev/null
+++ b/themes/takashiyoshida.zsh-theme
@@ -0,0 +1,27 @@
+#
+# PROMPT
+#
+PROMPT_BRACKET_BEGIN='%{$fg_bold[white]%}['
+PROMPT_HOST='%{$fg_bold[cyan]%}%m'
+PROMPT_SEPARATOR='%{$reset_color%}:'
+PROMPT_DIR='%{$fg_bold[yellow]%}%c'
+PROMPT_BRACKET_END='%{$fg_bold[white]%}]'
+
+PROMPT_USER='%{$fg_bold[white]%}%n'
+PROMPT_SIGN='%{$reset_color%}%#'
+
+GIT_PROMPT_INFO='$(git_prompt_info)'
+
+# My current prompt looks like:
+# [host:current_dir] (git_prompt_info)
+# [username]%
+PROMPT="${PROMPT_BRACKET_BEGIN}${PROMPT_HOST}${PROMPT_SEPARATOR}${PROMPT_DIR}${PROMPT_BRACKET_END}${GIT_PROMPT_INFO}
+${PROMPT_BRACKET_BEGIN}${PROMPT_USER}${PROMPT_BRACKET_END}${PROMPT_SIGN} "
+
+#
+# Git repository
+#
+ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%}!"
+ZSH_THEME_GIT_PROMPT_CLEAN=''

From 6bb13632f538db339520ab2b46794006a405430f Mon Sep 17 00:00:00 2001
From: Tobias Birmili <birmilts@studi.informatik.uni-stuttgart.de>
Date: Sun, 6 Jun 2010 18:42:25 +0800
Subject: [PATCH 32/34] added plugin to control macports mysql-server
 installation

---
 plugins/mysql-macports.plugin.zsh | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 plugins/mysql-macports.plugin.zsh

diff --git a/plugins/mysql-macports.plugin.zsh b/plugins/mysql-macports.plugin.zsh
new file mode 100644
index 000000000..63b881c9f
--- /dev/null
+++ b/plugins/mysql-macports.plugin.zsh
@@ -0,0 +1,6 @@
+# commands to control local mysql-server installation
+# paths are for osx installtion via macports
+
+alias mysqlstart='sudo /opt/local/bin/mysqld_safe5'
+alias mysqlstop='/opt/local/bin/mysqladmin5 -u root -p shutdown'
+alias mysqlstatus='mysqladmin5 -u root -p ping'
\ No newline at end of file

From b26ff059653716fd38d1813b797572bbec718c16 Mon Sep 17 00:00:00 2001
From: toabi <tobias@codingcorsairs.com>
Date: Sun, 6 Jun 2010 22:14:13 +0800
Subject: [PATCH 33/34] updated the readme

---
 README.textile | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/README.textile b/README.textile
index 23d8b5390..8b1b6875a 100644
--- a/README.textile
+++ b/README.textile
@@ -27,22 +27,19 @@ h3. The manual way
 
   @chsh -s /bin/zsh@
 
-4. Start / restart zsh (open a new terminal is easy enough..)
+4. Start / restart zsh (open a new terminal is easy enough...)
 
 h3. Problems?
 
-You _might_ need to modify your PATH in ~/.zshrc if you're not able to find some commands after switching to oh-my-zsh.
+You _might_ need to modify your PATH in ~/.zshrc if you're not able to find some commands after switching to _Oh My Zsh_.
 
 h2. Usage
 
-TODO: Update this..
-
-* Rake autocomplete: @rake (tab)@. Will generate a cache of all your rake tasks and then let you auto-complete and/or select the task to run.
-* ssh autocomplete: @ssh (tab)@ or @scp (tab)@
-* Git branch, it'll tell you which branch you're in when you're in a git repository directory.
+* 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":http://wiki.github.com/robbyrussell/oh-my-zsh/themes that come bundled with Oh My Zsh.
-* much much more..
+** Take a look at the "current themes":http://wiki.github.com/robbyrussell/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
 
@@ -51,6 +48,7 @@ the "refcard":http://www.bash2zsh.com/zsh_refcard/refcard.pdf is pretty tasty fo
 h3. Customization
 
 If you want to override any of the default behavior, just add a new file (ending in @.zsh@) into the @custom/@ directory.
+If you have many functions which go good together you can put them as a *.plugin.zsh file in the @plugin/@ directory and then enable this plugin.
 
 h3. Uninstalling
 
@@ -68,8 +66,4 @@ I'm far from being a zsh-expert and suspect there are many ways to improve. If y
 
 h3. Send us your theme!
 
-I'm hoping to collect a bunch of themes for our command prompts. You can see existing ones in the @themes/@ directory.
-
-h3. Todo from imajes:
-
-* need to make the title bar support git folder
\ No newline at end of file
+I'm hoping to collect a bunch of themes for our command prompts. You can see existing ones in the @themes/@ directory.
\ No newline at end of file

From 7f350da5b74c65ed99766c8ebd5137aee9479225 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Thu, 10 Jun 2010 07:50:13 -0700
Subject: [PATCH 34/34] Adding a ggpnp which does a git pull followed by a git
 push.

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

diff --git a/plugins/git.plugin.zsh b/plugins/git.plugin.zsh
index e0d967056..655eaf728 100644
--- a/plugins/git.plugin.zsh
+++ b/plugins/git.plugin.zsh
@@ -29,3 +29,4 @@ function current_branch() {
 # these aliases take advangate 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