diff --git a/modules/desktop.nix b/modules/desktop.nix
index b79d741..22f8563 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -34,7 +34,14 @@ let
     dontBuild = true;
     installPhase = ''
       runHook preInstall
-      install -Dm755 defaults/bin/moonarch-* -t "$out/bin/"
+      # moonarch-waybar* are excluded: waybar is not part of this setup, the
+      # Quickshell bar replaced it.
+      for f in defaults/bin/moonarch-*; do
+        case "$(basename "$f")" in
+          moonarch-waybar*) continue ;;
+        esac
+        install -Dm755 "$f" -t "$out/bin/"
+      done
       runHook postInstall
     '';
 
@@ -56,8 +63,6 @@ in
     "niri/config.kdl".source = "${xdg}/niri/config.kdl";
     "xdg/niri/config.kdl".source = "${xdg}/niri/config.kdl";
     "xdg/quickshell/moonarch".source = "${xdg}/quickshell/moonarch";
-    "xdg/waybar".source = "${xdg}/waybar";
-    "xdg/swaync".source = "${xdg}/swaync";
     "xdg/foot/foot.ini".source = "${xdg}/foot/foot.ini";
     "xdg/fastfetch/config.jsonc".source = "${xdg}/fastfetch/config.jsonc";
     "xdg/kanshi/config".source = "${xdg}/kanshi/config";
@@ -160,10 +165,11 @@ in
     xwayland-satellite
     kanshi
 
-    # Bar, notifications, clipboard
-    waybar
+    # Bar, notifications, clipboard.
+    # Neither waybar nor swaync are installed: the Quickshell bar owns both
+    # roles. The "kept as a reserve" notes in the Arch config date from the
+    # migration and do not apply to a fresh setup.
     quickshell
-    swaynotificationcenter
     libnotify
     cliphist
     wl-clipboard
diff --git a/modules/services.nix b/modules/services.nix
index 2f13ea9..5a5a6c6 100644
--- a/modules/services.nix
+++ b/modules/services.nix
@@ -80,9 +80,6 @@
       Type = "simple";
       ExecStartPre = "${pkgs.coreutils}/bin/sleep 2";
       ExecStart = "${lib.getExe pkgs.wlsunset} -T 6500 -t 5000 -S 00:00 -s 00:01";
-      # Leading '-' keeps a missing waybar non-fatal, otherwise pkill's exit 1
-      # fails the unit and Restart=on-failure spins it in a flicker loop.
-      ExecStartPost = "-${pkgs.procps}/bin/pkill -RTMIN+11 waybar";
       Restart = "on-failure";
       RestartSec = 3;
     };