From 550cadaf45165ccbc3dbe050a45d0d041c2c221d Mon Sep 17 00:00:00 2001
From: Arpit Chakladar <arpitchakladar+git@gmail.com>
Date: Sat, 25 Jul 2026 16:47:16 +0530
Subject: feat(waybar): add bandwidth stats, tooltips, spacing consistency, and
 workspace list fix

- Add spacing between icon and text across all waybar modules for consistency
- Add bandwidth download/upload indicators to network module
- Add tooltip-format to date (weekday) and time (seconds) modules
- Replace persistent-workspaces integer with table syntax, remove on-click
---
 modules/desktop/waybar/module/battery.nix    |  8 ++++----
 modules/desktop/waybar/module/cpu.nix        |  2 +-
 modules/desktop/waybar/module/date.nix       |  3 ++-
 modules/desktop/waybar/module/memory.nix     |  2 +-
 modules/desktop/waybar/module/network.nix    | 10 +++++++---
 modules/desktop/waybar/module/time.nix       |  3 ++-
 modules/desktop/waybar/module/volume.nix     |  2 +-
 modules/desktop/waybar/module/vpn.nix        |  2 +-
 modules/desktop/waybar/module/workspaces.nix | 14 ++++++++++++--
 9 files changed, 31 insertions(+), 15 deletions(-)

(limited to 'modules/desktop')

