X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=X%2F.xinitrc;h=9e44c741c379aa3ec9113b8e86e38da29e3a4e29;hb=5399a0d912bb43e0ec0c777c8d4db3f4bfef4266;hp=857c4b0fc3ac29e47e3826abce6119b3eecdd855;hpb=088cbfc12d13c0ae6a2fd1b59bdb10b54a9fa068;p=max%2Fdotfiles.git

diff --git a/X/.xinitrc b/X/.xinitrc
index 857c4b0..9e44c74 100644
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -15,20 +15,74 @@ fi
 
 # Load .Xresources
 xrdb -merge ~/.Xresources &> /dev/null
+if [ -f ~/.Xresources.$HOSTNAME ]; then
+  xrdb -merge ~/.Xresources.$HOSTNAME &> /dev/null
+fi
 
-setxkbmap -variant colemak gb
+# Set keyboard layout
+case $HOSTNAME in
+    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|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
-xrandr --output VGA1 --right-of HDMI1
-
+case $HOSTNAME in
+  beryllium)
+    xrandr --output HDMI-1 --left-of DVI-I-1 
+    ;;
+  magnesium)
+    xrandr --output VGA1 --right-of HDMI2
+    ;;
+  *)
+    ;;
+esac
 
 # Set java font option
 export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on"
 
 feh --bg-scale ~/Pictures/background.jpg&
 
+/usr/lib64/xfce4/notifyd/xfce4-notifyd&
+
 xset -b
 
-setxkbmap -option 'ctrl:nocaps'
+#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
+
+# run xcreensaver
+if [ -x $(which xscreensaver) ]; then
+	xscreensaver&
+fi
 
 exec /usr/bin/ratpoison