1 files changed, 11 insertions, 14 deletions

diff --git a/common/modules/mango/waybar.nix b/common/modules/mango/waybar.nix
index 54d9e59..7b8a26a 100644
--- a/common/modules/mango/waybar.nix
+++ b/common/modules/mango/waybar.nix
@@ -121,7 +121,7 @@ in
 
         network = {
           interval = 2;
-          format-wifi = "  {essid} ({signalStrength}%)";
+          format-wifi = " {essid} ({signalStrength}%)";
           format-ethernet = "󰈀 {ifname}";
           format-linked = " No IP ({ifname})";
           format-disconnected = " Disconnected";
@@ -131,8 +131,8 @@ in
 
         clock = {
           # format = "{:%H:%M} "; # 24 hrs
-          format = "{:%I:%M %p} ";
-          format-alt = "{:%A, %b %d} ";
+          format = "{:%I:%M %p}";
+          format-alt = " {:%A, %b %d}";
           tooltip-format = "{:%Y}";
           calendar = {
             mode = "year";
@@ -153,7 +153,6 @@ in
           format = "{icon} {volume}%";
           tooltip = false;
           format-muted = " Muted";
-          format-bluetooth = " {volume}%";
           format-bluetooth-muted = " Muted";
           on-click = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
           on-scroll-up = "wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 2%+";
@@ -169,7 +168,7 @@ in
             default = [
               ""
               ""
-              " "
+              ""
             ];
           };
           ignored-sinks = [ "Easy Effects Sink" ];
@@ -196,11 +195,11 @@ in
           format = "{icon}";
           tooltip-format = "Power profile: {profile}\nDriver: {driver}";
           tooltip = true;
-          format-icons = {
-            default = "NIGGA";
-            performance = "PERF";
-            balanced = "BAL";
-            power-saver = "LOW";
+          "format-icons" = {
+            default = "";
+            performance = "";
+            balanced = "";
+            power-saver = "";
           };
         };
 
@@ -275,7 +274,7 @@ in
     style = ''
       * {
         border: none;
-        font-family: "JetBrainsMono Nerd Font", monospace;
+        font-family: "JetBrainsMono Nerd Font Propo", monospace;
         font-weight: 700;
         font-size: 14px;
         min-height: 0;
@@ -484,10 +483,8 @@ in
       }
 
       #custom-power {
-        border-left: 0px;
-        margin-left: 0px;
+        margin-left: 4px;
         margin-right: 5px;
-        padding-right: 14px;
       }
 
       #workspaces button.active,