2 files changed, 17 insertions, 32 deletions

diff --git a/dot-config/waybar/config.jsonc b/dot-config/waybar/config.jsonc
index 3676989..98570a5 100644
--- a/dot-config/waybar/config.jsonc
+++ b/dot-config/waybar/config.jsonc
@@ -64,15 +64,15 @@
             "warning": 30,
             "critical": 15
         },
-        "format": "Bat:{capacity}%",
-        "format-charging": "Charging:{capacity}%",
-        "format-plugged": "Plugged:{capacity}%",
-        "format-alt": "Bat:{time}",
+        "format": "Battery[{capacity}%]",
+        "format-charging": "Charging[{capacity}%]",
+        "format-plugged": "Plugged[{capacity}%]",
+        "format-alt": "Battery[{time}]",
     },
     "network": {
         // "interface": "wlp2*", // (Optional) To force the use of this interface
-        "format-wifi": "Wifi:{essid}({signalStrength}%)",
-        "format-ethernet": "Wired:{ipaddr}/{cidr}",
+        "format-wifi": "Wifi[{essid}:{signalStrength}%]",
+        "format-ethernet": "Wired[{ipaddr}/{cidr}]",
         "tooltip-format": "{ifname} via {gwaddr}/{cidr}\ni am {ipaddr}/{cidr}\n{signalStrength}% strength at {bandwidthUpBytes} up and {bandwidthDownBytes} down",
         "format-linked": " {ifname}:No IP",
         "format-disconnected": "Disconnected",
@@ -80,12 +80,12 @@
     },
     "pulseaudio": {
         // "scroll-step": 1, // %, can be a float
-        "format": "{icon}:{volume}% | {format_source}",
-        "format-bluetooth": "{icon}(BT):{volume}% | {format_source}",
-        "format-bluetooth-muted": "{icon}(BT):Muted | {format_source}",
-        "format-muted": "{icon}:Muted | {format_source}",
-        "format-source": "Mic:{volume}%",
-        "format-source-muted": "Mic:Muted",
+        "format": "{icon}[{volume}%] {format_source}",
+        "format-bluetooth": "{icon}[BT:{volume}%] {format_source}",
+        "format-bluetooth-muted": "{icon}[BT:Muted] {format_source}",
+        "format-muted": "{icon}[Muted] {format_source}",
+        "format-source": "Mic[{volume}%]",
+        "format-source-muted": "Mic[Muted]",
         "format-icons": {
             "headphone": "Headphones",
             "hands-free": "",
diff --git a/dot-config/waybar/style.css b/dot-config/waybar/style.css
index a7237b4..24d8600 100644
--- a/dot-config/waybar/style.css
+++ b/dot-config/waybar/style.css
@@ -4,8 +4,8 @@
 
 * {
     border-radius: 0;
-    font-family: "BerkeleyMono";
-    font-weight: 800;
+    font-family: "Berkeley Mono";
+    font-weight: 600;
     font-size: 15px;
     min-height: 0;
 }
@@ -44,28 +44,13 @@ tooltip label {
 }
 
 #workspaces button {
-    padding: 0 4px;
-}
-
-#workspaces button.focused {
-    background: @sel;
-    color: white;
-}
-
-@keyframes blink {
-    to {
-        color: red;
-    }
+    padding: 0;
 }
 
 #battery.warning:not(.charging) {
-    animation-name: blink;
-    animation-duration: 0.5s;
-    animation-timing-function: steps(12);
-    animation-iteration-count: infinite;
-    animation-direction: alternate;
+    color: red;
 }
 
 #custom-separator {
-    margin: 0px 8px 0px 8px;
+    margin: 0px 3px 0px 3px;
 }