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

diff --git a/X/.xinitrc b/X/.xinitrc
index 8aba85f..ad4afd1 100644
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -27,6 +27,12 @@ case $HOSTNAME in
 	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)
 	setxkbmap -variant colemak us
 	xmodmap -e "keycode 66 = Control_L Control_L Control_L Control_L"
@@ -39,7 +45,7 @@ esac
 # Set screen layout
 case $HOSTNAME in
     beryllium)
-	xrandr --output VGA1 --left-of HDMI1
+	xrandr --output HDMI-1 --left-of DVI-I-1 
 	;;
     *)
 	;;
@@ -54,12 +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
+#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
 
-gpg-connect-agent udatestartuptty /bye >/dev/null
+cat ~/.ratpoisonrc.base ~/.ratpoisonrc.$HOSTNAME > ~/.ratpoisonrc
 
 exec /usr/bin/ratpoison