diff --git a/modules/desktop/waybar/module/battery.nix b/modules/desktop/waybar/module/battery.nix
index ec14b8b..e9b8186 100644
--- a/modules/desktop/waybar/module/battery.nix
+++ b/modules/desktop/waybar/module/battery.nix
@@ -1,10 +1,10 @@
 { config, iconColor }:
 with config.scheme.withHashtag;
 {
-  format = "<span foreground='${iconColor}'>{icon}</span> {capacity}%";
-  format-charging = "<span foreground='${iconColor}'>󰂄</span> {capacity}%";
-  format-plugged = "<span foreground='${iconColor}'>󰁹</span> {capacity}%";
-  format-alt = "{time} {icon}";
+  format = "<span foreground='${iconColor}'>{icon}</span>  {capacity}%";
+  format-charging = "<span foreground='${iconColor}'>󰂄</span>  {capacity}%";
+  format-plugged = "<span foreground='${iconColor}'>󰁹</span>  {capacity}%";
+  format-alt = "{time}  {icon}";
   format-icons = [
     "󰁺"
     "󰁻"
diff --git a/modules/desktop/waybar/module/cpu.nix b/modules/desktop/waybar/module/cpu.nix
index cde77e6..3b91c2b 100644
--- a/modules/desktop/waybar/module/cpu.nix
+++ b/modules/desktop/waybar/module/cpu.nix
@@ -1,6 +1,6 @@
 { config, iconColor }:
 with config.scheme.withHashtag;
 {
-  format = "<span foreground='${iconColor}'></span> {usage}%";
+  format = "<span foreground='${iconColor}'></span>  {usage}%";
   interval = 2;
 }
diff --git a/modules/desktop/waybar/module/date.nix b/modules/desktop/waybar/module/date.nix
index 39716db..477022e 100644
--- a/modules/desktop/waybar/module/date.nix
+++ b/modules/desktop/waybar/module/date.nix
@@ -1,6 +1,7 @@
 { config, iconColor }:
 with config.scheme.withHashtag;
 {
-  format = "<span foreground='${iconColor}'></span> {:%d/%m/%Y}";
+  format = "<span foreground='${iconColor}'></span>  {:%d/%m/%Y}";
+  tooltip-format = "{:%A, %d/%m/%Y}";
   interval = 60;
 }
diff --git a/modules/desktop/waybar/module/memory.nix b/modules/desktop/waybar/module/memory.nix
index 27b66e0..3aa49d6 100644
--- a/modules/desktop/waybar/module/memory.nix
+++ b/modules/desktop/waybar/module/memory.nix
@@ -1,6 +1,6 @@
 { config, iconColor }:
 with config.scheme.withHashtag;
 {
-  format = "<span foreground='${iconColor}'></span> {percentage}%";
+  format = "<span foreground='${iconColor}'></span>  {percentage}%";
   interval = 2;
 }
diff --git a/modules/desktop/waybar/module/network.nix b/modules/desktop/waybar/module/network.nix
index 4e14d69..514d54e 100644
--- a/modules/desktop/waybar/module/network.nix
+++ b/modules/desktop/waybar/module/network.nix
@@ -1,13 +1,17 @@
 { config, iconColor }:
 with config.scheme.withHashtag;
 {
-  format-wifi = "<span foreground='${iconColor}'>{icon}</span> {signalStrength}%";
-  format-ethernet = "<span foreground='${iconColor}'></span> {ipaddr}";
-  format-disconnected = "";
+  interval = 2;
+
+  format-wifi = "<span foreground='${iconColor}'>{icon}</span>  󰁅 {bandwidthDownBytes}  󰁝 {bandwidthUpBytes}";
+  format-ethernet = "<span foreground='${iconColor}'></span>  󰁅 {bandwidthDownBytes}  󰁝 {bandwidthUpBytes}";
+  format-disconnected = "<span foreground='${iconColor}'>󰤮</span>  Disconnected";
+
   tooltip-format = "{ifname}";
   tooltip-format-wifi = "{essid} ({signalStrength}%)";
   tooltip-format-ethernet = "Wired: {ipaddr}";
   tooltip-format-disconnected = "Disconnected";
+
   format-icons = [
     "󰢼"
     "󰢽"
diff --git a/modules/desktop/waybar/module/time.nix b/modules/desktop/waybar/module/time.nix
index f7c578d..fe6be26 100644
--- a/modules/desktop/waybar/module/time.nix
+++ b/modules/desktop/waybar/module/time.nix
@@ -1,6 +1,7 @@
 { config, iconColor }:
 with config.scheme.withHashtag;
 {
-  format = "<span foreground='${iconColor}'></span> {:%I:%M %p}";
+  format = "<span foreground='${iconColor}'></span>  {:%I:%M %p}";
+  tooltip-format = "{:%H:%M:%S}";
   interval = 30;
 }
diff --git a/modules/desktop/waybar/module/volume.nix b/modules/desktop/waybar/module/volume.nix
index cc074a7..fb57a16 100644
--- a/modules/desktop/waybar/module/volume.nix
+++ b/modules/desktop/waybar/module/volume.nix
@@ -1,7 +1,7 @@
 { config, iconColor }:
 with config.scheme.withHashtag;
 {
-  format = "<span foreground='${iconColor}'>{icon}</span> {volume}%";
+  format = "<span foreground='${iconColor}'>{icon}</span>  {volume}%";
   format-muted = "<span foreground='${iconColor}'>󰝟</span>";
   format-icons = [
     ""
diff --git a/modules/desktop/waybar/module/vpn.nix b/modules/desktop/waybar/module/vpn.nix
index bb0a242..52f41d4 100644
--- a/modules/desktop/waybar/module/vpn.nix
+++ b/modules/desktop/waybar/module/vpn.nix
@@ -8,7 +8,7 @@ with config.scheme.withHashtag;
 let
   vpnCheckScript = pkgs.writeShellScript "vpn-check" ''
     if ${lib.getExe' pkgs.iproute2 "ip"} a | ${lib.getExe pkgs.gnugrep} -q tun0; then
-      printf '<span foreground="${iconColor}"></span> VPN'
+      printf '<span foreground="${iconColor}"></span>  VPN'
     fi
   '';
 in
diff --git a/modules/desktop/waybar/module/workspaces.nix b/modules/desktop/waybar/module/workspaces.nix
index d2b0290..b3625dc 100644
--- a/modules/desktop/waybar/module/workspaces.nix
+++ b/modules/desktop/waybar/module/workspaces.nix
@@ -3,7 +3,17 @@ with config.scheme.withHashtag;
 {
   format = "{name}";
   persistent-workspaces = {
-    "*" = 10;
+    "*" = [
+      1
+      2
+      3
+      4
+      5
+      6
+      7
+      8
+      9
+      10
+    ];
   };
-  on-click = "hyprctl dispatch workspace {name}";
 }
-- 
cgit v1.2.3