X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=X%2F.xinitrc;h=2521a8889d8a03d308c3594994636913810480d9;hb=28c16053969320ff24650ad1d185382982e750ea;hp=86e176b10564f58dcabe8a3196890977d7c9ad89;hpb=607253b92bcd856b907c9d11fdcc1f0be8466d5b;p=max%2Fdotfiles.git

diff --git a/X/.xinitrc b/X/.xinitrc
index 86e176b..2521a88 100644
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -16,33 +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)
+    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"
 	;;
-    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 HDMI1 --left-of VGA1 
-	;;
-    *)
-	;;
+  beryllium)
+    xrandr --output HDMI-1 --left-of DVI-I-1 
+    ;;
+  magnesium)
+    xrandr --output VGA1 --right-of HDMI2
+    ;;
+  *)
+    ;;
 esac
 
 # Set java font option
@@ -54,12 +58,38 @@ 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
+#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|platinum)
+		~/.local/bin/bat_mgt.sh&
+		;;
+	*)
+                ;;
+esac
+
+cat ~/.ratpoisonrc.base ~/.ratpoisonrc.$HOSTNAME > ~/.ratpoisonrc
 
-gpg-connect-agent updatestartuptty /bye >/dev/null
+# run xcreensaver
+if [ -x $(which xscreensaver) ]; then
+	xscreensaver&
+fi
 
-exec /usr/bin/ratpoison
+case $HOSTNAME in
+        magnesium)
+          exec i3
+          ;;
+        *)
+          exec ratpoison
+          ;;
+esac