Merge branch 'master' of git.friedersdorff.com:max/dotfiles

[max/dotfiles.git] / X / .xinitrc

diff --git a/X/.xinitrc b/X/.xinitrc
index 1a86c7fc988fab9cc81b8f5d6f98da173fd013e1..2521a8889d8a03d308c3594994636913810480d9 100644 (file)
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -15,15 +15,81 @@ fi
 
 # Load .Xresources
 xrdb -merge ~/.Xresources &> /dev/null
+if [ -f ~/.Xresources.$HOSTNAME ]; then
+  xrdb -merge ~/.Xresources.$HOSTNAME &> /dev/null
+fi
 
-setxkbmap gb
+# Set keyboard layout
+case $HOSTNAME in
+    palladium|platinum|iridium)
+       setxkbmap -variant colemak gb
+       xmodmap -e "keycode 66 = Control_L Control_L Control_L Control_L"
+       xmodmap -e "keycode 135 = Control_R Control_R Control_R Control_R"
+       xmodmap -e "add Control = Control_L Control_R"
+       ;;
+    beryllium|magnesium)
+       setxkbmap -variant colemak us
+       xmodmap -e "keycode 66 = Control_L Control_L Control_L Control_L"
+       xmodmap -e "keycode 135 = Control_R Control_R Control_R Control_R"
+       xmodmap -e "add Control = Control_L Control_R"
+       ;;
+    *)
+        ;;
+esac
 
+# Set screen layout
+case $HOSTNAME in
+  beryllium)
+    xrandr --output HDMI-1 --left-of DVI-I-1 
+    ;;
+  magnesium)
+    xrandr --output VGA1 --right-of HDMI2
+    ;;
+  *)
+    ;;
+esac
 
 # Set java font option
 export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on"
 
 feh --bg-scale ~/Pictures/background.jpg&
 
+/usr/lib64/xfce4/notifyd/xfce4-notifyd&
+
 xset -b
 
-exec /usr/bin/ratpoison
+#if ! pgrep -x -u "${USER}" gpg-agent>/dev/null 2>&1; then
+#    eval $(gpg-agent --daemon \
+  #                 --use-standard-socket \
+  #                 --write-env-file "${HOME}/.gpg-agent-info")
+#fi
+#
+#gpg-connect-agent updatestartuptty /bye >/dev/null
+
+# Battery monitoring
+case $HOSTNAME in
+       palladium)
+               xbattmon&
+               ;;
+       iridium|platinum)
+               ~/.local/bin/bat_mgt.sh&
+               ;;
+       *)
+                ;;
+esac
+
+cat ~/.ratpoisonrc.base ~/.ratpoisonrc.$HOSTNAME > ~/.ratpoisonrc
+
+# run xcreensaver
+if [ -x $(which xscreensaver) ]; then
+       xscreensaver&
+fi
+
+case $HOSTNAME in
+        magnesium)
+          exec i3
+          ;;
+        *)
+          exec ratpoison
+          ;;
+esac