Merge keyboard config for iridium/platinum/palladium

[max/dotfiles.git] / X / .xinitrc

diff --git a/X/.xinitrc b/X/.xinitrc
index 17e58e923fb7ff769472f8003de709a2652e938b..d04b5df0186b17ef58b22fe2855109c5f9118f0e 100644 (file)
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -21,7 +21,7 @@ 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"
@@ -39,7 +39,7 @@ esac
 # Set screen layout
 case $HOSTNAME in
     beryllium)
-       xrandr --output VGA1 --right-of HDMI1
+       xrandr --output HDMI-1 --left-of DVI-I-1 
        ;;
     *)
        ;;
@@ -50,8 +50,29 @@ export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on"
 
 feh --bg-scale ~/Pictures/background.jpg&
 
-twmnd&
+/usr/lib64/xfce4/notifyd/xfce4-notifyd&
 
 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|platinum)
+               ~/.local/bin/bat_mgt.sh&
+               ;;
+       *)
+esac
+
+cat ~/.ratpoisonrc.base ~/.ratpoisonrc.$HOSTNAME > ~/.ratpoisonrc
+
 exec /usr/bin/ratpoison