2 files changed, 27 insertions, 20 deletions
diff --git a/waybar/config.jsonc b/waybar/config.jsonc
index 660cbf5..3922b89 100644
--- a/waybar/config.jsonc
+++ b/waybar/config.jsonc
@@ -4,9 +4,8 @@
   "spacing": 0,
   "margin-bottom": 0,
   "modules-left": [
-    "river/tags",
-    "river/layout",
-    "river/window"
+    "sway/workspaces",
+    "sway/window"
   ],
   "modules-center": [
   ],
@@ -20,11 +19,19 @@
     "clock",
     "tray",
   ],
-  "river/tags": {
-    "num-tags": 8,
-    "tag-labels": ["F", "U", "O", "Y", "Q", "L", "C", "M"],
+  "sway/workspaces": {
+    "persistent-workspaces": {
+      "F": [],
+      "O": [],
+      "U": [],
+      "B": [],
+      "L": [],
+      "D": [],
+      "C": []
+    },
+    "alphabetical_sort": false,
   },
-  "river/window": {
+  "sway/window": {
     "max-length": 48,
     "min-length": 48,
     "align": 0,
diff --git a/waybar/style.css b/waybar/style.css
index f8fb7dd..c752399 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -1,9 +1,12 @@
 * {
     /* `otf-font-awesome` is required to be installed for icons */
-    font-family: "Monaspace Krypton";
+    font-family: "BQN386 Unicode DZ";
+    /* font-family: "PxPlus IBM VGA 9x16"; */
     font-size: 28px;
-    padding-top: 4px;
+    padding-top: 0px;
     padding-bottom: 0px;
+    margin-top: 2px;
+    min-height: 46px;
 }
 
 window#waybar {
@@ -19,26 +22,26 @@ button {
     border-radius: 0;
 }
 
-#tags button{
-    padding-bottom: 4px;
-    padding-top: 0px;
+#workspaces button{
     padding-right: 6px;
     padding-left: 6px;
-}
-
-#tags button.occupied {
     color: #FF8C00;
 }
 
-#tags button:hover {
+#workspaces button:hover {
     background: #FF8;
 }
 
-#tags button.focused {
+#workspaces button.focused {
     background-color: #FF8C00;
     color: black;
 }
 
+#workspaces button.empty {
+    background-color: black;
+    color: grey;
+}
+
 #window {
     padding-left: 16px;
     background-color: #FF8C00;
@@ -56,7 +59,6 @@ button {
     color: #FF8C00;
 }
 
-#layout,
 #battery,
 #temperature,
 #backlight,
@@ -75,8 +77,6 @@ label:focus {
 }
 
 #tray {
-    padding-bottom: 4px;
-    padding-top: 0px;
 }
 
 #tray > .passive {