Merge branch 'master' of git.friedersdorff.com:max/dotfiles

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

diff --git a/X/.xinitrc b/X/.xinitrc
index 1a86c7fc988fab9cc81b8f5d6f98da173fd013e1..8aba85f39b10fad818e53cbfd42e954eb951c7f0 100644 (file)
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -15,15 +15,51 @@ fi
 
 # Load .Xresources
 xrdb -merge ~/.Xresources &> /dev/null
+if [ -f ~/.Xresources.$HOSTNAME ]; then
+    xrdb -merge ~/.Xresources.$HOSTNAME &> /dev/null
+fi
 
-setxkbmap gb
+# 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"
+       ;;
+    *)
+esac
 
+# Set screen layout
+case $HOSTNAME in
+    beryllium)
+       xrandr --output VGA1 --left-of HDMI1
+       ;;
+    *)
+       ;;
+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
 
+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 udatestartuptty /bye >/dev/null
+
 exec /usr/bin/ratpoison