From a1263d8bf1d78d1bcb8ffcb43aec5f4d91edcb09 Mon Sep 17 00:00:00 2001
From: Hektor Misplon <hektor.misplon@pm.me>
Date: Thu, 4 Dec 2025 12:37:20 +0100
Subject: [PATCH] fix: update waybar to match polybar config (for the most
 part)

---
 home/modules/waybar/config.jsonc | 42 ++++++++++++++++++++++++++++----
 home/modules/waybar/style.css    |  6 ++++-
 2 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/home/modules/waybar/config.jsonc b/home/modules/waybar/config.jsonc
index 4fceeaf..7f845b4 100644
--- a/home/modules/waybar/config.jsonc
+++ b/home/modules/waybar/config.jsonc
@@ -3,23 +3,55 @@
     "height": 16,
     "spacing": 4,
     "modules-left": ["niri/workspaces"],
-    "modules-center": ["sway/window"],
-    "modules-right": ["battery", "clock"],
+    "modules-right": [
+      "pulseaudio",
+      "memory",
+      "cpu",
+      "network",
+      "clock",
+      "battery",
+    ],
     "clock": {
       "format": "W{:%V %d %b %H:%M}",
       "tooltip-format": "{calendar}",
       "format-alt": "{:%Y-%m-%d %H:%M:%S}",
     },
     "battery": {
+      "bat": "BAT0",
+      "adapter": "ADP1",
+      "interval": 5,
+      "full-at": 99,
       "states": {
         "good": 80,
         "warning": 20,
         "critical": 10,
       },
-      "format": "{capacity}%",
-      "format-charging": "↑{capacity}%",
+      "format": "{capacity}%--",
+      "format-charging": "{capacity}%++",
       "format-plugged": "{capacity}%",
-      "format-alt": "{time}",
+      "format-alt": "{time} {power}W",
+    },
+    "pulseaudio": {
+      "format": "VOL {volume}%",
+      "format-muted": "muted",
+      "on-click": "pavucontrol",
+    },
+    "memory": {
+      "interval": 2,
+      "format": "RAM {percentage}%",
+      "format-alt": "RAM {used:0.1f}G/{total:0.1f}G",
+    },
+    "cpu": {
+      "interval": 2,
+      "format": "CPU {usage}%",
+      "format-alt": "CPU {avg_frequency}GHz",
+    },
+    "network": {
+      "interval": 5,
+      "format-wifi": "{ifname} {ipaddr} {essid}",
+      "format-ethernet": "{ifname} {ipaddr}",
+      "format-disconnected": "{ifname} disconnected",
+      "tooltip-format": "{ifname}: {ipaddr}/{cidr}",
     },
   },
 ]
diff --git a/home/modules/waybar/style.css b/home/modules/waybar/style.css
index 4c931dd..e7b2f8d 100644
--- a/home/modules/waybar/style.css
+++ b/home/modules/waybar/style.css
@@ -40,7 +40,11 @@ window#waybar.hidden {
 }
 
 #clock,
-#battery {
+#battery,
+#pulseaudio,
+#memory,
+#cpu,
+#network {
   padding: 0 4px;
   color: #ffffff;
   background-color: #111111;