Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh

2025-12-26 02:12:33 +01:00 · 2011-05-02 20:58:03 +02:00 · 2011-05-02 20:58:03 +02:00 · c0ffaf81c4
commit c0ffaf81c4
parent 2f423c2e78 0365ef0529
101 changed files with 2830 additions and 204 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1,6 @@
 locals.zsh
 log/.zsh_history
 projects.zsh
-custom/*.zsh
+custom/*
-!custom/example.zsh
+!custom/example.zsh
 cache
--- a/README.textile
+++ b/README.textile
@ -4,9 +4,11 @@ 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@
+@wget --no-check-certificate https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh -O - | sh@
 h3. The manual way
@ -25,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..
+* enable the plugins you want in your @~/.zshrc@ (take a look at @plugins/@ to see what's possible)
-
+** example: @plugins=(git osx ruby)@
 * 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.
 * 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.
+** Take a look at the "current themes":https://wiki.github.com/robbyrussell/oh-my-zsh/themes that come bundled with _Oh My Zsh_.
-* much much more..
+* much much more...  take a look at @lib/@ what _Oh My Zsh_ offers...
 h2. Useful
@ -49,17 +48,12 @@ 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
 If you want to uninstall it, just run @uninstall_oh_my_zsh@ from the command line and it'll remove itself and revert you to bash (or your previous zsh config).
 h2. Thanks
 * Rick Olson (technoweenie) might remember some of the configuration, which I took from a pastie a few years ago.
 * Marcel (noradio) provided Rick the original zsh configuration.
 * Nicholas (ulysses) for the "rake autocompletion code":http://weblog.rubyonrails.org/2006/3/9/fast-rake-task-completion-for-zsh.
 h2. Help out!
 I'm far from being a zsh-expert and suspect there are many ways to improve. If you have ideas on how to make the configuration easier to maintain (and faster), don't hesitate to fork and send pull requests!
@ -68,6 +62,10 @@ 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:
+h2. Contributors
-* need to make the title bar support git folder
+This project wouldn't exist without all of our awesome users and contributors.
 * "View our growing list of contributors":https://github.com/robbyrussell/oh-my-zsh/contributors
 Thank you so much!
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@ -1,21 +1,8 @@
 #!/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 ../..'
 alias -- -='cd -'
@ -30,23 +17,9 @@ 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 sgem='sudo gem'
 # Find ruby file
 alias rfind='find . -name *.rb | xargs grep -n'
 alias afind='ack-grep -il'
-# Git and svn mix
+alias x=extract
 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'
--- 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
@ -8,9 +8,6 @@ setopt always_to_end
 WORDCHARS=''
 autoload -U compinit
 compinit -i
 zmodload -i zsh/complist
 ## case-insensitive (all),partial-word and then substring completion
@ -27,19 +24,38 @@ 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"
-# Load known hosts file for auto-completion with ssh and scp commands
+# disable named-directories autocompletion
-if [ -f ~/.ssh/known_hosts ]; then
+zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-directories
-  zstyle ':completion:*' hosts $( sed 's/[, ].*$//' $HOME/.ssh/known_hosts )
+cdpath=(.)
-  zstyle ':completion:*:*:(ssh|scp):*:*' hosts `sed 's/^\([^ ,]*\).*$/\1/' ~/.ssh/known_hosts`
+
-fi
+# use /etc/hosts and known_hosts for hostname completion
 [ -r ~/.ssh/known_hosts ] && _ssh_hosts=(${${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts=()
 [ -r /etc/hosts ] && : ${(A)_etc_hosts:=${(s: :)${(ps:\t:)${${(f)~~"$(</etc/hosts)"}%%\#*}##[:blank:]#[^[:blank:]]#}}} || _etc_hosts=()
 hosts=(
  "$_ssh_hosts[@]"
  "$_etc_hosts[@]"
  `hostname`
  localhost
 )
 zstyle ':completion:*:hosts' hosts $hosts
 # Use caching so that commands like apt and dpkg complete are useable
 zstyle ':completion::complete:*' use-cache 1
 zstyle ':completion::complete:*' cache-path ~/.oh-my-zsh/cache/
 # Don't complete uninteresting users
 zstyle ':completion:*:*:*:users' ignored-patterns \
        adm amanda apache avahi beaglidx bin cacti canna clamav daemon \
        dbus distcache dovecot fax ftp games gdm gkrellmd gopher \
        hacluster haldaemon halt hsqldb ident junkbust ldap lp mail \
        mailman mailnull mldonkey mysql nagios \
        named netdump news nfsnobody nobody nscd ntp nut nx openvpn \
        operator pcap postfix postgres privoxy pulse pvm quagga radvd \
        rpc rpcuser rpm shutdown squid sshd sync uucp vcsa xfs
 # ... unless we really want to.
 zstyle '*' single-ignored show
 # 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
--- a/lib/correction.zsh
+++ b/lib/correction.zsh
@ -6,3 +6,5 @@ alias mysql='nocorrect mysql'
 alias mkdir='nocorrect mkdir'
 alias gist='nocorrect gist'
 alias heroku='nocorrect heroku'
 alias ebuild='nocorrect ebuild'
 alias hpodder='nocorrect hpodder'
--- 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'
+# mkdir & cd to it
 function mcd() { 
  mkdir -p "$1" && cd "$1"; 
 }
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@ -1,30 +1,3 @@
 ## fixme, i duplicated this in xterms - oops
 function title {
  if [[ $TERM == "screen" ]]; then
    # Use these two for GNU Screen:
    print -nR $'\033k'$1$'\033'\\\
    print -nR $'\033]0;'$2$'\a'
  elif [[ $TERM == "xterm" || $TERM == "rxvt" ]]; then
    # Use this one instead for XTerms:
    print -nR $'\033]0;'$*$'\a'
  fi
 }
 function precmd {
  title zsh "$PWD"
 }
 function preexec {
  emulate -L zsh
  local -a cmd; cmd=(${(z)1})
  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,41 +10,43 @@ 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
 }
-function tm() {
+function extract() {
-  cd $1
+    unset REMOVE_ARCHIVE
-  mate $1
+    
-}
+    if test "$1" = "-r"; then
        REMOVE=1
        shift
    fi
  if [[ -f $1 ]]; then
    case $1 in
      *.tar.bz2) tar xvjf $1;;
      *.tar.gz) tar xvzf $1;;
      *.tar.xz) tar xvJf $1;;
      *.tar.lzma) tar --lzma -xvf $1;;
      *.bz2) bunzip $1;;
      *.rar) unrar $1;;
      *.gz) gunzip $1;;
      *.tar) tar xvf $1;;
      *.tbz2) tar xvjf $1;;
      *.tgz) tar xvzf $1;;
      *.zip) unzip $1;;
      *.Z) uncompress $1;;
      *.7z) 7z x $1;;
      *) echo "'$1' cannot be extracted via >extract<";;
    esac
    if [[ $REMOVE_ARCHIVE -eq 1 ]]; then
        echo removing "$1";
        /bin/rm "$1";
    fi
 # 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 "'$1' is not a valid file"
    echo "Opening ticket #$1";
    `open $lighthouse_url/tickets/$1`;
  fi
 }
 alias lho='open_lighthouse_ticket'
--- a/lib/git.zsh
+++ b/lib/git.zsh
@ -4,7 +4,8 @@ function git_prompt_info() {
  echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
 }
-parse_git_dirty () {
+# Checks if working tree is dirty
 parse_git_dirty() {
  if [[ -n $(git status -s 2> /dev/null) ]]; then
    echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
  else
@ -12,26 +13,50 @@ parse_git_dirty () {
  fi
 }
-#
+# Checks if there are commits ahead from remote
-# Will return the current branch name
+function git_prompt_ahead() {
-# Usage example: git pull origin $(current_branch)
+  if $(echo "$(git log origin/master..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then
-#
+    echo "$ZSH_THEME_GIT_PROMPT_AHEAD"
-function current_branch() {
+  fi
  ref=$(git symbolic-ref HEAD 2> /dev/null) || return
  echo ${ref#refs/heads/}
 }
-# Aliases
+# Formats prompt string for current git commit short SHA
-alias g='git'
+function git_prompt_short_sha() {
-alias gst='git status'
+  SHA=$(git rev-parse --short HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER"
-alias gl='git pull'
+}
-alias gup='git fetch && git rebase'
+
-alias gp='git push'
+# Formats prompt string for current git commit long SHA
-alias gd='git diff | mate'
+function git_prompt_long_sha() {
-alias gdv='git diff -w "$@" | vim -R -'
+  SHA=$(git rev-parse HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER"
-alias gc='git commit -v'
+}
-alias gca='git commit -v -a'
+
-alias gb='git branch'
+# Get the status of the working tree
-alias gba='git branch -a'
+git_prompt_status() {
-alias gcount='git shortlog -sn'
+  INDEX=$(git status --porcelain 2> /dev/null)
-alias gcp='git cherry-pick'
+  STATUS=""
  if $(echo "$INDEX" | grep '^?? ' &> /dev/null); then
    STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS"
  fi
  if $(echo "$INDEX" | grep '^A  ' &> /dev/null); then
    STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
  elif $(echo "$INDEX" | grep '^M  ' &> /dev/null); then
    STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
  fi
  if $(echo "$INDEX" | grep '^ M ' &> /dev/null); then
    STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
  elif $(echo "$INDEX" | grep '^AM ' &> /dev/null); then
    STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
  elif $(echo "$INDEX" | grep '^ T ' &> /dev/null); then
    STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
  fi
  if $(echo "$INDEX" | grep '^R  ' &> /dev/null); then
    STATUS="$ZSH_THEME_GIT_PROMPT_RENAMED$STATUS"
  fi
  if $(echo "$INDEX" | grep '^ D ' &> /dev/null); then
    STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
  fi
  if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then
    STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
  fi
  echo $STATUS
 }
--- 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
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@ -1,6 +1,4 @@
 # TODO: Explain what some of this does..
 autoload -U compinit
 compinit -i
 bindkey -e
 bindkey '\ew' kill-region
@ -20,6 +18,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:
--- a/lib/rvm.zsh
+++ 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)"
 }
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@ -1,21 +1,29 @@
-case "$TERM" in
+#usage: title short_tab_title looooooooooooooooooooooggggggg_windows_title
-  xterm*|rxvt*)
+#http://www.faqs.org/docs/Linux-mini/Xterm-Title.html#ss3.1
-    preexec () {
+#Fully support screen, iterm, and probably most modern xterm and rxvt
-      print -Pn "\e]0;%n@%m: $1\a"  # xterm
+#Limited support for Apple Terminal (Terminal can't set window or tab separately)
-    }
+function title {
-    precmd () {
+  [ "$DISABLE_AUTO_TITLE" != "true" ] || return
-      print -Pn "\e]0;%n@%m: %~\a"  # xterm
+  if [[ "$TERM" == screen* ]]; then 
-    }
+    print -Pn "\ek$1:q\e\\" #set screen hardstatus, usually truncated at 20 chars
-    ;;
+  elif [[ "$TERM" == xterm* ]] || [[ $TERM == rxvt* ]] || [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then
-  screen*)
+    print -Pn "\e]2;$2:q\a" #set window name
-    preexec () {
+    print -Pn "\e]1;$1:q\a" #set icon (=tab) name (will override window name on broken terminal)
-      local CMD=${1[(wr)^(*=*|sudo|ssh|-*)]}
+  fi
-      echo -ne "\ek$CMD\e\\"
+}
-      print -Pn "\e]0;%n@%m: $1\a"  # xterm
+
-    }
+ZSH_THEME_TERM_TAB_TITLE_IDLE="%15<..<%~%<<" #15 char left truncated PWD
-    precmd () {
+ZSH_THEME_TERM_TITLE_IDLE="%n@%m: %~"
-      echo -ne "\ekzsh\e\\"
+
-      print -Pn "\e]0;%n@%m: %~\a"  # xterm
+#Appears when you have the prompt
-    }
+function precmd {
-    ;;
+  title $ZSH_THEME_TERM_TAB_TITLE_IDLE $ZSH_THEME_TERM_TITLE_IDLE
-esac
+}
 #Appears at the beginning of (and during) of command execution
 function preexec {
  emulate -L zsh
  setopt extended_glob
  local CMD=${1[(wr)^(*=*|sudo|ssh|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd
  title "$CMD" "%100>...>$2%<<"
 }
--- a/lib/theme-and-appearance.zsh
+++ b/lib/theme-and-appearance.zsh
@ -34,5 +34,3 @@ ZSH_THEME_GIT_PROMPT_CLEAN=""               # Text to display if the branch is c
 # Setup the prompt with pretty colors
 setopt prompt_subst
 # Load the theme
 source "$ZSH/themes/$ZSH_THEME.zsh-theme"
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@ -7,9 +7,39 @@ fpath=($ZSH/functions $fpath)
 # TIP: Add files you don't want in git to .gitignore
 for config_file ($ZSH/lib/*.zsh) source $config_file
 # Add all defined plugins to fpath
 plugin=${plugin:=()}
 for plugin ($plugins) fpath=($ZSH/plugins/$plugin $fpath)
 # Load and run compinit
 autoload -U compinit
 compinit -i
 # Load all of the plugins that were defined in ~/.zshrc
 for plugin ($plugins); do
  if [ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]; then
    source $ZSH/plugins/$plugin/$plugin.plugin.zsh
  fi
 done
 # Load all of your custom configurations from custom/
 for config_file ($ZSH/custom/*.zsh) source $config_file
 # Load the theme
 # Check for updates on initial load...
 if [ "$ZSH_THEME" = "random" ]
 then
  themes=($ZSH/themes/*zsh-theme)
  N=${#themes[@]}
  ((N=RANDOM%N))
  RANDOM_THEME=${themes[$N]}
  source "$RANDOM_THEME"
  echo "[oh-my-zsh] Random theme '$RANDOM_THEME' loaded..."
 else
  source "$ZSH/themes/$ZSH_THEME.zsh-theme"
 fi
 # Check for updates on initial load...
 if [ "$DISABLE_AUTO_UPDATE" = "true" ]
 then
@ -17,5 +47,3 @@ then
 else
  /usr/bin/env zsh $ZSH/tools/check_for_upgrade.sh
 fi
 unset config_file
--- a/plugins/brew/_brew
+++ b/plugins/brew/_brew
@ -1,6 +1,7 @@
 #compdef brew
 #autoload
-# copied from _fink
+# imported from the latest homebrew contributions
 _brew_all_formulae() {
  formulae=(`brew search`)
@ -12,19 +13,26 @@ _brew_installed_formulae() {
 local -a _1st_arguments
 _1st_arguments=(
-  'install:install a formula'
+  'cat:display formula file for a formula'
-  'remove:remove a formula'
+  'cleanup:uninstall unused and old versions of packages'
-  'search:search for a formula (/regex/ or string)'
+  'create:create a new formula'
-  'list:list files in a formula or not-installed formulae'
+  'deps:list dependencies and dependants of a formula'
-  'link:link a formula'
+  'doctor:audits your installation for common issues'
-  'unlink:unlink a formula'
+  'edit:edit a formula'
  'home:visit the homepage of a formula or the brew project'
  'info:information about a formula'
-  'prune:remove dead links'
+  'install:install a formula'
-  'update:freshen up links'
+  'link:link a formula'
  'list:list files in a formula or not-installed formulae'
  'log:git commit log for a formula'
-  'create:create a new formula'
+  'outdated:list formulas for which a newer version is available'
-  'edit:edit a formula'
+  'prune:remove dead links'
  'remove:remove a formula'
  'search:search for a formula (/regex/ or string)'
  'unlink:unlink a formula'
  'update:freshen up links'
  'upgrade:upgrade outdated formulae'
  'uses:show formulas which depend on a formula'
 )
 local expl
@ -47,15 +55,16 @@ case "$words[1]" in
    _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)
+  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
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@ -0,0 +1,3 @@
 alias be="bundle exec"
 alias bi="bundle install"
 alias bu="bundle update"
--- a/plugins/cap/cap.plugin.zsh
+++ b/plugins/cap/cap.plugin.zsh
@ -18,4 +18,4 @@ function _cap () {
  fi
 }
-compctl -K _cap cap
+compctl -K _cap cap
--- a/plugins/command-not-found/command-not-found.plugin.zsh
+++ b/plugins/command-not-found/command-not-found.plugin.zsh
@ -0,0 +1,5 @@
 # Uses the command-not-found package zsh support
 # as seen in http://www.porcheron.info/command-not-found-for-zsh/
 # this is installed in Ubuntu
 source /etc/zsh_command_not_found
--- a/plugins/cpanm/_cpanm
+++ b/plugins/cpanm/_cpanm
@ -0,0 +1,67 @@
 #compdef cpanm
 ##
 # cpanminus Z Shell completion script
 ##
 #
 # Current supported cpanm version: 1.4000 (Tue Mar  8 01:00:49 PST 2011)
 #
 # The latest code is always located at:
 #   https://github.com/rshhh/cpanminus/blob/master/etc/_cpanm
 #
 local arguments curcontext="$curcontext"
 typeset -A opt_args
 arguments=(
 # Commands
 #  '(--install -i)'{--install,-i}'[Installs the modules]'
  '(- :)--self-upgrade[Upgrades itself]'
  '(- :)--info[Displays distribution info on CPAN]'
  '(--installdeps)--installdeps[Only install dependencies]'
  '(--look)--look[Download/unpack the distribution and then open the directory with your shell]'
  '(- :)'{--help,-h}'[Displays help information]'
  '(- :)'{--version,-V}'[Displays software version]'
 # Options
  {--force,-f}'[Force install]'
  {--notest,-n}'[Do not run unit tests]'
  {--sudo,-S}'[sudo to run install commands]'
  '(-v --verbose --quiet -q)'{--verbose,-v}'[Turns on chatty output]'
  '(-q --quiet --verbose -v)'{--quiet,-q}'[Turns off all output]'
  {--local-lib,-l}'[Specify the install base to install modules]'
  {--local-lib-contained,-L}'[Specify the install base to install all non-core modules]'
  '--mirror[Specify the base URL for the mirror (e.g. http://cpan.cpantesters.org/)]:URLs:_urls'
  '--mirror-only[Use the mirror\''s index file instead of the CPAN Meta DB]'
  '--prompt[Prompt when configure/build/test fails]'
  '--reinstall[Reinstall the distribution even if you already have the latest version installed]'
  '--interactive[Turn on interactive configure]'
  '--scandeps[Scan the depencencies of given modules and output the tree in a text format]'
  '--format[Specify what format to display the scanned dependency tree]:scandeps format:(tree json yaml dists)'
  '--save-dists[Specify the optional directory path to copy downloaded tarballs]'
 #  '--uninst-shadows[Uninstalls the shadow files of the distribution that you\''re installing]'
  '--auto-cleanup[Number of days that cpanm\''s work directories expire in. Defaults to 7]'
  '(--no-man-pages)--man-pages[Generates man pages for executables (man1) and libraries (man3)]'
  '(--man-pages)--no-man-pages[Do not generate man pages]'
  # Note: Normally with "--lwp", "--wget" and "--curl" options set to true (which is the default) cpanm tries LWP,
  #            Wget, cURL and HTTP::Tiny (in that order) and uses the first one available.
  # (So that the exclusions are not enabled here for the completion)
  '(--lwp)--lwp[Use LWP module to download stuff]'
  '(--wget)--wget[Use GNU Wget (if available) to download stuff]'
  '(--curl)--curl[Use cURL (if available) to download stuff]'
 # Other completions
  '*:Local directory or archive:_files -/ -g "*.(tar.gz|tgz|tar.bz2|zip)(-.)"'
  #  '*::args: _normal' # this looks for default files (any files)
 )
 _arguments -s $arguments \
  && return 0
 return 1
--- a/plugins/deb/deb.plugin.zsh
+++ b/plugins/deb/deb.plugin.zsh
@ -0,0 +1,13 @@
 # Aliases
 alias as="aptitude -F \"* %p -> %d \n(%v/%V)\" \
 		--no-gui --disable-columns search"	# search package
 alias ad="sudo apt-get update"				# update packages lists
 alias au="sudo apt-get update && \
 		sudo apt-get dselect-upgrade"		# upgrade packages
 alias ai="sudo apt-get install"				# install package
 alias ar="sudo apt-get remove --purge && \
 		sudo apt-get autoremove --purge"	# remove package
 alias ap="apt-cache policy"				# apt policy
 alias av="apt-cache show"				# show package info
 alias acs="apt-cache search"                            # search package
 alias ac="sudo apt-get clean && sudo apt-get autoclean" # clean apt cache
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@ -0,0 +1,60 @@
 # https://github.com/dbbolton/
 #
 # Debian-related zsh aliases and functions for zsh
 # Aliases ###################################################################
 # Some self-explanatory aliases
 alias afs='apt-file search --regexp'
 alias aps='aptitude search'
 alias apsrc='apt-get source'
 alias apv='apt-cache policy'
 alias apdg='su -c "aptitude update && aptitude safe-upgrade"'
 alias apud='su -c "aptitude update"'
 alias apug='su -c "aptitude safe-upgrade"'
 # print all installed packages
 alias allpkgs='aptitude search -F "%p" --disable-columns ~i'
 # Install all .deb files in the current directory.
 # Warning: you will need to put the glob in single quotes if you use:
 # glob_subst
 alias di='su -c "dpkg -i ./*.deb"'
 # Create a basic .deb package
 alias mydeb='time dpkg-buildpackage -rfakeroot -us -uc'
 # Remove ALL kernel images and headers EXCEPT the one in use
 alias kclean='su -c '\''aptitude remove -P ?and(~i~nlinux-(ima|hea) ?not(~n`uname -r`))'\'' root'
 # Functions #################################################################
 # create a simple script that can be used to 'duplicate' a system
 apt-copy() {
 	print '#!/bin/sh'"\n" > apt-copy.sh
 	list=$(perl -m'AptPkg::Cache' -e '$c=AptPkg::Cache->new; for (keys %$c){ push @a, $_ if $c->{$_}->{'CurrentState'} eq 'Installed';} print "$_ " for sort @a;')
 	print 'aptitude install '"$list\n" >> apt-copy.sh
 	chmod +x apt-copy.sh
 }
 # Kernel-package building shortcut
 dbb-build () {
 	MAKEFLAGS=''		# temporarily unset MAKEFLAGS ( '-j3' will fail )
 	appendage='-custom' # this shows up in $ (uname -r )
    revision=$(date +"%Y%m%d") # this shows up in the .deb file name
    make-kpkg clean
    time fakeroot make-kpkg --append-to-version "$appendage" --revision \
        "$revision" kernel_image kernel_headers
 }
--- a/plugins/dirpersist/dirpersist.plugin.zsh
+++ 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"
--- a/plugins/gem/_gem
+++ b/plugins/gem/_gem
@ -0,0 +1,64 @@
 #compdef gem
 #autoload
 # gem zsh completion, based on homebrew completion
 _gem_installed() {
  installed_gems=(`gem list --local --no-versions`)
 }
 local -a _1st_arguments
 _1st_arguments=(
  'cert:Manage RubyGems certificates and signing settings'
  'check:Check installed gems'
  'cleanup:Clean up old versions of installed gems in the local repository'
  'contents:Display the contents of the installed gems'
  'dependency:Show the dependencies of an installed gem'
  'environment:Display information about the RubyGems environment'
  'fetch:Download a gem and place it in the current directory'
  'generate_index:Generates the index files for a gem server directory'
  'help:Provide help on the `gem` command'
  'install:Install a gem into the local repository'
  'list:Display gems whose name starts with STRING'
  'lock:Generate a lockdown list of gems'
  'mirror:Mirror a gem repository'
  'outdated:Display all gems that need updates'
  'owner:Manage gem owners on RubyGems.org.'
  'pristine:Restores installed gems to pristine condition from files located in the gem cache'
  'push:Push a gem up to RubyGems.org'
  'query:Query gem information in local or remote repositories'
  'rdoc:Generates RDoc for pre-installed gems'
  'search:Display all gems whose name contains STRING'
  'server:Documentation and gem repository HTTP server'
  'sources:Manage the sources and cache file RubyGems uses to search for gems'
  'specification:Display gem specification (in yaml)'
  'stale:List gems along with access times'
  'uninstall:Uninstall gems from the local repository'
  'unpack:Unpack an installed gem to the current directory'
  'update:Update the named gems (or all installed gems) in the local repository'
  'which:Find the location of a library file you can require'
 )
 local expl
 local -a gems installed_gems
 _arguments \
  '(-v --version)'{-v,--version}'[show version]' \
  '(-h --help)'{-h,--help}'[show help]' \
  '*:: :->subcmds' && return 0
 if (( CURRENT == 1 )); then
  _describe -t commands "gem subcommand" _1st_arguments
  return
 fi
 case "$words[1]" in
  list)
      if [[ "$state" == forms ]]; then
        _gem_installed
        _requested installed_gems expl 'installed gems' compadd -a installed_gems
      fi ;;
  uninstall|update)
    _gem_installed
    _wanted installed_gems expl 'installed gems' compadd -a installed_gems ;;
 esac
--- a/plugins/git-flow/git-flow.plugin.zsh
+++ b/plugins/git-flow/git-flow.plugin.zsh
@ -0,0 +1,332 @@
 #!zsh
 #
 # Installation
 # ------------
 #
 # To achieve git-flow completion nirvana:
 #
 #  0. Update your zsh's git-completion module to the newest verion.
 #     From here. http://zsh.git.sourceforge.net/git/gitweb.cgi?p=zsh/zsh;a=blob_plain;f=Completion/Unix/Command/_git;hb=HEAD
 #
 #  1. Install this file. Either:
 #
 #     a. Place it in your .zshrc:
 #
 #     b. Or, copy it somewhere (e.g. ~/.git-flow-completion.zsh) and put the following line in
 #        your .zshrc:
 #
 #            source ~/.git-flow-completion.zsh
 #
 #     c. Or, use this file as a oh-my-zsh plugin.
 #
 _git-flow ()
 {
 	local curcontext="$curcontext" state line
 	typeset -A opt_args
 	_arguments -C \
 		':command:->command' \
 		'*::options:->options'
 	case $state in
 		(command)
 			local -a subcommands
 			subcommands=(
 				'init:Initialize a new git repo with support for the branching model.'
 				'feature:Manage your feature branches.'
 				'release:Manage your release branches.'
 				'hotfix:Manage your hotfix branches.'
 				'support:Manage your support branches.'
 				'version:Shows version information.'
 			)
 			_describe -t commands 'git flow' subcommands
 		;;
 		(options)
 			case $line[1] in
 				(init)
 					_arguments \
 						-f'[Force setting of gitflow branches, even if already configured]'
 					;;
 					(version)
 					;;
 					(hotfix)
 						__git-flow-hotfix
 					;;
 					(release)
 						__git-flow-release
 					;;
 					(feature)
 						__git-flow-feature
 					;;
 			esac
 		;;
 	esac
 }
 __git-flow-release ()
 {
 	local curcontext="$curcontext" state line
 	typeset -A opt_args
 	_arguments -C \
 		':command:->command' \
 		'*::options:->options'
 	case $state in
 		(command)
 			local -a subcommands
 			subcommands=(
 				'start:Start a new release branch.'
 				'finish:Finish a release branch.'
 				'list:List all your release branches. (Alias to `git flow release`)'
 			)
 			_describe -t commands 'git flow release' subcommands
 			_arguments \
 				-v'[Verbose (more) output]'
 		;;
 		(options)
 			case $line[1] in
 				(start)
 					_arguments \
 						-F'[Fetch from origin before performing finish]'\
 						':version:__git_flow_version_list'
 				;;
 				(finish)
 					_arguments \
 						-F'[Fetch from origin before performing finish]' \
 						-s'[Sign the release tag cryptographically]'\
 						-u'[Use the given GPG-key for the digital signature (implies -s)]'\
 						-m'[Use the given tag message]'\
 						-p'[Push to $ORIGIN after performing finish]'\
 						':version:__git_flow_version_list'
 				;;
 				*)
 					_arguments \
 						-v'[Verbose (more) output]'
 				;;
 			esac
 		;;
 	esac
 }
 __git-flow-hotfix ()
 {
 	local curcontext="$curcontext" state line
 	typeset -A opt_args
 	_arguments -C \
 		':command:->command' \
 		'*::options:->options'
 	case $state in
 		(command)
 			local -a subcommands
 			subcommands=(
 				'start:Start a new hotfix branch.'
 				'finish:Finish a hotfix branch.'
 				'list:List all your hotfix branches. (Alias to `git flow hotfix`)'
 			)
 			_describe -t commands 'git flow hotfix' subcommands
 			_arguments \
 				-v'[Verbose (more) output]'
 		;;
 		(options)
 			case $line[1] in
 				(start)
 					_arguments \
 						-F'[Fetch from origin before performing finish]'\
 						':hotfix:__git_flow_version_list'\
 						':branch-name:__git_branch_names'
 				;;
 				(finish)
 					_arguments \
 						-F'[Fetch from origin before performing finish]' \
 						-s'[Sign the release tag cryptographically]'\
 						-u'[Use the given GPG-key for the digital signature (implies -s)]'\
 						-m'[Use the given tag message]'\
 						-p'[Push to $ORIGIN after performing finish]'\
 						':hotfix:__git_flow_hotfix_list'
 				;;
 				*)
 					_arguments \
 						-v'[Verbose (more) output]'
 				;;
 			esac
 		;;
 	esac
 }
 __git-flow-feature ()
 {
 	local curcontext="$curcontext" state line
 	typeset -A opt_args
 	_arguments -C \
 		':command:->command' \
 		'*::options:->options'
 	case $state in
 		(command)
 			local -a subcommands
 			subcommands=(
 				'start:Start a new feature branch.'
 				'finish:Finish a feature branch.'
 				'list:List all your feature branches. (Alias to `git flow feature`)'
 				'publish: public'
 				'track: track'
 				'diff: diff'
 				'rebase: rebase'
 				'checkout: checkout'
 				'pull: pull'
 			)
 			_describe -t commands 'git flow feature' subcommands
 			_arguments \
 				-v'[Verbose (more) output]'
 		;;
 		(options)
 			case $line[1] in
 				(start)
 					_arguments \
 						-F'[Fetch from origin before performing finish]'\
 						':feature:__git_flow_feature_list'\
 						':branch-name:__git_branch_names'
 				;;
 				(finish)
 					_arguments \
 						-F'[Fetch from origin before performing finish]' \
 						-r'[Rebase instead of merge]'\
 						':feature:__git_flow_feature_list'
 				;;
 				(publish)
 					_arguments \
 						':feature:__git_flow_feature_list'\
 				;;
 				(track)
 					_arguments \
 						':feature:__git_flow_feature_list'\
 				;;
 				(diff)
 					_arguments \
 						':branch:__git_branch_names'\
 				;;
 				(rebase)
 					_arguments \
 						-i'[Do an interactive rebase]' \
 						':branch:__git_branch_names'
 				;;
 				(checkout)
 					_arguments \
 						':branch:__git_flow_feature_list'\
 				;;
 				(pull)
 					_arguments \
 						':remote:__git_remotes'\
 						':branch:__git_branch_names'
 				;;
 				*)
 					_arguments \
 						-v'[Verbose (more) output]'
 				;;
 			esac
 		;;
 	esac
 }
 __git_flow_version_list ()
 {
 	local expl
 	declare -a versions
 	versions=(${${(f)"$(_call_program versions git flow release list 2> /dev/null | tr -d ' |*')"}})
 	__git_command_successful || return
 	_wanted versions expl 'version' compadd $versions
 }
 __git_flow_feature_list ()
 {
 	local expl
 	declare -a features
 	features=(${${(f)"$(_call_program features git flow feature list 2> /dev/null | tr -d ' |*')"}})
 	__git_command_successful || return
 	_wanted features expl 'feature' compadd $features
 }
 __git_remotes () {
 	local expl gitdir remotes
 	gitdir=$(_call_program gitdir git rev-parse --git-dir 2>/dev/null)
 	__git_command_successful || return
 	remotes=(${${(f)"$(_call_program remotes git config --get-regexp '"^remote\..*\.url$"')"}//#(#b)remote.(*).url */$match[1]})
 	__git_command_successful || return
 	# TODO: Should combine the two instead of either or.
 	if (( $#remotes > 0 )); then
 		_wanted remotes expl remote compadd $* - $remotes
 	else
 		_wanted remotes expl remote _files $* - -W "($gitdir/remotes)" -g "$gitdir/remotes/*"
 	fi
 }
 __git_flow_hotfix_list ()
 {
 	local expl
 	declare -a hotfixes
 	hotfixes=(${${(f)"$(_call_program hotfixes git flow hotfix list 2> /dev/null | tr -d ' |*')"}})
 	__git_command_successful || return
 	_wanted hotfixes expl 'hotfix' compadd $hotfixes
 }
 __git_branch_names () {
 	local expl
 	declare -a branch_names
 	branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads 2>/dev/null)"}#refs/heads/})
 	__git_command_successful || return
 	_wanted branch-names expl branch-name compadd $* - $branch_names
 }
 __git_command_successful () {
 	if (( ${#pipestatus:#0} > 0 )); then
 		_message 'not a git repository'
 		return 1
 	fi
 	return 0
 }
 zstyle ':completion:*:*:git:*' user-commands flow:'description for foo'
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@ -0,0 +1,50 @@
 # Aliases
 alias g='git'
 compdef g=git
 alias gst='git status'
 compdef _git gst=git-status
 alias gl='git pull'
 compdef _git gl=git-pull
 alias gup='git fetch && git rebase'
 compdef _git gup=git-fetch
 alias gp='git push'
 compdef _git gp=git-push
 gdv() { git-diff -w "$@" | view - }
 compdef _git gdv=git-diff
 alias gc='git commit -v'
 compdef _git gc=git-commit
 alias gca='git commit -v -a'
 compdef _git gca=git-commit
 alias gco='git checkout'
 compdef _git gco=git-checkout
 alias gb='git branch'
 compdef _git gb=git-branch
 alias gba='git branch -a'
 compdef _git gba=git-branch
 alias gcount='git shortlog -sn'
 compdef gcount=git
 alias gcp='git cherry-pick'
 compdef _git gcp=git-cherry-pick
 alias glg='git log --stat --max-count=5'
 compdef _git glg=git-log
 # Git and svn mix
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
 compdef git-svn-dcommit-push=git
 #
 # 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 advantage of the previous function
 alias ggpull='git pull origin $(current_branch)'
 compdef ggpull=git
 alias ggpush='git push origin $(current_branch)'
 compdef ggpush=git
 alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
 compdef ggpnp=git
--- a/plugins/github/_github
+++ b/plugins/github/_github
@ -0,0 +1,40 @@
 #compdef github
 #autoload
 # in order to make this work, you will need to have the github gem installed
 # http://github.com/defunkt/github-gem
 # github zsh completion, based on homebrew completion
 local -a _1st_arguments
 _1st_arguments=(
  'browse:Open this repo in a web browser'
  'clone:Clone a repo'
  'config:Automatically set configuration info, or pass args to specify'
  'create-from-local:Create a new GitHub repository from the current local repository'
  'create:Create a new empty GitHub repository'
  'fetch:Fetch from a remote to a local branch'
  'fetch_all:Fetch all refs from a user'
  'fork:Forks a GitHub repository'
  'home:Open this repos master branch in a web browser'
  'ignore:Ignore a SHA from github network commits'
  'info:Info about this project'
  'issues:Project issues tools'
  'network:Project network tools - sub-commands : web [user], list, fetch, commits'
  'open:Open the given user/project in a web browser'
  'pull-request:Generate the text for a pull request'
  'pull:Pull from a remote'
  'search:Search GitHub for the given repository name'
  'track:Track another users repository'
 )
 local expl
 local -a pkgs installed_pkgs
 _arguments \
  '*:: :->subcmds' && return 0
 if (( CURRENT == 1 )); then
  _describe -t commands "github subcommand" _1st_arguments
  return
 fi
--- a/plugins/github/github.plugin.zsh
+++ b/plugins/github/github.plugin.zsh
@ -0,0 +1,7 @@
 # hub alias from defunkt
 # https://github.com/defunkt/hub
 if [ "$commands[(I)hub]" ]; then
    # eval `hub alias -s zsh`
    function git(){hub "$@"}
 fi
--- a/plugins/lein/lein.plugin.zsh
+++ b/plugins/lein/lein.plugin.zsh
@ -0,0 +1,27 @@
 function _lein_commands() {
    local ret=1 state
    _arguments ':subcommand:->subcommand' && ret=0
    case $state in
      subcommand)
        subcommands=(
          "clean:remove compiled files and dependencies from project"
          "compile:ahead-of-time compile the project"
          "deps:download and install all dependencies"
          "help:display a list of tasks or help for a given task"
          "install:install the project and its dependencies in your local repository"
          "jar:create a jar file containing the compiled .class files"
          "new:create a new project skeleton"
          "pom:write a pom.xml file to disk for maven interop"
          "test:run the project's tests"
          "uberjar:Create a jar including the contents of each of deps"
          "upgrade:upgrade leiningen to the latest stable release"
          "version:print leiningen's version"
        )
        _describe -t subcommands 'leiningen subcommands' subcommands && ret=0
    esac
    return ret
 }
 compdef _lein_commands lein
--- a/plugins/lighthouse/lighthouse.plugin.zsh
+++ 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-url 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'
--- a/plugins/lol/lol.plugin.zsh
+++ b/plugins/lol/lol.plugin.zsh
@ -0,0 +1,26 @@
 # LOL!!1
 # Source: http://aur.archlinux.org/packages/lolbash/lolbash/lolbash.sh
 alias wtf='dmesg'
 alias onoz='cat /var/log/errors.log'
 alias rtfm='man'
 alias visible='echo'
 alias invisible='cat'
 alias moar='more'
 alias icanhas='mkdir'
 alias donotwant='rm'
 alias dowant='cp'
 alias gtfo='mv'
 alias hai='cd'
 alias plz='pwd'
 alias inur='locate'
 alias nomz='ps -aux'
 alias nomnom='killall'
 alias cya='reboot'
 alias kthxbai='halt'
--- a/plugins/macports/_port
+++ b/plugins/macports/_port
@ -0,0 +1,89 @@
 #compdef port
 local subcmds 
 # we cache the list of ports
 # we shall use some cache policy to avoid problems with new ports
 if (( ! $+portlist )); then
 	portlist=($(port echo all; echo "all current active inactive installed uninstalled outdated"))
 fi
 subcmds=(
 'activate'
 'archive'
 'build'
 'cat'
 'clean'
 'configure'
 'contents'
 'deactivate'
 'dependents'
 'deps'
 'destroot'
 'dir'
 'distcheck'
 'distclean'
 'dmg'
 'echo'
 'edit'
 'extract'
 'fetch'
 'file'
 'help'
 'info'
 'install' 
 'installed' 
 'list'
 'livecheck'
 'location'
 'mpkg'
 'outdated'
 'patch'
 'pkg'
 'provides'
 'rpmpackage'
 'search'
 'selfupdate'
 'sync'
 'test'
 'unarchive'
 'uninstall'
 'upgrade' 
 'variants'
 'version'
 )
 _arguments -C \
 '-v[verbose mode (generate verbose messages)]' \
 '-d[debug mode (generate debugging messages)]' \
 '-q[quiet mode (suppress messages)]' \
 '-D[specify portdir]' \
 '-k[keep mode (do not autoclean after install)]' \
 '-n[dont follow dependencies in upgrade (only for upgrading)]' \
 '-a[upgrade all installed ports (only for upgrading)]' \
 '-u[uninstall non-active ports when upgrading and uninstalling]' \
 '-f[force mode (ignore state file)]' \
 '-s[source-only mode]' \
 '-b[binary-only mode]' \
 '-o[honor state files older than Portfile]' \
 '*::command:->command' \
 && return 0
 case $state in
 	command)
 	if ((CURRENT == 1)); then
 		state=subcommands
 	else
 		state=portname
 	fi
 	;;
 esac
 case $state in
 	subcommands)
 	_describe -t commands 'port commands' subcmds
 	;;
 	portname)
 	_describe -t commands 'available ports' portlist
 	;;
 esac
