X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=X%2F.xinitrc;h=1b907ff54b6b7b8cad6c698955a61e908b8bb07f;hb=e1e1cbc8d10791ea427f5dc1f14b04ca47638c5a;hp=a0cce71ef23a37d84ed69493e5fd7b3cff7f540d;hpb=7751a23cc0426f2e80ed6a7b1b81efd3a8288f8e;p=max%2Fdotfiles.git

diff --git a/X/.xinitrc b/X/.xinitrc
index a0cce71..1b907ff 100644
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -16,33 +16,39 @@ 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)
-	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"
-	xmodmap -e "keycode 135 = Control_R Control_R Control_R Control_R"
-	xmodmap -e "add Control = Control_L Control_R"
-	;;
-    *)
+  palladium)
+    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"
+    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"
+    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 --right-of HDMI1
-	;;
-    *)
-	;;
+  beryllium)
+    xrandr --output HDMI-1 --left-of DVI-I-1 
+    ;;
+  *)
+    ;;
 esac
 
 # Set java font option
@@ -54,12 +60,25 @@ 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