refactor(waybar): extract mkIcon helper, drop per-module iconColor parameter

- Add lib.nix with shared mkIcon function for consistent icon formatting
- Pass mkIcon instead of per-module iconColor to all modules
- Define iconColor locally within each module
- Fix battery icon character

1 files changed, 7 insertions, 4 deletions

diff --git a/modules/desktop/waybar/module/network.nix b/modules/desktop/waybar/module/network.nix
index fb1e836..7f0af4c 100644
--- a/modules/desktop/waybar/module/network.nix
+++ b/modules/desktop/waybar/module/network.nix
@@ -1,11 +1,14 @@
-{ config, iconColor }:
+{ config, mkIcon }:
 with config.scheme.withHashtag;
+let
+  iconColor = base0B;
+in
 {
   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";
+  format-wifi = "${mkIcon iconColor "{icon}"}  󰁅{bandwidthDownBytes}  󰁝{bandwidthUpBytes}";
+  format-ethernet = "${mkIcon iconColor ""}  󰁅{bandwidthDownBytes}  󰁝{bandwidthUpBytes}";
+  format-disconnected = "${mkIcon iconColor "󰤮"}  Disconnected";
 
   tooltip-format = "{ifname}";
   tooltip-format-wifi = "{essid} ({signalStrength}%)";