From 5f53e3d3496f7621ee82d0de5e8bdcc31b84da38 Mon Sep 17 00:00:00 2001 From: Patrick Spek Date: Tue, 2 Apr 2024 19:24:56 +0200 Subject: Use graphical-session.target --- .config/awesome/rc.lua | 4 ++++ .config/systemd/user/dapp-bg-chwp.service | 6 +++--- .config/systemd/user/dapp-bg-chwp.timer | 2 +- .config/systemd/user/dapp-bg-dunst.service | 6 +++--- .config/systemd/user/dapp-bg-ntfy@.service | 5 +++-- .config/systemd/user/dapp-bg-redshift.service | 6 +++--- .config/systemd/user/dapp-bg-sxhkd.service | 6 +++--- .config/systemd/user/dapp-bg-xcompmgr.service | 6 +++--- .config/systemd/user/dapp-fg-chromium.service | 5 +++-- .config/systemd/user/dapp-fg-evolution.service | 12 ------------ .config/systemd/user/dapp-fg-firefox.service | 5 +++-- .config/systemd/user/dapp-fg-gajim.service | 5 +++-- .config/systemd/user/dapp-fg-irc.service | 5 +++-- .config/systemd/user/dapp-fg-keepassxc.service | 5 +++-- .config/systemd/user/dapp-fg-networkmanager.service | 5 +++-- .config/systemd/user/dapp-fg-nextcloud.service | 5 +++-- .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 | 3 --- .config/systemd/user/wman-awesome.service | 13 ------------- .config/systemd/user/wman.target | 2 -- 21 files changed, 44 insertions(+), 67 deletions(-) delete mode 100644 .config/systemd/user/dapp-fg-evolution.service delete mode 100644 .config/systemd/user/wman-.service.d/00-Environment.conf delete mode 100644 .config/systemd/user/wman-.service.d/00-Restart.conf delete mode 100644 .config/systemd/user/wman-.service.d/00-Target.conf delete mode 100644 .config/systemd/user/wman-awesome.service delete mode 100644 .config/systemd/user/wman.target (limited to '.config') diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua index 2c9eebc..3a37bba 100644 --- a/.config/awesome/rc.lua +++ b/.config/awesome/rc.lua @@ -704,3 +704,7 @@ client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end) -- }}} + +awful.util.spawn("systemctl --user import-environment DISPLAY") +awful.util.spawn("systemctl --user import-environment XAUTHORITY") +awful.util.spawn("systemctl --user start awesome-session.target") diff --git a/.config/systemd/user/dapp-bg-chwp.service b/.config/systemd/user/dapp-bg-chwp.service index 65299d2..0aed15a 100644 --- a/.config/systemd/user/dapp-bg-chwp.service +++ b/.config/systemd/user/dapp-bg-chwp.service @@ -1,7 +1,7 @@ [Unit] Description=Change the wallpaper used in Xorg -PartOf=graphical-session.target -After=wman.target +After=graphical-session.target +Requires=graphical-session.target [Service] Type=oneshot @@ -9,4 +9,4 @@ ExecStart=chwp Restart=on-failure [Install] -WantedBy=wman.target +WantedBy=graphical-session.target diff --git a/.config/systemd/user/dapp-bg-chwp.timer b/.config/systemd/user/dapp-bg-chwp.timer index 5d7c5e8..947b3e0 100644 --- a/.config/systemd/user/dapp-bg-chwp.timer +++ b/.config/systemd/user/dapp-bg-chwp.timer @@ -7,4 +7,4 @@ Unit=dapp-bg-chwp.service OnUnitInactiveSec=1h [Install] -WantedBy=wman.target +WantedBy=graphical-session.target diff --git a/.config/systemd/user/dapp-bg-dunst.service b/.config/systemd/user/dapp-bg-dunst.service index 2aff5ce..d74d5b2 100644 --- a/.config/systemd/user/dapp-bg-dunst.service +++ b/.config/systemd/user/dapp-bg-dunst.service @@ -1,11 +1,11 @@ [Unit] Description=Run dunst -PartOf=graphical-session.target -After=wman.target +After=graphical-session.target +Requires=graphical-session.target [Service] Type=exec ExecStart=/usr/bin/dunst [Install] -WantedBy=wman.target +WantedBy=graphical-session.target diff --git a/.config/systemd/user/dapp-bg-ntfy@.service b/.config/systemd/user/dapp-bg-ntfy@.service index 6297fea..bbf914c 100644 --- a/.config/systemd/user/dapp-bg-ntfy@.service +++ b/.config/systemd/user/dapp-bg-ntfy@.service @@ -1,11 +1,12 @@ [Unit] Description=Run ntfy After=network.target -After=wman.target +After=graphical-session.target +Requires=graphical-session.target [Service] Type=exec ExecStart=ntfy subscribe "%i" 'notify-send "$t" "$m"' [Install] -WantedBy=wman.target +WantedBy=graphical-session.target diff --git a/.config/systemd/user/dapp-bg-redshift.service b/.config/systemd/user/dapp-bg-redshift.service index 19dc3f7..fe996e9 100644 --- a/.config/systemd/user/dapp-bg-redshift.service +++ b/.config/systemd/user/dapp-bg-redshift.service @@ -1,11 +1,11 @@ [Unit] Description=Run redshift -PartOf=graphical-session.target -After=wman.target +After=graphical-session.target +Requires=graphical-session.target [Service] Type=exec ExecStart=redshift -l 51.50:4.59 -t 6500:3500 [Install] -WantedBy=wman.target +WantedBy=graphical-session.target diff --git a/.config/systemd/user/dapp-bg-sxhkd.service b/.config/systemd/user/dapp-bg-sxhkd.service index e250f1e..f345544 100644 --- a/.config/systemd/user/dapp-bg-sxhkd.service +++ b/.config/systemd/user/dapp-bg-sxhkd.service @@ -1,11 +1,11 @@ [Unit] Description=Run the Simple X HotKey Daemon -PartOf=graphical-session.target -After=wman.target +After=graphical-session.target +Requires=graphical-session.target [Service] Type=exec ExecStart=/usr/bin/sxhkd [Install] -WantedBy=wman.target +WantedBy=graphical-session.target diff --git a/.config/systemd/user/dapp-bg-xcompmgr.service b/.config/systemd/user/dapp-bg-xcompmgr.service index a55bbb5..153ca81 100644 --- a/.config/systemd/user/dapp-bg-xcompmgr.service +++ b/.config/systemd/user/dapp-bg-xcompmgr.service @@ -1,11 +1,11 @@ [Unit] Description=Run the X Compositing Manager -PartOf=graphical-session.target -After=wman.target +After=graphical-session.target +Requires=graphical-session.target [Service] Type=exec ExecStart=xcompmgr [Install] -WantedBy=wman.target +WantedBy=graphical-session.target diff --git a/.config/systemd/user/dapp-fg-chromium.service b/.config/systemd/user/dapp-fg-chromium.service index 754d98f..48a8283 100644 --- a/.config/systemd/user/dapp-fg-chromium.service +++ b/.config/systemd/user/dapp-fg-chromium.service @@ -1,10 +1,11 @@ [Unit] Description=Manage an x11 application -PartOf=graphical-session.target +After=graphical-session.target +Requires=graphical-session.target [Service] Type=exec ExecStart=chromium [Install] -WantedBy=wman.target +WantedBy=graphical-session.target diff --git a/.config/systemd/user/dapp-fg-evolution.service b/.config/systemd/user/dapp-fg-evolution.service deleted file mode 100644 index 4d1fd87..0000000 --- a/.config/systemd/user/dapp-fg-evolution.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Manage an x11 application -PartOf=graphical-session.target - -After=fsvc-keepassxc.service - -[Service] -Type=exec -ExecStart=evolution - -[Install] -WantedBy=wman.target diff --git a/.config/systemd/user/dapp-fg-firefox.service b/.config/systemd/user/dapp-fg-firefox.service index 1e92245..0d434cc 100644 --- a/.config/systemd/user/dapp-fg-firefox.service +++ b/.config/systemd/user/dapp-fg-firefox.service @@ -1,10 +1,11 @@ [Unit] Description=Manage an x11 application -PartOf=graphical-session.target +After=graphical-session.target +Requires=graphical-session.target [Service] Type=exec ExecStart=firefox [Install] -WantedBy=wman.target +WantedBy=graphical-session.target diff --git a/.config/systemd/user/dapp-fg-gajim.service b/.config/systemd/user/dapp-fg-gajim.service index a770612..0ed24f0 100644 --- a/.config/systemd/user/dapp-fg-gajim.service +++ b/.config/systemd/user/dapp-fg-gajim.service @@ -1,10 +1,11 @@ [Unit] Description=Manage an x11 application -PartOf=graphical-session.target +After=graphical-session.target +Requires=graphical-session.target [Service] Type=exec ExecStart=gajim [Install] -WantedBy=wman.target +WantedBy=graphical-session.target diff --git a/.config/systemd/user/dapp-fg-irc.service b/.config/systemd/user/dapp-fg-irc.service index 203b80c..91cba0e 100644 --- a/.config/systemd/user/dapp-fg-irc.service +++ b/.config/systemd/user/dapp-fg-irc.service @@ -1,10 +1,11 @@ [Unit] Description=Manage an x11 application -PartOf=graphical-session.target +After=graphical-session.target +Requires=graphical-session.target [Service] Type=exec ExecStart=irc [Install] -WantedBy=wman.target +WantedBy=graphical-session.target diff --git a/.config/systemd/user/dapp-fg-keepassxc.service b/.config/systemd/user/dapp-fg-keepassxc.service index d24a757..f93cfac 100644 --- a/.config/systemd/user/dapp-fg-keepassxc.service +++ b/.config/systemd/user/dapp-fg-keepassxc.service @@ -1,10 +1,11 @@ [Unit] Description=Manage an x11 application -PartOf=graphical-session.target +After=graphical-session.target +Requires=graphical-session.target [Service] Type=exec ExecStart=keepassxc [Install] -WantedBy=wman.target +WantedBy=graphical-session.target diff --git a/.config/systemd/user/dapp-fg-networkmanager.service b/.config/systemd/user/dapp-fg-networkmanager.service index 6400135..63b74b0 100644 --- a/.config/systemd/user/dapp-fg-networkmanager.service +++ b/.config/systemd/user/dapp-fg-networkmanager.service @@ -1,10 +1,11 @@ [Unit] Description=Manage an x11 application -PartOf=graphical-session.target +After=graphical-session.target +Requires=graphical-session.target [Service] Type=exec ExecStart=nm-applet [Install] -WantedBy=wman.target +WantedBy=graphical-session.target diff --git a/.config/systemd/user/dapp-fg-nextcloud.service b/.config/systemd/user/dapp-fg-nextcloud.service index 1c92d77..7f175fd 100644 --- a/.config/systemd/user/dapp-fg-nextcloud.service +++ b/.config/systemd/user/dapp-fg-nextcloud.service @@ -1,10 +1,11 @@ [Unit] Description=Run the Nextcloud desktop application -PartOf=graphical-session.target +After=graphical-session.target +Requires=graphical-session.target [Service] Type=exec ExecStart=nextcloud [Install] -WantedBy=wman.target +WantedBy=graphical-session.target diff --git a/.config/systemd/user/wman-.service.d/00-Environment.conf b/.config/systemd/user/wman-.service.d/00-Environment.conf deleted file mode 100644 index 7bb880b..0000000 --- a/.config/systemd/user/wman-.service.d/00-Environment.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Service] -Environment=XAUTHORITY=%h/.Xauthority -Environment=DISPLAY=:0 diff --git a/.config/systemd/user/wman-.service.d/00-Restart.conf b/.config/systemd/user/wman-.service.d/00-Restart.conf deleted file mode 100644 index 8a764e3..0000000 --- a/.config/systemd/user/wman-.service.d/00-Restart.conf +++ /dev/null @@ -1,2 +0,0 @@ -[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 deleted file mode 100644 index 70c349d..0000000 --- a/.config/systemd/user/wman-.service.d/00-Target.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Service] -ExecStartPost=systemctl --user --no-block start 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 deleted file mode 100644 index 4582405..0000000 --- a/.config/systemd/user/wman-awesome.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Awesome window manager -Requires=wsys-xorg.service - -After=wsys-xorg.target -Before=wman.target - -[Service] -#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/wman.target b/.config/systemd/user/wman.target deleted file mode 100644 index b7b343b..0000000 --- a/.config/systemd/user/wman.target +++ /dev/null @@ -1,2 +0,0 @@ -[Unit] -Description = Window Manager -- cgit v1.1