--- a/plugins/macports/macports.plugin.zsh
+++ b/plugins/macports/macports.plugin.zsh
@ -0,0 +1,8 @@
 #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"
--- a/plugins/mysql-macports/mysql-macports.plugin.zsh
+++ b/plugins/mysql-macports/mysql-macports.plugin.zsh
@ -0,0 +1,8 @@
 # commands to control local mysql-server installation
 # paths are for osx installation via macports
 alias mysqlstart='sudo /opt/local/share/mysql5/mysql/mysql.server start'
 alias mysqlstop='sudo /opt/local/share/mysql5/mysql/mysql.server stop'
 alias mysqlrestart='sudo /opt/local/share/mysql5/mysql/mysql.server restart'
 alias mysqlstatus='mysqladmin5 -u root -p ping'
--- a/plugins/npm/_npm
+++ b/plugins/npm/_npm
@ -0,0 +1,19 @@
 #compdef npm
 # Node Package Manager 0.3.15 completion, letting npm do all the completion work
 _npm() {
  compadd -- $(_npm_complete $words)
 }
 # We want to show all errors of any substance, but never the "npm (not )ok" one.
 # (Also doesn't consider "ERR! no match found" worth breaking the terminal for.)
 _npm_complete() {
  local ask_npm
  ask_npm=(npm completion --color false --loglevel error -- $@)
  { _call_program npm $ask_npm 2>&1 >&3 \
  | egrep -v '^(npm (not |)ok|ERR! no match found)$' >&2; \
  } 3>&1
 }
 _npm "$@"
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@ -0,0 +1,57 @@
 function savepath() {
  pwd > ~/.current_path~
 }
 function tab() {
 savepath
 osascript >/dev/null <<EOF
 on do_submenu(app_name, menu_name, menu_item, submenu_item)
    -- bring the target application to the front
    tell application app_name
      activate
    end tell
    tell application "System Events"
      tell process app_name
        tell menu bar 1
          tell menu bar item menu_name
            tell menu menu_name
              tell menu item menu_item
                tell menu menu_item
                  click menu item submenu_item
                end tell
              end tell
            end tell
          end tell
        end tell
      end tell
    end tell
 end do_submenu
 do_submenu("Terminal", "Shell", "New Tab", 1)
 EOF
 }
 function itab() {
 savepath
 osascript >/dev/null <<EOF
 on do_submenu(app_name, menu_name, menu_item)
    -- bring the target application to the front
    tell application app_name
      activate
    end tell
    tell application "System Events"
      tell process app_name
        tell menu bar 1
          tell menu bar item menu_name
            tell menu menu_name
              click menu item menu_item
            end tell
          end tell
        end tell
      end tell
    end tell
 end do_submenu
 do_submenu("iTerm", "Shell", "New Tab")
 EOF
 }
