[waybar] switch to nerdfont glyphs for proper rendering

3 files changed, 53 insertions, 42 deletions

diff --git a/waybar/config.jsonc b/waybar/config.jsonc
index f8c7426..20e1def 100644
--- a/waybar/config.jsonc
+++ b/waybar/config.jsonc
@@ -78,20 +78,20 @@
   },
   "pulseaudio": {
     "scroll-step": 1,
-    "format": "{volume}% {icon} ",
-    "format-bluetooth": "{volume}% {icon} ",
-    "format-bluetooth-muted": "🔇 {icon} ",
-    "format-muted": "🔇",
-    "format-source": "",
-    "format-source-muted": "",
+    "format": "{volume}% {icon} {format_source}",
+    "format-bluetooth": "{volume}% {icon} \uF294 {format_source}",
+    "format-bluetooth-muted": "\uF026 {icon} \uF294 {format_source}",
+    "format-muted": "\uF026 {format_source}",
+    "format-source": "\uF130",
+    "format-source-muted": "\uF131",
     "format-icons": {
-      "headphone": "",
-      "hands-free": "",
-      "headset": "",
-      "phone": "",
-      "portable": "",
-      "car": "",
-      "default": ["", "", ""]
+        "headphone": "\uF025",
+        "hands-free": "\uF2A0",
+        "headset": "\uEE59",
+        "phone": "\uF095",
+        "portable": "\uF10B",
+        "car": "\uF1B9",
+        "default": ["\uF026", "\uF027", "\uF028"]
     },
     "on-click": "pavucontrol"
   }
diff --git a/waybar/config.jsonc.desktop b/waybar/config.jsonc.desktop
index b43183e..48bf46c 100644
--- a/waybar/config.jsonc.desktop
+++ b/waybar/config.jsonc.desktop
@@ -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,17 +21,26 @@
     "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",
   },
   "mpd": {
-    "format": "| {stateIcon} {title}",
+    "format": "{stateIcon} {title}",
     "format-stopped": "",
     "tooltip-format": "{title} - {album} - {artist}",
     "state-icons": {
-      "playing": "▶️",
-      "paused": "⏸️",
-      "stopped": "⯀",
+      "playing": "\uf04b",
+      "paused": "\uf04c",
+      "stopped": "\uf04d",
     },
   },
   "tray": {
@@ -36,46 +48,47 @@
     "spacing": 10
   },
   "clock": {
-    "format": "| {:%a %H:%M:%S %d/%m/%Y}",
+    "format": "{:%a %H:%M:%S %d/%m/%Y}",
     "tooltip-format": "<tt><big>{calendar}</big></tt>",
     "interval": 1,
   },
   "temperature": {
     "interval": 3,
     "hwmon-path": "/sys/class/hwmon/hwmon3/temp1_input",
-    "format": "| CPU {temperatureC}°C",
+    "format": "CPU {temperatureC}°C",
   },
   "custom/gpu": {
     "exec": "nvidia-smi --query-gpu temperature.gpu --format=csv,noheader",
-    "format": "| GPU {text}°C",
+    "format": "GPU {text}°C",
     "interval": 3,
   },
   "network#vpn": {
     "interface": "wg0-mullvad",
-    "format-disconnected": "| VPN ⚠",
-    "format": "",
+    "format-disconnected": "V-",
+    "format": "V+",
+    "on-click": "mullvad reconnect",
   },
   "network#eth": {
     "interface": "eno1",
-    "format-disconnected": "| ETH ⚠",
+    "format-disconnected": "E-",
     "format": "",
   },
   "pulseaudio": {
     "scroll-step": 1,
-    "format": "| {volume}% {icon} {format_source}",
-    "format-bluetooth": "{volume}% {icon} {format_source}",
-    "format-bluetooth-muted": " {icon} {format_source}",
-    "format-muted": " {format_source}",
-    "format-source": "",
-    "format-source-muted": "",
+    "format": "{volume}% {icon} {format_source}",
+    "format-bluetooth": "{volume}% {icon} \uF294 {format_source}",
+    "format-bluetooth-muted": "\uF026 {icon} \uF294 {format_source}",
+    "format-muted": "\uF026 {format_source}",
+    "format-source": "\uF130",
+    "format-source-muted": "\uF131",
     "format-icons": {
-      "headphone": "",
-      "hands-free": "",
-      "headset": "",
-      "phone": "",
-      "portable": "",
-      "car": "",
-      "default": ["", "", ""]
+        "headphone": "\uF025",
+        "hands-free": "\uF2A0",
+        "headset": "\uEE59",
+        "phone": "\uF095",
+        "portable": "\uF10B",
+        "car": "\uF1B9",
+        "default": ["\uF026", "\uF027", "\uF028"]
     },
     "on-click": "pavucontrol"
   }
diff --git a/waybar/style.css b/waybar/style.css
index 17eec0b..2c264ff 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -4,9 +4,7 @@ window#waybar {
 }
 
 * {
-    /* `otf-font-awesome` is required to be installed for icons */
-     font-family: "Crimson Pro";
-     font-family: "Readerly";
+    font-family: "Readerly", "Symbols Nerd Font";
     font-size: 32px;
     padding-top: 0px;
     padding-bottom: 0px;