From 95f75e3e5b2ef2af9dc0fdde8ed06f91025c39fa Mon Sep 17 00:00:00 2001
From: Sravan Balaji <balajsra@umich.edu>
Date: Sat, 28 Sep 2024 11:15:41 -0400
Subject: [PATCH] Fix Waybar Font and Icon Spacing

---
 README.org          | 19 ++++++++++---------
 waybar/config.jsonc | 16 ++++++++--------
 waybar/style.css    |  3 ++-
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/README.org b/README.org
index f9aef5e..efd2ddb 100644
--- a/README.org
+++ b/README.org
@@ -567,7 +567,8 @@ window#waybar {
 .module {
     border-radius: 25px;
     padding: 0px 3px;
-    font-size: 14px;
+    font-size: 15px;
+    font-family: Ubuntu Nerd Font
 }
 #+END_SRC
 
@@ -583,7 +584,7 @@ window#waybar {
         "format": "{icon} {capacity}%",
         "format-icons": ["󰂎", "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"],
         "tooltip": true,
-        "tooltip-format": "󱧥  {timeTo}\n󱐋  {power} W\n󱠴  {cycles}\n󱈏  {health}%",
+        "tooltip-format": "󱧥\t{timeTo}\n󱐋\t{power} W\n󱠴\t{cycles}\n󱈏\t{health}%",
     },
 #+END_SRC
 
@@ -603,7 +604,7 @@ window#waybar {
 #+BEGIN_SRC jsonc :tangle waybar/config.jsonc
     "cpu": {
         "interval": 5,
-        "format": "   {usage}%",
+        "format": " {usage}%",
         "tooltip": true,
     },
 #+END_SRC
@@ -624,7 +625,7 @@ window#waybar {
 #+BEGIN_SRC jsonc :tangle waybar/config.jsonc
     "clock": {
         "interval": 60,
-        "format": "󰥔  {:%H:%M}"
+        "format": "󰥔 {:%H:%M}"
     },
 #+END_SRC
 
@@ -682,7 +683,7 @@ window#waybar {
 #+BEGIN_SRC jsonc :tangle waybar/config.jsonc
     "disk": {
         "interval": 60,
-        "format": "󰋊  {percentage_used}%",
+        "format": "󰋊 {percentage_used}%",
         "tooltip": true,
         "tooltip-format": "Used: {used} ({percentage_used}%)\nFree: {free} ({percentage_free}%)\nTotal: {total}",
     },
@@ -704,7 +705,7 @@ window#waybar {
 #+BEGIN_SRC jsonc :tangle waybar/config.jsonc
     "memory": {
         "interval": 5,
-        "format": "  {percentage}%",
+        "format": " {percentage}%",
         "tooltip": true,
         "tooltip-format": "RAM:\n\tUsed: {used} GiB ({percentage}%)\n\tFree: {avail} GiB\n\tTotal: {total} GiB\nSwap:\n\tUsed: {swapUsed} GiB ({swapPercentage}%)\n\tFree: {swapAvail} GiB\n\tTotal: {swapTotal} GiB",
     },
@@ -726,9 +727,9 @@ window#waybar {
 #+BEGIN_SRC jsonc :tangle waybar/config.jsonc
     "pulseaudio": {
         "interval": 5,
-        "format": "{icon}  {volume}%",
-        "format-bluetooth": "{icon} 󰂯  {volume}%",
-        "format-muted": "󰝟  muted",
+        "format": "{icon} {volume}%",
+        "format-bluetooth": "{icon} 󰂯 {volume}%",
+        "format-muted": "󰝟 muted",
         "format-icons": {
             "hdmi": "󰡁",
             "headset": "󰋎",
diff --git a/waybar/config.jsonc b/waybar/config.jsonc
index c33e510..4dc7df4 100644
--- a/waybar/config.jsonc
+++ b/waybar/config.jsonc
@@ -32,18 +32,18 @@
         "format": "{icon} {capacity}%",
         "format-icons": ["󰂎", "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"],
         "tooltip": true,
-        "tooltip-format": "󱧥  {timeTo}\n󱐋  {power} W\n󱠴  {cycles}\n󱈏  {health}%",
+        "tooltip-format": "󱧥\t{timeTo}\n󱐋\t{power} W\n󱠴\t{cycles}\n󱈏\t{health}%",
     },
 
     "cpu": {
         "interval": 5,
-        "format": "   {usage}%",
+        "format": " {usage}%",
         "tooltip": true,
     },
 
     "clock": {
         "interval": 60,
-        "format": "󰥔  {:%H:%M}"
+        "format": "󰥔 {:%H:%M}"
     },
 
     "dwl/tags": {
@@ -54,23 +54,23 @@
 
     "disk": {
         "interval": 60,
-        "format": "󰋊  {percentage_used}%",
+        "format": "󰋊 {percentage_used}%",
         "tooltip": true,
         "tooltip-format": "Used: {used} ({percentage_used}%)\nFree: {free} ({percentage_free}%)\nTotal: {total}",
     },
 
     "memory": {
         "interval": 5,
-        "format": "  {percentage}%",
+        "format": " {percentage}%",
         "tooltip": true,
         "tooltip-format": "RAM:\n\tUsed: {used} GiB ({percentage}%)\n\tFree: {avail} GiB\n\tTotal: {total} GiB\nSwap:\n\tUsed: {swapUsed} GiB ({swapPercentage}%)\n\tFree: {swapAvail} GiB\n\tTotal: {swapTotal} GiB",
     },
 
     "pulseaudio": {
         "interval": 5,
-        "format": "{icon}  {volume}%",
-        "format-bluetooth": "{icon} 󰂯  {volume}%",
-        "format-muted": "󰝟  muted",
+        "format": "{icon} {volume}%",
+        "format-bluetooth": "{icon} 󰂯 {volume}%",
+        "format-muted": "󰝟 muted",
         "format-icons": {
             "hdmi": "󰡁",
             "headset": "󰋎",
diff --git a/waybar/style.css b/waybar/style.css
index ce2bed0..a6cb024 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -5,7 +5,8 @@ window#waybar {
 .module {
     border-radius: 25px;
     padding: 0px 3px;
-    font-size: 14px;
+    font-size: 15px;
+    font-family: Ubuntu Nerd Font
 }
 
 #battery {