--- a/plugins/perl/perl.plugin.zsh
+++ b/plugins/perl/perl.plugin.zsh
@ -0,0 +1,62 @@
 # https://github.com/dbbolton
 #
 # Below are some useful Perl-related aliases/functions that I use with zsh.
 # Aliases ###################################################################
 # perlbrew ########
 alias pbi='perlbrew install'
 alias pbl='perlbrew list'
 alias pbo='perlbrew off'
 alias pbs='perlbrew switch'
 alias pbu='perlbrew use'
 # Perl ############
 # perldoc`
 alias pd='perldoc'
 # use perl like awk/sed
 alias ple='perl -wlne'
 # show the latest stable release of Perl
 alias latest-perl='curl -s http://www.perl.org/get.html | perl -wlne '\''if (/perl\-([\d\.]+)\.tar\.gz/) { print $1; exit;}'\'
 # Functions #################################################################
 # newpl - creates a basic Perl script file and opens it with $EDITOR 
 newpl () {
 	# set $EDITOR to 'vim' if it is undefined
 	[[ -z $EDITOR ]] && EDITOR=vim
 	# if the file exists, just open it
 	[[ -e $1 ]] && print "$1 exists; not modifying.\n" && $EDITOR $1
 	# if it doesn't, make it, and open it
 	[[ ! -e $1 ]] && print '#!/usr/bin/perl'"\n"'use strict;'"\n"'use warnings;'\
 		"\n\n" > $1 && $EDITOR $1
 }
 # pgs - Perl Global Substitution
 # find pattern		= 1st arg
 # replace pattern	= 2nd arg
 # filename			= 3rd arg
 pgs() { # [find] [replace] [filename]
    perl -i.orig -pe 's/'"$1"'/'"$2"'/g' "$3"
 }
 # Perl grep, because 'grep -P' is terrible. Lets you work with pipes or files.
 prep() { # [pattern] [filename unless STDOUT]
    perl -nle 'print if /'"$1"'/;' $2
 }
 # say - append a newline to 'print'
 say() {
    print "$1\n"
 }
