From 031090e4eacaed1771bc96f902b5bee731851ab8 Mon Sep 17 00:00:00 2001
From: alexion <contact@alexion.dev>
Date: Sun, 11 Oct 2026 22:12:17 -0400
Subject: [PATCH] fix(waybar): use Lua dispatch build

---
 .../desktop/session/hyprland/default.nix      |  1 -
 .../nixos/modules/desktop/session/waybar.nix  | 26 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/configs/nixos/modules/desktop/session/hyprland/default.nix b/configs/nixos/modules/desktop/session/hyprland/default.nix
index 0d39fd8..725a043 100644
--- a/configs/nixos/modules/desktop/session/hyprland/default.nix
+++ b/configs/nixos/modules/desktop/session/hyprland/default.nix
@@ -233,7 +233,6 @@
       position = "left";
       order = 10;
       settings = {
-        on-click = "activate";
         format = "{id} {windows}";
         format-window-separator = " ";
         window-rewrite-default = util.glyph "f2d0";
diff --git a/configs/nixos/modules/desktop/session/waybar.nix b/configs/nixos/modules/desktop/session/waybar.nix
index 0e57a11..459bc96 100644
--- a/configs/nixos/modules/desktop/session/waybar.nix
+++ b/configs/nixos/modules/desktop/session/waybar.nix
@@ -30,6 +30,32 @@ in
 
     home-manager.users.${config.user.name}.programs.waybar = {
       enable = true;
+      # Waybar 0.15.0 sends old Hyprland workspace dispatch commands.
+      # Use the fix commit until a release includes upstream PR #5013.
+      package = pkgs.waybar.overrideAttrs {
+        src = pkgs.fetchFromGitHub {
+          owner = "Alexays";
+          repo = "Waybar";
+          rev = "05945748dccce28bf96d26d8f64a9e69a8dd49ba";
+          hash = "sha256-51R3mIt8cLNvh/X5qe9vOqeJCj0U9KRyemVE5y+OhiU=";
+        };
+
+        postUnpack =
+          let
+            libcava = pkgs.fetchFromGitHub {
+              owner = "LukashonakV";
+              repo = "cava";
+              tag = "0.10.7";
+              hash = "sha256-zkyj1vBzHtoypX4Bxdh1Vmwh967DKKxN751v79hzmgQ=";
+            };
+          in
+          ''
+            pushd "$sourceRoot"
+            cp -R --no-preserve=mode,ownership ${libcava} subprojects/cava-0.10.7
+            patchShebangs .
+            popd
+          '';
+      };
 
       # A user service bound to graphical-session.target, which uwsm activates,
       # so the bar comes up with the session and no compositor exec-once.
-- 
2.47.3