X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;ds=sidebyside;f=X%2F.xinitrc;h=0546ebfcdc8327150247cc01e398c0390765899e;hb=cb2c165304f53d8e2e3cbc874d9ebfff9bc9cc6f;hp=ad4afd12629ed744abc0842259445003eb430eb3;hpb=ac24a79f863f3d876d9e84a789d32c64d989c20d;p=max%2Fdotfiles.git

diff --git a/X/.xinitrc b/X/.xinitrc
index ad4afd1..0546ebf 100644
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -16,39 +16,34 @@ fi
 # Load .Xresources
 xrdb -merge ~/.Xresources &> /dev/null
 if [ -f ~/.Xresources.$HOSTNAME ]; then
-    xrdb -merge ~/.Xresources.$HOSTNAME &> /dev/null
+  xrdb -merge ~/.Xresources.$HOSTNAME &> /dev/null
 fi
 
 # Set keyboard layout
 case $HOSTNAME in
-    palladium)
-	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"
-	;;
-    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)
-	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"
-	;;
-    *)
+  platinum)
+    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"
+    ;;
+  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
@@ -60,24 +55,37 @@ feh --bg-scale ~/Pictures/background.jpg&
 
 xset -b
 
-#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)
-		~/.local/bin/bat_mgt.sh&
-	*)
+  platinum)
+    ~/.local/bin/bat_mgt.sh&
+    ;;
+  *)
+    ;;
 esac
 
 cat ~/.ratpoisonrc.base ~/.ratpoisonrc.$HOSTNAME > ~/.ratpoisonrc
 
-exec /usr/bin/ratpoison
+# run xcreensaver
+if [ -x $(which xscreensaver) ]; then
+  xscreensaver&
+fi
+
+# configure i3
+
+if [ -f ~/.config/i3/config.base ]; then
+  cat ~/.config/i3/config.base ~/.config/i3/config.${HOSTNAME} > ~/.config/i3/config
+fi
+
+case $HOSTNAME in
+  magnesium|platinum|plutonium)
+    exec i3
+    ;;
+  *)
+    exec ratpoison
+    ;;
+esac
+
+
+
+# vim: set expandtab tabstop=2 smarttab: