From bc3a65ba93564f24950748703d832e840c0c5d3c Mon Sep 17 00:00:00 2001 From: ItsDrike Date: Sun, 26 Mar 2023 13:03:56 +0200 Subject: [PATCH] Make services specific to wayland use their own sysd target --- home/.config/hypr/hyprland.conf | 2 +- home/.config/systemd/user/swayidle.service | 2 +- .../systemd/user/systemd-lock-handler-swaylock.service | 1 + home/.config/systemd/user/wallpaper.service | 2 +- home/.config/systemd/user/wayland-session.target | 6 ++++++ .../swayidle.service | 0 .../wallpaper.service | 0 .../wl-gammarelay.service | 0 home/.config/systemd/user/wl-gammarelay.service | 4 ++-- home/.config/systemd/user/wm-ready.target | 3 --- 10 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 home/.config/systemd/user/wayland-session.target rename home/.config/systemd/user/{wm-ready.target.wants => wayland-session.target.wants}/swayidle.service (100%) rename home/.config/systemd/user/{wm-ready.target.wants => wayland-session.target.wants}/wallpaper.service (100%) rename home/.config/systemd/user/{wm-ready.target.wants => wayland-session.target.wants}/wl-gammarelay.service (100%) diff --git a/home/.config/hypr/hyprland.conf b/home/.config/hypr/hyprland.conf index e064fa3..cffec74 100644 --- a/home/.config/hypr/hyprland.conf +++ b/home/.config/hypr/hyprland.conf @@ -13,7 +13,7 @@ monitor = , preferred, auto, 1 exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP XDG_SESSION_TYPE -exec-once = sleep 1 && systemctl --user start wm-ready.target # Hyprland socket sometimes isn't yet loaded, sleep for sec +exec-once = sleep 1 && systemctl --user start wayland-session.target # Hyprland socket sometimes isn't yet loaded, sleep for sec # exec-once = aa-notify -p # exec-once = udiskie -A -T diff --git a/home/.config/systemd/user/swayidle.service b/home/.config/systemd/user/swayidle.service index d307232..04bfcc1 100644 --- a/home/.config/systemd/user/swayidle.service +++ b/home/.config/systemd/user/swayidle.service @@ -7,4 +7,4 @@ ExecStart=/usr/bin/swayidle Restart=on-failure [Install] -WantedBy=wm-ready.target +WantedBy=wayland-session.target diff --git a/home/.config/systemd/user/systemd-lock-handler-swaylock.service b/home/.config/systemd/user/systemd-lock-handler-swaylock.service index c5a2196..7707395 100644 --- a/home/.config/systemd/user/systemd-lock-handler-swaylock.service +++ b/home/.config/systemd/user/systemd-lock-handler-swaylock.service @@ -12,6 +12,7 @@ After=lock.target # which swaylock will only do after it has locked the screen Type=forking ExecStart=/usr/bin/swaylock -fF +#ExecStart=/usr/bin/swaylock -fF --image /home/itsdrike/Pictures/Wallpapers/Categories/Extra/CommieGNULinux.png --indicator-x-position 300 --indicator-y-position 300 Restart=on-failure [Install] diff --git a/home/.config/systemd/user/wallpaper.service b/home/.config/systemd/user/wallpaper.service index 9403465..888a433 100644 --- a/home/.config/systemd/user/wallpaper.service +++ b/home/.config/systemd/user/wallpaper.service @@ -9,4 +9,4 @@ Restart=always RestartSec=3s [Install] -WantedBy=wm-ready.target +WantedBy=wayland-session.target diff --git a/home/.config/systemd/user/wayland-session.target b/home/.config/systemd/user/wayland-session.target new file mode 100644 index 0000000..e7b42ca --- /dev/null +++ b/home/.config/systemd/user/wayland-session.target @@ -0,0 +1,6 @@ +[Unit] +Description=Waylnad compositor loaded and ready +BindsTo=wm-ready.target +Wants=xdg-desktop-portal.service +Wants=xdg-desktop-portal-hyprland.service +Wants=systemd-lock-handler.service diff --git a/home/.config/systemd/user/wm-ready.target.wants/swayidle.service b/home/.config/systemd/user/wayland-session.target.wants/swayidle.service similarity index 100% rename from home/.config/systemd/user/wm-ready.target.wants/swayidle.service rename to home/.config/systemd/user/wayland-session.target.wants/swayidle.service diff --git a/home/.config/systemd/user/wm-ready.target.wants/wallpaper.service b/home/.config/systemd/user/wayland-session.target.wants/wallpaper.service similarity index 100% rename from home/.config/systemd/user/wm-ready.target.wants/wallpaper.service rename to home/.config/systemd/user/wayland-session.target.wants/wallpaper.service diff --git a/home/.config/systemd/user/wm-ready.target.wants/wl-gammarelay.service b/home/.config/systemd/user/wayland-session.target.wants/wl-gammarelay.service similarity index 100% rename from home/.config/systemd/user/wm-ready.target.wants/wl-gammarelay.service rename to home/.config/systemd/user/wayland-session.target.wants/wl-gammarelay.service diff --git a/home/.config/systemd/user/wl-gammarelay.service b/home/.config/systemd/user/wl-gammarelay.service index e7b882c..86e8ff7 100644 --- a/home/.config/systemd/user/wl-gammarelay.service +++ b/home/.config/systemd/user/wl-gammarelay.service @@ -1,10 +1,10 @@ [Unit] Description="Redshift and brightness control for Wayland" -BindsTo=graphical-session.target +BindsTo=wayland-session.target [Service] ExecStart=/usr/bin/wl-gammarelay-rs run Restart=on-failure [Install] -WantedBy=wm-ready.target +WantedBy=wayland-session.target diff --git a/home/.config/systemd/user/wm-ready.target b/home/.config/systemd/user/wm-ready.target index 2b8d5b9..33ae807 100644 --- a/home/.config/systemd/user/wm-ready.target +++ b/home/.config/systemd/user/wm-ready.target @@ -3,8 +3,5 @@ Description=Window Manager loaded and ready BindsTo=graphical-session.target Wants=wireplumber.service Wants=pipewire-pulse.socket -Wants=systemd-lock-handler.service Wants=usbguard-notifier.service Wants=gnome-keyring-daemon.service -Wants=xdg-desktop-portal.service -Wants=xdg-desktop-portal-hyprland.service