From 3e1d5fa3164db236653756bde816c94af7d23b01 Mon Sep 17 00:00:00 2001
From: Tomas Kramar <kramar.tomas@gmail.com>
Date: Mon, 22 Mar 2010 21:44:15 +0100
Subject: Make Shift+Tab move backwards in the menu

---
 lib/key-bindings.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index 87e47bab6..8d22eb2b3 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -20,6 +20,7 @@ bindkey "^[[F"  end-of-line
 bindkey "^[[4~" end-of-line
 bindkey ' ' magic-space    # also do history expansion on space
 
+bindkey '^[[Z' reverse-menu-complete
 
 # consider emacs keybindings:
 
@@ -38,4 +39,4 @@ bindkey ' ' magic-space    # also do history expansion on space
 #bindkey '^I' complete-word
 ## Fix weird sequence that rxvt produces
 #bindkey -s '^[[Z' '\t'
-#
\ No newline at end of file
+#
-- 
cgit v1.2.3-70-g09d2


From fbc22d80fe098f9ee5ca935766bc3d411c53ed92 Mon Sep 17 00:00:00 2001
From: Kenneth Reitz <me@kennethreitz.com>
Date: Mon, 30 Aug 2010 14:59:23 -0400
Subject: Added the truly epic kennethreitz theme.

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

