[waybar] adapt to parameterised machi_status, use vertical separators, fix some icons

2 files changed, 44 insertions, 23 deletions

diff --git a/waybar/config.jsonc b/waybar/config.jsonc
index 5b86b96..6382e90 100644
--- a/waybar/config.jsonc
+++ b/waybar/config.jsonc
@@ -4,7 +4,10 @@
   "spacing": 0,
   "margin-bottom": 0,
   "modules-left": [
-      "custom/machi"
+      "custom/machi_W",
+      "custom/machi_P",
+      "custom/machi_F",
+      "custom/machi_T"
   ],
   "modules-center": [
   ],
@@ -18,35 +21,44 @@
     "clock",
     "tray",
   ],
-  "custom/machi": {
-    "exec": "machi_status"
+  "custom/machi_W": {
+    "exec": "machi_status W"
+  },
+  "custom/machi_P": {
+    "exec": "machi_status P"
+  },
+  "custom/machi_F": {
+    "exec": "machi_status F"
+  },
+  "custom/machi_T": {
+    "exec": "machi_status T",
   },
   "tray": {
     "icon-size": 32,
     "spacing": 10
   },
   "clock": {
-    "format": "|{:%a %H:%M %d/%m/%Y}",
+    "format": "{:%a %H:%M %d/%m/%Y}",
     "tooltip-format": "<tt><big>{calendar}</big></tt>",
   },
   "temperature": {
     "interval": 10,
     "hwmon-path": "/sys/class/hwmon/hwmon5/temp1_input",
-    "format": "|{temperatureC}°C",
+    "format": "{temperatureC}°C",
     "tooltip": false,
   },
   "backlight": {
-    "format": "|{percent}% {icon}  ",
+    "format": "L{percent}%",
     "format-icons": ["\ue39b", "\ue3c8", "\ue3ca", "\ue3cd", "\ue3ce", "\ue3cf", "\ue3d1", "\ue3d3", "\ue38d"],
     "tooltip": false
   },
   "battery": {
     "interval": 10,
-    "format": "|U{capacity}%",
+    "format": "U{capacity}%",
     "format-plugged": "",
-    "format-not-charging": "|N{capacity}%",
-    "format-discharging": "|D{capacity}% {time}",
-    "format-charging": "|C{capacity}% {time}",
+    "format-not-charging": "N{capacity}%",
+    "format-discharging": "D{capacity}% {time}",
+    "format-charging": "C{capacity}% {time}",
     "format-time": "{H}h{M}m",
   },
   "network#vpn": {
@@ -58,17 +70,17 @@
   },
   "network#wifi": {
     "interface": "wlp1s0",
-    "format": "|W-",
-    "format-wifi": "|W+",
+    "format": "W-",
+    "format-wifi": "W+",
     "tooltip-format": "{essid} @ {ifname}: {ipaddr}/{cidr}",
     "tooltip-format-disconnected": "WIFI DISCONNECTED"
   },
   "pulseaudio": {
     "scroll-step": 1,
-    "format": "|{volume}% {icon} ",
-    "format-bluetooth": "|{volume}% {icon} ",
-    "format-bluetooth-muted": "| {icon} ",
-    "format-muted": "|",
+    "format": "{volume}% {icon} ",
+    "format-bluetooth": "{volume}% {icon} ",
+    "format-bluetooth-muted": "🔇 {icon} ",
+    "format-muted": "🔇",
     "format-source": "",
     "format-source-muted": "",
     "format-icons": {
diff --git a/waybar/style.css b/waybar/style.css
index 1195817..7abaf90 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -5,13 +5,13 @@ window#waybar {
 
 * {
     /* `otf-font-awesome` is required to be installed for icons */
-    font-family: "BQN386 Unicode DZ";
-    /* font-family: "PxPlus IBM VGA 9x16"; */
-    font-size: 26px;
+     font-family: "Crimson Pro";
+     font-family: "Readerly";
+    font-size: 32px;
     padding-top: 0px;
     padding-bottom: 0px;
-    padding-left: 2px;
-    padding-right: 2px;
+    padding-left: 0px;
+    padding-right: 0px;
     min-height: 36px;
     margin: 2px;
     color: black;
@@ -26,8 +26,6 @@ button {
     border-radius: 0;
 }
 
-#custom-machi,
-#network,
 #network.wifi,
 #battery,
 #temperature,
@@ -35,9 +33,20 @@ button {
 #pulseaudio,
 #clock,
 #wireplumber {
+    border-left: 2px solid #000;
+    padding-left: 4px;
+    padding-top: 4px;
 }
 
 
+#custom-machi_W,
+#custom-machi_P,
+#custom-machi_F {
+    border-right: 2px solid #000;
+    padding-right: 4px;
+    padding-top: 4px;
+}
+
 #tray > .passive {
     -gtk-icon-effect: dim;
 }