From 9419bb9bddcf6cfb882f78841d1c29e113155f94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Thu, 27 Jan 2022 16:25:10 +0100
Subject: [PATCH] feat(i3): show which vpn is active

---
 lib/i3status-rust.nix | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/lib/i3status-rust.nix b/lib/i3status-rust.nix
index 189c14b..12ffd5b 100644
--- a/lib/i3status-rust.nix
+++ b/lib/i3status-rust.nix
@@ -121,22 +121,16 @@ in {
         print("🌅 {} 🌇 {} {} {}".format(sun["sunrise"].strftime("%R"), sun["sunset"].strftime("%R"), moon_phases[closest_phase], round(current_phase, 1)))
       '';
     }
-    (let service = "openvpn-hu-berlin"; in {
+    {
       block = "custom";
       interval = 5;
-      command = pkgs.writers.writeDash "net-device" ''
+      command = pkgs.writers.writeDash "hu-berlin-vpn" ''
         PATH=${lib.makeBinPath [ pkgs.systemd ]}
-        systemctl is-active --quiet ${service}.service && echo "🎓👍" || echo "🎓👎"
+        (systemctl is-active --quiet openvpn-hu-berlin.service && echo "🎓👍 (OpenVPN)") \
+          || (systemctl is-active --quiet hu-vpn.service && echo "🎓👍 (PPP+SSL)") \
+          || echo "🎓👎"
       '';
-      on_click = pkgs.writers.writeDash "toggle" ''
-        PATH=${lib.makeBinPath [ pkgs.systemd pkgs.libnotify ]}
-        systemctl is-active --quiet ${service}.service && {
-          systemctl stop ${service}.service && notify-send -a "${service}" stopped
-        } || {
-          systemctl start ${service}.service && notify-send -a "${service}" started
-        }
-      '';
-    })
+    }
     {
       block = "net";
       device = wirelessInterface;