From cc6289c1226cf98c8279835f299354fc8ae5b1bd Mon Sep 17 00:00:00 2001
From: Matthias Puchstein <matthias@puchstein.dev>
Date: Mon, 16 Mar 2026 00:39:43 +0100
Subject: [PATCH] waybar: fix workspace config block priority to match module
 selection

Hyprland was checked first for the module name but niri was checked
first for the config block, so on machines with both tags the
hyprland/workspaces module had no config and thus no format-icons.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 dot_config/waybar/config.tmpl | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dot_config/waybar/config.tmpl b/dot_config/waybar/config.tmpl
index 1892519..4383e73 100644
--- a/dot_config/waybar/config.tmpl
+++ b/dot_config/waybar/config.tmpl
@@ -55,12 +55,7 @@
     {{- end }}
   ],
 
-  {{- if $tags.niri }}
-  "niri/workspaces": {
-    "format": "{value}",
-    "all-outputs": true
-  },
-  {{- else if $tags.hyprland }}
+  {{- if $tags.hyprland }}
   "hyprland/workspaces": {
     "format": "{icon}",
     "all-outputs": true,
@@ -88,6 +83,11 @@
     "on-scroll-up": "hyprctl dispatch workspace e+1",
     "on-scroll-down": "hyprctl dispatch workspace e-1"
   },
+  {{- else if $tags.niri }}
+  "niri/workspaces": {
+    "format": "{value}",
+    "all-outputs": true
+  },
   {{- end }}
 
   "cpu": {