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

diff --git a/X/.xinitrc b/X/.xinitrc
index 11f0213..623b4dd 100644
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -21,7 +21,13 @@ fi
 
 # Set keyboard layout
 case $HOSTNAME in
-    palladium)
+    palladium|platinum)
+	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"
@@ -39,7 +45,7 @@ esac
 # Set screen layout
 case $HOSTNAME in
     beryllium)
-	xrandr --output VGA1 --right-of HDMI1
+	xrandr --output HDMI-1 --left-of DVI-I-1 
 	;;
     *)
 	;;
@@ -54,4 +60,24 @@ 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
+#
+#gpg-connect-agent updatestartuptty /bye >/dev/null
+
+# Battery monitoring
+case $HOSTNAME in
+	palladium)
+		xbattmon&
+		;;
+	iridium)
+		~/.local/bin/bat_mgt.sh&
+	*)
+esac
+
+cat ~/.ratpoisonrc.base ~/.ratpoisonrc.$HOSTNAME > ~/.ratpoisonrc
+
 exec /usr/bin/ratpoison