From 3bf055a6c21eb1867758d739acb8af8199df05b6 Mon Sep 17 00:00:00 2001
From: Jeremy Kaplan <jkaplan@memsql.com>
Date: Wed, 23 May 2018 10:20:09 -0700
Subject: [PATCH] Split out .xsessionrc for display managers

---
 X/.xinitrc         | 10 +++-------
 X/.xsessionrc      |  8 ++++++++
 personal.conf.yaml |  1 +
 3 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100644 X/.xsessionrc

diff --git a/X/.xinitrc b/X/.xinitrc
index 32b9c33..a4a7d55 100644
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -7,12 +7,8 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then
     unset f
 fi
 
-xset -b
-xset -dpms
-xset s off
-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
+if [ -f $HOME/.xsessionrc ] ; then
+    . "$f"
+fi
 
 exec i3
diff --git a/X/.xsessionrc b/X/.xsessionrc
new file mode 100644
index 0000000..2f093b3
--- /dev/null
+++ b/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
diff --git a/personal.conf.yaml b/personal.conf.yaml
index f81c86b..8b17b8d 100644
--- a/personal.conf.yaml
+++ b/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