diff --git a/dots/.config/hypr/hyprland.conf b/dots/.config/hypr/hyprland.conf index c289eac5..b4a578d4 100644 --- a/dots/.config/hypr/hyprland.conf +++ b/dots/.config/hypr/hyprland.conf @@ -6,6 +6,7 @@ source = ~/.config/hypr/wm/monitors.conf source = ~/.config/hypr/wm/window-rules.conf exec-once = ~/.config/hypr/scripts/launchers/events-monitor.bash exec-once = ~/.config/hypr/scripts/launchers/launch-waybar.bash +exec-once = ~/.config/hypr/scripts/launchers/launch-swww.bash exec-once = mako --history 1 exec-once = udiskie --tray exec-once = blueman-applet diff --git a/dots/.config/systemd/user/scripts/init-wallpapers.bash b/dots/.config/hypr/scripts/launchers/launch-swww.bash similarity index 96% rename from dots/.config/systemd/user/scripts/init-wallpapers.bash rename to dots/.config/hypr/scripts/launchers/launch-swww.bash index 7f08f7f0..fcc7e1ad 100755 --- a/dots/.config/systemd/user/scripts/init-wallpapers.bash +++ b/dots/.config/hypr/scripts/launchers/launch-swww.bash @@ -49,7 +49,7 @@ set-wallpapers() { } main() { - until systemctl --user is-active swww --quiet; do + until swww init; do sleep .1 done log "swww daemon running, setting wallpapers" diff --git a/dots/.config/systemd/user/.gitignore b/dots/.config/systemd/user/.gitignore deleted file mode 100644 index 900fd357..00000000 --- a/dots/.config/systemd/user/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.wants diff --git a/dots/.config/systemd/user/compositor.target b/dots/.config/systemd/user/compositor.target deleted file mode 100644 index 183d285c..00000000 --- a/dots/.config/systemd/user/compositor.target +++ /dev/null @@ -1,4 +0,0 @@ -[Unit] -Description=Compositor target for WM to be launched manually -Requires=graphical-session.target -After=graphical-session.target diff --git a/dots/.config/systemd/user/swww-init-wallpapers.service b/dots/.config/systemd/user/swww-init-wallpapers.service deleted file mode 100644 index cd075615..00000000 --- a/dots/.config/systemd/user/swww-init-wallpapers.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Wayland Wallpaper Service -PartOf=swww.service -After=swww.service - -[Service] -ExecStart=bash %h/.config/systemd/user/scripts/init-wallpapers.bash -ExecStop=kill -SIGTERM $MAINPID -TimeoutSec=5sec -Restart=on-failure -RestartSec=3 - -[Install] -WantedBy=swww.service diff --git a/dots/.config/systemd/user/swww.service b/dots/.config/systemd/user/swww.service deleted file mode 100644 index 918ab0d4..00000000 --- a/dots/.config/systemd/user/swww.service +++ /dev/null @@ -1,18 +0,0 @@ -[Unit] -Description=Wayland Wallpaper Service -PartOf=compositor.target -After=compositor.target -ConditionEnvironment=WAYLAND_DISPLAY -ConditionEnvironment=HOME -ConditionEnvironment=XDG_RUNTIME_DIR - -[Service] -ExecStart=swww-daemon -# ExecStartPost=sh -c 'bash %h/.config/systemd/user/scripts/init-wallpapers.bash || true' -ExecStop=kill -SIGTERM $MAINPID -TimeoutSec=5sec -Restart=on-failure -RestartSec=3 - -[Install] -WantedBy=compositor.target