Updates

.config/waybar/config

@@ -1,16 +1,30 @@
 [{
     "spacing": 4, // Gaps between modules (4px)
-    "modules-left": ["sway/workspaces"],
+    "modules-left": ["sway/workspaces", "wlr/taskbar"],
+    "modules-center": [],
     "modules-right": ["pulseaudio", "memory", "cpu", "battery", "network", "custom/pacman", "clock", "tray"],
     "memory": {
         "format": "\uf538 {used:0.1f}GiB",
         "on-click": "kitty --class kitty-scratch -c ~/.config/kitty/kitty-scratch.conf btop"
     },
+    "sway/workspaces": {
+        "format": "{value}"
+    },
+    "wlr/taskbar": {
+        "on-click": "activate"
+    },
     "tray": {
         "spacing": 10
     },
     "clock": {
-        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
+        "tooltip-format": "<tt><small>{calendar}</small></tt>",
+        "calendar": {
+            "mode": "year",
+            "mode-mon-col": 3,
+            "format": {
+                "today": "<b><u>{}</u></b>"
+            }
+        },
         "format": "\uf017 {:%A %d/%m/%Y %H:%M}"
     },
     "cpu": {

.config/waybar/style.css

@@ -14,9 +14,39 @@ window#waybar.hidden {
     opacity: 0.2;
 }
 
-#workspaces button {
+tooltip {
+    background-color: #002b36;
+    border: 1px solid #859900;
+    border-radius: 0px;
+}
+tooltip label {
+    color: #93a1a1;
+}
+
+#taskbar {
+    margin-left: 10px;
+    padding: 0px;
+}
+
+#taskbar button {
+    padding: 0px;
+    box-shadow: inset 0 -3px transparent;
+    border: none;
+}
+
+#taskbar button:hover {
+    background: inherit;
+    background-color: #268bd2;
+    -gtk-icon-shadow: none;
+}
+
+#taskbar button.active {
+    background-color: #859900;
+}
+
+#workspaces button {
+    color: #93a1a1;
     padding: 0px;
-    background-color: transparent;
     /* Use box-shadow instead of border so the text isn't offset */
     box-shadow: inset 0 -3px transparent;
     /* Avoid rounded borders under each workspace name */
@@ -25,6 +55,8 @@ window#waybar.hidden {
 
 /* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
 #workspaces button:hover {
+    background: inherit;
+    text-shadow: none;
     background-color: #268bd2;
     color: #002b36;
 }
@@ -45,6 +77,7 @@ window#waybar.hidden {
 }
 
 #workspaces button,
+#taskbar button,
 #clock,
 #battery,
 #cpu,
@@ -66,7 +99,7 @@ window#waybar.hidden {
 
 #window,
 #workspaces {
-    margin: 0 4px;
+    margin: 0 20px;
 }
 
 /* If workspaces is the leftmost module, omit left margin */