From 4adac992b7f429ab964b0dbc9706ddbf6dbee3b7 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Wed, 30 Oct 2024 09:50:39 +0000
Subject: [PATCH] Switch back from propo nf, bring back extra spaces needed in
 waybar config

---
 system/default.nix             |   2 +-
 system/home/desktop/waybar.nix | 152 ++++++++++++++++-----------------
 2 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/system/default.nix b/system/default.nix
index 58c1f1f2..9510a46a 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -233,7 +233,7 @@
       };
       monospace = {
         package = pkgs.nerdfonts.override { fonts = [ "Iosevka" ]; };
-        name = "Iosevka Nerd Font Propo";
+        name = "Iosevka Nerd Font";
       };
       sizes = {
         applications = 12;
diff --git a/system/home/desktop/waybar.nix b/system/home/desktop/waybar.nix
index 1f15afbc..907e8352 100644
--- a/system/home/desktop/waybar.nix
+++ b/system/home/desktop/waybar.nix
@@ -36,14 +36,14 @@
       "hyprland/workspaces" = {
         format = "{icon}";
         format-icons = {
-          "1" = "󰫃";
-          "2" = "󰫄";
-          "3" = "󰫅";
-          "4" = "󰫆";
-          "5" = "󰫇";
-          "6" = "󰫈";
-          default = "󰋙";
-          urgent = "󰁡";
+          "1" = "󰫃 ";
+          "2" = "󰫄 ";
+          "3" = "󰫅 ";
+          "4" = "󰫆 ";
+          "5" = "󰫇 ";
+          "6" = "󰫈 ";
+          default = "󰋙 ";
+          urgent = "󰁡 ";
         };
         all-outputs = false;
         persistent-workspaces = {
@@ -59,29 +59,29 @@
         "format" = "{title}";
         "max-length" = 50;
         "rewrite" = {
-          "(.*) - GNU Emacs at (.*)" = " $1 [$2]";
-          "(alacritty.*)" = " $1";
-          "(.*) - mpv" = "󰦟 $1";
-          "swayimg: (.*)" = "󰋩 $1";
-          "swappy" = "󰹑 swappy";
-          "(?:/nix/.*)(btm)" = " Resource Usage [$1]";
-          "(?:/nix/.*)(cava)" = "󰝚 Music Visualiser [$1]";
-          "Mozilla Firefox" = "󰈹 $1";
-          "(.*) — Mozilla Firefox" = "󰈹 $1";
-          "Nyxt - (.*)" = "󰀹 $1";
-          "(.*) - Chromium" = "󰊯 $1";
-          "(Signal.*)" = "󰭹 $1";
-          "(WhatsApp for Linux.*)" = "󰖣 $1";
-          "((?:.*)WebCord.*)" = "󰙯 $1";
-          "(Cartridges.*)" = "󰊗 $1";
-          "([Ss]team.*)" = "󰓓 $1";
-          "(Prism Launcher.*)" = "󰍳 Minecraft ($1)";
-          "(.*)(?: *)PrusaSlicer-(.*)" = "󰐫 $1 PrusaSlicer ($2)";
-          "(.*)(?: *)PrusaSlicer G-code Viewer-(.*)" = "󰹛 $1 G-code Viewer ($2)";
-          "FreeCAD (.*)" = "󰻬 FreeCAD $1";
-          "(.*) - Blender.* " = "󰂫 $1";
-          "(Remmina Remote Desktop Client)" = "󰢹 $1";
-          "(NoMachine|Nxplayer.bin)(?: *)(.*)" = "󰢹 $1 $2";
+          "(.*) - GNU Emacs at (.*)" = "  $1 [$2]";
+          "(alacritty.*)" = "  $1";
+          "(.*) - mpv" = "󰦟  $1";
+          "swayimg: (.*)" = "󰋩  $1";
+          "swappy" = "󰹑  swappy";
+          "(?:/nix/.*)(btm)" = "  Resource Usage [$1]";
+          "(?:/nix/.*)(cava)" = "󰝚  Music Visualiser [$1]";
+          "Mozilla Firefox" = "󰈹  $1";
+          "(.*) — Mozilla Firefox" = "󰈹  $1";
+          "Nyxt - (.*)" = "󰀹  $1";
+          "(.*) - Chromium" = "󰊯  $1";
+          "(Signal.*)" = "󰭹  $1";
+          "(WhatsApp for Linux.*)" = "󰖣  $1";
+          "((?:.*)WebCord.*)" = "󰙯  $1";
+          "(Cartridges.*)" = "󰊗  $1";
+          "([Ss]team.*)" = "󰓓  $1";
+          "(Prism Launcher.*)" = "󰍳  Minecraft ($1)";
+          "(.*)(?: *)PrusaSlicer-(.*)" = "󰐫  $1 PrusaSlicer ($2)";
+          "(.*)(?: *)PrusaSlicer G-code Viewer-(.*)" = "󰹛  $1 G-code Viewer ($2)";
+          "FreeCAD (.*)" = "󰻬  FreeCAD $1";
+          "(.*) - Blender.* " = "󰂫  $1";
+          "(Remmina Remote Desktop Client)" = "󰢹  $1";
+          "(NoMachine|Nxplayer.bin)(?: *)(.*)" = "󰢹  $1 $2";
         };
       };
       mpris = {
@@ -97,8 +97,8 @@
           "length"
         ];
         "player-icons" = {
-          "default" = "󰲸";
-          "firefox" = "󰈹";
+          "default" = "󰲸 ";
+          "firefox" = "󰈹 ";
         };
         "status-icons" = {
           "playing" = "󰐊";
@@ -109,22 +109,22 @@
       };
       pulseaudio = {
         scroll-step = 5;
-        format = "{format_source} {icon} {volume}%";
-        format-muted = "{format_source} 󰝟";
-        format-source = "󰍬";
-        format-source-muted = "󰍭";
+        format = "{format_source}{icon}{volume}%";
+        format-muted = "{format_source} 󰝟 ";
+        format-source = "󰍬 ";
+        format-source-muted = "󰍭 ";
         format-icons = {
-          car = "󰄍";
+          car = "󰄍 ";
           default = [
-            "󰕿"
-            "󰖀"
-            "󰕾"
+            "󰕿 "
+            "󰖀 "
+            "󰕾 "
           ];
-          hands-free = "󰥰";
-          headset = "󰋎";
-          phone = "󰏲";
-          portable = "󰏳";
-          headphone = "󰋋";
+          hands-free = "󰥰 ";
+          headset = "󰋎 ";
+          phone = "󰏲 ";
+          portable = "󰏳 ";
+          headphone = "󰋋 ";
         };
         on-click = "${pkgs.pavucontrol}/bin/pavucontrol";
         on-click-right = "${pkgs.pamixer}/bin/pamixer -t";
@@ -153,15 +153,15 @@
       };
       network = {
         format-icons = [
-          "󰤟"
-          "󰤢"
-          "󰤥"
-          "󰤨"
+          "󰤟 "
+          "󰤢 "
+          "󰤥 "
+          "󰤨 "
         ];
         format-wifi = "{icon}";
         format-ethernet = "󰈁";
-        format-linked = "󰈂";
-        format-disconnected = "󰈂";
+        format-linked = "󰈂 ";
+        format-disconnected = "󰈂 ";
         tooltip-format = "{essid} ({signalStrength}%)";
         on-click = "${pkgs.networkmanagerapplet}/bin/nm-connection-editor";
       };
@@ -205,15 +205,15 @@
         format = "{icon}";
         tooltip-format = "{percent}%";
         format-icons = [
-          ""
-          ""
-          ""
-          ""
-          ""
-          ""
-          ""
-          ""
-          ""
+          " "
+          " "
+          " "
+          " "
+          " "
+          " "
+          " "
+          " "
+          " "
         ];
       };
       battery = {
@@ -224,28 +224,28 @@
         format = "{icon}";
         format-time = "{H}:{m}";
         format-charging = "󰂄 ({time})";
-        format-plugged = "󰚥";
+        format-plugged = "󰚥 ";
         format-warning = "{icon}{capacity}%";
         format-critical = "{icon}{capacity}% ({time})";
         tooltip-format = "{capacity}% | {power}W | {time}";
         format-icons = [
-          "󱃍"
-          "󰁺"
-          "󰁻"
-          "󰁼"
-          "󰁽"
-          "󰁾"
-          "󰁿"
-          "󰂀"
-          "󰂁"
-          "󰂂"
-          "󰁹"
+          "󱃍 "
+          "󰁺 "
+          "󰁻 "
+          "󰁼 "
+          "󰁽 "
+          "󰁾 "
+          "󰁿 "
+          "󰂀 "
+          "󰂁 "
+          "󰂂 "
+          "󰁹 "
         ];
       };
       "systemd-failed-units" = {
         hide-on-ok = false;
-        format = "󰀦 S:{nr_failed_system} U:{nr_failed_user}";
-        format-ok = "󰄬";
+        format = "󰀦  S:{nr_failed_system} U:{nr_failed_user}";
+        format-ok = "󰄬 ";
         system = true;
         user = true;
       };
@@ -255,7 +255,7 @@
           jq = "${pkgs.jq}/bin/jq";
         in
         {
-          exec = "( ${makoctl} list | ${jq} -e '.data[] | length > 0' >/dev/null && echo '󱅫' ) || echo '󰂚' ";
+          exec = "( ${makoctl} list | ${jq} -e '.data[] | length > 0' >/dev/null && echo '󱅫 ' ) || echo '󰂚 ' ";
           format = "{}";
           on-click = "${makoctl} dismiss -a";
           interval = 3;