From c517426a6d17fe67a0a9b3e5368a292daa97470e Mon Sep 17 00:00:00 2001
From: Simon Studer <s.studer.s@gmail.com>
Date: Sun, 12 Oct 2025 22:05:13 +0200
Subject: [PATCH] add disk to waybar and update styling

---
 config/waybar/config.jsonc | 12 ++++++
 config/waybar/style.css    | 76 +++++++++++++++++++++-----------------
 2 files changed, 54 insertions(+), 34 deletions(-)

diff --git a/config/waybar/config.jsonc b/config/waybar/config.jsonc
index b003371..765ac36 100644
--- a/config/waybar/config.jsonc
+++ b/config/waybar/config.jsonc
@@ -103,6 +103,18 @@
     "format": "{usage}% ",
     "tooltip": false
   },
+  "disk": {
+    "interval": 30,
+    "path": "/",
+    "format": "{specific_free:.0f}GB {path}",
+    "unit": "GB"
+  },
+  "disk#disk_home": {
+    "interval": 30,
+    "path": "/home/",
+    "format": "{specific_free:.0f}GB {path}",
+    "unit": "GB"
+  },
   "memory": {
     "format": "{}% "
   },
diff --git a/config/waybar/style.css b/config/waybar/style.css
index 18e316a..18f9f44 100644
--- a/config/waybar/style.css
+++ b/config/waybar/style.css
@@ -2,20 +2,26 @@
 /* https://github.com/acaibowlz/niri-setup/blob/main/waybar/style.css */
 
 @define-color bg_main rgba(43, 48, 59, 0.5);
-@define-color content_main white;
+@define-color content_main @color15;
+
+@define-color alternate0 @color2;
+@define-color alternate1 @color6;
+
+@define-color custom_green #26a65b;
+@define-color custom_red #f53c3c;
 
-/*@define-color memory_color @color6;*/
 
 @define-color idle_inhibitor @bg_main;
 @define-color idle_inhibitor_activated_color @color7;
-@define-color pulseaudio_color @color4;
-@define-color network_color @color6;
-@define-color power_profile_balanced_color @color6;
-@define-color cpu_color @color4;
-@define-color disk_color @color2;
-@define-color temperature_color @color3;
-@define-color backlight_color @color1;
-@define-color battery_color @color7;
+@define-color pulseaudio_color @alternate0;
+@define-color network_color @alternate1;
+@define-color power_profile_balanced_color @alternate0;
+@define-color cpu_color @alternate1;
+@define-color memory_color @alternate0;
+@define-color disk_color @alternate1;
+@define-color temperature_color @alternate0;
+@define-color backlight_color @alternate1;
+@define-color battery_color @alternate0;
 @define-color clock_color @color3;
 
 * {
@@ -77,7 +83,7 @@ button:hover {
 #workspaces button {
     padding: 0 5px;
     background-color: transparent;
-    color: #ffffff;
+    /*color: #ffffff;*/
 }
 
 #workspaces button:hover {
@@ -116,7 +122,7 @@ button:hover {
 #power-profiles-daemon,
 #mpd {
     padding: 0 10px;
-    color: #ffffff;
+    /*color: #ffffff;*/
 }
 
 #window,
@@ -134,18 +140,23 @@ button:hover {
     margin-right: 0;
 }
 
+.modules-right > widget:nth-child(odd) {
+  background-color: @alternate0;
+}
+.modules-right > widget:nth-child(even) {
+  background-color: @alternate1;
+}
+
 #clock {
     background-color: @clock_color;
 }
 
 #battery {
-    background-color: @battery_color;
-    color: #000000;
 }
 
 #battery.charging, #battery.plugged {
-    color: #ffffff;
-    background-color: #26A65B;
+    /*color: #ffffff;*/
+    background-color: @custom_green;
 }
 
 @keyframes blink {
@@ -171,18 +182,18 @@ button:hover {
 }
 
 #power-profiles-daemon.performance {
-    background-color: #f53c3c;
-    color: #ffffff;
+    background-color: @custom_red;
+    /*color: #ffffff;*/
 }
 
 #power-profiles-daemon.balanced {
-    background-color: @power_profile_balanced_color;
-    color: #ffffff;
+    /*background-color: @power_profile_balanced_color;*/
+    /*color: #ffffff;*/
 }
 
 #power-profiles-daemon.power-saver {
-    background-color: #2ecc71;
-    color: #000000;
+    background-color: @custom_green;
+    color: @color8;
 }
 
 label:focus {
@@ -190,38 +201,36 @@ label:focus {
 }
 
 #cpu {
-    background-color: @cpu_color;
-    color: #000000;
 }
 
 #memory {
-    background-color: @memory_color;
 }
 
 #disk {
-    background-color: @disk_color;
 }
 
 #backlight {
-    background-color: @backlight_color;
 }
 
 #network {
-    background-color: @network_color;
 }
 
 #network.disconnected {
     background-color: #f53c3c;
 }
 
-#pulseaudio {
+#pulseaudio:not(muted) {
     background-color: #90b1b1;
-    color: #000000;
+    /*color: #000000;*/
+}
+
+#pulseaudio:not(source-muted) {
+    background-color: #90b1b1;
+    /*color: #000000;*/
 }
 
 #pulseaudio.muted.source-muted {
-    background-color: @pulseaudio_color;
-    /* color: #2a5c45;*/
+    background-color: inherit;
 }
 
 #wireplumber {
@@ -248,7 +257,6 @@ label:focus {
 }
 
 #temperature {
-    background-color: @temperature_color;
 }
 
 #temperature.critical {
@@ -324,7 +332,7 @@ label:focus {
 
 #privacy-item {
     padding: 0 5px;
-    color: white;
+    /*color: white;*/
 }
 
 #privacy-item.screenshare {