--- a/plugins/phing/phing.plugin.zsh
+++ b/plugins/phing/phing.plugin.zsh
@ -0,0 +1,20 @@
 _phing_does_target_list_need_generating () {
  if [ ! -f .phing_targets ]; then return 0;
  else
    accurate=$(stat -f%m .phing_targets)
    changed=$(stat -f%m build.xml)
    return $(expr $accurate '>=' $changed)
  fi
 }
 _phing () {
  if [ -f build.xml ]; then
    if _phing_does_target_list_need_generating; then
      echo "\nGenerating .phing_targets..." > /dev/stderr
      phing -l |grep -v ":" |grep -v "^$"|grep -v "\-" > .phing_targets
    fi
    compadd `cat .phing_targets`
  fi
 }
 compdef _phing phing
--- a/plugins/pip/_pip
+++ b/plugins/pip/_pip
@ -0,0 +1,46 @@
 #compdef pip
 #autoload
 # pip zsh completion, based on homebrew completion
 _pip_installed() {
  installed_pkgs=(`pip freeze`)
 }
 local -a _1st_arguments
 _1st_arguments=(
  'bundle:Create pybundles (archives containing multiple packages)'
  'freeze:Output all currently installed packages (exact versions) to stdout'
  'help:Show available commands'
  'install:Install packages'
  'search:Search PyPI'
  'uninstall:Uninstall packages'
  'unzip:Unzip individual packages'
  'zip:Zip individual packages'
 )
 local expl
 local -a pkgs installed_pkgs
 _arguments \
  '(--version)--version[Show version number of program and exit]' \
  '(-v --verbose)'{-v,--verbose}'[Give more output]' \
  '(-q --quiet)'{-q,--quiet}'[Give less output]' \
  '(-h --help)'{-h,--help}'[Show help]' \
  '*:: :->subcmds' && return 0
 if (( CURRENT == 1 )); then
  _describe -t commands "pip subcommand" _1st_arguments
  return
 fi
 case "$words[1]" in
  list)
      if [[ "$state" == forms ]]; then
        _pip_installed
        _requested installed_pkgs expl 'installed packages' compadd -a installed_pkgs
      fi ;;
  uninstall)
    _pip_installed
    _wanted installed_pkgs expl 'installed packages' compadd -a installed_pkgs ;;
 esac
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@ -0,0 +1,13 @@
 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 remote_console() {
  /usr/bin/env ssh $1 "( cd $2 && ruby script/console production )"
 }
--- a/plugins/rails3/rails3.plugin.zsh
+++ b/plugins/rails3/rails3.plugin.zsh
@ -0,0 +1,30 @@
 # Rails 3 aliases, backwards-compatible with Rails 2.
 function _bundle_command {
  if command -v bundle && [ -e "Gemfile" ]; then
    bundle exec $@
  else
    $@
  fi
 }
 function _rails_command () {
  if [ -e "script/server" ]; then
    ruby script/$@
  else
    ruby script/rails $@
  fi
 }
 alias rc='_rails_command console'
 alias rd='_rails_command destroy'
 alias rdb='_rails_command dbconsole'
 alias rdbm='rake db:migrate db:test:clone'
 alias rg='_rails_command generate'
 alias rp='_rails_command plugin'
 alias rs='_rails_command server'
 alias rsd='_rails_command server --debugger'
 alias devlog='tail -f log/development.log'
 alias rspec='_bundle_command rspec'
 alias cuke='_bundle_command cucumber'
