diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2015-02-06 15:17:51 -0500 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2015-02-06 15:17:51 -0500 |
| commit | dab097d5000c4697761b6985cb3512f7bce0147f (patch) | |
| tree | 7b81b7826a1e23822955560f0f73dc09cda6c8e8 /.config/X11/clientrc | |
| parent | f50b49ef26f5c692bda1f3f13cd38f9f4f395300 (diff) | |
| parent | a6f973687fb4a1a4558f74f7da595b6902a5dce0 (diff) | |
Merge remote-tracking branch 'origin/master' into purdue-cs/master
Conflicts:
.config/X11/clientrc
.config/bash/rc.d/emacs.sh
.config/cron/make-config
.config/emacs/custom.el
.config/emacs/init.el
.config/git/config
.config/login.sh
.config/selected_editor
.local/bin/config-path
Diffstat (limited to '.config/X11/clientrc')
| -rwxr-xr-x[-rw-r--r--] | .config/X11/clientrc | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/.config/X11/clientrc b/.config/X11/clientrc index c139519..4478db0 100644..100755 --- a/.config/X11/clientrc +++ b/.config/X11/clientrc @@ -1,9 +1,7 @@ #!/bin/sh -# -# ~/.xinitrc -# -# Executed by startx (run your window manager from here) +# 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 @@ -20,7 +18,10 @@ if [ -f "$usermodmap" ]; then fi exec gnome-session -# exec startkde -# exec startxfce4 -# ...or the Window Manager of your choice -#exec wmii + +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" & +wait |