Laptop config

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

diff --git a/X/.xinitrc b/X/.xinitrc
index 0c2dc6b055e36771ac75c6c0bc2497e07fefdc35..ad4afd12629ed744abc0842259445003eb430eb3 100644 (file)
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -15,22 +15,37 @@ fi
 
 # Load .Xresources
 xrdb -merge ~/.Xresources &> /dev/null
+if [ -f ~/.Xresources.$HOSTNAME ]; then
+    xrdb -merge ~/.Xresources.$HOSTNAME &> /dev/null
+fi
 
 # Set keyboard layout
 case $HOSTNAME in
-    palladium|beryllium)
+    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
+       xrandr --output HDMI-1 --left-of DVI-I-1 
        ;;
     *)
        ;;
@@ -41,6 +56,28 @@ export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on"
 
 feh --bg-scale ~/Pictures/background.jpg&
 
+/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)
+               ~/.local/bin/bat_mgt.sh&
+       *)
+esac
+
+cat ~/.ratpoisonrc.base ~/.ratpoisonrc.$HOSTNAME > ~/.ratpoisonrc
+
 exec /usr/bin/ratpoison