From 6df65d1b9bfd6b332c2825cf635c1327e2194f23 Mon Sep 17 00:00:00 2001
From: John Mertz <git@john.me.tz>
Date: Mon, 12 Sep 2022 11:42:45 -0400
Subject: [PATCH] Stardardize icons more

---
 waybar/config.template |  7 ++++---
 waybar/style.css       | 46 +++++++++++++++++++++++++++++-------------
 2 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/waybar/config.template b/waybar/config.template
index dd3ec9918..f7b1d9b48 100644
--- a/waybar/config.template
+++ b/waybar/config.template
@@ -93,7 +93,7 @@
     "network": {
         // "interface": "wlp58s0", // (Optional) To force the use of this interface
 	"interval": 10,
-	"tooltip": "{ipaddr}",
+	"tooltip-format": "{essid} {ipaddr}",
         "format-ethernet": "",
         "format-wifi": "",
         "format-disconnected": "⛖",
@@ -103,6 +103,7 @@
     "network#wireguard": {
 	"interval": 10,
         "interface": "wg0", // (Optional) To force the use of this interface
+	"tooltip-format": "{ifname} {ipaddr}",
         "tooltip": "{ipaddr}",
         "format": "⚿",
         "format-disconnected": "⚿",
@@ -158,8 +159,8 @@
         "on-click": "${HOME}/scripts/waybar/waybar-audio.sh"
     },
     "tray": {
-        "icon-size": 28,
-        "spacing": 10
+        "icon-size": 24,
+        "spacing": 0
     },
     "custom/todo": {
         "format": "🗈",
diff --git a/waybar/style.css b/waybar/style.css
index 72fd6d0b2..dba380b99 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -62,7 +62,7 @@ window#waybar {
 
 #window, #workspaces, #mode, #mpd, #network, #cpu, #memory, #custom-disk, #temperature, #backlight, #custom-battery, #pulseaudio, #custom-clock, #tray, #custom-todo, #custom-osk, #idle_inhibitor, #custom-power, #custom-weather {
     color: @grey06;
-    padding: 0 5px;
+    padding: 0 3px;
     margin: 0px;
 }
 
@@ -128,12 +128,13 @@ window#waybar {
 
 #network {
     color: @blue;
-    margin-right: -8px;
+    font-size: 24px;
+    margin-right: -4px;
 }
 
 #network.wireguard {
     padding: 0px;
-    margin-right: 0px;
+    margin-right: 4px;
 }
 
 #network.disconnected {
@@ -185,7 +186,7 @@ window#waybar {
 /* Battery */
 
 #custom-battery {
-    color: @yellow;
+    color: @green;
 }
 
 #custom-battery.charging {
@@ -193,6 +194,10 @@ window#waybar {
 }
 
 #custom-battery.discharging {
+    color: @yellow;
+}
+
+#custom-battery.low {
     color: @orange;
 }
 
@@ -215,26 +220,26 @@ window#waybar {
     color: @grey06;
 }
 
-/* Clock */
+/* Tray */
 
-#custom-clock {
-    color: @fg;
+#tray {
+        margin-right: 3px;
 }
 
 /* Todo-txt */
 
 #custom-todo {
-    font-size: 20px;
+    font-size: 40px;
     margin-top: -13px;
-    margin-bottom: -10px;
+    margin-bottom: -9px;
     margin-left: -8px;
-    margin-right: -8px;
+    margin-right: -6px;
 }
 
 /* On-Screen Keyboard */
 
 #custom-osk {
-    font-size: 30px;
+    font-size: 40px;
     margin-top: -13px;
     margin-bottom: -15px;
 }
@@ -249,16 +254,23 @@ window#waybar {
         color: @orange;
 }
 
-/* Gammastep */
+/* Bar locker */
 
-#custom-gammastep.enabled {
-        color: #fefefe;
+#custom-bar {
+    padding: 3px;
+    margin-top: -10px;
 }
 
+/* Gammastep */
+
 #custom-gammastep {
     margin-top: -5px;
 }
 
+#custom-gammastep.enabled {
+        color: #fefefe;
+}
+
 /* Idle Inhibitor */
 
 #idle_inhibitor.activated {
@@ -266,6 +278,12 @@ window#waybar {
     color: @white;
 }
 
+/* Clock */
+
+#custom-clock {
+    color: @fg;
+}
+
 /* Power button */
 
 #custom-power {