Merge branch 'desktop' into laptop

scripts/hyprland/start_services.sh

@@ -1,10 +1,25 @@
 #!/bin/sh
 
+#
+# Make sure xdg-desktop-portal-hyprland has access to what it needs
+#
+dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP &
+
+#
+# Start authentication polkit.
+#
+/nix/store/$(ls -la /nix/store | rg '^d.*polkit-kde-agent.*\d$' | awk '{print $9}')/libexec/polkit-kde-authentication-agent-1 &
+
 #
 # Start waybar.
 #
 waybar &
 
+#
+# Start xwaylandvideobridge
+#
+xwaylandvideobridge &
+
 #
 ## Start wallpaper daemon and set one.
 #
@@ -16,7 +31,7 @@ function load_wallpapers() {
 }
 
 if ! swww query; then
-  swww init &
+  swww-daemon &
 fi
 
 load_wallpapers &
@@ -26,11 +41,6 @@ load_wallpapers &
 #
 mako &
 
-#
-# Start authentication polkit.
-#
-/nix/store/$(ls -la /nix/store | rg '^d.*polkit-kde-agent.*\d$' | awk '{print $9}')/libexec/polkit-kde-authentication-agent-1 &
-
 #
 # Refresh kdeconnect connections
 #
@@ -43,13 +53,3 @@ wl-paste -w cliphist store &
 
  # Need this to be able to paste in xwayland applications.
 wl-paste -t text -w sh -c 'xclip -selection clipboard -o > /dev/null 2> /dev/null || xclip -selection clipboard'
-
-#
-# Start xwaylandvideobridge
-#
-xwaylandvideobridge &
-
-#
-# Make sure xdg-desktop-portal-hyprland has access to what it needs
-#
-dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP &