summaryrefslogtreecommitdiffstats
path: root/.zprofile
diff options
context:
space:
mode:
authorGravatar Tom Willemsen2012-09-16 02:07:48 +0200
committerGravatar Tom Willemsen2012-09-16 02:07:48 +0200
commitc4ea2643f6cbac10d5b7300e13325c59eb23c5d8 (patch)
tree3556421a5bc83722d2d9f382a11ab98adb972170 /.zprofile
parent72d124100d3fc4fb7ee9ada43385867b0c171a4d (diff)
parentbbc17210a1d3b0c69c36207891d9fb18fd8759f9 (diff)
downloaddotfiles-c4ea2643f6cbac10d5b7300e13325c59eb23c5d8.tar.gz
dotfiles-c4ea2643f6cbac10d5b7300e13325c59eb23c5d8.zip
Merge remote-tracking branch 'origin/master' into phoenix
Conflicts: .config/herbstluftwm/autostart .config/herbstluftwm/panel.sh
Diffstat (limited to '.zprofile')
-rw-r--r--.zprofile12
1 files changed, 6 insertions, 6 deletions
diff --git a/.zprofile b/.zprofile
index 0da982a..ebf90b7 100644
--- a/.zprofile
+++ b/.zprofile
@@ -1,8 +1,8 @@
-# -*- eval: (git-auto-commit-mode 1) -*-
-export BROWSER=firefox
+export BROWSER=conkeror
export EDITOR="emacsclient -c -a emacs"
-export INFOPATH="${HOME}/documents/info:${INFOPATH}"
+export INFOPATH="${HOME}/documents/info:/usr/local/emacs/share/info:/usr/share/info:/usr/local/stumpwm/share/info"
-PATH="${HOME}/bin:${PATH}:/usr/local/bin:/usr/local/stumpwm/bin"
-PATH="$HOME/code/ext/emacs/trunk/lib-src:$PATH"
-export PATH="$HOME/code/ext/emacs/trunk/src:$PATH"
+PATH="${HOME}/usr/bin:${PATH}:/usr/local/bin:/usr/local/stumpwm/bin"
+PATH="/usr/local/scwm/bin:$PATH"
+PATH="/usr/local/clfswm/bin:$PATH"
+export PATH="/usr/local/emacs/bin:$PATH"