4 files changed, 27 insertions, 9 deletions
diff --git a/.zsh/zshenv/00_shell b/.zsh/zshenv/00_shell
new file mode 100644
index 0000000..3b7fa98
--- /dev/null
+++ b/.zsh/zshenv/00_shell
@@ -0,0 +1,11 @@
+# zshenv/00_shell
+#
+# <description>
+#
+# Copyright © 2014 Tobias Klauser <tklauser@distanz.ch>
+# Released under the terms of the Artistic Licence 2.0
+#
+# Source repository: git://git.distanz.ch/dotfiles/zsh.git
+
+
+# vim:ft=zsh
diff --git a/.zsh/zshenv/01_path b/.zsh/zshenv/01_path
index 2781e1c..c39ef75 100644
--- a/.zsh/zshenv/01_path
+++ b/.zsh/zshenv/01_path
@@ -2,7 +2,7 @@
 #
 # Functions to add custom directories to the $PATH
 #
-# Copyright © 2011 Tobias Klauser <tklauser@distanz.ch>
+# Copyright © 2011-2013 Tobias Klauser <tklauser@distanz.ch>
 # Copyright © 1994–2008 martin f. krafft <madduck@madduck.net>
 # Released under the terms of the Artistic Licence 2.0
 #
@@ -35,13 +35,17 @@ path_append()
 
 path_prepend $HOME/bin
 #path_append /opt/nios2-new/bin
+path_prepend /opt/local/bin
+
 path_append /opt/nios2/bin
 path_append /opt/nios2mmu/x86-linux2/bin
 path_prepend /opt/codesourcery/nios2-4.1-211/bin
-path_append /opt/codesourcery/arm-2010.09/bin
-path_append /opt/android-sdk-linux_86
-path_prepend /opt/local/bin
-path_append /opt/MATLAB/R2012a/bin
+#path_append /opt/codesourcery/arm-2010.09/bin
+#path_append /opt/android-sdk-linux_86
 path_append /opt/cov-analysis-linux64-6.5.1/bin
+path_append /opt/linaro/gcc-linaro-arm-linux-gnueabihf/bin
+
+path_append /opt/MATLAB/R2012a/bin
+path_append /opt/MATLAB/R2013a/bin
 
 # vim:ft=zsh
diff --git a/.zsh/zshenv/80_go b/.zsh/zshenv/80_go
index b13f255..9da79e8 100644
--- a/.zsh/zshenv/80_go
+++ b/.zsh/zshenv/80_go
@@ -2,15 +2,18 @@
 #
 # Set variables related to the Go programming language
 #
-# Copyright © 2010 Tobias Klauser <tklauser@distanz.ch>
+# Copyright © 2010-2013 Tobias Klauser <tklauser@distanz.ch>
 # Released under the terms of the Artistic Licence 2.0
 #
 # Source repository: git://git.distanz.ch/dotfiles/zsh.git
 
-_GOROOT=$HOME/src/go
+_GOROOT=/opt/local/go/
 
 if [ -d $_GOROOT ] ; then
+
   export GOROOT=$_GOROOT
+  export GOPATH=$HOME/src/gospace/
+
   arch="$(uname -m)"
   case "$arch" in
     x86_64) export GOARCH="amd64";;
@@ -26,7 +29,7 @@ if [ -d $_GOROOT ] ; then
     *)      export GOOS="unsupported";;
   esac
 
-  path_append $_GOROOT/bin
+  path_append $GOROOT/bin
 fi
 
 # vim:ft=zsh
diff --git a/.zsh/zshenv/99_matlab b/.zsh/zshenv/99_matlab
index f4c42bb..f4d228d 100644
--- a/.zsh/zshenv/99_matlab
+++ b/.zsh/zshenv/99_matlab
@@ -8,7 +8,7 @@
 # Source repository: git://git.distanz.ch/dotfiles/zsh.git
 
 # make MATLAB run on awesome/dwm
-export MATLAB_JAVA=/usr/lib/jvm/java-6-openjdk-amd64/jre
+export MATLAB_JAVA=/usr/lib/jvm/java-7-openjdk-amd64/jre
 export _JAVA_AWT_WM_NONREPARENTING=1
 
 # vim:ft=zsh