From b92efb8a4779cef2063b822ee1550c71dc9283a0 Mon Sep 17 00:00:00 2001 From: Patrick Spek Date: Fri, 16 Feb 2024 12:04:54 +0100 Subject: Split out wman and wsys values into drop-ins --- .config/systemd/user/wman-.service.d/00-Environment.conf | 3 +++ .config/systemd/user/wman-.service.d/00-Restart.conf | 2 ++ .config/systemd/user/wman-.service.d/00-Target.conf | 2 ++ .config/systemd/user/wman-awesome.service | 7 ------- .config/systemd/user/wsys-.service.d/00-Target.conf | 6 ++++++ .config/systemd/user/wsys-xorg.service | 5 ----- 6 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 .config/systemd/user/wman-.service.d/00-Environment.conf create mode 100644 .config/systemd/user/wman-.service.d/00-Restart.conf create mode 100644 .config/systemd/user/wman-.service.d/00-Target.conf create mode 100644 .config/systemd/user/wsys-.service.d/00-Target.conf (limited to '.config') diff --git a/.config/systemd/user/wman-.service.d/00-Environment.conf b/.config/systemd/user/wman-.service.d/00-Environment.conf new file mode 100644 index 0000000..1fd3857 --- /dev/null +++ b/.config/systemd/user/wman-.service.d/00-Environment.conf @@ -0,0 +1,3 @@ +[Service] +Environment=XAUTHORITY=%h/.Xauthority +Environment=DISPLAY=:1 diff --git a/.config/systemd/user/wman-.service.d/00-Restart.conf b/.config/systemd/user/wman-.service.d/00-Restart.conf new file mode 100644 index 0000000..8a764e3 --- /dev/null +++ b/.config/systemd/user/wman-.service.d/00-Restart.conf @@ -0,0 +1,2 @@ +[Service] +Restart=always diff --git a/.config/systemd/user/wman-.service.d/00-Target.conf b/.config/systemd/user/wman-.service.d/00-Target.conf new file mode 100644 index 0000000..174cf82 --- /dev/null +++ b/.config/systemd/user/wman-.service.d/00-Target.conf @@ -0,0 +1,2 @@ +ExecStartPost=systemctl --user --no-block start wman.target +ExecStopPre=systemctl --user --no-block stop wman.target diff --git a/.config/systemd/user/wman-awesome.service b/.config/systemd/user/wman-awesome.service index 3b093c9..973126d 100644 --- a/.config/systemd/user/wman-awesome.service +++ b/.config/systemd/user/wman-awesome.service @@ -6,14 +6,7 @@ After=wsys-xorg.target Before=wman.target [Service] -Environment=XAUTHORITY=%h/.Xauthority -Environment=DISPLAY=:1 -Restart=always - ExecStart=/usr/bin/awesome -ExecStartPost=systemctl --user --no-block start wman.target - -ExecStopPre=systemctl --user --no-block stop wman.target [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 new file mode 100644 index 0000000..9d4d2f7 --- /dev/null +++ b/.config/systemd/user/wsys-.service.d/00-Target.conf @@ -0,0 +1,6 @@ +[Service] +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 diff --git a/.config/systemd/user/wsys-xorg.service b/.config/systemd/user/wsys-xorg.service index a1784ed..8e24d4a 100644 --- a/.config/systemd/user/wsys-xorg.service +++ b/.config/systemd/user/wsys-xorg.service @@ -18,8 +18,3 @@ SuccessExitStatus=0 1 ExecStart=/usr/bin/Xorg :1 -nolisten tcp -noreset -verbose 2 "vt1" ExecStartPost=systemctl --user import-environment DISPLAY ExecStartPost=systemctl --user import-environment XAUTHORITY -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 -- cgit v1.1