@@ -4,12 +4,17 @@

 alias pu='pushd'

 alias po='popd'

-# Ruby related

 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'

 # Basic directory operations

 alias .='pwd'

 alias ...='cd ../..'

+alias -- -='cd -'

 # Super user

 alias _='sudo'

@@ -21,12 +26,17 @@ alias ss='sudo su -'

 alias g='git'

 alias gst='git status'

 alias gl='git pull'

+alias gup='git fetch && git rebase'

 alias gp='git push'

 alias gd='git diff | mate'

+alias gdv='git diff -w "$@" | vim -R -'

 alias gc='git commit -v'

 alias gca='git commit -v -a'

 alias gb='git branch'

 alias gba='git branch -a'

+alias gdb='git branch -d'

+alias gcount='git shortlog -sn'

+alias gcp='git cherry-pick'

 # Show history

 alias history='fc -l 1'

@@ -41,6 +51,7 @@ alias sgem='sudo gem'

 # Find ruby file

 alias rfind='find . -name *.rb | xargs grep -n'

+alias afind='ack-grep -il'

 # Git and svn mix

 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'

@@ -59,5 +70,3 @@ alias sd='ruby script/server --debugger'

 # Editor Ruby file in TextMate

 alias mr='mate CHANGELOG app config db lib public script spec test'

-

-

@@ -7,11 +7,3 @@ bindkey "^[m" copy-prev-shell-word

 ## jobs

 setopt long_list_jobs

-

-# Check for updates on initial load...

-if [ "$DISABLE_AUTO_UPDATE" = "true" ]

-then

-  return

-else

-  /bin/sh $ZSH/tools/check_for_upgrade.sh

-fi

@@ -7,5 +7,10 @@ for config_file ($ZSH/lib/*.zsh) source $config_file

 # Load all of your custom configurations from custom/

 for config_file ($ZSH/custom/*.zsh) source $config_file

-

-export PATH=~/bin:/opt/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/local/sbin:/opt/local/lib/postgresql83/bin

+# Check for updates on initial load...

+if [ "$DISABLE_AUTO_UPDATE" = "true" ]

+then

+  return

+else

+  /bin/sh $ZSH/tools/check_for_upgrade.sh

+fi

new file mode 100644

@@ -0,0 +1,4 @@

+# Based on evan's prompt

+# Shows the exit status of the last command if non-zero

+# Uses "#" instead of "»" when running with elevated privileges

+PROMPT="%m %{${fg_bold[red]}%}:: %{${fg[green]}%}%3~%(0?. . ${fg[red]}%? )%{${fg[blue]}%}»%{${reset_color}%} "

new file mode 100644

@@ -0,0 +1,7 @@

+PROMPT='$(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]%})"

new file mode 100644

@@ -0,0 +1,6 @@

+# user, host, full path, and time/date

+# on two lines for easier vgrepping

+# entry in a nice long thread on the Arch Linux forums: http://bbs.archlinux.org/viewtopic.php?pid=521888#p521888

+PROMPT=$'%{\e[0;34m%}%B┌─[%b%{\e[0m%}%{\e[1;32m%}%n%{\e[1;30m%}@%{\e[0m%}%{\e[0;36m%}%m%{\e[0;34m%}%B]%b%{\e[0m%} - %b%{\e[0;34m%}%B[%b%{\e[1;37m%}%~%{\e[0;34m%}%B]%b%{\e[0m%} - %{\e[0;34m%}%B[%b%{\e[0;33m%}'%D{"%a %b %d, %I:%M"}%b$'%{\e[0;34m%}%B]%b%{\e[0m%}

+%{\e[0;34m%}%B└─%B[%{\e[1;35m%}$%{\e[0;34m%}%B]>%{\e[0m%}%b '

+PS2=$' \e[0;34m%}%B>%{\e[0m%}%b '

@@ -4,7 +4,7 @@ current_epoch=$(($(date +%s) / 60 / 60 / 24))

 if [ -f ~/.zsh-update ]

 then

-  source ~/.zsh-update

+  . ~/.zsh-update

   epoch_diff=$(($current_epoch - $LAST_EPOCH))

   if [ $epoch_diff -gt 6 ]

   then