From f7e5b10c543ad47515cb50c839bb6fb3273d7938 Mon Sep 17 00:00:00 2001 From: Arpit Chakladar Date: Sun, 26 Jul 2026 00:24:33 +0530 Subject: 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 --- modules/desktop/waybar/module/network.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'modules/desktop/waybar/module/network.nix') 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 = "{icon} 󰁅{bandwidthDownBytes} 󰁝{bandwidthUpBytes}"; - format-ethernet = " 󰁅{bandwidthDownBytes} 󰁝{bandwidthUpBytes}"; - format-disconnected = "󰤮 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}%)"; -- cgit v1.2.3