diff options
| author | Tobias Klauser <tklauser@distanz.ch> | 2012-05-09 10:49:04 +0200 |
|---|---|---|
| committer | Tobias Klauser <tklauser@distanz.ch> | 2012-05-09 10:49:04 +0200 |
| commit | c0ff7a452dbca74fad88d86a6057db5aa0daae57 (patch) | |
| tree | 43950ebd82105ecf017a09bc434eb5cea747873f | |
| parent | 8b713d4c2ff2f9d44f0395f37c9e5bfb7889db70 (diff) | |
| parent | fc53a57cb2a83b266e73265d2c7942398d7159e9 (diff) | |
Merge branch 'master' of git+ssh://git.distanz.ch/home/tklauser/scm/dotfiles/zsh
| -rw-r--r-- | .zsh/00_skeleton | 2 | ||||
| -rw-r--r-- | .zsh/zshenv/01_path | 1 | ||||
| -rw-r--r-- | .zsh/zshenv/99_matlab | 14 |
3 files changed, 16 insertions, 1 deletions
diff --git a/.zsh/00_skeleton b/.zsh/00_skeleton index c58f77f..b581150 100644 --- a/.zsh/00_skeleton +++ b/.zsh/00_skeleton @@ -2,7 +2,7 @@ # # <description> # -# Copyright © 2011 Tobias Klauser <tklauser@distanz.ch> +# Copyright © 2012 Tobias Klauser <tklauser@distanz.ch> # Released under the terms of the Artistic Licence 2.0 # # Source repository: git://git.distanz.ch/dotfiles/zsh.git diff --git a/.zsh/zshenv/01_path b/.zsh/zshenv/01_path index a8d56af..f1cf818 100644 --- a/.zsh/zshenv/01_path +++ b/.zsh/zshenv/01_path @@ -40,5 +40,6 @@ 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_append /opt/local/bin +path_append /opt/MATLAB/R2012a/bin # vim:ft=zsh diff --git a/.zsh/zshenv/99_matlab b/.zsh/zshenv/99_matlab new file mode 100644 index 0000000..f4c42bb --- /dev/null +++ b/.zsh/zshenv/99_matlab @@ -0,0 +1,14 @@ +# zshenv/99_matlab +# +# Set up MATLAB specific variables +# +# Copyright © 2012 Tobias Klauser <tklauser@distanz.ch> +# Released under the terms of the Artistic Licence 2.0 +# +# 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 _JAVA_AWT_WM_NONREPARENTING=1 + +# vim:ft=zsh |