home: Emacs should use the user dbus session, not the system one
* user-config/xorg/.xinitrc: Start dbus directly; no longer use dbus-launch to run window manager.
This commit is contained in:
parent
4923e7e2ca
commit
fd2f0d27b5
|
@ -37,6 +37,12 @@ init_full_session() {
|
||||||
# Allow clipboard to be shared via spice
|
# Allow clipboard to be shared via spice
|
||||||
spice-vdagent &
|
spice-vdagent &
|
||||||
|
|
||||||
|
# Start dbus session here so emacs daemon connects to the users dbus session and not the
|
||||||
|
# system one
|
||||||
|
if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
|
||||||
|
eval "$(dbus-launch --sh-syntax)"
|
||||||
|
fi
|
||||||
|
|
||||||
# Determine how to start (or not start) emacs
|
# Determine how to start (or not start) emacs
|
||||||
if [ "$SESSION_WM" = "exwm" ]; then
|
if [ "$SESSION_WM" = "exwm" ]; then
|
||||||
case "$SESSION_TYPE" in
|
case "$SESSION_TYPE" in
|
||||||
|
@ -129,20 +135,20 @@ init_session() {
|
||||||
run_session() {
|
run_session() {
|
||||||
case "$SESSION_WM" in
|
case "$SESSION_WM" in
|
||||||
xmonad|stumpwm)
|
xmonad|stumpwm)
|
||||||
exec dbus-launch --exit-with-session "$SESSION_WM"
|
exec "$SESSION_WM"
|
||||||
;;
|
;;
|
||||||
exwm)
|
exwm)
|
||||||
if [ "$SESSION_TYPE" = "min" ]; then
|
if [ "$SESSION_TYPE" = "min" ]; then
|
||||||
exec dbus-launch --exit-with-session emacs -f start-as-window-manager
|
exec emacs -f start-as-window-manager
|
||||||
else
|
else
|
||||||
exec emacsclient -c
|
exec emacsclient -c
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
if [ "$SESSION_TYPE" = "new" ]; then
|
if [ "$SESSION_TYPE" = "new" ]; then
|
||||||
exec dbus-launch --exit-with-session "$SESSION_WM"
|
exec "$SESSION_WM"
|
||||||
else
|
else
|
||||||
exec dbus-launch --exit-with-session "$DEFAULT_WM"
|
exec "$DEFAULT_WM"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
Loading…
Reference in New Issue