Split out .xsessionrc for display managers

X/.xinitrc

@@ -7,12 +7,8 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then
     unset f
 fi
 
-xset -b
+if [ -f $HOME/.xsessionrc ] ; then
-xset -dpms
+    . "$f"
-xset s off
+fi
-xset s 0 0
-xset r rate 250 50
-
-setxkbmap -layout us,us -variant dvorak, -option grp:ctrls_toggle,shift:both_capslock,caps:escape,compose:prsc
 
 exec i3

X/.xsessionrc

@@ -0,0 +1,8 @@
+xset -b
+xset -dpms
+xset s off
+xset s 0 0
+xset r rate 250 50
+
+# The first -option clears any existing options
+setxkbmap -layout us,us -variant dvorak, -option -option grp:ctrls_toggle,shift:both_capslock,caps:escape,compose:prsc

personal.conf.yaml

@@ -8,6 +8,7 @@
     ~/.mbsyncrc: isync/.mbsyncrc
     ~/.mutt: mutt/
     ~/.xinitrc: X/.xinitrc
+    ~/.xsessionrc: X/.xsessionrc
     ~/.Xresources: X/.Xresources
     ~/.Xdefaults: X/.Xdefaults
     ~/.urlview: urlview/.urlview