--- a/plugins/redis-cli/_redis-cli
+++ b/plugins/redis-cli/_redis-cli
@ -0,0 +1,142 @@
 #compdef redis-cli rec
 #autoload
 #redis cli completion, based off homebrew completion (ref. 2011-04-14)
 local -a _1st_arguments
 _1st_arguments=(
  'append:append a value to a key'
  'auth:authenticate to the server'
  'bgrewriteeaof:asynchronously rewrite the append-only file'
  'bgsave:asynchornously save the dataset to disk'
  'blpop:remove and get the first element in a list, or block until one is available'
  'brpop:remove and get the last element in a list, or block until one is available'
  'brpoplpush:pop a value from a list, push it to another list and return it; or block until one is available'
  # 'config get:get the value of a configuration parameter'
  # 'config set:set a configuration parameter to the given value'
  # 'config resetstat: reset the stats returned by INFO'
  'dbsize:return the number of keys in the selected database'
  # 'debug object:get debugging information about a key'
  # 'debug setgfault:make the server crash'
  'decr:decrement the integer value of a key by one'
  'decrby:decrement the integet value of a key by the given number'
  'del:delete a key'
  'discard:discard all commands issued after MULTI'
  'echo:echo the given string'
  'exec:execute all commands issued after a MULTI'
  'exists:determine if a key exists'
  'expire:set the time to live for a key, in seconds'
  'expireat:set the expiration for a key as a UNIX timestamp'
  'flushall:remove all keys from all databases'
  'flushdb:remove all keys from the current database'
  'get:get the value of a key'
  'getbit:returns the bit value at offset in the string value stored at key'
  'getrange:get a substring of the string stored at a key'
  'getset:set the string value of a key and return its old value'
  'hdel:delete a hash field'
  'hexists:determine if a hash field exists'
  'hget:get the value of a hash field'
  'hgetall:get all the fields and values in a hash'
  'hincrby:increment the integer value of a hash field by the given number'
  'hkeys:get all the fields in a hash'
  'hlen:get the number of fields in a hash'
  'hmget:get the values of all the given hash fields'
  'hmset:set multiple hash fields to multiple values'
  'hset:set the string value of a hash field'
  'hsetnx:set the value of a hash field, only if the field does not exist'
  'hvals:get all the values in a hash'
  'incr:increment the integer value of a key by one'
  'incrby:increment the integer value of a key by the given number'
  'info:get information and statistics about the server'
  'keys:find all keys matching the given pattern'
  'lastsave:get the UNIX timestamp of the last successful save to disk'
  'lindex:get an element from a list by its index'
  'linset:insert an element before or after another element in a list'
  'llen:get the length of a list'
  'lpop:remove and get the first element in a list'
  'lpush:prepend a value to a list'
  'lpushx:prepend a value to a list, only if the list exists'
  'lrange:get a range of elements from a list'
  'lrem:remove elements from a list'
  'lset:set the value of an element in a list by its index'
  'ltrim:trim a list to the specified range'
  'mget:get the values of all the given keys'
  'monitor:listen for all requests received by the server in real time'
  'move:move a key to another database'
  'mset:set multiple keys to muliple values'
  'msetnx:set multiple keys tom ultiple values, only if none of the keys exist'
  'multi:mark the start of a transaction block'
  'object:inspect the internals of Redis objects'
  'persist:remove the expiration from a key'
  'ping:ping the server'
  'psubscribe:listen for messages published to channels matching the given patterns'
  'publish:post a message to a channel'
  'punsubscribe:stop listening for messages posted to channels matching the given patterns'
  'quit:close the connection'
  'randomkey:return a random key from the keyspace'
  'rename:rename a key'
  'renamenx:rename a key, only if the new key does not exist'
  'rpop:remove and get the last element in a list'
  'rpoplpush:remove the last element in a list, append it to another list and return it'
  'rpush:append a value to a list'
  'rpushx:append a value to a list, only if the list exists'
  'sadd:add a member to a set'
  'save:synchronously save the dataset to disk'
  'scard:get the number of members in a set'
  'sdiff:subtract multiple sets'
  'sdiffstore:subtract multiple sets and store the resulting set in a key'
  'select:change the selected database for the current connection'
  'set:set the string value of a key'
  'setbit:sets or clears the bit at offset in the string value stored at key'
  'setex:set the value and expiration of a key'
  'setnx:set the value of a key, only if the key does not exist'
  'setrange:overwrite part of a string at key starting at the specified offset'
  'shutdown:synchronously save the dataset to disk and then shut down the server'
  'sinter:intersect multiple sets'
  'sinterstore:intersect multiple sets and store the resulting set in a key'
  'sismember:determine if a given value is a member of a set'
  'slaveof:make the server a slave of another instance, or promote it as master'
  'smembers:get all the members in a set'
  'smove:move a member from one set to another'
  'sort:sort the elements in a list, set or sorted set'
  'spop:remove and return a random member from a set'
  'srandmember:get a random member from a set'
  'srem:remove a member from a set'
  'strlen:get the length of the value stored in a key'
  'subscribe:listen for messages published to the given channels'
  'sunion:add multiple sets'
  'sunionstore:add multiple sets and store the resulting set in a key'
  'ttl:get the time to live for a key'
  'type:determine the type stored at key'
  'unsubscribe:stop listening for messages posted to the given channels'
  'unwatch:forget about all watched keys'
  'watch:watch the given keys to determine execution of the MULTI/EXEC block'
  'zadd:add a member to a sorted set, or update its score if it already exists'
  'zcard:get the number of members in a sorted set'
  'zcount:count the members in a sorted set with scores within the given values'
  'zincrby:increment the score of a member in a sorted set'
  'zinterstore:intersect multiple sorted sets and store the resulting sorted set in a new key'
  'zrange:return a range of members in a sorted set, by index'
  'zrangebyscore:return a range of members in a sorted set, by score'
  'zrank:determine the index of a member in a sorted set'
  'zrem:remove a member from a sorted set'
  'zremrangebyrank:remove all members in a sorted set within the given indexes'
  'zremrangebyscore:remove all members in a sorted set within the given scores'
  'zrevrange:return a range of membrs in a sorted set, by index, with scores ordered from high to low'
  'zrevrangebyscore:return a range of members in a sorted set, by score, with scores ordered from high to low'
  'zrevrank:determine the index of a member in a sorted set, with scores ordered from high to low'
  'zscore:get the score associated with the given member in a sorted set'
  'zunionstore:add multiple sorted sets and store te resulting sorted set in a new key'
 )
 local expl
 _arguments \
  '(-v --version)'{-v,--version}'[show version]' \
  '(-h --help)'{-h,--help}'[show help]' \
  '*:: :->subcmds' && return 0
 if (( CURRENT == 1 )); then
  _describe -t commands "redis-cli subcommand" _1st_arguments
  return
 fi
--- a/plugins/ruby/ruby.plugin.zsh
+++ 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'
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ 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-$HOST
 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
--- a/plugins/svn/svn.plugin.zsh
+++ 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
 }
--- a/plugins/textmate/textmate.plugin.zsh
+++ 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
 }
--- a/plugins/vagrant/_vagrant
+++ b/plugins/vagrant/_vagrant
@ -0,0 +1,104 @@
 #compdef vagrant 
 #autoload
 # vagrant zsh completion
 local -a _1st_arguments
 _1st_arguments=(
    'box:Box commands'
    'destroy:Destroys the vagrant environment'
    'halt:Halts the currently running vagrant environment'
    'help:[TASK] Describe available tasks or one specific task'
    'init:[box_name] [box_url] Initializes current folder for Vagrant usage'
    'package:Packages a vagrant environment for distribution'
    'provision:Run the provisioner'
    'reload:Reload the vagrant environment'
    'resume:Resumes a suspend vagrant environment'
    'ssh:SSH into the currently running environment'
    'ssh_config:outputs .ssh/config valid syntax for connecting to this environment via ssh.'
    'status:Shows the status of the current Vagrant environment.'
    'suspend:Suspends the currently running vagrant environment'
    'up:Creates the vagrant environment'
    'version:Prints the Vagrant version information'
 )
 local -a _box_arguments
 _box_arguments=(
    'add:NAME URI Add a box to the system'
    'help:COMMAND Describe subcommands or one specific subcommand'
    'list:Lists all installed boxes'
    'remove:NAME Remove a box from the system'
    'repackage:NAME Repackage an installed box into a `.box` file.'
 )
 __task_list ()
 {
    local expl
    declare -a tasks
    tasks=(box destroy halt init package provision reload resume ssh ssh_config status suspend up version)
    _wanted tasks expl 'help' compadd $tasks
 }
 __box_list ()
 {
    _wanted application expl 'command' compadd $(command ls -1 $HOME/.vagrant/boxes 2>/dev/null| sed -e 's/ /\\ /g')
 }
 __vagrant-box ()
 {
    local curcontext="$curcontext" state line
    typeset -A opt_args
    _arguments -C \
        ':command:->command' \
        '*::options:->options'
   case $state in
       (command)
           _describe -t commands "gem subcommand" _box_arguments
           return
       ;;
       (options)
           case $line[1] in
               (repackage|remove)
                   _arguments ':feature:__box_list' 
               ;;
           esac
       ;;
    esac
 }
 local expl
 local -a boxes installed_boxes
 local curcontext="$curcontext" state line
 typeset -A opt_args
 _arguments -C \
    ':command:->command' \
    '*::options:->options'
 case $state in
  (command)
      _describe -t commands "gem subcommand" _1st_arguments
      return
  ;;
  (options)
    case $line[1] in
      (help)
         _arguments ':feature:__task_list' 
      ;;
      (box)
          __vagrant-box
      ;;
    esac
  ;;
 esac
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ 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
--- a/plugins/yum/yum.plugin.zsh
+++ b/plugins/yum/yum.plugin.zsh
@ -0,0 +1,12 @@
 ## Aliases
 alias ys="yum search"                       # search package
 alias yp="yum info"                         # show package info
 alias yl="yum list"                         # list packages
 alias yli="yum list installed"              # print all installed packages
 alias yu="sudo yum update"                  # upgrate packages
 alias yi="sudo yum install"                 # install package
 alias yr="sudo yum remove"                  # remove package
 alias yrl="sudo yum remove --remove-leaves" # remove package and leaves
 alias yc="sudo yum clean all"               # clean cache
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@ -1,8 +1,10 @@
 # Path to your oh-my-zsh configuration.
 export ZSH=$HOME/.oh-my-zsh
-# Set to the name theme to load.
+# Set name of the theme to load.
 # Look in ~/.oh-my-zsh/themes/
 # Optionally, if you set this to "random", it'll load a random theme each
 # time that oh-my-zsh is loaded.
 export ZSH_THEME="robbyrussell"
 # Set to this to use case-sensitive completion
@ -14,6 +16,13 @@ export ZSH_THEME="robbyrussell"
 # Uncomment following line if you want to disable colors in ls
 # export DISABLE_LS_COLORS="true"
 # Uncomment following line if you want to disable autosetting terminal title.
 # export DISABLE_AUTO_TITLE="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...
--- a/themes/Soliah.zsh-theme
+++ b/themes/Soliah.zsh-theme
@ -1,6 +1,86 @@
-PROMPT='%{$fg[blue]%}%B%20~%b%{$reset_color%}%{$(git_prompt_info)%} $ '
+PROMPT='%{$fg[blue]%}%n%{$reset_color%} on %{$fg[red]%}%M%{$reset_color%} in %{$fg[blue]%}%~%b%{$reset_color%}$(git_time_since_commit)$(check_git_prompt_info)
 $ '
-ZSH_THEME_GIT_PROMPT_PREFIX="(%{$fg[green]%}"
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[white]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%})"
 ZSH_THEME_GIT_PROMPT_DIRTY="*%{$reset_color%}"
 # Text to display if the branch is dirty
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*%{$reset_color%}" 
 # Text to display if the branch is clean
 ZSH_THEME_GIT_PROMPT_CLEAN="" 
 # Colors vary depending on time lapsed.
 ZSH_THEME_GIT_TIME_SINCE_COMMIT_SHORT="%{$fg[green]%}"
 ZSH_THEME_GIT_TIME_SHORT_COMMIT_MEDIUM="%{$fg[yellow]%}"
 ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG="%{$fg[red]%}"
 ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL="%{$fg[cyan]%}"
 # Git sometimes goes into a detached head state. git_prompt_info doesn't
 # return anything in this case. So wrap it in another function and check
 # for an empty string.
 function check_git_prompt_info() {
    if git rev-parse --git-dir > /dev/null 2>&1; then
        if [[ -z $(git_prompt_info) ]]; then
            echo "%{$fg[magenta]%}detached-head%{$reset_color%})"
        else
            echo "$(git_prompt_info)"
        fi
    fi
 }
 # Determine if we are using a gemset.
 function rvm_gemset() {
    GEMSET=`rvm gemset list | grep '=>' | cut -b4-`
    if [[ -n $GEMSET ]]; then
        echo "%{$fg[yellow]%}$GEMSET%{$reset_color%}|"
    fi 
 }
 # Determine the time since last commit. If branch is clean,
 # use a neutral color, otherwise colors will vary according to time.
 function git_time_since_commit() {
    if git rev-parse --git-dir > /dev/null 2>&1; then
        # Only proceed if there is actually a commit.
        if [[ $(git log 2>&1 > /dev/null | grep -c "^fatal: bad default revision") == 0 ]]; then
            # Get the last commit.
            last_commit=`git log --pretty=format:'%at' -1 2> /dev/null`
            now=`date +%s`
            seconds_since_last_commit=$((now-last_commit))
            # Totals
            MINUTES=$((seconds_since_last_commit / 60))
            HOURS=$((seconds_since_last_commit/3600))
            # Sub-hours and sub-minutes
            DAYS=$((seconds_since_last_commit / 86400))
            SUB_HOURS=$((HOURS % 24))
            SUB_MINUTES=$((MINUTES % 60))
            if [[ -n $(git status -s 2> /dev/null) ]]; then
                if [ "$MINUTES" -gt 30 ]; then
                    COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG"
                elif [ "$MINUTES" -gt 10 ]; then
                    COLOR="$ZSH_THEME_GIT_TIME_SHORT_COMMIT_MEDIUM"
                else
                    COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_SHORT"
                fi
            else
                COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL"
            fi
            if [ "$HOURS" -gt 24 ]; then
                echo "($(rvm_gemset)$COLOR${DAYS}d${SUB_HOURS}h${SUB_MINUTES}m%{$reset_color%}|"
            elif [ "$MINUTES" -gt 60 ]; then
                echo "($(rvm_gemset)$COLOR${HOURS}h${SUB_MINUTES}m%{$reset_color%}|"
            else
                echo "($(rvm_gemset)$COLOR${MINUTES}m%{$reset_color%}|"
            fi
        else
            COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL"
            echo "($(rvm_gemset)$COLOR~|"
        fi
    fi
 }
--- 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%})"
--- 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%}'
--- a/themes/aussiegeek.zsh-theme
+++ 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="✗"
--- a/themes/awesomepanda.zsh-theme
+++ 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=" "
--- a/themes/bira.zsh-theme
+++ b/themes/bira.zsh-theme
@ -0,0 +1,14 @@
 # ZSH Theme - Preview: http://gyazo.com/8becc8a7ed5ab54a0262a470555c3eed.png
 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
 local user_host='%{$terminfo[bold]$fg[green]%}%n@%m%{$reset_color%}'
 local current_dir='%{$terminfo[bold]$fg[blue]%} %~%{$reset_color%}'
 local rvm_ruby='%{$fg[red]%}‹$(rvm-prompt i v g)›%{$reset_color%}'
 local git_branch='$(git_prompt_info)%{$reset_color%}'
 PROMPT="╭─${user_host} ${current_dir} ${rvm_ruby} ${git_branch}
 ╰─%B$%b "
 RPS1="${return_code}"
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}‹"
 ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}"