diff --git a/themes/kennethreitz.zsh-theme b/themes/kennethreitz.zsh-theme
new file mode 100644
index 000000000..109be0c22
--- /dev/null
+++ b/themes/kennethreitz.zsh-theme
@@ -0,0 +1,13 @@
+local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
+
+PROMPT='%{$fg[green]%}%c \
+$(git_prompt_info)\
+%{$fg[red]%}%(!.#.»)%{$reset_color%} '
+PROMPT2='%{$fg[red]%}\ %{$reset_color%}'
+RPS1='%{$fg[blue]%}%~%{$reset_color%} ${return_code} '
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}:: %{$fg[yellow]%}("
+ZSH_THEME_GIT_PROMPT_SUFFIX=")%{$reset_color%} "
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*%{$fg[yellow]%}"
+
-- 
cgit v1.2.3-70-g09d2


From 5215e74bf470b4baba571e879cbd1bfddc28daf3 Mon Sep 17 00:00:00 2001
From: Vivek Prahlad <vivek.prahlad@gmail.com>
Date: Fri, 10 Sep 2010 10:50:42 +0530
Subject: Adding a plugin with aliases for macports

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

diff --git a/plugins/macports.plugin.zsh b/plugins/macports.plugin.zsh
new file mode 100644
index 000000000..94a5f5ef2
--- /dev/null
+++ b/plugins/macports.plugin.zsh
@@ -0,0 +1,6 @@
+alias pc="sudo port clean --all installed"
+alias pi="sudo port install $1"
+alias psu="sudo port selfupdate"
+alias puni="sudo port uninstall inactive"
+alias puo="sudo port upgrade outdated"
+alias pup="psu && puo"
-- 
cgit v1.2.3-70-g09d2


From f9fce9bb8d293286d7d0fb7ecde170bd0c7f37fc Mon Sep 17 00:00:00 2001
From: Vivek Prahlad <vivek.prahlad@gmail.com>
Date: Fri, 10 Sep 2010 10:55:17 +0530
Subject: Adding comments

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

diff --git a/plugins/macports.plugin.zsh b/plugins/macports.plugin.zsh
index 94a5f5ef2..9564829b0 100644
--- a/plugins/macports.plugin.zsh
+++ b/plugins/macports.plugin.zsh
@@ -1,3 +1,4 @@
+#Aliases
 alias pc="sudo port clean --all installed"
 alias pi="sudo port install $1"
 alias psu="sudo port selfupdate"
-- 
cgit v1.2.3-70-g09d2


From a0a8ba666b29cbcdbba05726e4e2d46eca708ca1 Mon Sep 17 00:00:00 2001
From: Matt Cable <wozz@wookie.net>
Date: Sat, 27 Feb 2010 16:15:47 -0700
Subject: Initial pass at pesistant directory stack

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

diff --git a/lib/dirspersist.zsh b/lib/dirspersist.zsh
new file mode 100644
index 000000000..a7c077ae0
--- /dev/null
+++ b/lib/dirspersist.zsh
@@ -0,0 +1,19 @@
+#!/bin/zsh
+# 
+# Make the dirstack more persistant
+# 
+# Run dirpersiststore in ~/.zlogout
+
+dirpersiststore () {
+    dirs -p | sed 's/ /\\ /g;s/^/pushd -q /;1!G;h;$!d;' > ~/.zdirstore
+}
+
+dirpersistrestore () {
+    if [ -f ~/.zdirstore ]; then
+        source ~/.zdirstore
+    fi
+}
+
+DIRSTACKSIZE=10
+setopt autopushd pushdminus pushdsilent pushdtohome pushdignoredups
+dirpersistrestore
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From 870551e960c6cb506fd7cc232a069432dfc72f2c Mon Sep 17 00:00:00 2001
From: Matt Cable <wozz@wookie.net>
Date: Mon, 15 Mar 2010 20:34:26 -0600
Subject: Alias popd to remove deleted dirs from persistance

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

diff --git a/lib/dirspersist.zsh b/lib/dirspersist.zsh
index a7c077ae0..8364a879c 100644
--- a/lib/dirspersist.zsh
+++ b/lib/dirspersist.zsh
@@ -16,4 +16,7 @@ dirpersistrestore () {
 
 DIRSTACKSIZE=10
 setopt autopushd pushdminus pushdsilent pushdtohome pushdignoredups
-dirpersistrestore
\ No newline at end of file
+dirpersistrestore
+
+# Make popd changes permanent without having to wait for logout
+alias popd="popd;dirpersiststore"
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From 21e2a913bff765b8dc23f12309059f7446e0ff99 Mon Sep 17 00:00:00 2001
From: Matt Cable <wozz@wookie.net>
Date: Fri, 2 Apr 2010 15:24:41 -0600
Subject: Escape &'s in path name.  Need to find general function for escaping
 all shell metacharacters.

---
 lib/dirspersist.zsh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/dirspersist.zsh b/lib/dirspersist.zsh
index 8364a879c..973107c52 100644
--- a/lib/dirspersist.zsh
+++ b/lib/dirspersist.zsh
@@ -5,7 +5,8 @@
 # Run dirpersiststore in ~/.zlogout
 
 dirpersiststore () {
-    dirs -p | sed 's/ /\\ /g;s/^/pushd -q /;1!G;h;$!d;' > ~/.zdirstore
+# FIXME: need to escape all shell metacharacters, not just spaces!
+    dirs -p | sed 's/ /\\ /g;s/&/\\&/;s/^/pushd -q /;1!G;h;$!d;' > ~/.zdirstore
 }
 
 dirpersistrestore () {
@@ -19,4 +20,4 @@ setopt autopushd pushdminus pushdsilent pushdtohome pushdignoredups
 dirpersistrestore
 
 # Make popd changes permanent without having to wait for logout
-alias popd="popd;dirpersiststore"
\ No newline at end of file
+alias popd="popd;dirpersiststore"
-- 
cgit v1.2.3-70-g09d2


From 181a2ed5379f5bf9d0420c0caaea56034eb22732 Mon Sep 17 00:00:00 2001
From: Matt Cable <wozz@wookie.net>
Date: Thu, 22 Apr 2010 11:26:08 -0600
Subject: Escape some metachars that trip up .zdirstore script

---
 lib/dirspersist.zsh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/dirspersist.zsh b/lib/dirspersist.zsh
index 973107c52..d694c55e2 100644
--- a/lib/dirspersist.zsh
+++ b/lib/dirspersist.zsh
@@ -5,8 +5,7 @@
 # Run dirpersiststore in ~/.zlogout
 
 dirpersiststore () {
-# FIXME: need to escape all shell metacharacters, not just spaces!
-    dirs -p | sed 's/ /\\ /g;s/&/\\&/;s/^/pushd -q /;1!G;h;$!d;' > ~/.zdirstore
+    dirs -p | tail -r | perl -ne 'chomp;s/([& ])/\\$1/g ;print "if [ -d $_ ]; then pushd -q $_; fi\n"' > ~/.zdirstore
 }
 
 dirpersistrestore () {
-- 
cgit v1.2.3-70-g09d2


From 50fb2d037ee75ac6e558923c7a92c818a96d43c8 Mon Sep 17 00:00:00 2001
From: Matt Cable <wozz@wookie.net>
Date: Sun, 19 Sep 2010 19:39:51 -0600
Subject: Move dirpersist to plugin

---
 lib/dirspersist.zsh           | 22 ----------------------
 plugins/dirpersist.plugin.zsh | 22 ++++++++++++++++++++++
 2 files changed, 22 insertions(+), 22 deletions(-)
 delete mode 100644 lib/dirspersist.zsh
 create mode 100644 plugins/dirpersist.plugin.zsh

diff --git a/lib/dirspersist.zsh b/lib/dirspersist.zsh
deleted file mode 100644
index d694c55e2..000000000
--- a/lib/dirspersist.zsh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/zsh
-# 
-# Make the dirstack more persistant
-# 
-# Run dirpersiststore in ~/.zlogout
-
-dirpersiststore () {
-    dirs -p | tail -r | perl -ne 'chomp;s/([& ])/\\$1/g ;print "if [ -d $_ ]; then pushd -q $_; fi\n"' > ~/.zdirstore
-}
-
-dirpersistrestore () {
-    if [ -f ~/.zdirstore ]; then
-        source ~/.zdirstore
-    fi
-}
-
-DIRSTACKSIZE=10
-setopt autopushd pushdminus pushdsilent pushdtohome pushdignoredups
-dirpersistrestore
-
-# Make popd changes permanent without having to wait for logout
-alias popd="popd;dirpersiststore"
diff --git a/plugins/dirpersist.plugin.zsh b/plugins/dirpersist.plugin.zsh
new file mode 100644
index 000000000..d694c55e2
--- /dev/null
+++ b/plugins/dirpersist.plugin.zsh
@@ -0,0 +1,22 @@
+#!/bin/zsh
+# 
+# Make the dirstack more persistant
+# 
+# Run dirpersiststore in ~/.zlogout
+
+dirpersiststore () {
+    dirs -p | tail -r | perl -ne 'chomp;s/([& ])/\\$1/g ;print "if [ -d $_ ]; then pushd -q $_; fi\n"' > ~/.zdirstore
+}
+
+dirpersistrestore () {
+    if [ -f ~/.zdirstore ]; then
+        source ~/.zdirstore
+    fi
+}
+
+DIRSTACKSIZE=10
+setopt autopushd pushdminus pushdsilent pushdtohome pushdignoredups
+dirpersistrestore
+
+# Make popd changes permanent without having to wait for logout
+alias popd="popd;dirpersiststore"
-- 
cgit v1.2.3-70-g09d2


From 1862b1c0755770cffcbcb936bdecc3bfb050931d Mon Sep 17 00:00:00 2001
From: Matt Cable <wozz@wookie.net>
Date: Sun, 19 Sep 2010 19:43:49 -0600
Subject: Added installation function

---
 plugins/dirpersist.plugin.zsh | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/plugins/dirpersist.plugin.zsh b/plugins/dirpersist.plugin.zsh
index d694c55e2..48ca94d7c 100644
--- a/plugins/dirpersist.plugin.zsh
+++ b/plugins/dirpersist.plugin.zsh
@@ -4,6 +4,17 @@
 # 
 # Run dirpersiststore in ~/.zlogout
 
+dirpersistinstall () {
+    if grep -qL 'dirpersiststore' ~/.zlogout; then
+    else
+        if read -q \?"Would you like to set up your .zlogout file for use with dirspersist? (y/n) "; then
+            echo "# Store dirs stack\n# See ~/.oh-my-zsh/plugins/dirspersist.plugin.zsh\ndirpersiststore" >> ~/.zlogout
+        else
+            echo "If you don't want this message to appear, remove dirspersist from \$plugins"
+        fi
+    fi
+}
+
 dirpersiststore () {
     dirs -p | tail -r | perl -ne 'chomp;s/([& ])/\\$1/g ;print "if [ -d $_ ]; then pushd -q $_; fi\n"' > ~/.zdirstore
 }
@@ -16,6 +27,8 @@ dirpersistrestore () {
 
 DIRSTACKSIZE=10
 setopt autopushd pushdminus pushdsilent pushdtohome pushdignoredups
+
+dirpersistinstall
 dirpersistrestore
 
 # Make popd changes permanent without having to wait for logout
-- 
cgit v1.2.3-70-g09d2


From 610f68c8e0401048f87d1f2bd48086b8c0cd0dbe Mon Sep 17 00:00:00 2001
From: Matt Cable <wozz@wookie.net>
Date: Sun, 19 Sep 2010 22:39:11 -0600
Subject: Added install instructions

---
 plugins/dirpersist.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/dirpersist.plugin.zsh b/plugins/dirpersist.plugin.zsh
index 48ca94d7c..4decd8b30 100644
--- a/plugins/dirpersist.plugin.zsh
+++ b/plugins/dirpersist.plugin.zsh
@@ -2,7 +2,8 @@
 # 
 # Make the dirstack more persistant
 # 
-# Run dirpersiststore in ~/.zlogout
+# Add dirpersist to $plugins in ~/.zshrc to load
+# 
 
 dirpersistinstall () {
     if grep -qL 'dirpersiststore' ~/.zlogout; then
-- 
cgit v1.2.3-70-g09d2


From 8f7609b4fabd3d02e3991221cbe35bea692c22e3 Mon Sep 17 00:00:00 2001
From: Matt Cable <wozz@wookie.net>
Date: Sun, 19 Sep 2010 22:40:47 -0600
Subject: Change zdirstore to variable

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

diff --git a/plugins/dirpersist.plugin.zsh b/plugins/dirpersist.plugin.zsh
index 4decd8b30..5b3fdfb3d 100644
--- a/plugins/dirpersist.plugin.zsh
+++ b/plugins/dirpersist.plugin.zsh
@@ -5,6 +5,9 @@
 # Add dirpersist to $plugins in ~/.zshrc to load
 # 
 
+# $zdirstore is the file used to persist the stack
+zdirstore=~/.zdirstore
+
 dirpersistinstall () {
     if grep -qL 'dirpersiststore' ~/.zlogout; then
     else
@@ -17,12 +20,12 @@ dirpersistinstall () {
 }
 
 dirpersiststore () {
-    dirs -p | tail -r | perl -ne 'chomp;s/([& ])/\\$1/g ;print "if [ -d $_ ]; then pushd -q $_; fi\n"' > ~/.zdirstore
+    dirs -p | tail -r | perl -ne 'chomp;s/([& ])/\\$1/g ;print "if [ -d $_ ]; then pushd -q $_; fi\n"' > $zdirstore
 }
 
 dirpersistrestore () {
-    if [ -f ~/.zdirstore ]; then
-        source ~/.zdirstore
+    if [ -f $zdirstore ]; then
+        source $zdirstore
     fi
 }
 
-- 
cgit v1.2.3-70-g09d2


From 2ff567e16267274041f542b5bce18876b8815fca Mon Sep 17 00:00:00 2001
From: Matt Cable <wozz@wookie.net>
Date: Tue, 21 Sep 2010 12:07:02 -0600
Subject: Removed unportable (and unnecessary) grep flags

---
 plugins/dirpersist.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/dirpersist.plugin.zsh b/plugins/dirpersist.plugin.zsh
index 5b3fdfb3d..b5e825bff 100644
--- a/plugins/dirpersist.plugin.zsh
+++ b/plugins/dirpersist.plugin.zsh
@@ -9,7 +9,7 @@
 zdirstore=~/.zdirstore
 
 dirpersistinstall () {
-    if grep -qL 'dirpersiststore' ~/.zlogout; then
+    if grep 'dirpersiststore' ~/.zlogout > /dev/null; then
     else
         if read -q \?"Would you like to set up your .zlogout file for use with dirspersist? (y/n) "; then
             echo "# Store dirs stack\n# See ~/.oh-my-zsh/plugins/dirspersist.plugin.zsh\ndirpersiststore" >> ~/.zlogout
@@ -19,6 +19,7 @@ dirpersistinstall () {
     fi
 }
 
+# FIXME solaris doesn't support tail -r
 dirpersiststore () {
     dirs -p | tail -r | perl -ne 'chomp;s/([& ])/\\$1/g ;print "if [ -d $_ ]; then pushd -q $_; fi\n"' > $zdirstore
 }
-- 
cgit v1.2.3-70-g09d2


From 62cea310fb97a98f6360397dfeef3a01507153fd Mon Sep 17 00:00:00 2001
From: gwjo <gowen72@gmail.com>
Date: Fri, 24 Sep 2010 20:46:52 -0400
Subject: ssh-agent module

Implement a simple module that automatically launches the ssh-agent when you login and
adds your default key.

Useful for anyone that does remote work and thus doesn't have access to a keychain tool.
---
 plugins/ssh-agent.plugin.zsh | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 plugins/ssh-agent.plugin.zsh

diff --git a/plugins/ssh-agent.plugin.zsh b/plugins/ssh-agent.plugin.zsh
new file mode 100644
index 000000000..fa8c45ea2
--- /dev/null
+++ b/plugins/ssh-agent.plugin.zsh
@@ -0,0 +1,24 @@
+# Based on code from Joseph M. Reagle
+# http://www.cygwin.com/ml/cygwin/2001-06/msg00537.html
+
+local SSH_ENV=$HOME/.ssh/environment
+
+function start_agent {
+     /usr/bin/ssh-agent | sed 's/^echo/#echo/' > ${SSH_ENV}
+     chmod 600 ${SSH_ENV}
+     . ${SSH_ENV} > /dev/null
+     /usr/bin/ssh-add;
+}
+
+# Source SSH settings, if applicable
+
+if [ -f "${SSH_ENV}" ]; then
+     . ${SSH_ENV} > /dev/null
+     #ps ${SSH_AGENT_PID} doesn't work under cywgin
+     ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || {
+         start_agent;
+     }
+else
+     start_agent;
+fi
+
-- 
cgit v1.2.3-70-g09d2


From 6764e50397f35eba635e57a231ff06f1685efc5f Mon Sep 17 00:00:00 2001
From: Jake Bell <jake.b.bell@gmail.com>
Date: Sat, 25 Sep 2010 00:48:19 -0500
Subject: Added theunraveler theme.

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

diff --git a/themes/theunraveler.zsh-theme b/themes/theunraveler.zsh-theme
new file mode 100644
index 000000000..4eec8e827
--- /dev/null
+++ b/themes/theunraveler.zsh-theme
@@ -0,0 +1,6 @@
+# Comment 
+
+ZSH_THEME_GIT_PROMPT_PREFIX=' (git:'
+ZSH_THEME_GIT_PROMPT_SUFFIX=')'
+
+PROMPT='%{$fg[magenta]%}[%c]$(git_prompt_info) $ %{$reset_color%}'
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From e37d62a282dc74b7cd265643dcb01f80e25b3e34 Mon Sep 17 00:00:00 2001
From: Tomas Kramar <kramar.tomas@gmail.com>
Date: Sun, 26 Sep 2010 16:05:53 +0200
Subject: unset config_file is useless

---
 oh-my-zsh.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index bb45c71eb..c46aea7ac 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -21,5 +21,3 @@ then
 else
   /usr/bin/env zsh $ZSH/tools/check_for_upgrade.sh
 fi
-
-unset config_file
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From 74b2c5d75ab6477ea3f72eeadb6fd81b42c1abd4 Mon Sep 17 00:00:00 2001
From: Tomas Kramar <kramar.tomas@gmail.com>
Date: Sun, 26 Sep 2010 16:03:44 +0200
Subject: Do not complete named-directories

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

diff --git a/lib/completion.zsh b/lib/completion.zsh
index cba90179f..52cc5b53c 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -1,4 +1,4 @@
-## fixme - the load process here seems a bit bizarre
+# fixme - the load process here seems a bit bizarre
 
 unsetopt menu_complete   # do not autoselect the first completion entry
 unsetopt flowcontrol
@@ -30,6 +30,11 @@ zstyle ':completion:*:*:*:*:*' menu select
 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"
 
+# disable named-directories autocompletion
+zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-directories
+cdpath=(.)
+
+
 # Load known hosts file for auto-completion with ssh and scp commands
 if [ -f ~/.ssh/known_hosts ]; then
   zstyle ':completion:*' hosts $( sed 's/[, ].*$//' $HOME/.ssh/known_hosts )
-- 
cgit v1.2.3-70-g09d2


From 6c3b9daaf7cd1bf387d46e865f316c6815dc14d2 Mon Sep 17 00:00:00 2001
From: Tomas Kramar <kramar.tomas@gmail.com>
Date: Sun, 26 Sep 2010 22:25:31 +0200
Subject: Add vi-mode plugin for vi-like editing

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

diff --git a/plugins/vi-mode.plugin.zsh b/plugins/vi-mode.plugin.zsh
new file mode 100644
index 000000000..c47ab7211
--- /dev/null
+++ b/plugins/vi-mode.plugin.zsh
@@ -0,0 +1,22 @@
+function zle-line-init zle-keymap-select {
+  zle reset-prompt
+}
+
+zle -N zle-line-init
+zle -N zle-keymap-select
+
+bindkey -v
+
+# if mode indicator wasn't setup by theme, define default
+if [[ "$MODE_INDICATOR" == "" ]]; then
+  MODE_INDICATOR="%{$fg_bold[red]%}<%{$fg[red]%}<<%{$reset_color%}"
+fi
+
+function vi_mode_prompt_info() {
+  echo "${${KEYMAP/vicmd/$MODE_INDICATOR}/(main|viins)/}"
+}
+
+# define right prompt, if it wasn't defined by a theme
+if [[ "$RPS1" == "" && "$RPROMPT" == "" ]]; then
+  RPS1='$(vi_mode_prompt_info)'
+fi
-- 
cgit v1.2.3-70-g09d2


From 3add6a2ac47186240a2d02a986ae22b6519d965f Mon Sep 17 00:00:00 2001
From: Matt Cable <wozz@wookie.net>
Date: Sun, 26 Sep 2010 21:30:57 -0600
Subject: Portable perl dirpersiststore because 'tail -r' doesn't work
 everywhere.

---
 plugins/dirpersist.plugin.zsh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/dirpersist.plugin.zsh b/plugins/dirpersist.plugin.zsh
index b5e825bff..6a2b289a2 100644
--- a/plugins/dirpersist.plugin.zsh
+++ b/plugins/dirpersist.plugin.zsh
@@ -19,9 +19,8 @@ dirpersistinstall () {
     fi
 }
 
-# FIXME solaris doesn't support tail -r
 dirpersiststore () {
-    dirs -p | tail -r | perl -ne 'chomp;s/([& ])/\\$1/g ;print "if [ -d $_ ]; then pushd -q $_; fi\n"' > $zdirstore
+    dirs -p | perl -e 'foreach (reverse <STDIN>) {chomp;s/([& ])/\\$1/g ;print "if [ -d $_ ]; then pushd -q $_; fi\n"}' > $zdirstore
 }
 
 dirpersistrestore () {
-- 
cgit v1.2.3-70-g09d2


From d647a9b25c43b75eea6fee29f27affe5edc4b72e Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Thu, 30 Sep 2010 20:54:45 -0700
Subject: Tidying up the spacing to bring in line with coding standards

---
 plugins/ssh-agent.plugin.zsh | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/plugins/ssh-agent.plugin.zsh b/plugins/ssh-agent.plugin.zsh
index fa8c45ea2..ce0d645c1 100644
--- a/plugins/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent.plugin.zsh
@@ -4,21 +4,20 @@
 local SSH_ENV=$HOME/.ssh/environment
 
 function start_agent {
-     /usr/bin/ssh-agent | sed 's/^echo/#echo/' > ${SSH_ENV}
-     chmod 600 ${SSH_ENV}
-     . ${SSH_ENV} > /dev/null
-     /usr/bin/ssh-add;
+  /usr/bin/env ssh-agent | sed 's/^echo/#echo/' > ${SSH_ENV}
+  chmod 600 ${SSH_ENV}
+  . ${SSH_ENV} > /dev/null
+  /usr/bin/ssh-add;
 }
 
 # Source SSH settings, if applicable
 
 if [ -f "${SSH_ENV}" ]; then
-     . ${SSH_ENV} > /dev/null
-     #ps ${SSH_AGENT_PID} doesn't work under cywgin
-     ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || {
-         start_agent;
-     }
+  . ${SSH_ENV} > /dev/null
+  ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || {
+    start_agent;
+  }
 else
-     start_agent;
+  start_agent;
 fi
 
-- 
cgit v1.2.3-70-g09d2


From b9056303669806be8e1e90eacfc471590c39f353 Mon Sep 17 00:00:00 2001
From: Trevor Creech <trevor.creech@involver.com>
Date: Mon, 20 Sep 2010 17:31:17 -0700
Subject: Match xterm-color, the default OS X terminal

---
 lib/functions.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/functions.zsh b/lib/functions.zsh
index fcbe994be..561586cba 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -5,7 +5,7 @@ function title {
     print -nR $'\033k'$1$'\033'\\\
 
     print -nR $'\033]0;'$2$'\a'
-  elif [[ $TERM == "xterm" || $TERM == "rxvt" ]]; then
+  elif [[ $TERM =~ "^xterm" || $TERM == "rxvt" ]]; then
     # Use this one instead for XTerms:
     print -nR $'\033]0;'$*$'\a'
   fi
-- 
cgit v1.2.3-70-g09d2


From 26d97a9355d37c55e0b044d8dafc425cc0ca7217 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Thu, 30 Sep 2010 21:34:06 -0700
Subject: Reorganizing plugins so that each plugin has it's own directory now
 so that any plugin-specific functions can be bundled within there.

---
 oh-my-zsh.sh                             |  2 +-
 plugins/brew.plugin.zsh                  | 67 --------------------------------
 plugins/brew/brew.plugin.zsh             | 67 ++++++++++++++++++++++++++++++++
 plugins/dirpersist.plugin.zsh            | 39 -------------------
 plugins/dirpersist/dirpersist.plugin.zsh | 39 +++++++++++++++++++
 plugins/git.plugin.zsh                   | 32 ---------------
 plugins/git/git.plugin.zsh               | 32 +++++++++++++++
 plugins/lighthouse.plugin.zsh            | 16 --------
 plugins/lighthouse/lighthouse.plugin.zsh | 16 ++++++++
 plugins/macports.plugin.zsh              |  7 ----
 plugins/macports/macports.plugin.zsh     |  7 ++++
 plugins/mysql-macports.plugin.zsh        |  6 ---
 plugins/mysql/mysql-macports.plugin.zsh  |  6 +++
 plugins/osx.plugin.zsh                   | 11 ------
 plugins/osx/osx.plugin.zsh               | 11 ++++++
 plugins/rails.plugin.zsh                 | 36 -----------------
 plugins/rails/rails.plugin.zsh           | 36 +++++++++++++++++
 plugins/ruby.plugin.zsh                  |  4 --
 plugins/ruby/ruby.plugin.zsh             |  4 ++
 plugins/ssh-agent.plugin.zsh             | 23 -----------
 plugins/ssh-agent/ssh-agent.plugin.zsh   | 23 +++++++++++
 plugins/textmate.plugin.zsh              | 14 -------
 plugins/textmate/textmate.plugin.zsh     | 14 +++++++
 plugins/vi-mode.plugin.zsh               | 22 -----------
 plugins/vi-mode/vi-mode.plugin.zsh       | 22 +++++++++++
 25 files changed, 278 insertions(+), 278 deletions(-)
 delete mode 100644 plugins/brew.plugin.zsh
 create mode 100644 plugins/brew/brew.plugin.zsh
 delete mode 100644 plugins/dirpersist.plugin.zsh
 create mode 100644 plugins/dirpersist/dirpersist.plugin.zsh
 delete mode 100644 plugins/git.plugin.zsh
 create mode 100644 plugins/git/git.plugin.zsh
 delete mode 100644 plugins/lighthouse.plugin.zsh
 create mode 100644 plugins/lighthouse/lighthouse.plugin.zsh
 delete mode 100644 plugins/macports.plugin.zsh
 create mode 100644 plugins/macports/macports.plugin.zsh
 delete mode 100644 plugins/mysql-macports.plugin.zsh
 create mode 100644 plugins/mysql/mysql-macports.plugin.zsh
 delete mode 100644 plugins/osx.plugin.zsh
 create mode 100644 plugins/osx/osx.plugin.zsh
 delete mode 100644 plugins/rails.plugin.zsh
 create mode 100644 plugins/rails/rails.plugin.zsh
 delete mode 100644 plugins/ruby.plugin.zsh
 create mode 100644 plugins/ruby/ruby.plugin.zsh
 delete mode 100644 plugins/ssh-agent.plugin.zsh
 create mode 100644 plugins/ssh-agent/ssh-agent.plugin.zsh
 delete mode 100644 plugins/textmate.plugin.zsh
 create mode 100644 plugins/textmate/textmate.plugin.zsh
 delete mode 100644 plugins/vi-mode.plugin.zsh
 create mode 100644 plugins/vi-mode/vi-mode.plugin.zsh

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index c46aea7ac..848e48eb5 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -12,7 +12,7 @@ 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
+for plugin ($plugins) source $ZSH/plugins/$plugin/$plugin.plugin.zsh
 
 # Check for updates on initial load...
 if [ "$DISABLE_AUTO_UPDATE" = "true" ]
diff --git a/plugins/brew.plugin.zsh b/plugins/brew.plugin.zsh
deleted file mode 100644
index 162eb6442..000000000
--- a/plugins/brew.plugin.zsh
+++ /dev/null
@@ -1,67 +0,0 @@
-#compdef brew
-
-# imported from the latest homebrew contributions
-
-_brew_all_formulae() {
-  formulae=(`brew search`)
-}
-
-_brew_installed_formulae() {
-  installed_formulae=(`brew list`)
-}
-
-local -a _1st_arguments
-_1st_arguments=(
-  'cat:display formula file for a formula'
-  'cleanup:uninstall unused and old versions of packages'
-  'create:create a new formula'
-  'deps:list dependencies and dependants of a formula'
-  'doctor:audits your installation for common issues'
-  'edit:edit a formula'
-  'home:visit the homepage of a formula or the brew project'
-  'info:information about a formula'
-  'install:install a formula'
-  'link:link a formula'
-  'list:list files in a formula or not-installed formulae'
-  'log:git commit log for a formula'
-  'outdated:list formulas for which a newer version is available'
-  'prune:remove dead links'
-  'remove:remove a formula'
-  'search:search for a formula (/regex/ or string)'
-  'unlink:unlink a formula'
-  'update:freshen up links'
-  'uses:show formulas which depend on a formula'
-)
-
-local expl
-local -a formula installed_formulae
-
-_arguments \
-  '(-v --verbose)'{-v,--verbose}'[verbose]' \
-  '(--version)--version[version information]' \
-  '(--prefix)--prefix[where brew lives on this system]' \
-  '(--cache)--cache[brew cache]' \
-  '*:: :->subcmds' && return 0
-
-if (( CURRENT == 1 )); then
-  _describe -t commands "brew subcommand" _1st_arguments
-  return
-fi
-
-case "$words[1]" in
-  list)
-    _arguments \
-      '(--unbrewed)--unbrewed[files in brew --prefix not controlled by brew]' \
-      '1: :->forms' &&  return 0
-
-      if [[ "$state" == forms ]]; then
-        _brew_installed_formulae
-        _requested installed_formulae expl 'installed formulae' compadd -a installed_formulae
-      fi ;;
-  install|home|log|info|uses|cat|deps)
-    _brew_all_formulae
-    _wanted formulae expl 'all formulae' compadd -a formulae ;;
-  remove|edit|xo)
-    _brew_installed_formulae
-    _wanted installed_formulae expl 'installed formulae' compadd -a installed_formulae ;;
-esac
diff --git a/plugins/brew/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh
new file mode 100644
index 000000000..162eb6442
--- /dev/null
+++ b/plugins/brew/brew.plugin.zsh
@@ -0,0 +1,67 @@
+#compdef brew
+
+# imported from the latest homebrew contributions
+
+_brew_all_formulae() {
+  formulae=(`brew search`)
+}
+
+_brew_installed_formulae() {
+  installed_formulae=(`brew list`)
+}
+
+local -a _1st_arguments
+_1st_arguments=(
+  'cat:display formula file for a formula'
+  'cleanup:uninstall unused and old versions of packages'
+  'create:create a new formula'
+  'deps:list dependencies and dependants of a formula'
+  'doctor:audits your installation for common issues'
+  'edit:edit a formula'
+  'home:visit the homepage of a formula or the brew project'
+  'info:information about a formula'
+  'install:install a formula'
+  'link:link a formula'
+  'list:list files in a formula or not-installed formulae'
+  'log:git commit log for a formula'
+  'outdated:list formulas for which a newer version is available'
+  'prune:remove dead links'
+  'remove:remove a formula'
+  'search:search for a formula (/regex/ or string)'
+  'unlink:unlink a formula'
+  'update:freshen up links'
+  'uses:show formulas which depend on a formula'
+)
+
+local expl
+local -a formula installed_formulae
+
+_arguments \
+  '(-v --verbose)'{-v,--verbose}'[verbose]' \
+  '(--version)--version[version information]' \
+  '(--prefix)--prefix[where brew lives on this system]' \
+  '(--cache)--cache[brew cache]' \
+  '*:: :->subcmds' && return 0
+
+if (( CURRENT == 1 )); then
+  _describe -t commands "brew subcommand" _1st_arguments
+  return
+fi
+
+case "$words[1]" in
+  list)
+    _arguments \
+      '(--unbrewed)--unbrewed[files in brew --prefix not controlled by brew]' \
+      '1: :->forms' &&  return 0
+
+      if [[ "$state" == forms ]]; then
+        _brew_installed_formulae
+        _requested installed_formulae expl 'installed formulae' compadd -a installed_formulae
+      fi ;;
+  install|home|log|info|uses|cat|deps)
+    _brew_all_formulae
+    _wanted formulae expl 'all formulae' compadd -a formulae ;;
+  remove|edit|xo)
+    _brew_installed_formulae
+    _wanted installed_formulae expl 'installed formulae' compadd -a installed_formulae ;;
+esac
diff --git a/plugins/dirpersist.plugin.zsh b/plugins/dirpersist.plugin.zsh
deleted file mode 100644
index 6a2b289a2..000000000
--- a/plugins/dirpersist.plugin.zsh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/zsh
-# 
-# Make the dirstack more persistant
-# 
-# Add dirpersist to $plugins in ~/.zshrc to load
-# 
-
-# $zdirstore is the file used to persist the stack
-zdirstore=~/.zdirstore
-
-dirpersistinstall () {
-    if grep 'dirpersiststore' ~/.zlogout > /dev/null; then
-    else
-        if read -q \?"Would you like to set up your .zlogout file for use with dirspersist? (y/n) "; then
-            echo "# Store dirs stack\n# See ~/.oh-my-zsh/plugins/dirspersist.plugin.zsh\ndirpersiststore" >> ~/.zlogout
-        else
-            echo "If you don't want this message to appear, remove dirspersist from \$plugins"
-        fi
-    fi
-}
-
-dirpersiststore () {
-    dirs -p | perl -e 'foreach (reverse <STDIN>) {chomp;s/([& ])/\\$1/g ;print "if [ -d $_ ]; then pushd -q $_; fi\n"}' > $zdirstore
-}
-
-dirpersistrestore () {
-    if [ -f $zdirstore ]; then
-        source $zdirstore
-    fi
-}
-
-DIRSTACKSIZE=10
-setopt autopushd pushdminus pushdsilent pushdtohome pushdignoredups
-
-dirpersistinstall
-dirpersistrestore
-
-# Make popd changes permanent without having to wait for logout
-alias popd="popd;dirpersiststore"
diff --git a/plugins/dirpersist/dirpersist.plugin.zsh b/plugins/dirpersist/dirpersist.plugin.zsh
new file mode 100644
index 000000000..6a2b289a2
--- /dev/null
+++ b/plugins/dirpersist/dirpersist.plugin.zsh
@@ -0,0 +1,39 @@
+#!/bin/zsh
+# 
+# Make the dirstack more persistant
+# 
+# Add dirpersist to $plugins in ~/.zshrc to load
+# 
+
+# $zdirstore is the file used to persist the stack
+zdirstore=~/.zdirstore
+
+dirpersistinstall () {
+    if grep 'dirpersiststore' ~/.zlogout > /dev/null; then
+    else
+        if read -q \?"Would you like to set up your .zlogout file for use with dirspersist? (y/n) "; then
+            echo "# Store dirs stack\n# See ~/.oh-my-zsh/plugins/dirspersist.plugin.zsh\ndirpersiststore" >> ~/.zlogout
+        else
+            echo "If you don't want this message to appear, remove dirspersist from \$plugins"
+        fi
+    fi
+}
+
+dirpersiststore () {
+    dirs -p | perl -e 'foreach (reverse <STDIN>) {chomp;s/([& ])/\\$1/g ;print "if [ -d $_ ]; then pushd -q $_; fi\n"}' > $zdirstore
+}
+
+dirpersistrestore () {
+    if [ -f $zdirstore ]; then
+        source $zdirstore
+    fi
+}
+
+DIRSTACKSIZE=10
+setopt autopushd pushdminus pushdsilent pushdtohome pushdignoredups
+
+dirpersistinstall
+dirpersistrestore
+
+# Make popd changes permanent without having to wait for logout
+alias popd="popd;dirpersiststore"
diff --git a/plugins/git.plugin.zsh b/plugins/git.plugin.zsh
deleted file mode 100644
index 655eaf728..000000000
--- a/plugins/git.plugin.zsh
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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'
-
-#
-# 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)'
-alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
\ No newline at end of file
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
new file mode 100644
index 000000000..655eaf728
--- /dev/null
+++ b/plugins/git/git.plugin.zsh
@@ -0,0 +1,32 @@
+# 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'
+
+#
+# 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)'
+alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
\ No newline at end of file
diff --git a/plugins/lighthouse.plugin.zsh b/plugins/lighthouse.plugin.zsh
deleted file mode 100644
index 4eb06a997..000000000
--- a/plugins/lighthouse.plugin.zsh
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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/lighthouse/lighthouse.plugin.zsh b/plugins/lighthouse/lighthouse.plugin.zsh
new file mode 100644
index 000000000..4eb06a997
--- /dev/null
+++ b/plugins/lighthouse/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/macports.plugin.zsh b/plugins/macports.plugin.zsh
deleted file mode 100644
index 9564829b0..000000000
--- a/plugins/macports.plugin.zsh
+++ /dev/null
@@ -1,7 +0,0 @@
-#Aliases
-alias pc="sudo port clean --all installed"
-alias pi="sudo port install $1"
-alias psu="sudo port selfupdate"
-alias puni="sudo port uninstall inactive"
-alias puo="sudo port upgrade outdated"
-alias pup="psu && puo"
diff --git a/plugins/macports/macports.plugin.zsh b/plugins/macports/macports.plugin.zsh
new file mode 100644
index 000000000..9564829b0
--- /dev/null
+++ b/plugins/macports/macports.plugin.zsh
@@ -0,0 +1,7 @@
+#Aliases
+alias pc="sudo port clean --all installed"
+alias pi="sudo port install $1"
+alias psu="sudo port selfupdate"
+alias puni="sudo port uninstall inactive"
+alias puo="sudo port upgrade outdated"
+alias pup="psu && puo"
diff --git a/plugins/mysql-macports.plugin.zsh b/plugins/mysql-macports.plugin.zsh
deleted file mode 100644
index 63b881c9f..000000000
--- a/plugins/mysql-macports.plugin.zsh
+++ /dev/null
@@ -1,6 +0,0 @@
-# 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
diff --git a/plugins/mysql/mysql-macports.plugin.zsh b/plugins/mysql/mysql-macports.plugin.zsh
new file mode 100644
index 000000000..63b881c9f
--- /dev/null
+++ b/plugins/mysql/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
diff --git a/plugins/osx.plugin.zsh b/plugins/osx.plugin.zsh
deleted file mode 100644
index fce88c796..000000000
--- a/plugins/osx.plugin.zsh
+++ /dev/null
@@ -1,11 +0,0 @@
-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/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
new file mode 100644
index 000000000..fce88c796
--- /dev/null
+++ b/plugins/osx/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
deleted file mode 100644
index 45bebb722..000000000
--- a/plugins/rails.plugin.zsh
+++ /dev/null
@@ -1,36 +0,0 @@
-
-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'
-
-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
-
-function remote_console() {
-  /usr/bin/env ssh $1 "( cd $2 && ruby script/console production )"
-}
diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
new file mode 100644
index 000000000..45bebb722
--- /dev/null
+++ b/plugins/rails/rails.plugin.zsh
@@ -0,0 +1,36 @@
+
+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'
+
+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
+
+function remote_console() {
+  /usr/bin/env ssh $1 "( cd $2 && ruby script/console production )"
+}
diff --git a/plugins/ruby.plugin.zsh b/plugins/ruby.plugin.zsh
deleted file mode 100644
index 82bf5d49d..000000000
--- a/plugins/ruby.plugin.zsh
+++ /dev/null
@@ -1,4 +0,0 @@
-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/ruby/ruby.plugin.zsh b/plugins/ruby/ruby.plugin.zsh
new file mode 100644
index 000000000..82bf5d49d
--- /dev/null
+++ b/plugins/ruby/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/ssh-agent.plugin.zsh b/plugins/ssh-agent.plugin.zsh
deleted file mode 100644
index ce0d645c1..000000000
--- a/plugins/ssh-agent.plugin.zsh
+++ /dev/null
@@ -1,23 +0,0 @@
-# Based on code from Joseph M. Reagle
-# http://www.cygwin.com/ml/cygwin/2001-06/msg00537.html
-
-local SSH_ENV=$HOME/.ssh/environment
-
-function start_agent {
-  /usr/bin/env ssh-agent | sed 's/^echo/#echo/' > ${SSH_ENV}
-  chmod 600 ${SSH_ENV}
-  . ${SSH_ENV} > /dev/null
-  /usr/bin/ssh-add;
-}
-
-# Source SSH settings, if applicable
-
-if [ -f "${SSH_ENV}" ]; then
-  . ${SSH_ENV} > /dev/null
-  ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || {
-    start_agent;
-  }
-else
-  start_agent;
-fi
-
diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
new file mode 100644
index 000000000..ce0d645c1
--- /dev/null
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -0,0 +1,23 @@
+# Based on code from Joseph M. Reagle
+# http://www.cygwin.com/ml/cygwin/2001-06/msg00537.html
+
+local SSH_ENV=$HOME/.ssh/environment
+
+function start_agent {
+  /usr/bin/env ssh-agent | sed 's/^echo/#echo/' > ${SSH_ENV}
+  chmod 600 ${SSH_ENV}
+  . ${SSH_ENV} > /dev/null
+  /usr/bin/ssh-add;
+}
+
+# Source SSH settings, if applicable
+
+if [ -f "${SSH_ENV}" ]; then
+  . ${SSH_ENV} > /dev/null
+  ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || {
+    start_agent;
+  }
+else
+  start_agent;
+fi
+
diff --git a/plugins/textmate.plugin.zsh b/plugins/textmate.plugin.zsh
deleted file mode 100644
index 7b73e2751..000000000
--- a/plugins/textmate.plugin.zsh
+++ /dev/null
@@ -1,14 +0,0 @@
-
-# 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
-}
diff --git a/plugins/textmate/textmate.plugin.zsh b/plugins/textmate/textmate.plugin.zsh
new file mode 100644
index 000000000..7b73e2751
--- /dev/null
+++ b/plugins/textmate/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
+}
diff --git a/plugins/vi-mode.plugin.zsh b/plugins/vi-mode.plugin.zsh
deleted file mode 100644
index c47ab7211..000000000
--- a/plugins/vi-mode.plugin.zsh
+++ /dev/null
@@ -1,22 +0,0 @@
-function zle-line-init zle-keymap-select {
-  zle reset-prompt
-}
-
-zle -N zle-line-init
-zle -N zle-keymap-select
-
-bindkey -v
-
-# if mode indicator wasn't setup by theme, define default
-if [[ "$MODE_INDICATOR" == "" ]]; then
-  MODE_INDICATOR="%{$fg_bold[red]%}<%{$fg[red]%}<<%{$reset_color%}"
-fi
-
-function vi_mode_prompt_info() {
-  echo "${${KEYMAP/vicmd/$MODE_INDICATOR}/(main|viins)/}"
-}
-
-# define right prompt, if it wasn't defined by a theme
-if [[ "$RPS1" == "" && "$RPROMPT" == "" ]]; then
-  RPS1='$(vi_mode_prompt_info)'
-fi
diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
new file mode 100644
index 000000000..c47ab7211
--- /dev/null
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
@@ -0,0 +1,22 @@
+function zle-line-init zle-keymap-select {
+  zle reset-prompt
+}
+
+zle -N zle-line-init
+zle -N zle-keymap-select
+
+bindkey -v
+
+# if mode indicator wasn't setup by theme, define default
+if [[ "$MODE_INDICATOR" == "" ]]; then
+  MODE_INDICATOR="%{$fg_bold[red]%}<%{$fg[red]%}<<%{$reset_color%}"
+fi
+
+function vi_mode_prompt_info() {
+  echo "${${KEYMAP/vicmd/$MODE_INDICATOR}/(main|viins)/}"
+}
+
+# define right prompt, if it wasn't defined by a theme
+if [[ "$RPS1" == "" && "$RPROMPT" == "" ]]; then
+  RPS1='$(vi_mode_prompt_info)'
+fi
-- 
cgit v1.2.3-70-g09d2