X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=X%2F.xinitrc;h=8aba85f39b10fad818e53cbfd42e954eb951c7f0;hb=791dddd6094eb7d4ec4266c7ac7840c050dbdcfd;hp=857c4b0fc3ac29e47e3826abce6119b3eecdd855;hpb=b716205f36376fd67c257bab081cb6771eea7640;p=max%2Fdotfiles.git

diff --git a/X/.xinitrc b/X/.xinitrc
index 857c4b0..8aba85f 100644
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -15,20 +15,51 @@ 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)
+	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
-xrandr --output VGA1 --right-of HDMI1
-
+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
 
-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 udatestartuptty /bye >/dev/null
 
 exec /usr/bin/ratpoison