Lots of fixy business

users/configs/desktop/waybar/config.json

@@ -1,25 +1,22 @@
 {
 	"layer": "top",
 	"modules-left": [
-		"hyprland/workspaces",
-		"hyprland/window",
-		"river/tags",
-		"river/mode",
-		"river/layout",
-		"river/window"
+		"sway/workspaces",
+		"sway/window"
 	],
 	"modules-center": [
 		"clock"
 	],
 	"modules-right": [
 		"backlight",
+		"pulseaudio/slider",
 		"pulseaudio",
 		"network",
 		"battery",
 		"tray"
 	],
-	"hyprland/window": {
-		"separate-outputs": true
+	"wlr/taskbar": {
+		"format": "{icon} {title}"
 	},
 	"network": {
 		"tooltip-format": "{ipaddr}",
@@ -50,16 +47,15 @@
 			""
 		]
 	},
-	"hyprland/workspaces": {
-		"on-scroll-up": "hyprctl dispatch workspace -1",
-		"on-scroll-down": "hyprctl dispatch workspace +1",
-		"on-click": "activate",
-		"format": "{id}",
+	"sway/workspaces": {
+		"format": "{icon}",
 		"format-icons": {
 			"urgent": "",
 			"active": "",
 			"default": ""
 		},
+		"disable-scroll-wraparound": true,
+		"disable-markup": false,
 		"persistent-workspaces": {
 			"DP-2": ["sidebar"],
 			"HDMI-A-2": [2,3,4,5,6]

users/configs/desktop/waybar/style.css

@@ -1,6 +1,16 @@
 @import "macchiato.css";
 
+* {
+  border: none;
+  border-radius: 0;
+  min-height: 10px;
+  font-family: "Iosevka Nerd Font Propo", "Font Awesome";
+  font-size: 16px;
+  min-height: 0;
+}
+
 window#waybar {
+  margin-top: 5px;
   background: @base;
   color: @text;
 }
@@ -10,10 +20,15 @@ window#waybar {
 }
 
 #workspaces button {
+  padding: 0 5px;
   color: @text;
   border-bottom: 2px solid @base;
 }
 
+#workspaces button label {
+  font-size: 10px;
+}
+
 #workspaces button:hover {
   box-shadow: inherit;
   text-shadow: inherit;
@@ -22,7 +37,7 @@ window#waybar {
   border-color: @surface1;
 }
 
-#workspaces button.active {
+#workspaces button.focused {
   color: @green;
   background: @surface1;
   border-color: currentcolor;
@@ -38,15 +53,7 @@ window#waybar {
   background: @yellow;
 }
 
-* {
-  border: none;
-  border-radius: 0;
-  min-height: 0;
-  font-family: "Iosevka Nerd Font Propo", "Font Awesome";
-  font-size: 16px;
-}
-
-#workspaces, #tray, #battery, #backlight, #pulseaudio, #network {
+#tray, #battery, #backlight, #pulseaudio, #network {
   padding: 0 5px;
 }