From 7c936fa4cccdc1372b6e3bb815cf1adff0a7d8db Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de>
Date: Tue, 30 May 2023 14:03:12 +0200
Subject: [PATCH] waybar: Migrate icons to Nerd Fonts 3

---
 users/simon/modules/sway/waybar.nix | 90 ++++++++++++++---------------
 1 file changed, 43 insertions(+), 47 deletions(-)

diff --git a/users/simon/modules/sway/waybar.nix b/users/simon/modules/sway/waybar.nix
index d34da54..1c7fb8e 100644
--- a/users/simon/modules/sway/waybar.nix
+++ b/users/simon/modules/sway/waybar.nix
@@ -16,10 +16,6 @@ let
     fi
   '';
 
-  # nerd fonts are abusing arabic which breaks latin text
-  # context: https://github.com/Alexays/Waybar/issues/628
-  lrm = "&#8206;";
-
   # for fine-grained control over spacing
   thinsp = "&#8201;";
 in
@@ -71,14 +67,14 @@ in
         { class = "inactive"; };
       on-click = toggleUserUnitState "gammastep";
       return-type = "json";
-      format = "";
+      format = "󰌵";
       tooltip = false;
     };
     idle_inhibitor = {
       format = "{icon}";
       format-icons = {
-        activated = " ";
-        deactivated = " ";
+        activated = "󰈈 ";
+        deactivated = "󰈉 ";
       };
     };
     "custom/screencast" = {
@@ -104,7 +100,7 @@ in
                     print(f"Invalid action {action} (in line {line})", file=sys.stderr)
 
                 if active_outputs > 0:
-                    print("${lrm} ")
+                    print("󰄘 ")
                 else:
                     print()
 
@@ -115,15 +111,15 @@ in
     };
     backlight = {
       format = "{percent}% {icon}";
-      format-icons = [ " " " " " " " " " " " " " " ];
+      format-icons = [ "󰃚 " "󰃛 " "󰃜 " "󰃝 " "󰃞 " "󰃟 " "󰃠 " ];
       on-scroll-up = "${pkgs.brightnessctl}/bin/brightnessctl -q set +5%";
       on-scroll-down = "${pkgs.brightnessctl}/bin/brightnessctl -q set 5%-";
     };
     mpd = {
       server = config.services.mpd.network.listenAddress;
-      format = "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} – {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ";
-      format-disconnected = "Disconnected ";
-      format-stopped = "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ";
+      format = "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} – {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) 󰎈";
+      format-disconnected = "Disconnected 󰎊";
+      format-stopped = "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped 󰓛";
       unknown-tag = "N/A";
       interval = 2;
       tooltip-format = "MPD (connected)";
@@ -136,47 +132,47 @@ in
       title-len = 48;
       artist-len = 24;
       consume-icons = {
-        on = " ";
+        on = "󰆐 ";
       };
       random-icons = {
-        off = "劣 ";
-        on = "列 ";
+        off = "󰒞 ";
+        on = "󰒝 ";
       };
       repeat-icons = {
-        on = "凌 ";
+        on = "󰑖 ";
       };
       single-icons = {
-        on = "綾 ";
+        on = "󰑘 ";
       };
       state-icons = {
-        paused = "";
-        playing = "契";
+        paused = "󰏤";
+        playing = "󰐊";
       };
     };
     pulseaudio = {
       format = "{volume}% {icon} {format_source}";
-      format-bluetooth = "{volume}% {icon} {format_source}";
-      format-bluetooth-muted = "${lrm}ﱝ${lrm}  {icon} {format_source}";
-      format-muted = "${lrm}ﱝ${lrm}  {format_source}";
-      format-source = "{volume}% ${thinsp}";
-      format-source-muted = "${thinsp}";
+      format-bluetooth = "{volume}% {icon}󰂯 {format_source}";
+      format-bluetooth-muted = "󰝟  {icon}󰂯 {format_source}";
+      format-muted = "󰝟  {format_source}";
+      format-source = "{volume}% 󰍬${thinsp}";
+      format-source-muted = "󰍭${thinsp}";
       format-icons = {
-        car = " ";
-        default = [ "奄" "奔" "墳" ];
-        hands-free = " ";
-        headphone = " ";
-        headset = " ";
-        phone = " ";
-        portable = " ";
+        car = "󰄋 ";
+        default = [ "󰕿" "󰖀" "󰕾" ];
+        hands-free = "󰋎 ";
+        headphone = "󰋋 ";
+        headset = "󰋎 ";
+        phone = "󰏲 ";
+        portable = "󰏲 ";
       };
       on-click = "${pkgs.pavucontrol}/bin/pavucontrol";
       on-click-right = "${pkgs.unstable.helvum}/bin/helvum";
     };
     network = {
-      format-wifi = "{essid} ({signalStrength}%) 直 ";
-      format-ethernet = "{ipaddr}/{cidr}  ";
-      format-linked = "{ifname} (No IP)  ";
-      format-disconnected = "Disconnected ⚠ ";
+      format-wifi = "{essid} ({signalStrength}%) 󰖩 ";
+      format-ethernet = "{ipaddr}/{cidr} 󰈀 ";
+      format-linked = "{ifname} (No IP) 󰈀 ";
+      format-disconnected = "Disconnected 󰌙 ";
       format-alt = "{ifname}: {ipaddr}/{cidr}";
       tooltip = false;
       on-click-right = "foot -e ${pkgs.networkmanager}/bin/nmtui";
@@ -186,7 +182,7 @@ in
       exec = pkgs.writeShellScript "vpn-state" ''
         ${pkgs.iproute}/bin/ip -j link \
           | ${pkgs.jq}/bin/jq --unbuffered --compact-output '
-            [[.[].ifname | select(. | startswith("mlv"))][] | sub("mlv-"; "") + " ${thinsp}"] as $conns
+            [[.[].ifname | select(. | startswith("mlv"))][] | sub("mlv-"; "") + " 󰌾${thinsp}"] as $conns
             | { text: ($conns[0] // ""), class: (if $conns | length > 0 then "connected" else "disconnected" end) }'
       '';
       return-type = "json";
@@ -195,11 +191,11 @@ in
     };
     memory = {
       interval = 2;
-      format = "{:2}%  ";
+      format = "{:2}% 󰍛 ";
     };
     cpu = {
       interval = 2;
-      format = "{usage:2}% ﬙ ";
+      format = "{usage:2}% 󰘚 ";
       tooltip = false;
     };
     temperature = {
@@ -210,10 +206,10 @@ in
     battery = {
       interval = 5;
       format = "{capacity}% {icon}";
-      format-charging = "{capacity}% ";
-      format-plugged = "{capacity}% ${lrm}ﮣ";
+      format-charging = "{capacity}% 󰂄";
+      format-plugged = "{capacity}% 󰚥";
       format-alt = "{time} {icon}";
-      format-icons = [ "" "" "" "" "" "" "" "" "" "" "" ];
+      format-icons = [ "󱃍" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹" ];
       states = {
         critical = 15;
         good = 95;
@@ -261,9 +257,9 @@ in
             events_today = []
 
         if len(events_today) == 0:
-            text = " "
+            text = "󰃮 "
         else:
-            text = f"{len(events_today)}  "
+            text = f"{len(events_today)} 󰃭 "
 
         print(
             json.dumps(
@@ -282,10 +278,10 @@ in
       tooltip = false;
       format = "{icon}";
       format-icons = {
-        notification = "${thinsp}";
-        none = "${thinsp}";
-        dnd-notification = "${thinsp}";
-        dnd-none = "${thinsp}";
+        notification = "󱅫${thinsp}";
+        none = "󰂚${thinsp}";
+        dnd-notification = "󰂛${thinsp}";
+        dnd-none = "󰂛${thinsp}";
       };
       return-type = "json";
       exec = "${pkgs.swaynotificationcenter}/bin/swaync-client -swb";