From 080e04e7161ed82842ba9705ddaffcdaa4163877 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Tue, 14 Mar 2023 13:53:12 +0100
Subject: [PATCH] feat(vpn): improve postStart script

---
 system/vpn.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/system/vpn.nix b/system/vpn.nix
index 65d536c..ef7c98e 100644
--- a/system/vpn.nix
+++ b/system/vpn.nix
@@ -15,19 +15,20 @@
     postStart = ''
       while ! ${pkgs.mullvad}/bin/mullvad status >/dev/null; do sleep 1; done
 
-      account="$(<"$CREDENTIALS_DIRECTORY/account")"
-      current_account="$(${pkgs.mullvad}/bin/mullvad account get | grep "account:" | sed 's/.* //')"
-      if [[ "$current_account" != "$account" ]]; then
-        ${pkgs.mullvad}/bin/mullvad account login "$account"
-      fi
-
       ${pkgs.mullvad}/bin/mullvad always-require-vpn set on
+      ${pkgs.mullvad}/bin/mullvad auto-connect set on
       ${pkgs.mullvad}/bin/mullvad dns set default \
         --block-ads --block-trackers --block-malware
       ${pkgs.mullvad}/bin/mullvad lan set allow
       ${pkgs.mullvad}/bin/mullvad tunnel ipv6 set on
       ${pkgs.mullvad}/bin/mullvad relay set tunnel-protocol wireguard
       ${pkgs.mullvad}/bin/mullvad relay set location de dus
+
+      account="$(<"$CREDENTIALS_DIRECTORY/account")"
+      current_account="$(${pkgs.mullvad}/bin/mullvad account get | grep "account:" | sed 's/.* //')"
+      if [[ "$current_account" != "$account" ]]; then
+        ${pkgs.mullvad}/bin/mullvad account login "$account"
+      fi
     '';
   };
 }