3 files changed, 11 insertions, 5 deletions
diff --git a/modules/desktop/waybar/module/default.nix b/modules/desktop/waybar/module/default.nix
index ebfa2c4..c1c8048 100644
--- a/modules/desktop/waybar/module/default.nix
+++ b/modules/desktop/waybar/module/default.nix
@@ -24,6 +24,6 @@ in
         ;
     };
     "hyprland/window" = import ./window.nix { inherit config; };
-    "hyprland/workspaces" = import ./workspaces.nix { inherit config lib; };
+    "hyprland/workspaces" = import ./workspaces.nix { inherit config lib mkIcon; };
   };
 }
diff --git a/modules/desktop/waybar/module/network.nix b/modules/desktop/waybar/module/network.nix
index 7f0af4c..f20121f 100644
--- a/modules/desktop/waybar/module/network.nix
+++ b/modules/desktop/waybar/module/network.nix
@@ -2,12 +2,14 @@
 with config.scheme.withHashtag;
 let
   iconColor = base0B;
+  downloadIcon = mkIcon base0F "󰁅";
+  uploadIcon = mkIcon base0F "󰁝";
 in
 {
   interval = 2;
 
-  format-wifi = "${mkIcon iconColor "{icon}"}  󰁅{bandwidthDownBytes}  󰁝{bandwidthUpBytes}";
-  format-ethernet = "${mkIcon iconColor ""}  󰁅{bandwidthDownBytes}  󰁝{bandwidthUpBytes}";
+  format-wifi = "${mkIcon iconColor "{icon}"}  ${downloadIcon}{bandwidthDownBytes}  ${uploadIcon}{bandwidthUpBytes}";
+  format-ethernet = "${mkIcon iconColor ""}  ${downloadIcon}{bandwidthDownBytes}  ${uploadIcon}{bandwidthUpBytes}";
   format-disconnected = "${mkIcon iconColor "󰤮"}  Disconnected";
 
   tooltip-format = "{ifname}";
diff --git a/modules/desktop/waybar/module/workspaces.nix b/modules/desktop/waybar/module/workspaces.nix
index a16b9e5..c8a99c2 100644
--- a/modules/desktop/waybar/module/workspaces.nix
+++ b/modules/desktop/waybar/module/workspaces.nix
@@ -1,9 +1,13 @@
-{ config, lib }:
+{
+  config,
+  lib,
+  mkIcon,
+}:
 with config.scheme.withHashtag;
 let
   mkWindowRewrite =
     enable: color: icon:
-    lib.mkIf enable "<span font_size='150%' color='${color}'>${icon}</span>";
+    lib.mkIf enable (mkIcon color icon);
 in
 {
   format = "{windows} <span rise='-3000' font_size='small'>{id}</span>";