diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-02-27 20:12:38 -0500 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-02-27 20:12:38 -0500 |
commit | 4e802e740bb2f7c6891271d3eaab39768360e261 (patch) | |
tree | 52cd247d9ffabab2f5cfb9f7821fbafbb27678f7 /.config/X11 | |
parent | bd42aa1b31e2e41cac7ac2ffa6edc05e04354815 (diff) | |
parent | d09fa8687ee01dcb4ef540deb106b8531f56b403 (diff) |
Merge branch 'master' into build64-par/master
Diffstat (limited to '.config/X11')
-rw-r--r-- | .config/X11/clientrc | 23 | ||||
-rw-r--r-- | .config/X11/resources (renamed from .config/X11/defaults) | 0 |
2 files changed, 4 insertions, 19 deletions
diff --git a/.config/X11/clientrc b/.config/X11/clientrc index bc68ed6..5ffdd97 100644 --- a/.config/X11/clientrc +++ b/.config/X11/clientrc @@ -1,30 +1,15 @@ #!/hint/sh -# Load system xinit modules (disabled) -# Remove "false &&" to enable -if false && [ -d /etc/X11/xinit/xinitrc.d ]; then - echo ' ==> Running scripts in Entering xinitrc.d/*' - for f in /etc/X11/xinit/xinitrc.d/*; do - echo " -> $f" - [ -x "$f" ] && . "$f" - done - unset f - echo ' -> done' -fi - -usermodmap="$XDG_CONFIG_HOME/X11/modmap" -if [ -f "$usermodmap" ]; then - xmodmap "$usermodmap" -fi - if [ -z "$XDG_RUNTIME_DIR" ]; then printf "XDG_RUNTIME_DIR isn't set\n" >&2 exit 6 fi + _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 "X11@${_DISPLAY}.target" & wait +systemctl --user stop "X11@${_DISPLAY}.target" diff --git a/.config/X11/defaults b/.config/X11/resources index fca1914..fca1914 100644 --- a/.config/X11/defaults +++ b/.config/X11/resources |