From bcdc8591d20f23e3f4a1645a7ccfc473b2916c3e Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Wed, 22 Apr 2015 16:19:24 -0400
Subject: X11/clientrc: properly escape $DISPLAY for systemd

---
 .config/X11/clientrc   | 9 +++++----
 .config/X11/modmap.new | 4 ++++
 2 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 .config/X11/modmap.new

diff --git a/.config/X11/clientrc b/.config/X11/clientrc
index 88ae527..ac0d5a8 100644
--- a/.config/X11/clientrc
+++ b/.config/X11/clientrc
@@ -18,9 +18,10 @@ if [ -f "$usermodmap" ]; then
 fi
 
 [ -n "$XDG_RUNTIME_DIR" ] || exit 1
-trap "rm -f $(printf '%q' "${XDG_RUNTIME_DIR}/x11-wm@${DISPLAY}")" EXIT
-mkfifo "${XDG_RUNTIME_DIR}/x11-wm@${DISPLAY}"
+_DISPLAY="$(systemd-escape -- "$DISPLAY")"
+trap "rm -f $(printf '%q' "${XDG_RUNTIME_DIR}/x11-wm@${_DISPLAY}")" EXIT
+mkfifo "${XDG_RUNTIME_DIR}/x11-wm@${_DISPLAY}"
 
-cat "${XDG_RUNTIME_DIR}/x11-wm@${DISPLAY}" &
-systemctl --user start "wm@${DISPLAY}.target" &
+cat "${XDG_RUNTIME_DIR}/x11-wm@${_DISPLAY}" &
+systemctl --user start "wm@${_DISPLAY}.target" &
 wait
diff --git a/.config/X11/modmap.new b/.config/X11/modmap.new
new file mode 100644
index 0000000..c902b52
--- /dev/null
+++ b/.config/X11/modmap.new
@@ -0,0 +1,4 @@
+keycode 135 = Super_R
+
+clear mod4
+add mod4 = Super_L Super_R Hyper_L Hyper_R Menu
-- 
cgit v1.2.3