--- a/bashrc	Mon Oct 27 13:29:47 2008 -0700
+++ b/bashrc	Tue Oct 28 17:04:41 2008 -0700
@@ -13,22 +13,40 @@ fi
 # LC_CTYPE
 export LC_CTYPE=en_US.UTF-8
 
+# use gnu tools when available
+type gbasename > /dev/null && alias basename=gbasename
+type gcat > /dev/null && alias cat=gcat
+type gcp > /dev/null && alias cp=gcp
+type gawk > /dev/null && alias awk=gawk
+type gcut > /dev/null && alias cut=gcut
+type gdate > /dev/null && alias date=gdate
+
 # aliases
-if [ -e $HOME/.serial_number ]; then
-    alias ls="ls -G -h"
-    alias ll="ls -G -l"
-    alias df="df -h"
-    alias du="du -h"
+# host specific aliases
+if [ -e $HOME/.serial_number ]; then # this is my MBP
+    alias ls="gls --color=auto --si"
+    alias ll="ls --color=auto --si -l"
+    alias df="gdf --si"
+    alias dot="ls -ldF .[a-zA-Z0-9]*"
+    alias du="gdu --si"
     alias port="sudo port"
-    export EDITOR="mate -w"
+    alias tmbun="cd $HOME/Library/Application\ Support/TextMate/Bundles"
+    alias empty_trash="rm -rf $HOME/.Trash/*"
+    alias vi="vim"
+	alias dp="cd $HOME/Dropbox"
+    export EDITOR="mate"
 	export MANPATH=/opt/local/share/man:$MANPATH
-    export LSCOLORS="ExGxFxdxCxDxDxhbadExEx"
-elif [ `hostname` = "helium.vibrantlogic.com" ]; then
+	export LSCOLORS="ExGxFxdxCxDxDxhbadExEx"
+elif [ ${HOST} = "helium.vibrantlogic.com" ]; then
     alias ls="ls -G -F -h"
     alias ll="ls -G -F -l -h"
     alias df="df -h"
     alias du="du -h"
     alias dot="ls -l -h -d -F -G .[a-zA-Z0-9]*"
+	export PATH=$HOME/bin:$PATH
+	export PYTHONPATH=$HOME/lib/python:$PYTHONPATH
+elif [ ${HOST} = "kiviuq.local" ]; then
+	export PATH=$HOME/Software/MacBU/SD/tools/cli:$PATH
 else
     alias ls="ls --color --si --classify"
     alias ll="ls -l --color --si --classify"
@@ -42,21 +60,35 @@ alias ....="cd ../../../"
 alias ....="cd ../../../"
 alias free="free -m"
 alias exit="clear && exit"
-alias grep="grep -n"
+alias grep="egrep --color=auto"
 alias v="vim"
-alias hw="cd ~/Documents/Classes"
 alias dl="cd ~/Downloads"
 alias sw="cd ~/Software"
 alias win="cd /mnt/windows/Documents \and \Settings/yi"
 alias dsage="cd ~/Software/sage/devel/sage/sage/dsage"
 alias sage="~/Software/sage/sage"
+alias sageq="sage -q"
 alias sage-python="~/Software/sage/sage-python"
 alias sage-devel="cd ~/Software/sage/devel/sage/sage"
 alias docu="cd ~/Documents"
+alias hw="cd ~/Documents/Classes"
 alias h="fc -r -l 1 |less"
-alias less="less -N" 
+alias less="less -N"
 alias rm="rm -i"
-alias screen="TERM=screen screen"
+alias c="clear"
+alias diff="colordiff"
+alias e=$EDITOR
+alias q="exit"
+alias p="pwd"
+alias cf='cd ~/.config'
+
+# django specific aliases
+alias dj="python manage.py"
+alias djr="dj runserver"
+alias djs="dj shell"
+
+# PEP8
+alias pep8="pep8.py --show-pep8 --repeat"
 
 # bash options
 shopt -s histappend