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

Conflicts:
	.xinitrc

.config/herbstluftwm/autostart

@@ -13,6 +13,9 @@ hc set frame_border_width 0
 hc set window_border_width 1
 hc set window_border_normal_color "#15abc3"
 hc set window_border_active_color "#e0c625"
+hc set focus_stealing_prevention 0
+hc set swap_monitors_to_get_tag 0
+hc set focus_follows_mouse 1
 
 # Layout
 hc set default_frame_layout 2
@@ -34,6 +37,8 @@ hc rule windowtype=_NET_WM_WINDOW_TYPE_DIALOG focus=on pseudotile=on
 hc rule class=Xephyr pseudotile=on
 hc rule instance=Xine\ Window pseudotile=on
 
+xbindkeys
+
 # Panel
 ~/.config/herbstluftwm/panel.sh &
 

.xbindkeysrc.scm

@@ -10,7 +10,7 @@
 (define dzen-pipe '())
 (define editor (getenv "EDITOR"))
 (define modkey 'mod4)
-(define prefix `(,modkey w))
+(define prefix '(control i))
 (define terminal "urxvt")
 (define date-format "~a ~d ~b ~Y ~H:~M")
 (define previous-tag '())

.zprofile

@@ -1,2 +1,5 @@
 # -*- eval: (git-auto-commit-mode 1) -*-
-export PATH="${HOME}/bin:${PATH}:/usr/local/bin"
+export BROWSER=firefox
+export EDITOR="emacsclient -c -a emacs"
+export INFOPATH="${HOME}/documents/info:${INFOPATH}"
+export PATH="${HOME}/bin:${PATH}:/usr/local/bin:/usr/local/stumpwm/bin"