--- a/themes/candy.zsh-theme
+++ b/themes/candy.zsh-theme
@ -0,0 +1,7 @@
 PROMPT=$'%{$fg_bold[green]%}%n@%m %{$fg[blue]%}%D{[%I:%M:%S]} %{$reset_color%}%{$fg[white]%}[%~]%{$reset_color%} $(git_prompt_info)\
 %{$fg[blue]%}->%{$fg_bold[blue]%} %#%{$reset_color%} '
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}["
 ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}*%{$fg[green]%}"
 ZSH_THEME_GIT_PROMPT_CLEAN=""
--- 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='[%*]'
--- a/themes/cloud.zsh-theme
+++ b/themes/cloud.zsh-theme
@ -0,0 +1,6 @@
 PROMPT='%{$fg_bold[cyan]%}☁ %{$fg_bold[green]%}%p %{$fg[green]%}%c %{$fg_bold[cyan]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}[%{$fg[cyan]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%}] %{$fg[yellow]%}⚡%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%}]"
--- a/themes/dieter.zsh-theme
+++ b/themes/dieter.zsh-theme
@ -0,0 +1,56 @@
 # the idea of this theme is to contain a lot of info in a small string, by
 # compressing some parts and colorcoding, which bring useful visual cues,
 # while limiting the amount of colors and such to keep it easy on the eyes.
 # When a command exited >0, the timestamp will be in red and the exit code
 # will be on the right edge.
 # The exit code visual cues will only display once.
 # (i.e. they will be reset, even if you hit enter a few times on empty command prompts)
 typeset -A host_repr
 # translate hostnames into shortened, colorcoded strings
 host_repr=('dieter-ws-a7n8x-arch' "%{$fg_bold[green]%}ws" 'dieter-p4sci-arch' "%{$fg_bold[blue]%}p4")
 # local time, color coded by last return code
 time_enabled="%(?.%{$fg[green]%}.%{$fg[red]%})%*%{$reset_color%}"
 time_disabled="%{$fg[green]%}%*%{$reset_color%}"
 time=$time_enabled
 # user part, color coded by privileges
 local user="%(!.%{$fg[blue]%}.%{$fg[blue]%})%n%{$reset_color%}"
 # Hostname part.  compressed and colorcoded per host_repr array
 # if not found, regular hostname in default color
 local host="@${host_repr[$(hostname)]:-$(hostname)}%{$reset_color%}"
 # Compacted $PWD
 local pwd="%{$fg[blue]%}%c%{$reset_color%}"
 PROMPT='${time} ${user}${host} ${pwd} $(git_prompt_info)'
 # i would prefer 1 icon that shows the "most drastic" deviation from HEAD,
 # but lets see how this works out
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%} %{$fg[yellow]%}?%{$fg[green]%}%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%}"
 # elaborate exitcode on the right when >0
 return_code_enabled="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
 return_code_disabled=
 return_code=$return_code_enabled
 RPS1='${return_code}'
 function accept-line-or-clear-warning () {
 	if [[ -z $BUFFER ]]; then
 		time=$time_disabled
 		return_code=$return_code_disabled
 	else
 		time=$time_enabled
 		return_code=$return_code_enabled
 	fi
 	zle accept-line
 }
 zle -N accept-line-or-clear-warning
 bindkey '^M' accept-line-or-clear-warning
--- a/themes/dogenpunk.zsh-theme
+++ b/themes/dogenpunk.zsh-theme
@ -0,0 +1,85 @@
 # -----------------------------------------------------------------------------
 #          FILE: dogenpunk.zsh-theme
 #   DESCRIPTION: oh-my-zsh theme file.
 #        AUTHOR: Matthew Nelson (dogenpunk@gmail.com)
 #       VERSION: 0.1
 #    SCREENSHOT: coming soon
 # -----------------------------------------------------------------------------
 MODE_INDICATOR="%{$fg_bold[red]%}❮%{$reset_color%}%{$fg[red]%}❮❮%{$reset_color%}"
 local return_status="%{$fg[red]%}%(?..⏎)%{$reset_color%}"
 PROMPT='%{$fg[blue]%}%m%{$reset_color%}%{$fg_bold[white]%} ओम् %{$reset_color%}%{$fg[cyan]%}%~:%{$reset_color%}$(git_time_since_commit)$(git_prompt_info)
 %{$fg[red]%}%!%{$reset_color%} $(prompt_char) '
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[green]%}git%{$reset_color%}@%{$bg[white]%}%{$fg[black]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%})"
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}!%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 RPROMPT='${return_status}$(git_prompt_status)%{$reset_color%}'
 ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} ✚"
 ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} ✹"
 ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖"
 ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜"
 ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═"
 ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭"
 function prompt_char() {
  git branch >/dev/null 2>/dev/null && echo "%{$fg[green]%}±%{$reset_color%}" && return
  hg root >/dev/null 2>/dev/null && echo "%{$fg_bold[red]%}☿%{$reset_color%}" && return
  echo "%{$fg[cyan]%}◯ %{$reset_color%}"
 }
 # Colors vary depending on time lapsed.
 ZSH_THEME_GIT_TIME_SINCE_COMMIT_SHORT="%{$fg[green]%}"
 ZSH_THEME_GIT_TIME_SHORT_COMMIT_MEDIUM="%{$fg[yellow]%}"
 ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG="%{$fg[red]%}"
 ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL="%{$fg[cyan]%}"
 # Determine the time since last commit. If branch is clean,
 # use a neutral color, otherwise colors will vary according to time.
 function git_time_since_commit() {
    if git rev-parse --git-dir > /dev/null 2>&1; then
        # Only proceed if there is actually a commit.
        if [[ $(git log 2>&1 > /dev/null | grep -c "^fatal: bad default revision") == 0 ]]; then
            # Get the last commit.
            last_commit=`git log --pretty=format:'%at' -1 2> /dev/null`
            now=`date +%s`
            seconds_since_last_commit=$((now-last_commit))
            # Totals
            MINUTES=$((seconds_since_last_commit / 60))
            HOURS=$((seconds_since_last_commit/3600))
            # Sub-hours and sub-minutes
            DAYS=$((seconds_since_last_commit / 86400))
            SUB_HOURS=$((HOURS % 24))
            SUB_MINUTES=$((MINUTES % 60))
            if [[ -n $(git status -s 2> /dev/null) ]]; then
                if [ "$MINUTES" -gt 30 ]; then
                    COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG"
                elif [ "$MINUTES" -gt 10 ]; then
                    COLOR="$ZSH_THEME_GIT_TIME_SHORT_COMMIT_MEDIUM"
                else
                    COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_SHORT"
                fi
            else
                COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL"
            fi
            if [ "$HOURS" -gt 24 ]; then
                echo "($COLOR${DAYS}d${SUB_HOURS}h${SUB_MINUTES}m%{$reset_color%}|"
            elif [ "$MINUTES" -gt 60 ]; then
                echo "($COLOR${HOURS}h${SUB_MINUTES}m%{$reset_color%}|"
            else
                echo "($COLOR${MINUTES}m%{$reset_color%}|"
            fi
        else
            COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL"
            echo "($COLOR~|"
        fi
    fi
 }
--- 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%}
--- a/themes/eastwood.zsh-theme
+++ 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 '
--- a/themes/fishy.zsh-theme
+++ 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%}"
--- a/themes/flazz.zsh-theme
+++ 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
--- a/themes/fletcherm.zsh-theme
+++ b/themes/fletcherm.zsh-theme
@ -0,0 +1,12 @@
 # Copied from old version of tonotdo's theme. LSCOLORS modified.
 PROMPT='%{$fg_no_bold[cyan]%}%n%{$fg_no_bold[magenta]%}•%{$fg_no_bold[green]%}%3~$(git_prompt_info)%{$reset_color%}» '
 RPROMPT='[%*]'
 # git theming
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}(%{$fg_no_bold[red]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX=""
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[blue]%})"
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[yellow]%}⚡%{$fg_bold[blue]%})"
 export LSCOLORS="exfxcxdxbxegedabagacad"
 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:'
--- a/themes/frisk.zsh-theme
+++ b/themes/frisk.zsh-theme
@ -0,0 +1,10 @@
 PROMPT=$'
 %{$fg[blue]%}%/%{$reset_color%} $(git_prompt_info)%{$fg[white]%}[%n@%m]%{$reset_color%} %{$fg[white]%}[%T]%{$reset_color%}
 %{$fg_bold[black]%}>%{$reset_color%} '
 PROMPT2="%{$fg_blod[black]%}%_> %{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}["
 ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}*%{$fg[green]%}"
 ZSH_THEME_GIT_PROMPT_CLEAN=""
--- a/themes/gallois.zsh-theme
+++ b/themes/gallois.zsh-theme
@ -0,0 +1,19 @@
 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
 }
 #RVM and git settings
 if [[ -s ~/.rvm/scripts/rvm ]] ; then 
  RPS1='$(git_custom_status)%{$fg[red]%}[`~/.rvm/bin/rvm-prompt`]%{$reset_color%} $EPS1'
 fi
 PROMPT='%{$fg[cyan]%}[%~% ]%(?.%{$fg[green]%}.%{$fg[red]%})%B$%b '
--- a/themes/gentoo.zsh-theme
+++ b/themes/gentoo.zsh-theme
@ -0,0 +1,4 @@
 PROMPT='%(!.%{$fg_bold[red]%}.%{$fg_bold[green]%}%n@)%m %{$fg_bold[blue]%}%(!.%1~.%~) $(git_prompt_info)%#%{$reset_color%} '
 ZSH_THEME_GIT_PROMPT_PREFIX="("
 ZSH_THEME_GIT_PROMPT_SUFFIX=") "
--- a/themes/gozilla.zsh-theme
+++ b/themes/gozilla.zsh-theme
@ -0,0 +1,15 @@
 PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
 ZSH_THEME_GIT_PROMPT_PREFIX="("
 ZSH_THEME_GIT_PROMPT_SUFFIX=")"
 ZSH_THEME_GIT_PROMPT_DIRTY=""
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 RPROMPT='$(git_prompt_status)%{$reset_color%}'
 ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[cyan]%} ✈"
 ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[yellow]%} ✭"
 ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✗"
 ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[blue]%} ➦"
 ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[magenta]%} ✂"
 ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[grey]%} ✱"
