--- a/zshrc	Tue Sep 03 07:45:23 2013 +0200
+++ b/zshrc	Wed Feb 04 02:56:28 2015 +0100
@@ -11,6 +11,9 @@
 fi
 
 # get rid of some unwanted aliases from the oh-my-zsh env
+if [ "`alias | grep 'll='`" != "" ]; then
+    unalias ll
+fi
 if [ "`alias | grep 'l='`" != "" ]; then
     unalias l
 fi
@@ -18,6 +21,10 @@
     unalias lsa
 fi
 
+# enable zsh's fancy autocomplete
+autoload -U compinit
+compinit
+
 # custom functions/aliases that should work on all platforms
 cd() { builtin cd "$@"; print -D $PWD; }
 ff() { find $2 -print0 | xargs -0 grep $1 }
@@ -25,9 +32,13 @@
 mcd() { mkdir $1; cd $1 }
 psg() { ps auxww | grep -v grep | grep -i "$@" }
 alias pd=pushd
+alias history="history 1"
+alias ta="tmux attach -t"
+alias tn="tmux new -s"
 
 # no history handling for now ... or find a better way to save history per shell not across all shells
 export HISTFILE=
+export HISTSIZE=100
 
 # emulate tcsh's behaviour for forked processes: do not warn, do not kill when shell is closed
 setopt nohup
@@ -46,7 +57,8 @@
 unsetopt correct_all
 
 # utility function that is used by various other modules
-removeFromPath() {
+removeFromPath() 
+{
     search_term="$1"
     split_path=(${(s/:/)PATH})
     clean_path=""

--- a/zshrc-cassiopeia	Tue Sep 03 07:45:23 2013 +0200
+++ b/zshrc-cassiopeia	Wed Feb 04 02:56:28 2015 +0100
@@ -5,6 +5,7 @@
 . $HOME/.zsh-env/zshrc-jdk
 . $HOME/.zsh-env/zshrc-maven
 . $HOME/.zsh-env/zshrc-bindkey
+. $HOME/.autoenv/activate.sh
 
 export EXENTRA_WORKSPACE=/home/dirk/Eclipse/Workspaces/Exentra/trunk
 export MULE_TEST_OPTS="-Dmule.verbose=false"
@@ -15,17 +16,18 @@
 #
 # aliases
 #
-alias ant="/opt/eclipse-4.3/plugins/org.apache.ant_1.8.4.v201303080030/bin/ant"
-alias bzip=pbzip2
-alias cvscheck='sh -c "cvs -n update 2>&1 | grep \?"'
-alias cvsupdate='cvs -q -z3 update -dP | egrep -v "^\?.*\.d"'
+alias ant="/opt/eclipse-4.4/plugins/org.apache.ant_1.9.2.v201404171502/bin/ant"
+alias bzip=lbzip2
 alias df="df -h"
 alias env="env | sort | $PAGER"
+alias ex-dist="/home/dirk/Projects/Exentra/RPI/trunk/utils/ex-dist"
+alias ex-eclipse="/home/dirk/Projects/Exentra/RPI/trunk/utils/ex-eclipse"
+alias ex-install="/home/dirk/Projects/Exentra/RPI/trunk/utils/ex-install"
 alias ne=neditc
+alias ping=noping
 alias top=htop
 
 #
 # functions to be used directly from the command line
 #
-cvsrm() { rm "$@"; cvs remove "$@" }
 ed() { kate -u "$@" > /dev/null 2>&1 & }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/zshrc-centos	Wed Feb 04 02:56:28 2015 +0100
@@ -0,0 +1,7 @@
+#
+# zshrc-centos: CentOS specific initialization
+#
+
+# custom functions for CentOS
+ll() { /usr/bin/env -u LC_ALL LANG=C ls -laFh "$@" | more }
+lr() { /usr/bin/env -u LC_ALL LANG=C ls -rtlh "$@" }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/zshrc-epm	Wed Feb 04 02:56:28 2015 +0100
@@ -0,0 +1,16 @@
+#
+# zshrc-epm: custom shell environment for EPM
+#
+
+export EDITOR="nano"
+export JAVA_HOME=/exentra/java
+export PATH="$JAVA_HOME/bin":"$PATH"
+
+. /etc/profile.d/exentra.sh
+
+# EPM_LOCATION is set through /etc/profile.d/exentra.sh
+export PS1="%n@${EPM_LOCATION}%# "
+
+alias fw="sudo iptables --line-numbers -vnL"
+alias sex="screen -r exentra"
+alias sue="sudo -u exentra -i"

--- a/zshrc-gentoo	Tue Sep 03 07:45:23 2013 +0200
+++ b/zshrc-gentoo	Wed Feb 04 02:56:28 2015 +0100
@@ -13,16 +13,14 @@
 export PATH="${PATH}":/opt/bin
 
 # custom aliases for gentoo
+alias cd..="cd .."
 alias es="ionice -c3 emerge --sync"
+alias les="less"
 alias wu="emerge -uvDa world"
+alias xm="xmodmap ~/.Xmodmap"
 
 # custom functions for gentoo
 kcs() { source $HOME/.keychain/${HOST}-sh }
-
-if [ "`alias | grep 'll='`" != "" ]; then
-    unalias ll
-fi
 ll() { /usr/bin/env -u LC_ALL LANG=C ls -laFh "$@" | more }
-
 lr() { /usr/bin/env -u LC_ALL LANG=C ls -rtlh "$@" }
 service() { /etc/init.d/"$@" }

--- a/zshrc-jdk	Tue Sep 03 07:45:23 2013 +0200
+++ b/zshrc-jdk	Wed Feb 04 02:56:28 2015 +0100
@@ -35,3 +35,7 @@
 jdk7() {
     switchJdk "oracle-jdk-bin-1.7"
 }
+
+jdk8() {
+    switchJdk "oracle-jdk-bin-1.8"
+}

--- a/zshrc-linux-gnu	Tue Sep 03 07:45:23 2013 +0200
+++ b/zshrc-linux-gnu	Wed Feb 04 02:56:28 2015 +0100
@@ -14,6 +14,8 @@
 local linux_distro="unknown"
 if [ -d /usr/portage ]; then
     linux_distro="gentoo"
+elif [ -f /etc/centos-release ]; then
+    linux_distro="centos"
 fi
 
 # now source the distro zshrc file if it exists