From ed049d62ed2bb38537ad2f535dbce72675577e76 Mon Sep 17 00:00:00 2001
From: "flyingscorpio@clevo" <tfranken@protonmail.com>
Date: Fri, 14 Oct 2022 15:21:29 +0200
Subject: [PATCH] Add labels for pub-ip script

---
 roles/i3/files/i3blocksconfig | 10 ++++++----
 roles/i3/files/pub-ip         |  9 ++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/roles/i3/files/i3blocksconfig b/roles/i3/files/i3blocksconfig
index e610c2d..7d36bd1 100644
--- a/roles/i3/files/i3blocksconfig
+++ b/roles/i3/files/i3blocksconfig
@@ -47,20 +47,22 @@ LABEL=
 interval=60
 
 [temperature]
-label=<span foreground='#c7505c'>  </span>
+label=<span foreground='#c7505c'> </span>
 interval=10
 
 [cpu_usage]
 interval=10
-LABEL=<span foreground='#f59335'>  </span>
+LABEL=<span foreground='#f59335'> </span>
 
 [free_disk_space]
 interval=10
-LABEL=<span foreground='#fec7cd'>  </span>
+LABEL=<span foreground='#fec7cd'> </span>
 DISK=$HOME
 
 [pub-ip]
 interval=5
+LABEL_VPN=<span foreground='#8cff8a'>廬 </span>
+LABEL_IP=<span foreground='#8ccaff'> </span>
 
 [battery]
 THRESHOLD=10
@@ -68,7 +70,7 @@ interval=5
 
 [calendar]
 interval=60
-LABEL=<span foreground='#ffca8c'>  </span>
+LABEL=<span foreground='#ffca8c'> </span>
 DATEFMT=+ %a %d %b - %H:%M
 SHORTFMT=+ %d.%m.%Y
 HEIGHT=180
diff --git a/roles/i3/files/pub-ip b/roles/i3/files/pub-ip
index f2156be..5248c6a 100755
--- a/roles/i3/files/pub-ip
+++ b/roles/i3/files/pub-ip
@@ -1,13 +1,12 @@
 #!/bin/bash
 
-CYAN="<span foreground='#8ccaff'>"
-GREEN="<span foreground='#8cff8a'>"
-NC="</span>"
+LABEL_VPN=${LABEL_VPN:-VPN}
+LABEL_IP=${LABEL_IP:-IP}
 
 ip="$(curl ifconfig.me)"
 
 if ip link show tun0 >/dev/null 2>&1; then
-    echo "${GREEN}VPN:${NC} $ip"
+    echo "${LABEL_VPN}$ip"
 else
-    echo "${CYAN}IP:${NC} $ip"
+    echo "${LABEL_IP}$ip"
 fi