X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=X%2F.xinitrc;h=2521a8889d8a03d308c3594994636913810480d9;hb=f065367b1d2d3a73a0c7ee5b3d8fbc86e634fbf2;hp=623b4dd8e6e961db23a0e840abe9ba69b2b9f151;hpb=52a75ec3a12499525cfb11bd916b9dd0022fc5cc;p=max%2Fdotfiles.git

diff --git a/X/.xinitrc b/X/.xinitrc
index 623b4dd..2521a88 100644
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -16,39 +16,37 @@ 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|platinum)
+    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"
 	;;
-    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)
+    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 
-	;;
-    *)
-	;;
+  beryllium)
+    xrandr --output HDMI-1 --left-of DVI-I-1 
+    ;;
+  magnesium)
+    xrandr --output VGA1 --right-of HDMI2
+    ;;
+  *)
+    ;;
 esac
 
 # Set java font option
@@ -62,8 +60,8 @@ 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")
+  #		     --use-standard-socket \
+  #		     --write-env-file "${HOME}/.gpg-agent-info")
 #fi
 #
 #gpg-connect-agent updatestartuptty /bye >/dev/null
@@ -73,11 +71,25 @@ case $HOSTNAME in
 	palladium)
 		xbattmon&
 		;;
-	iridium)
+	iridium|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
+
+case $HOSTNAME in
+        magnesium)
+          exec i3
+          ;;
+        *)
+          exec ratpoison
+          ;;
+esac