From 304376397b83eb527cde7d63e0cd6c2adc9b45c2 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Wed, 4 Feb 2026 11:47:28 -0800
Subject: [PATCH] waybar: use workspace taskbar icons

---
 dotfiles/config/waybar/config.jsonc |  2 +-
 dotfiles/config/waybar/style.css    |  8 ++++++--
 nixos/overlay.nix                   | 17 +++++++++++++++++
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/dotfiles/config/waybar/config.jsonc b/dotfiles/config/waybar/config.jsonc
index e5f479e4..2bc75668 100644
--- a/dotfiles/config/waybar/config.jsonc
+++ b/dotfiles/config/waybar/config.jsonc
@@ -83,7 +83,7 @@
         "on-click": "pavucontrol"
     },
     "hyprland/workspaces": {
-        "format": "{id}",
+        "format": "{id} {windows}",
         "on-click": "activate",
         "workspace-taskbar": {
             "enable": true,
diff --git a/dotfiles/config/waybar/style.css b/dotfiles/config/waybar/style.css
index df2d5d23..29f4642d 100644
--- a/dotfiles/config/waybar/style.css
+++ b/dotfiles/config/waybar/style.css
@@ -82,7 +82,7 @@ button:hover {
 }
 
 #workspaces .taskbar-window {
-    padding: 0 4px;
+    padding: 0 2px;
 }
 
 #workspaces .taskbar-window.active {
@@ -90,8 +90,12 @@ button:hover {
     box-shadow: inset 0 -3px #ffffff;
 }
 
+#workspaces .taskbar-window label {
+    color: #ffffff;
+}
+
 #workspaces .taskbar-window image {
-    margin: 0 2px;
+    margin: 0 1px;
 }
 
 #mode {
diff --git a/nixos/overlay.nix b/nixos/overlay.nix
index 659e3baa..0af06f76 100644
--- a/nixos/overlay.nix
+++ b/nixos/overlay.nix
@@ -145,6 +145,16 @@ in
     };
   });
 
+  rofi-pass = prev.rofi-pass.overrideAttrs (_: {
+    version = "git-0fb508a";
+    src = prev.fetchFromGitHub {
+      owner = "colonelpanic8";
+      repo = "rofi-pass";
+      rev = "0fb508a93ab5f653b63d68ce569e79c8bb27e87b";
+      sha256 = "sha256-49kdaqCp6O4RrZMbAKYJKDJaAzHBUqYZT2O7OjtQ8W0=";
+    };
+  });
+
   wyoming-satellite = prev.wyoming-satellite.overridePythonAttrs (oldAttrs: {
     src = prev.fetchFromGitHub {
       owner = "colonelpanic8";
@@ -190,6 +200,13 @@ in
     };
   });
 
+  # Local Waybar for workspace taskbar support.
+  waybar = prev.waybar.overrideAttrs (old: {
+    src = final.lib.cleanSource /home/imalison/Projects/waybar;
+    version = old.version;
+    mesonFlags = (old.mesonFlags or []) ++ [ "-Dcava=disabled" ];
+  });
+
   gnupg_2_4_0 = prev.gnupg.overrideAttrs (_: rec {
     pname = "gnupg";
     # 2.4.1 breaks emacs