waybar: Fix to use upstream hyprland/workspaces

Hyprland/workspaces has been upstreamed, so we're using that now. Also
fix the css not showing persistent button status properly while we're at
it.

2 files changed, 11 insertions, 9 deletions

diff --git a/waybar/config b/waybar/config
index 63ac30e..0590008 100644
--- a/waybar/config
+++ b/waybar/config
@@ -9,14 +9,14 @@
 
     // Choose the order of the modules
 
-    "modules-left":[ "wlr/workspaces", "custom/launcher", "hyprland/window"],
+    "modules-left":[ "hyprland/workspaces", "custom/launcher", "hyprland/window"],
     "modules-center":[],
     "modules-right":[ "mpd", "idle_inhibitor", "pulseaudio", "cpu", "memory", "temperature#cpu", "temperature#gpu", "backlight",  "network", "clock", "tray", "custom/power"],
 
     // Modules configuration
 
-    "wlr/workspaces": {
-      "format": "{name}",
+    "hyprland/workspaces": {
+      "format": "{icon}",
       "active-only": false,
       "all-outputs": false,
       "persistent_workspaces": {
@@ -30,8 +30,8 @@
         "8": [],
         "9": []
       },
-      "on-scroll-up": "hyprctl dispatch workspace e+1",
-      "on-scroll-down": "hyprctl dispatch workspace e-1",
+      "on-scroll-up": "hyprctl dispatch split-workspace e+1",
+      "on-scroll-down": "hyprctl dispatch split-workspace e-1",
       "on-click": "activate"
     },
     "hyprland/window": {
diff --git a/waybar/style.css b/waybar/style.css
index 8b15dfb..88b8900 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -37,6 +37,12 @@ window#waybar.hidden {
     border-bottom: 3px solid #1b1d1c;
 }
 
+#workspaces button.empty {
+    background: black;
+    color: white;
+    border-bottom: 3px solid #1b1d1c;
+}
+
 /*
 #workspaces button:hover {
     background: #39c1ed;
@@ -62,10 +68,6 @@ window#waybar.hidden {
     background-color: #eb4d4b;
 }
 
-#workspaces button.persistent {
-    background: black;
-}
-
 #mode {
     background-color: #64727D;
     border-bottom: 3px solid #ffffff;