From ae41ec1cb0a20fb8d344b7f385f5e5f5634545cf Mon Sep 17 00:00:00 2001
From: LMBishop <me@leonardobishop.com>
Date: Wed, 12 Jul 2023 15:02:16 +0100
Subject: Fix fonts

---
 alacritty/alacritty.yml |  8 ++++----
 mako/config             |  2 +-
 swaylock/config         |  2 +-
 waybar/config           | 38 ++++++++++++++++++++++++++++++++------
 waybar/style.css        |  2 +-
 5 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/alacritty/alacritty.yml b/alacritty/alacritty.yml
index d7b569b..c617f68 100644
--- a/alacritty/alacritty.yml
+++ b/alacritty/alacritty.yml
@@ -1,15 +1,15 @@
 font:
   normal:
-    family: Iosevka Term Nerd Font
+    family: Iosevka Nerd Font
     style: Regular
   bold:
-    family: Iosevka Term Nerd Font
+    family: Iosevka Nerd Font
     style: Bold
   italic:
-    family: Iosevka Term Nerd Font
+    family: Iosevka Nerd Font
     style: Italic
   bold_italic:
-    family: Iosevka Term Nerd Font
+    family: Iosevka Nerd Font
     style: Bold Italic
   size: 11
 
diff --git a/mako/config b/mako/config
index 00d7957..35a1d62 100644
--- a/mako/config
+++ b/mako/config
@@ -10,4 +10,4 @@ icon-location=right
 max-icon-size=64
 default-timeout=5000
 ignore-timeout=1
-font=Iosevka Term Nerd Font 12
+font=Iosevka Nerd Font 12
diff --git a/swaylock/config b/swaylock/config
index 49cac89..2296fcd 100644
--- a/swaylock/config
+++ b/swaylock/config
@@ -1,4 +1,4 @@
-font=Iosevka Term Nerd Font
+font=Iosevka Nerd Font
 
 image=/home/leonardo/.config/sway/wallpaper.jpg
 clock
diff --git a/waybar/config b/waybar/config
index ca808f7..1f8d512 100644
--- a/waybar/config
+++ b/waybar/config
@@ -2,7 +2,7 @@
     "height": 30, 
     "spacing": 4, 
     "modules-left": ["sway/workspaces", "sway/mode"],
-    "modules-right": ["tray", "custom/lock", "custom/scratchpad_indicator", "network", "cpu", "memory", "backlight", "pulseaudio", "battery", "clock"],
+    "modules-right": ["tray", "custom/lock", "custom/scratchpad_indicator", "network#vpnovpn", "network#vpnwg", "network#e", "network#wl", "network", "cpu", "memory", "backlight", "pulseaudio", "battery", "clock"],
     "custom/lock": {
         "format": "   ",
         "on-click": "swaylock"
@@ -69,13 +69,39 @@
         "format": "  {used}/{total} GiB"
     },
     "network": {
-        "format-wifi": "  {ipaddr} @ {essid} ({signalStrength}%)",
-        "format-ethernet": "歷 {ipaddr}",
-        "tooltip-format": "  {ifname} via {gwaddr}",
-        "format-linked": "歷 {ifname} (No IP)",
-        "format-disconnected": "歷 Disconnected",
+        "format-disconnected": "󱘖  Disconnected",
+        "format": "",
+        "on-click-right": "alacritty -e /usr/bin/nmtui",
+    },
+    "network#e": {
+        "interface": "e*",
+        "format": "󰈁",
+        "tooltip-format": "{ipaddr}: {ifname} via {gwaddr}",
+        "format-linked": "󰈂 {ifname} (No IP)",
+        "format-alt": "{ifname}: {ipaddr}/{cidr}",
+        "on-click-right": "alacritty -e /usr/bin/nmtui",
+        "format-disconnected": "",
+    },
+    "network#wl": {
+        "interface": "wl*",
+        "format-wifi": "󰖩  {essid} ({signalStrength}%)",
+        "tooltip-format": "{ipaddr}: {ifname} via {gwaddr}",
+        "format-linked": "󰖪  {ifname} (No IP)",
         "format-alt": "{ifname}: {ipaddr}/{cidr}",
         "on-click-right": "alacritty -e /usr/bin/nmtui",
+        "format-disconnected": "",
+    },
+    "network#vpnovpn": {
+        "interface": "tun*",
+        "format": "󰟥 TUN",
+        "format-alt": "{ifname}: {ipaddr}/{cidr}",
+        "format-disconnected": "",
+    },
+    "network#vpnwg": {
+        "interface": "*-wg-*",
+        "format": "󰟥 WG",
+        "format-alt": "{ifname}: {ipaddr}/{cidr}",
+        "format-disconnected": "",
     },
     "pulseaudio": {
         "format": "{icon} {volume}%  {format_source}",
diff --git a/waybar/style.css b/waybar/style.css
index 6f0ea93..0313815 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -1,6 +1,6 @@
 * {
     /* `otf-font-awesome` is required to be installed for icons */
-    font-family: Iosevka Term Nerd Font;
+    font-family: Iosevka Nerd Font;
     font-size: 13px;
 }
 
-- 
cgit v1.2.3-70-g09d2