X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=X%2F.xinitrc;h=def251d4265ad66b3fcfcebe39c9791724739efa;hb=46657a2bac3b51f7dbb1e78982347cf258b36b83;hp=86cfd39a5d3f3711885d7071fd5ad16fd6e06f23;hpb=1b17ece26e2019c0d2d2eb3d612e2dff5cca0169;p=max%2Fdotfiles.git

diff --git a/X/.xinitrc b/X/.xinitrc
index 86cfd39..def251d 100644
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -21,13 +21,13 @@ fi
 
 # Set keyboard layout
 case $HOSTNAME in
-    palladium|platinum|iridium)
+    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"
 	;;
-    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"
@@ -39,8 +39,8 @@ esac
 
 # Set screen layout
 case $HOSTNAME in
-  beryllium)
-    xrandr --output HDMI-1 --left-of DVI-I-1 
+  magnesium)
+    xrandr --output VGA1 --right-of HDMI2
     ;;
   *)
     ;;
@@ -65,10 +65,7 @@ xset -b
 
 # Battery monitoring
 case $HOSTNAME in
-	palladium)
-		xbattmon&
-		;;
-	iridium|platinum)
+	platinum)
 		~/.local/bin/bat_mgt.sh&
 		;;
 	*)
@@ -77,4 +74,22 @@ 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