Merge remote-tracking branch 'ryuslash/drd' into phoenix

Conflicts:
	.config/herbstluftwm/autostart
	.emacs.d/init.el
	.xinitrc
	.zprofile
	Makefile
	xmonad/xmonad.hs

1 files changed, 8 insertions, 3 deletions

diff --git a/.zprofile b/.zprofile
index 5d4d30e..b6ee4f7 100644
--- a/.zprofile
+++ b/.zprofile
@@ -1,11 +1,16 @@
-# -*- eval: (git-auto-commit-mode 1) -*-
-export BROWSER=firefox
+export BROWSER=conkeror
 export EDITOR="emacsclient -c -a emacs"
-export INFOPATH="${HOME}/documents/info:${INFOPATH}"
+
+INFOPATH="$HOME/documents/info"
+INFOPATH="$INFOPATH:/usr/local/emacs/share/info"
+INFOPATH="$INFOPATH:/usr/share/info"
+INFOPATH="$INFOPATH:/usr/local/clark/share/info"
+export INFOPATH="$INFOPATH:/usr/local/stumpwm/share/info"
 
 PATH="${HOME}/usr/bin:${PATH}:/usr/local/bin:/usr/local/stumpwm/bin"
 PATH="/usr/local/scwm/bin:$PATH"
 PATH="/usr/local/clfswm/bin:$PATH"
+PATH="/usr/local/clark/bin:$PATH"
 export PATH="/usr/local/emacs/bin:$PATH"
 
 if [ -z "$SSH_AGENT_PID" ]; then