X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;ds=sidebyside;f=X%2F.xinitrc;h=144eb2351cf9cb15685e250d59b36bdb78000c86;hb=42df1b23211e8f628369b9572577a29988896073;hp=d02fb1cbed639af1fa3dc80b60806988b2fb82eb;hpb=b6954184eabf300fe0a8538353d43ac475dfaab7;p=max%2Fdotfiles.git

diff --git a/X/.xinitrc b/X/.xinitrc
index d02fb1c..144eb23 100644
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -27,7 +27,7 @@ case $HOSTNAME in
 	xmodmap -e "keycode 135 = Control_R Control_R Control_R Control_R"
 	xmodmap -e "add Control = Control_L Control_R"
 	;;
-    beryllium)
+    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"
@@ -42,6 +42,9 @@ case $HOSTNAME in
   beryllium)
     xrandr --output HDMI-1 --left-of DVI-I-1 
     ;;
+  magnesium)
+    xrandr --output VGA1 --right-of HDMI2
+    ;;
   *)
     ;;
 esac
@@ -77,11 +80,22 @@ esac
 
 cat ~/.ratpoisonrc.base ~/.ratpoisonrc.$HOSTNAME > ~/.ratpoisonrc
 
+# 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
-  platinum)
-    exec ck-launch-session dbus-launch --sh-syntax --exit-with-session startkde
-    ;;
-  *)
-    exec /usr/bin/ratpoison
+        magnesium|platinum)
+          exec i3
+          ;;
+        *)
+          exec ratpoison
+          ;;
 esac
-