X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=X%2F.xinitrc;h=2f7d505f4dac1d68f2396da0a37f093eef28febd;hb=b17e0edbf16a9202c6509c3001cbc3d6c9823ef3;hp=8aba85f39b10fad818e53cbfd42e954eb951c7f0;hpb=4998694b7bccd0fc0f46ec99bfc136c72bd206b5;p=max%2Fdotfiles.git

diff --git a/X/.xinitrc b/X/.xinitrc
index 8aba85f..2f7d505 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 VGA1 --left-of HDMI1
-	;;
-    *)
-	;;
+  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,26 @@ 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
 
-gpg-connect-agent udatestartuptty /bye >/dev/null
+cat ~/.ratpoisonrc.base ~/.ratpoisonrc.$HOSTNAME > ~/.ratpoisonrc
 
 exec /usr/bin/ratpoison