X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=X%2F.xinitrc;h=8aba85f39b10fad818e53cbfd42e954eb951c7f0;hb=4998694b7bccd0fc0f46ec99bfc136c72bd206b5;hp=a031825e5dcc5703b8da221fef55f1fa27537748;hpb=8f540bfb294f5fadf9e15d85c668c8dda3ced64c;p=max%2Fdotfiles.git

diff --git a/X/.xinitrc b/X/.xinitrc
index a031825..8aba85f 100644
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -21,19 +21,25 @@ 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"
 	;;
+    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 VGA1 --left-of HDMI1
 	;;
     *)
 	;;
@@ -44,6 +50,16 @@ 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