From 4fe33b7e8012ac238e2d0dfeecdb05f5ab149e51 Mon Sep 17 00:00:00 2001
From: Natsu Kagami <nki@nkagami.me>
Date: Sat, 14 Sep 2024 15:57:59 +0300
Subject: [PATCH] Use new vpn format

---
 home/modules/programs/openconnect-epfl.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/home/modules/programs/openconnect-epfl.nix b/home/modules/programs/openconnect-epfl.nix
index 228660b..85d5601 100644
--- a/home/modules/programs/openconnect-epfl.nix
+++ b/home/modules/programs/openconnect-epfl.nix
@@ -4,13 +4,15 @@ let
     name = "openconnect-epfl";
     runtimeInputs = with pkgs; [ openconnect rbw ];
     text = ''
-      GASPAR_PASSWORD=$(rbw get gaspar)
-      GASPAR_TOKEN=$(rbw code gaspar)
+      METHOD="Microsoft Entra ID"
+      RBW_ENTRY="EPFL Microsoft Auth"
+      GASPAR_PASSWORD=$(rbw get "$RBW_ENTRY")
+      GASPAR_TOKEN=$(rbw code "$RBW_ENTRY")
 
-      printf "%s\n%s\n" "$GASPAR_PASSWORD" "$GASPAR_TOKEN" | sudo openconnect \
+      printf "\n%s\n%s\n%s\n" "$METHOD" "$GASPAR_PASSWORD" "$GASPAR_TOKEN" | command sudo openconnect \
           --passwd-on-stdin \
-          -u pham \
-           --useragent='AnyConnect' \
+          -u "pham" \
+          --useragent='AnyConnect' \
           "https://vpn.epfl.ch"
     '';
   };