using_oh_my_zsh: integrate origin zshrc's aliases and env values

RUNME

@@ -58,6 +58,7 @@ echo " -> Done"
 echo "Symlinking for zsh:"
 ln -s dotfiles/zsh/oh-my-zsh ~/.oh-my-zsh
 ln -s dotfiles/zsh/zshrc.ohmyzsh ~/.zshrc
+ln -s dotfiles/zsh/zshenv ~/.zshenv
 ln -s dotfiles/zsh/zshlocal ~/.zshlocal
 ln -s ../../oh-my-zsh-customs/cinaeco.zsh-theme zsh/oh-my-zsh/custom
 echo " -> Done"

zsh/zshenv

@@ -11,28 +11,28 @@
 export LESS='-eirMX'
 export PAGER=less
 
-## colour ls
-export CLICOLOR=1
-export LSCOLORS=gxfxcxdxbxegedabagacad
-
+## csv login
 export CVSROOT=:pserver:weiyi@cvs:/usr/cvsroot
-export PATH=/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:~/bin:$PATH
-export PATH=/usr/local/git/bin:/usr/local/php/bin:/usr/local/php53/bin:/usr/local/apache2/bin:/usr/local/mysql/bin:/usr/lib/firefox-3.6:/jails/alcatraz/usr/local/www/oars/libraries/lithium/console:$PATH
+
+## 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=/opt/local/bin:/opt/local/sbin:$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
-export FISHEYE_OPTS="-Xms128m -Xmx512m -XX:MaxPermSize=256m"
-export FISHEYE_INST=/var/crucible 
 
 # for esxi perl stuff to not fail
 export PERL_LWP_SSL_VERIFY_HOSTNAME=0
 
-# Move Homebrew temp files to ramdisk (build directory)
+# Homebrew for Mac: move temp files to ramdisk (build directory)
 #export HOMEBREW_TEMP=/Volumes/RamDisk
 
-export DISPLAY=localhost:10.0
-
 # Add /usr/local manpages
 if [[ -d /usr/local/share/man ]];then
     MANPATH=$MANPATH:/usr/local/share/man

zsh/zshlocal

@@ -15,10 +15,10 @@ alias tfine='ssh cinaeco@tfine'
 alias blackomelette='ssh cinaeco@10.0.1.1'
 
 ## shortcuts for development
-alias auth-log='tail -F /jails/alcatraz/usr/local/www-conf/logs/auth-log'
-alias delivery-log='tail -F /jails/alcatraz/usr/local/www-conf/logs/delivery-phplog'
-alias oars-log='tail -F /jails/alcatraz/usr/local/www-conf/logs/oars-phplog'
-alias schools-log='tail -F /jails/alcatraz/usr/local/www-conf/logs/schools-phplog'
+alias authlog='tail -F /jails/alcatraz/usr/local/www-conf/logs/auth-phplog'
+alias deliverylog='tail -F /jails/alcatraz/usr/local/www-conf/logs/delivery-phplog'
+alias oarslog='tail -F /jails/alcatraz/usr/local/www-conf/logs/oars-phplog'
+alias schoolslog='tail -F /jails/alcatraz/usr/local/www-conf/logs/schools-phplog'
 alias cda='cd /jails/alcatraz/usr/local/www/auth'
 alias cdd='cd /jails/alcatraz/usr/local/www/delivery'
 alias cdo='cd /jails/alcatraz/usr/local/www/oars'
@@ -26,6 +26,11 @@ alias cds='cd /jails/alcatraz/usr/local/www/schools'
 alias migrate='li3 migration db:migrate'
 alias sqlo='mysql -u oars -p'
 
+## proxy setup
+alias proxy='export http_proxy=http://192.168.1.248:3128;export HTTP_PROXY=$http_proxy;export https_proxy=$http_proxy;export HTTPS_PROXY=$http_proxy;export ftp_proxy=$http_proxy;export FTP_PROXY=$http_proxy;'
+alias noproxy='export http_proxy='';export HTTP_PROXY=$http_proxy;export https_proxy=$http_proxy;export HTTPS_PROXY=$http_proxy;export ftp_proxy=$http_proxy;export FTP_PROXY=$http_proxy;'
+
+## shortcuts for Jails setup
 #alias guantanamo-start='env -i /usr/sbin/chroot /jails/guantanamo /usr/local/apache2/bin/httpd -k start'
 #alias guantanamo-graceful='env -i /usr/sbin/chroot /jails/guantanamo /usr/local/apache2/bin/httpd -k graceful'
 #alias guantanamo-stop='env -i /usr/sbin/chroot /jails/guantanamo /usr/local/apache2/bin/httpd -k stop'  

zsh/zshrc.ohmyzsh

@@ -34,3 +34,47 @@ plugins=(git vi-mode)
 source $ZSH/oh-my-zsh.sh
 
 # Customize to your needs...
+
+## history
+alias h='history'
+
+## common typos
+alias vf='cd'
+alias xs='cd'
+alias ks='ls'
+alias ecgi='echo'
+
+## folder listing/traversal
+alias l='ls'
+alias l1='ls -1'
+alias ll='ls -hl'
+alias la='ls -A'
+alias lal="ls -Ahl"
+alias l.='ls -d .[^.]*'
+alias lsd='ls -ld *(-/DN)'
+alias lg='ls -l | grep -i'
+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'
+
+## host file
+alias hosts='vim /etc/hosts'
+
+## additional git shortcuts not in the git plugin
+alias gs='git status'
+alias gd='git diff'
+alias gds='git diff --staged'
+
+## include settings specific to this machine
+if [[ -r ~/.zshlocal ]]; then
+    source ~/.zshlocal
+fi