From a1a9e580e6b1bddcd92f657a6db64d833a3d9600 Mon Sep 17 00:00:00 2001 From: Patrick Spek Date: Fri, 23 Feb 2024 15:36:53 +0100 Subject: Update services for managing awesome --- .config/systemd/user/wman-.service.d/00-Environment.conf | 2 +- .config/systemd/user/wman-.service.d/00-Target.conf | 3 ++- .config/systemd/user/wman-awesome.service | 3 ++- .config/systemd/user/wsys-.service.d/00-Target.conf | 4 ++-- .config/systemd/user/wsys-xorg.service | 4 ++-- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.config/systemd/user/wman-.service.d/00-Environment.conf b/.config/systemd/user/wman-.service.d/00-Environment.conf index 1fd3857..7bb880b 100644 --- a/.config/systemd/user/wman-.service.d/00-Environment.conf +++ b/.config/systemd/user/wman-.service.d/00-Environment.conf @@ -1,3 +1,3 @@ [Service] Environment=XAUTHORITY=%h/.Xauthority -Environment=DISPLAY=:1 +Environment=DISPLAY=:0 diff --git a/.config/systemd/user/wman-.service.d/00-Target.conf b/.config/systemd/user/wman-.service.d/00-Target.conf index 174cf82..70c349d 100644 --- a/.config/systemd/user/wman-.service.d/00-Target.conf +++ b/.config/systemd/user/wman-.service.d/00-Target.conf @@ -1,2 +1,3 @@ +[Service] ExecStartPost=systemctl --user --no-block start wman.target -ExecStopPre=systemctl --user --no-block stop wman.target +ExecStopPost=systemctl --user --no-block stop wman.target diff --git a/.config/systemd/user/wman-awesome.service b/.config/systemd/user/wman-awesome.service index 973126d..4582405 100644 --- a/.config/systemd/user/wman-awesome.service +++ b/.config/systemd/user/wman-awesome.service @@ -6,7 +6,8 @@ After=wsys-xorg.target Before=wman.target [Service] -ExecStart=/usr/bin/awesome +#ExecStart=/usr/bin/awesome +ExecStart=/usr/bin/dbus-launch --exit-with-session /usr/bin/awesome [Install] WantedBy=wsys.target diff --git a/.config/systemd/user/wsys-.service.d/00-Target.conf b/.config/systemd/user/wsys-.service.d/00-Target.conf index 9d4d2f7..d80f469 100644 --- a/.config/systemd/user/wsys-.service.d/00-Target.conf +++ b/.config/systemd/user/wsys-.service.d/00-Target.conf @@ -2,5 +2,5 @@ ExecStartPost=systemctl --user --no-block start wsys-xorg.target ExecStartPost=systemctl --user --no-block start wsys.target -ExecStopPre=systemctl --user stop wsys.target -ExecStopPre=systemctl --user stop wsys-xorg.target +ExecStopPost=systemctl --user stop wsys.target +ExecStopPost=systemctl --user stop wsys-xorg.target diff --git a/.config/systemd/user/wsys-xorg.service b/.config/systemd/user/wsys-xorg.service index 8e24d4a..8c7a43a 100644 --- a/.config/systemd/user/wsys-xorg.service +++ b/.config/systemd/user/wsys-xorg.service @@ -5,7 +5,7 @@ # needs_root_rights=yes [Unit] -Description=Xorg server at display :1 +Description=Xorg server at display :0 Requires=wsys-xorg.socket After=wsys-xorg.socket @@ -15,6 +15,6 @@ Before=wsys.target Type=simple SuccessExitStatus=0 1 -ExecStart=/usr/bin/Xorg :1 -nolisten tcp -noreset -verbose 2 "vt1" +ExecStart=/usr/bin/Xorg :0 -nolisten tcp -noreset -verbose 2 "vt1" ExecStartPost=systemctl --user import-environment DISPLAY ExecStartPost=systemctl --user import-environment XAUTHORITY -- cgit v1.1