X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=X%2F.xinitrc;h=2521a8889d8a03d308c3594994636913810480d9;hb=9dbbf975a8730e69449aad97a4fa849a80b686dd;hp=d04b5df0186b17ef58b22fe2855109c5f9118f0e;hpb=07bc91dc5bfa085c6e5bb7118d9df009bc030924;p=max%2Fdotfiles.git

diff --git a/X/.xinitrc b/X/.xinitrc
index d04b5df..2521a88 100644
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -16,7 +16,7 @@ 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
@@ -27,22 +27,26 @@ 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"
 	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
@@ -56,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
@@ -71,8 +75,21 @@ case $HOSTNAME in
 		~/.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