Swapped beryllium monitors

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

diff --git a/X/.xinitrc b/X/.xinitrc
index a031825e5dcc5703b8da221fef55f1fa27537748..8aba85f39b10fad818e53cbfd42e954eb951c7f0 100644 (file)
--- 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