--- a/themes/jbergantine.zsh-theme
+++ 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]%})"
--- a/themes/jonathan.zsh-theme
+++ b/themes/jonathan.zsh-theme
@ -0,0 +1,137 @@
 function precmd {
    local TERMWIDTH
    (( TERMWIDTH = ${COLUMNS} - 1 ))
    ###
    # Truncate the path if it's too long.
    PR_FILLBAR=""
    PR_PWDLEN=""
    local promptsize=${#${(%):---(%n@%m:%l)---()--}}
    local rubyprompt=`rvm_prompt_info`
    local rubypromptsize=${#${rubyprompt}}
    local pwdsize=${#${(%):-%~}}
    if [[ "$promptsize + $rubypromptsize + $pwdsize" -gt $TERMWIDTH ]]; then
      ((PR_PWDLEN=$TERMWIDTH - $promptsize))
    else
      PR_FILLBAR="\${(l.(($TERMWIDTH - ($promptsize + $rubypromptsize + $pwdsize)))..${PR_HBAR}.)}"
    fi
 }
 setopt extended_glob
 preexec () {
    if [[ "$TERM" == "screen" ]]; then
 	local CMD=${1[(wr)^(*=*|sudo|-*)]}
 	echo -n "\ek$CMD\e\\"
    fi
 }
 setprompt () {
    ###
    # Need this so the prompt will work.
    setopt prompt_subst
    ###
    # See if we can use colors.
    autoload colors zsh/terminfo
    if [[ "$terminfo[colors]" -ge 8 ]]; then
 	colors
    fi
    for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE GREY; do
 	eval PR_$color='%{$terminfo[bold]$fg[${(L)color}]%}'
 	eval PR_LIGHT_$color='%{$fg[${(L)color}]%}'
 	(( count = $count + 1 ))
    done
    PR_NO_COLOUR="%{$terminfo[sgr0]%}"
    ###
    # Modify Git prompt
    ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[green]%}"
    ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
    ZSH_THEME_GIT_PROMPT_DIRTY=""
    ZSH_THEME_GIT_PROMPT_CLEAN=""
    ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} ✚"
    ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} ✹"
    ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖"
    ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜"
    ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═"
    ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭"
    ###
    # See if we can use extended characters to look nicer.
    typeset -A altchar
    set -A altchar ${(s..)terminfo[acsc]}
    PR_SET_CHARSET="%{$terminfo[enacs]%}"
    PR_SHIFT_IN="%{$terminfo[smacs]%}"
    PR_SHIFT_OUT="%{$terminfo[rmacs]%}"
    PR_HBAR=${altchar[q]:--}
    PR_ULCORNER=${altchar[l]:--}
    PR_LLCORNER=${altchar[m]:--}
    PR_LRCORNER=${altchar[j]:--}
    PR_URCORNER=${altchar[k]:--}
    ###
    # Decide if we need to set titlebar text.
    case $TERM in
 	xterm*)
 	    PR_TITLEBAR=$'%{\e]0;%(!.-=*[ROOT]*=- | .)%n@%m:%~ | ${COLUMNS}x${LINES} | %y\a%}'
 	    ;;
 	screen)
 	    PR_TITLEBAR=$'%{\e_screen \005 (\005t) | %(!.-=[ROOT]=- | .)%n@%m:%~ | ${COLUMNS}x${LINES} | %y\e\\%}'
 	    ;;
 	*)
 	    PR_TITLEBAR=''
 	    ;;
    esac
    ###
    # Decide whether to set a screen title
    if [[ "$TERM" == "screen" ]]; then
 	PR_STITLE=$'%{\ekzsh\e\\%}'
    else
 	PR_STITLE=''
    fi
    ###
    # Finally, the prompt.
    PROMPT='$PR_SET_CHARSET$PR_STITLE${(e)PR_TITLEBAR}\
 $PR_CYAN$PR_SHIFT_IN$PR_ULCORNER$PR_HBAR$PR_SHIFT_OUT$PR_GREY(\
 $PR_GREEN%$PR_PWDLEN<...<%~%<<\
 $PR_GREY)`rvm_prompt_info`$PR_CYAN$PR_SHIFT_IN$PR_HBAR$PR_HBAR${(e)PR_FILLBAR}$PR_HBAR$PR_SHIFT_OUT$PR_GREY(\
 $PR_CYAN%(!.%SROOT%s.%n)$PR_GREY@$PR_GREEN%m:%l\
 $PR_GREY)$PR_CYAN$PR_SHIFT_IN$PR_HBAR$PR_URCORNER$PR_SHIFT_OUT\
 $PR_CYAN$PR_SHIFT_IN$PR_LLCORNER$PR_BLUE$PR_HBAR$PR_SHIFT_OUT(\
 $PR_YELLOW%D{%H:%M:%S}\
 $PR_LIGHT_BLUE%{$reset_color%}`git_prompt_info``git_prompt_status`$PR_BLUE)$PR_CYAN$PR_SHIFT_IN$PR_HBAR\
 $PR_SHIFT_IN$PR_HBAR$PR_SHIFT_OUT\
 >$PR_NO_COLOUR '
    # display exitcode on the right when >0
    return_code="%(?..%{$fg[red]%}%? ↵ %{$reset_color%})"
    RPROMPT=' $return_code$PR_CYAN$PR_SHIFT_IN$PR_HBAR$PR_BLUE$PR_HBAR$PR_SHIFT_OUT\
 ($PR_YELLOW%D{%a,%b%d}$PR_BLUE)$PR_SHIFT_IN$PR_HBAR$PR_CYAN$PR_LRCORNER$PR_SHIFT_OUT$PR_NO_COLOUR'
    PS2='$PR_CYAN$PR_SHIFT_IN$PR_HBAR$PR_SHIFT_OUT\
 $PR_BLUE$PR_SHIFT_IN$PR_HBAR$PR_SHIFT_OUT(\
 $PR_LIGHT_GREEN%_$PR_BLUE)$PR_SHIFT_IN$PR_HBAR$PR_SHIFT_OUT\
 $PR_CYAN$PR_SHIFT_IN$PR_HBAR$PR_SHIFT_OUT$PR_NO_COLOUR '
 }
 setprompt
--- a/themes/josh.zsh-theme
+++ b/themes/josh.zsh-theme
@ -0,0 +1,43 @@
 grey='\e[0;90m'
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$grey%}("
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$grey%}) %{$fg[yellow]%}✗%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$grey%})"
 function josh_prompt {
  (( spare_width = ${COLUMNS} ))
  prompt=" "
  branch=$(current_branch)
  ruby_version=$(rvm_prompt_info)
  path_size=${#PWD}
  branch_size=${#branch}
  ruby_size=${#ruby_version}
  user_machine_size=${#${(%):-%n@%m-}}
  if [[ ${#branch} -eq 0 ]]
    then (( ruby_size = ruby_size + 1 ))
  else
    (( branch_size = branch_size + 4 ))
    if [[ -n $(git status -s 2> /dev/null) ]]; then
      (( branch_size = branch_size + 2 ))
    fi
  fi
  (( spare_width = ${spare_width} - (${user_machine_size} + ${path_size} + ${branch_size} + ${ruby_size}) ))
  while [ ${#prompt} -lt $spare_width ]; do
    prompt=" $prompt"
  done
  prompt="%{%F{green}%}$PWD$prompt%{%F{red}%}$(rvm_prompt_info)%{$reset_color%} $(git_prompt_info)"
  echo $prompt
 }
 setopt prompt_subst
 PROMPT='
 %n@%m $(josh_prompt)
 %(?,%{%F{green}%},%{%F{red}%})⚡%{$reset_color%} '
--- 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%} %~ \
--- a/themes/jtriley.zsh-theme
+++ b/themes/jtriley.zsh-theme
@ -0,0 +1,8 @@
 #PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
 PROMPT="%{$fg_bold[cyan]%}%T%{$fg_bold[green]%} %{$fg_bold[white]%}%n%{$fg[magenta]%}@%{$fg_bold[white]%}%m %{$fg_bold[green]%}%d
 %{$fg_bold[yellow]%}%% $(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]%})"
--- a/themes/juanghurtado.zsh-theme
+++ b/themes/juanghurtado.zsh-theme
@ -0,0 +1,46 @@
 # ------------------------------------------------------------------------
 # Juan G. Hurtado oh-my-zsh theme
 # (Needs Git plugin for current_branch method)
 # ------------------------------------------------------------------------
 # Color shortcuts
 RED=$fg[red]
 YELLOW=$fg[yellow]
 GREEN=$fg[green]
 WHITE=$fg[white]
 BLUE=$fg[blue]
 RED_BOLD=$fg_bold[red]
 YELLOW_BOLD=$fg_bold[yellow]
 GREEN_BOLD=$fg_bold[green]
 WHITE_BOLD=$fg_bold[white]
 BLUE_BOLD=$fg_bold[blue]
 RESET_COLOR=$reset_color
 # Format for git_prompt_info()
 ZSH_THEME_GIT_PROMPT_PREFIX=""
 ZSH_THEME_GIT_PROMPT_SUFFIX=""
 # Format for parse_git_dirty()
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$RED%}(*)"
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 # Format for git_prompt_status()
 ZSH_THEME_GIT_PROMPT_UNMERGED=" %{$RED%}unmerged"
 ZSH_THEME_GIT_PROMPT_DELETED=" %{$RED%}deleted"
 ZSH_THEME_GIT_PROMPT_RENAMED=" %{$YELLOW%}renamed"
 ZSH_THEME_GIT_PROMPT_MODIFIED=" %{$YELLOW%}modified"
 ZSH_THEME_GIT_PROMPT_ADDED=" %{$GREEN%}added"
 ZSH_THEME_GIT_PROMPT_UNTRACKED=" %{$WHITE%}untracked"
 # Format for git_prompt_ahead()
 ZSH_THEME_GIT_PROMPT_AHEAD=" %{$RED%}(!)"
 # Format for git_prompt_long_sha() and git_prompt_short_sha()
 ZSH_THEME_GIT_PROMPT_SHA_BEFORE=" %{$WHITE%}[%{$YELLOW%}"
 ZSH_THEME_GIT_PROMPT_SHA_AFTER="%{$WHITE%}]"
 # Prompt format
 PROMPT='
 %{$GREEN_BOLD%}%n@%m%{$WHITE%}:%{$YELLOW%}%~%u$(parse_git_dirty)$(git_prompt_ahead)%{$RESET_COLOR%}
 %{$BLUE%}>%{$RESET_COLOR%} '
 RPROMPT='%{$GREEN_BOLD%}$(current_branch)$(git_prompt_short_sha)$(git_prompt_status)%{$RESET_COLOR%}'
--- a/themes/kardan.zsh-theme
+++ b/themes/kardan.zsh-theme
@ -0,0 +1,12 @@
 # Simple theme based on my old zsh settings.
 function get_host {
 	echo '@'`hostname`''
 }
 PROMPT='> '
 RPROMPT='%~$(git_prompt_info)$(get_host)'
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%}✗%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_PREFIX="("
 ZSH_THEME_GIT_PROMPT_SUFFIX=")"
--- a/themes/kennethreitz.zsh-theme
+++ 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]%}"
--- a/themes/kolo.zsh-theme
+++ b/themes/kolo.zsh-theme
@ -0,0 +1,21 @@
 autoload -U colors && colors
 autoload -Uz vcs_info
 zstyle ':vcs_info:*' stagedstr '%F{green}●'
 zstyle ':vcs_info:*' unstagedstr '%F{yellow}●'
 zstyle ':vcs_info:*' check-for-changes true
 zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{11}%r'
 zstyle ':vcs_info:*' enable git svn
 precmd () {
    if [[ -z $(git ls-files --other --exclude-standard 2> /dev/null) ]] {
        zstyle ':vcs_info:*' formats ' [%b%c%u%B%F{green}]'
    } else {
        zstyle ':vcs_info:*' formats ' [%b%c%u%B%F{red}●%F{green}]'
    }
    vcs_info
 }
 setopt prompt_subst
 PROMPT='%B%F{magenta}%c%B%F{green}${vcs_info_msg_0_}%B%F{magenta} %{$reset_color%}%% '
--- a/themes/kphoen.zsh-theme
+++ b/themes/kphoen.zsh-theme
@ -0,0 +1,50 @@
 # ------------------------------------------------------------------------------
 #          FILE:  kphoen.zsh-theme
 #   DESCRIPTION:  oh-my-zsh theme file.
 #        AUTHOR:  Kévin Gomez (geek63@gmail.com)
 #       VERSION:  1.0.0
 #    SCREENSHOT:
 # ------------------------------------------------------------------------------
 if [[ "$TERM" != "dumb" ]] && [[ "$DISABLE_LS_COLORS" != "true" ]]; then
    PROMPT='[%{$fg[red]%}%n%{$reset_color%}@%{$fg[magenta]%}%m%{$reset_color%}:%{$fg[blue]%}%~%{$reset_color%}$(git_prompt_info)]
 %# '
    ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[green]%}"
    ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
    ZSH_THEME_GIT_PROMPT_DIRTY=""
    ZSH_THEME_GIT_PROMPT_CLEAN=""
    # display exitcode on the right when >0
    return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
    RPROMPT='${return_code}$(git_prompt_status)%{$reset_color%}'
    ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} ✚"
    ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} ✹"
    ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖"
    ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜"
    ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═"
    ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭"
 else
    PROMPT='[%n@%m:%~$(git_prompt_info)]
 %# '
    ZSH_THEME_GIT_PROMPT_PREFIX=" on"
    ZSH_THEME_GIT_PROMPT_SUFFIX=""
    ZSH_THEME_GIT_PROMPT_DIRTY=""
    ZSH_THEME_GIT_PROMPT_CLEAN=""
    # display exitcode on the right when >0
    return_code="%(?..%? ↵)"
    RPROMPT='${return_code}$(git_prompt_status)'
    ZSH_THEME_GIT_PROMPT_ADDED=" ✚"
    ZSH_THEME_GIT_PROMPT_MODIFIED=" ✹"
    ZSH_THEME_GIT_PROMPT_DELETED=" ✖"
    ZSH_THEME_GIT_PROMPT_RENAMED=" ➜"
    ZSH_THEME_GIT_PROMPT_UNMERGED=" ═"
    ZSH_THEME_GIT_PROMPT_UNTRACKED=" ✭"
 fi
--- a/themes/lambda.zsh-theme
+++ 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%} "
--- a/themes/linuxonly
+++ 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:
--- a/themes/lukerandall.zsh-theme
+++ b/themes/lukerandall.zsh-theme
@ -0,0 +1,10 @@
 # ZSH Theme - Preview: http://cl.ly/f701d00760f8059e06dc
 # Thanks to gallifrey, upon whose theme this is based
 local return_code="%(?..%{$fg_bold[red]%}%? ↵%{$reset_color%})"
 PROMPT='%{$fg_bold[green]%}%n@%m%{$reset_color%} %{$fg_bold[blue]%}%2~%{$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%}"
--- a/themes/macovsky-ruby.zsh-theme
+++ 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%}"
--- 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%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}"
--- a/themes/mrtazz.zsh-theme
+++ b/themes/mrtazz.zsh-theme
@ -0,0 +1,7 @@
 PROMPT='%{$fg_bold[red]%}%m%{$reset_color%}:%{$fg[cyan]%}%c%{$reset_color%}:%# '
 RPROMPT='%{$fg_bold[green]%}$(git_prompt_info)%{$reset_color%}% '
 ZSH_THEME_GIT_PROMPT_PREFIX="<%{$fg[red]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%} %{$fg[yellow]%}✗%{$fg[green]%}>%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%}>"
