add path for rvm and tidy up zsh config

zsh/oh-my-zsh-custom/ack.zsh

@@ -1 +0,0 @@
-alias ackl='ack -a --ignore-dir=webroot'

zsh/omz-custom/ack.zsh

@@ -0,0 +1,2 @@
+# Useful for searching in lithium applications
+alias ackl='ack -a --ignore-dir=webroot'

zsh/oh-my-zsh-custom/auto-ssh.zsh → zsh/omz-custom/auto-ssh-hosts.zsh

@@ -10,3 +10,6 @@ _myhosts=( ${${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[0-9]*}%%\ *}%%,*} )
 for host in $_myhosts; do
   alias $host="ssh $host"
 done
+
+## hosts file
+alias hosts='sudo vim /etc/hosts'

zsh/omz-custom/file-folder-ops.zsh

@@ -0,0 +1,17 @@
+## folder listing/traversal
+alias l='ls'
+alias ll='ls -hl'
+alias la='ls -A'
+alias lal="ls -Ahl"
+alias cd..='cd ..';
+alias ..='cd ..'
+alias -g ...="../.."
+alias -g ....="../../.."
+alias -g .....="../../../.."
+
+## file/folder manipulation
+alias mkdir='nocorrect mkdir'
+alias mv='nocorrect mv'
+alias cp='nocorrect cp'
+alias touch='nocorrect touch'
+alias ln='nocorrect ln'

zsh/omz-custom/history.zsh

@@ -0,0 +1,6 @@
+## history
+alias h='history'
+## don't show expansions, just execute, e.g. for !! and !$
+setopt nohistverify
+## don't have the same history across tabs/windows
+setopt nosharehistory

zsh/omz-custom/typos.zsh

@@ -0,0 +1,2 @@
+## typos
+alias scren='screen'

zsh/zshenv

@@ -10,34 +10,35 @@
 ## don't close less when I am done reading
 export LESS='-eirMX'
 
-## csv login
-export CVSROOT=:pserver:weiyi@cvs:/usr/cvsroot
-
 ## paths
 export PATH=/usr/sbin:/usr/bin:~/bin:$PATH
 export PATH=/usr/lib/firefox-3.6:$PATH
 export PATH=/usr/local/bin:/usr/local/git/bin:$PATH
 export PATH=/usr/local/php/bin:/usr/local/php53/bin:$PATH
-export PATH=/usr/local/apache2/bin:/usr/local/mysql/bin:$PATH
+export PATH=/usr/local/apache2/bin:$PATH
+export PATH=/usr/local/mysql/bin:$PATH
 export PATH=/opt/local/bin:/opt/local/sbin:$PATH
+export PATH=$HOME/.rvm/bin:$PATH
 export PATH=/jails/alcatraz/usr/local/www/oars/libraries/lithium/console:$PATH
 export JAVA_HOME=/usr/local/java
 export ANT_HOME=/Developer/Java/Ant
 export CATALINA_HOME=/usr/local/tomcat
 export CLASSPATH=/usr/local/cruisecontrol/lib
 
+# Add /usr/local manpages
+if [[ -d /usr/local/share/man ]];then
+    MANPATH=/usr/local/share/man:$MANPATH
+fi
+if [[ -d /usr/local/man ]];then
+    MANPATH=/usr/local/man:$MANPATH
+fi
+export MANPATH
+
+## csv login
+export CVSROOT=:pserver:weiyi@cvs:/usr/cvsroot
+
 # for esxi perl stuff to not fail
 export PERL_LWP_SSL_VERIFY_HOSTNAME=0
 
 # Homebrew for Mac: move temp files to ramdisk (build directory)
 #export HOMEBREW_TEMP=/Volumes/RamDisk
-
-# Add /usr/local manpages
-if [[ -d /usr/local/share/man ]];then
-    MANPATH=$MANPATH:/usr/local/share/man
-fi  
-
-if [[ -d /usr/local/man ]];then
-    MANPATH=$MANPATH:/usr/local/man
-fi  
-export MANPATH

zsh/zshrc

@@ -1,6 +1,6 @@
 # Path to your oh-my-zsh configuration.
 ZSH=$HOME/dotfiles/zsh/oh-my-zsh
-ZSH_CUSTOM=$HOME/dotfiles/zsh/oh-my-zsh-custom
+ZSH_CUSTOM=$HOME/dotfiles/zsh/omz-custom
 
 # Set name of the theme to load.
 # Look in ~/.oh-my-zsh/themes/
@@ -35,37 +35,7 @@ plugins=(git vi-mode ssh-agent)
 source $ZSH/oh-my-zsh.sh
 
 # Customize to your needs...
-
-## hosts file
-alias hosts='sudo vim /etc/hosts'
-
-## history
-alias h='history'
-## don't show expansions, just execute, e.g. for !! and !$
-setopt nohistverify
-## don't have the same history across tabs/windows
-setopt nosharehistory
-
-## typos
-alias scren='screen'
-
-## folder listing/traversal
-alias l='ls'
-alias ll='ls -hl'
-alias la='ls -A'
-alias lal="ls -Ahl"
-alias cd..='cd ..';
-alias ..='cd ..'
-alias -g ...="../.."
-alias -g ....="../../.."
-alias -g .....="../../../.."
-
-## file manipulation
-alias mkdir='nocorrect mkdir'
-alias mv='nocorrect mv'
-alias cp='nocorrect cp'
-alias touch='nocorrect touch'
-alias ln='nocorrect ln'
+#  Most customisations are now under ZSH_CUSTOM
 
 ## include settings specific to this machine
 if [[ -r ~/.zshlocal ]]; then