From 15b258af59da525d23fa5921dfc6695b72c4225d Mon Sep 17 00:00:00 2001
From: zachir <zachir@librem.one>
Date: Mon, 28 Jul 2025 12:27:10 -0500
Subject: Fix merge from master

---
 waybar/config | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/waybar/config b/waybar/config
index d25cedd..50b8068 100644
--- a/waybar/config
+++ b/waybar/config
@@ -255,25 +255,24 @@
 
     // Choose the order of the modules
 
-    "modules-left":[ "hyprland/workspaces", "custom/launcher", "hyprland/window"],
+    "modules-left":[ "sway/workspaces", "custom/launcher", "sway/window"],
     "modules-center":[],
     "modules-right":[ "tray", "mpd", "idle_inhibitor", "temperature#cpu0", "temperature#cpu1", "temperature#gpu0", "temperature#gpu1", "temperature#gpu2", "wireplumber", "cpu", "memory", "network", "clock", "custom/power"],
 
     // Modules configuration
 
-    
     "sway/workspaces": {
       "all-outputs": false,
       "persistent-workspaces": {
-        "21": ["DP-2"],
-        "22": ["DP-2"],
-        "23": ["DP-2"],
-        "24": ["DP-2"],
-        "25": ["DP-2"],
-        "26": ["DP-2"],
-        "27": ["DP-2"],
-        "28": ["DP-2"],
-        "29": ["DP-2"],
+        "21": ["HDMI-A-1"],
+        "22": ["HDMI-A-1"],
+        "23": ["HDMI-A-1"],
+        "24": ["HDMI-A-1"],
+        "25": ["HDMI-A-1"],
+        "26": ["HDMI-A-1"],
+        "27": ["HDMI-A-1"],
+        "28": ["HDMI-A-1"],
+        "29": ["HDMI-A-1"],
       },
       "format": "{icon}",
       "format-icons": {
@@ -308,6 +307,11 @@
         "29": "9",
       },
     },
+    "niri/workspaces": {
+      "format": "{value}",
+      "all-outputs": false,
+      "on-click": "activate"
+    },
     "hyprland/workspaces": {
       "format": "{icon}",
       "active-only": false,
-- 
cgit v1.2.3