From b43a30d9cfeea32b3a4fa87a6fe40c89425d56de Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Sat, 7 Jun 2025 11:06:31 +0200
Subject: [PATCH] Refine default waybar

---
 config/waybar/config    |  64 +++++++-----------------
 config/waybar/style.css | 107 +++++-----------------------------------
 2 files changed, 31 insertions(+), 140 deletions(-)

diff --git a/config/waybar/config b/config/waybar/config
index 9165f4c..b675be0 100644
--- a/config/waybar/config
+++ b/config/waybar/config
@@ -2,30 +2,19 @@
     "layer": "top",
     "position": "top",
     "spacing": 0,
-    "height": 34,
+    "height": 20,
     "modules-left": [
-        "custom/logo",
         "hyprland/workspaces"
     ],
     "modules-center": [
         "clock"
     ],
     "modules-right": [
-        "tray",
-        "memory",
+        "bluetooth",
         "network",
-        "wireplumber",
+        "cpu",
         "battery",
-        "custom/power"
     ],
-    "wlr/taskbar": {
-        "format": "{icon}",
-        "on-click": "activate",
-        "on-click-right": "fullscreen",
-        "icon-theme": "WhiteSur",
-        "icon-size": 25,
-        "tooltip-format": "{title}"
-    },
     "hyprland/workspaces": {
         "on-click": "activate",
         "format": "{icon}",
@@ -51,21 +40,29 @@
             "5": []
         }
     },
-    "memory": {
-        "interval": 5,
-        "format": "󰍛 {}%",
-        "max-length": 10
+    "bluetooth": {
+      "format": " ",
+      "format-connected": " {device_alias}",
+      "format-connected-battery": " {device_alias} {device_battery_percentage}%",
+      "tooltip-format": "{controller_alias}\t{controller_address}\n\n{num_connections} connected",
+      "tooltip-format-connected": "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}",
+      "tooltip-format-enumerate-connected": "{device_alias}\t{device_address}",
+      "tooltip-format-enumerate-connected-battery": "{device_alias}\t{device_address}\t{device_battery_percentage}%",
+      "on-click": "blueberry"
     },
-    "tray": {
-        "spacing": 10
+    "cpu": {
+        "interval": 5,
+        "format": "{usage}% 󰍛",
+        "max-length": 10,
+        "on-click": "alacritty -e btop"
     },
     "clock": {
         "tooltip-format": "{calendar}",
         "format-alt": "  {:%a, %d %b %Y}",
-        "format": "  {:%I:%M %p}"
+        "format": "{:%H:%M}"
     },
     "network": {
-        "format-wifi" : "{icon}",
+        "format-wifi" : "{icon} ",
         "format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"],
         "format-ethernet": "󰀂",
 	"format-alt" : "󱛇",
@@ -78,24 +75,6 @@
 	"interval": 5,
 	"nospacing": 1,
     },
-    "wireplumber": {
-        "format": "{icon}",
-        "format-bluetooth": "󰂰",
-        "nospacing": 1,
-        "tooltip-format": "Volume : {volume}%",
-        "format-muted": "󰝟",
-        "format-icons": {
-            "headphone": "",
-            "default": ["󰖀","󰕾",""]
-        },
-        "on-click": "pamixer -t",
-        "scroll-step": 1
-    },
-    "custom/logo": {
-        "format": "  ",
-        "tooltip": false,
-        "on-click": "~/.config/rofi/launchers/misc/launcher.sh &"
-    },
     "battery": {
         "format": "{capacity}% {icon}",
         "format-icons": {
@@ -131,10 +110,5 @@
             "critical": 10
         },
         "tooltip": false
-    },
-    "custom/power": {
-        "format": "󰤆",
-        "tooltip": false,
-        "on-click": "~/.config/rofi/powermenu/type-2/powermenu.sh &"
     }
 }
diff --git a/config/waybar/style.css b/config/waybar/style.css
index 4002db8..d5424cd 100644
--- a/config/waybar/style.css
+++ b/config/waybar/style.css
@@ -2,125 +2,42 @@
   border: none;
   border-radius: 0;
   min-height: 0;
-  font-family: JetBrainsMono Nerd Font;
+  font-family: CaskaydiaMono Nerd Font;
   font-size: 11px;
 }
 
 window#waybar {
-  background-color: #181825;
-  transition-property: background-color;
-  transition-duration: 0.5s;
-}
-
-window#waybar.hidden {
-  opacity: 0.5;
+  background-color: #1a1b26;
+  opacity: 0.98;
 }
 
 #workspaces {
-  background-color: transparent;
+  margin-left: 5px;
 }
 
 #workspaces button {
   all: initial;
   /* Remove GTK theme values (waybar #1351) */
   min-width: 0;
-  /* Fix weird spacing in materia (waybar #450) */
-  box-shadow: inset 0 -3px transparent;
   /* Use box-shadow instead of border so the text isn't offset */
-  padding: 6px 12px;
-  margin: 6px 3px;
-  border-radius: 4px;
-  background-color: #1e1e2e;
+  padding: 2px 6px;
+  margin-right: 3px;
   color: #cdd6f4;
 }
 
-#workspaces button.active {
-  color: #1e1e2e;
-  background-color: #cdd6f4;
-}
-
-#workspaces button:hover {
-  box-shadow: inherit;
-  text-shadow: inherit;
-  color: #1e1e2e;
-  background-color: #cdd6f4;
-}
-
-#workspaces button.urgent {
-  background-color: #f38ba8;
-}
-
-#memory,
-#custom-power,
+#bluetooth,
+#cpu,
 #battery,
-#backlight,
-#wireplumber,
 #network,
-#clock,
-#tray {
-  border-radius: 4px;
-  margin: 6px 3px;
-  padding: 6px 12px;
-  background-color: #1e1e2e;
-  color: #181825;
-}
-
-#custom-power {
-  margin-right: 6px;
-}
-
-#custom-logo {
-  padding-right: 7px;
-  padding-left: 7px;
-  margin-left: 5px;
-  font-size: 15px;
-  border-radius: 8px 0px 0px 8px;
-  color: #1793d1;
-}
-
-#memory {
-  background-color: #fab387;
+#clock {
+  padding: 6px 8px;
+  color: #cdd6f4;
 }
 
 #battery {
-  background-color: #f38ba8;
+  margin-right: 10px;
 }
 
-#battery.warning,
-#battery.critical,
-#battery.urgent {
-  background-color: #ff0000;
-  color: #FFFF00;
-}
-
-#battery.charging {
-  background-color: #a6e3a1;
-  color: #181825;
-}
-
-#backlight {
-  background-color: #fab387;
-}
-
-#wireplumber {
-  background-color: #f9e2af;
-}
-
-#network {
-  background-color: #94e2d5;
-  padding-right: 17px;
-}
-
-#clock {
-  font-family: JetBrainsMono Nerd Font;
-  background-color: #cba6f7;
-}
-
-#custom-power {
-  background-color: #f2cdcd;
-}
-
-
 tooltip {
   border-radius: 8px;
   padding: 15px;