--- a/themes/murilasso.zsh-theme
+++ b/themes/murilasso.zsh-theme
@ -0,0 +1,14 @@
 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
 local user_host='%{$terminfo[bold]$fg[green]%}%n@%m%{$reset_color%}'
 local current_dir='%{$terminfo[bold]$fg[blue]%}%~%{$reset_color%}'
 local rvm_ruby='%{$fg[red]%}$(rvm_prompt_info)%{$reset_color%}'
 local git_branch='%{$fg[blue]%}$(git_prompt_info)%{$reset_color%}'
 PROMPT="${user_host}:${current_dir} ${rvm_ruby}
 ${git_branch} %B$%b "
 RPS1="${return_code}"
 ZSH_THEME_GIT_PROMPT_PREFIX=""
 ZSH_THEME_GIT_PROMPT_SUFFIX=""
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}✗%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_CLEAN=" %{$fg[green]%}✔%{$reset_color%}"
--- a/themes/muse.zsh-theme
+++ b/themes/muse.zsh-theme
@ -0,0 +1,30 @@
 #!/usr/bin/env zsh
 #local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
 setopt promptsubst
 autoload -U add-zsh-hook
 PROMPT_SUCCESS_COLOR=$FG[117]
 PROMPT_FAILURE_COLOR=$FG[124]
 PROMPT_VCS_INFO_COLOR=$FG[242]
 PROMPT_PROMPT=$FG[077]
 GIT_DIRTY_COLOR=$FG[133]
 GIT_CLEAN_COLOR=$FG[118]
 GIT_PROMPT_INFO=$FG[012]
 PROMPT='%{$PROMPT_SUCCESS_COLOR%}%~%{$reset_color%} %{$GIT_PROMPT_INFO%}$(git_prompt_info)%{$GIT_DIRTY_COLOR%}$(git_prompt_status) %{$reset_color%}%{$PROMPT_PROMPT%}ᐅ%{$reset_color%} '
 #RPS1="${return_code}"
 ZSH_THEME_GIT_PROMPT_PREFIX="("
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$GIT_PROMPT_INFO%})"
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$GIT_DIRTY_COLOR%}✘"
 ZSH_THEME_GIT_PROMPT_CLEAN=" %{$GIT_CLEAN_COLOR%}✔"
 ZSH_THEME_GIT_PROMPT_ADDED="%{$FG[082]%}✚%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_MODIFIED="%{$FG[166]%}✹%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_DELETED="%{$FG[160]%}✖%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_RENAMED="%{$FG[220]%}➜%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_UNMERGED="%{$FG[082]%}═%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$FG[190]%}✭%{$reset_color%}"
--- a/themes/nanotech.zsh-theme
+++ b/themes/nanotech.zsh-theme
@ -0,0 +1,7 @@
 PROMPT='%F{green}%2c%F{blue} [%f '
 RPROMPT='$(git_prompt_info) %F{blue}] %F{green}%D{%L:%M} %F{yellow}%D{%p}%f'
 ZSH_THEME_GIT_PROMPT_PREFIX="%F{yellow}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%f"
 ZSH_THEME_GIT_PROMPT_DIRTY=" %F{red}*%f"
 ZSH_THEME_GIT_PROMPT_CLEAN=""
--- a/themes/nicoulaj.zsh-theme
+++ b/themes/nicoulaj.zsh-theme
@ -0,0 +1,43 @@
 #!/usr/bin/env zsh
 # ------------------------------------------------------------------------------
 # Prompt for the Zsh shell:
 #   * One line.
 #   * VCS info on the right prompt.
 #   * Only shows the path on the left prompt by default.
 #   * Crops the path to a defined length and only shows the path relative to
 #     the current VCS repository root.
 #   * Wears a different color wether the last command succeeded/failed.
 #   * Shows user@hostname if connected through SSH.
 #   * Shows if logged in as root or not.
 # ------------------------------------------------------------------------------
 # Customizable parameters.
 PROMPT_PATH_MAX_LENGTH=30
 PROMPT_DEFAULT_END=❯
 PROMPT_ROOT_END=❯❯❯
 PROMPT_SUCCESS_COLOR=$FG[071]
 PROMPT_FAILURE_COLOR=$FG[124]
 PROMPT_VCS_INFO_COLOR=$FG[242]
 # Set required options.
 setopt promptsubst
 # Load required modules.
 autoload -U add-zsh-hook
 autoload -Uz vcs_info
 # Add hook for calling vcs_info before each command.
 add-zsh-hook precmd vcs_info
 # Set vcs_info parameters.
 zstyle ':vcs_info:*' enable hg bzr git
 zstyle ':vcs_info:*:*' check-for-changes true # Can be slow on big repos.
 zstyle ':vcs_info:*:*' unstagedstr '!'
 zstyle ':vcs_info:*:*' stagedstr '+'
 zstyle ':vcs_info:*:*' actionformats "%S" "%r/%s/%b %u%c (%a)"
 zstyle ':vcs_info:*:*' formats "%S" "%r/%s/%b %u%c"
 zstyle ':vcs_info:*:*' nvcsformats "%~" ""
 # Define prompts.
 PROMPT="%(0?.%{$PROMPT_SUCCESS_COLOR%}.%{$PROMPT_FAILURE_COLOR%})${SSH_TTY:+[%n@%m]}%{$FX[bold]%}%$PROMPT_PATH_MAX_LENGTH<..<"'${vcs_info_msg_0_%%.}'"%<<%(!.$PROMPT_ROOT_END.$PROMPT_DEFAULT_END)%{$FX[no-bold]%}%{$FX[reset]%} "
 RPROMPT="%{$PROMPT_VCS_INFO_COLOR%}"'$vcs_info_msg_1_'"%{$FX[reset]%}"
--- a/themes/philips.zsh-theme
+++ b/themes/philips.zsh-theme
@ -0,0 +1,14 @@
 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='[%*]'
 # git theming
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}(%{$fg_no_bold[red]%}%B"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%b%{$fg_bold[blue]%})%{$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:'
--- 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%}
--- a/themes/rixius.zsh-theme
+++ b/themes/rixius.zsh-theme
@ -0,0 +1,24 @@
 # /|/ Code by Stephen
 # /|/ "Rixius" Middleton
 # 
 # name in folder (github)
 # ± if in github repo, or ≥ if otherwise Time in 24-hour format is on right.
 function collapse_pwd {
    echo $(pwd | sed -e "s,^$HOME,~,")
 }
 function prompt_char {
    echo -n "%{$bg[white]%}%{$fg[red]%}"
    git branch >/dev/null 2>/dev/null && echo "±%{$reset_color%}" && return
    echo "≥%{$reset_color%}"
 }
 RIXIUS_PRE="%{$bg[white]%}%{$fg[red]%}"
 PROMPT='
 %{$RIXIUS_PRE%}%n%{$reset_color%} in %{$fg_bold[green]%}$(collapse_pwd)%{$reset_color%}$(git_prompt_info)
 $(prompt_char) '
 RPROMPT='%{$RIXIUS_PRE%}%T%{$reset_color%}'
 ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$RIXIUS_PRE%}!%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_CLEAN=" %{$RIXIUS_PRE%}√%{$reset_color%}"
--- a/themes/sorin.zsh-theme
+++ b/themes/sorin.zsh-theme
@ -0,0 +1,48 @@
 # ------------------------------------------------------------------------------
 #          FILE:  sorin.zsh-theme
 #   DESCRIPTION:  oh-my-zsh theme file.
 #        AUTHOR:  Sorin Ionescu (sorin.ionescu@gmail.com)
 #       VERSION:  1.0.2
 #    SCREENSHOT:  http://i.imgur.com/aipDQ.png
 # ------------------------------------------------------------------------------
 if [[ "$TERM" != "dumb" ]] && [[ "$DISABLE_LS_COLORS" != "true" ]]; then
  MODE_INDICATOR="%{$fg_bold[red]%}❮%{$reset_color%}%{$fg[red]%}❮❮%{$reset_color%}"
  local return_status="%{$fg[red]%}%(?..⏎)%{$reset_color%}"
  PROMPT='%{$fg[cyan]%}%c$(git_prompt_info) %(!.%{$fg_bold[red]%}#.%{$fg_bold[green]%}❯)%{$reset_color%} '
  ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[blue]%}git%{$reset_color%}:%{$fg[red]%}"
  ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
  ZSH_THEME_GIT_PROMPT_DIRTY=""
  ZSH_THEME_GIT_PROMPT_CLEAN=""
  RPROMPT='${return_status}$(git_prompt_status)%{$reset_color%}'
  ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} ✚"
  ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} ✹"
  ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖"
  ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜"
  ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═"
  ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭"
 else 
  MODE_INDICATOR="❮❮❮"
  local return_status="%(?::⏎)"
  PROMPT='%c$(git_prompt_info) %(!.#.❯) '
  ZSH_THEME_GIT_PROMPT_PREFIX=" git:"
  ZSH_THEME_GIT_PROMPT_SUFFIX=""
  ZSH_THEME_GIT_PROMPT_DIRTY=""
  ZSH_THEME_GIT_PROMPT_CLEAN=""
  RPROMPT='${return_status}$(git_prompt_status)'
  ZSH_THEME_GIT_PROMPT_ADDED=" ✚"
  ZSH_THEME_GIT_PROMPT_MODIFIED=" ✹"
  ZSH_THEME_GIT_PROMPT_DELETED=" ✖"
  ZSH_THEME_GIT_PROMPT_RENAMED=" ➜"
  ZSH_THEME_GIT_PROMPT_UNMERGED=" ═"
  ZSH_THEME_GIT_PROMPT_UNTRACKED=" ✭"
 fi
--- a/themes/takashiyoshida.zsh-theme
+++ 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=''
--- a/themes/theunraveler.zsh-theme
+++ b/themes/theunraveler.zsh-theme
@ -0,0 +1,16 @@
 # Comment
 PROMPT='%{$fg[magenta]%}[%c] %{$reset_color%}'
 RPROMPT='%{$fg[magenta]%}$(git_prompt_info)%{$reset_color%} $(git_prompt_status)%{$reset_color%}'
 ZSH_THEME_GIT_PROMPT_PREFIX=""
 ZSH_THEME_GIT_PROMPT_SUFFIX=""
 ZSH_THEME_GIT_PROMPT_DIRTY=""
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[cyan]%} ✈"
 ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[yellow]%} ✭"
 ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✗"
 ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[blue]%} ➦"
 ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[magenta]%} ✂"
 ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[grey]%} ✱"
--- a/themes/thomasjbradley.zsh-theme
+++ 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
--- a/themes/tjkirch.zsh-theme
+++ b/themes/tjkirch.zsh-theme
@ -0,0 +1,15 @@
 ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[green]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}⚡"
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 function prompt_char {
 	if [ $UID -eq 0 ]; then echo "%{$fg[red]%}#%{$reset_color%}"; else echo $; fi
 }
 PROMPT='%(?, ,%{$fg[red]%}FAIL: $?%{$reset_color%}
 )
 %{$fg[magenta]%}%n%{$reset_color%}@%{$fg[yellow]%}%m%{$reset_color%}: %{$fg_bold[blue]%}%~%{$reset_color%}$(git_prompt_info)
 %_$(prompt_char) '
 RPROMPT='%{$fg[green]%}[%*]%{$reset_color%}'
--- a/themes/wezm+.zsh-theme
+++ 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]%})"
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@ -16,7 +16,7 @@ then
    _update_zsh_update && return 0;
  fi
-  epoch_diff=$((${_current_epoch} - $LAST_EPOCH))
+  epoch_diff=$(($(_current_epoch) - $LAST_EPOCH))
  if [ $epoch_diff -gt 6 ]
  then
    echo "[Oh My Zsh] Would you like to check for updates?"
@ -25,10 +25,11 @@ then
    if [ "$line" = Y ] || [ "$line" = y ]
    then
      /bin/sh $ZSH/tools/upgrade.sh
      # update the zsh file
      _update_zsh_update
    fi
  fi
 else
  # create the zsh file
  _update_zsh_update
 fi
 # update the zsh file
 _update_zsh_update
--- a/tools/install.sh
+++ b/tools/install.sh
@ -5,7 +5,7 @@ then
 fi
 echo "Cloning Oh My Zsh..."
-/usr/bin/env git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh
+/usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh
 echo "Looking for an existing zsh config..."
 if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]
@ -22,7 +22,7 @@ echo "Copying your current PATH and adding it to the end of ~/.zshrc for you."
 echo "export PATH=$PATH" >> ~/.zshrc
 echo "Time to change your default shell to zsh!"
-chsh -s /bin/zsh
+chsh -s `which zsh`
 echo '         __                                     __  '
 echo '  ____  / /_     ____ ___  __  __   ____  _____/ /_ '
@ -32,5 +32,5 @@ echo '\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '
 echo '                        /____/'
 echo "\n\n ....is now installed."
-/bin/zsh
+/usr/bin/env zsh
 source ~/.zshrc
--- a/Show more
+++ b/Show more
`@ -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%})"`	`local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"`