From 20f04eb4ee99dbe8843aab0eb8949bdcdadf9509 Mon Sep 17 00:00:00 2001
From: unman <unman@thirdeyesecurity.org>
Date: Tue, 13 Feb 2024 15:38:59 +0000
Subject: [PATCH] Mullvad - fix menus. Update Spec.

---
 mullvad.spec                  | 9 +++++++--
 mullvad/clone.sls             | 6 ++----
 mullvad/create_disposable.sls | 3 +++
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/mullvad.spec b/mullvad.spec
index 8909fd4..c9375f0 100644
--- a/mullvad.spec
+++ b/mullvad.spec
@@ -1,5 +1,5 @@
 Name:           3isec-qubes-mullvad-vpn
-Version:       	1.2
+Version:       	2.01
 Release:        1%{?dist}
 Summary:        Set up a Mullvad wireguard proxy in Qubes
 
@@ -58,8 +58,10 @@ cp -rv %{SOURCE0}/setup_MullvadVPN.sh %{buildroot}/usr/bin/setup_MullvadVPN.sh
 
 %post
 if [ $1 -eq 1 ]; then
+  qubesctl state.apply mullvad.clone
+  qubesctl --skip-dom0 --targets=template-mullvad state.apply mullvad.repo
+  qubesctl --skip-dom0 --targets=template-mullvad state.apply mullvad.browser
   qubesctl state.apply mullvad.create
-  qubesctl --skip-dom0 --targets=template-mullvad state.apply mullvad.install
   qubesctl --skip-dom0 --targets=MullvadVPN state.apply mullvad.configure
 fi
 
@@ -71,6 +73,9 @@ if [ $1 -eq 0 ]; then
 fi
 
 %changelog
+* Sat Feb 10 2024 unman <unman@thirdeyesecurity.org> - 2.01
+- Rewrite to use Mullvad GUI for connections
+- Include Mullvad Browser
 * Mon Feb 20 2023 unman <unman@thirdeyesecurity.org> - 1.02
 - Use pillar for cacher to determine repo changes
 * Mon Nov 28 2022 unman <unman@thirdeyesecurity.org> - 1.1
diff --git a/mullvad/clone.sls b/mullvad/clone.sls
index eabdef1..3aef61b 100644
--- a/mullvad/clone.sls
+++ b/mullvad/clone.sls
@@ -11,7 +11,5 @@ mullvad_menu:
   qvm.features:
     - name: template-mullvad
     - set:
-      - menu-items: "start-mullvad-browser.desktop mullvad-vpn.desktop debian-xterm.desktop"
-      - default-menu-items: "start-mullvad-browser.desktop mullvad-vpn.desktop debian-xterm.desktop" 
-
-
+      - menu-items: "mullvad-vpn.desktop start-mullvad-browser.desktop debian-xterm.desktop"
+      - default-menu-items: "mullvad-vpn.desktop start-mullvad-browser.desktop debian-xterm.desktop" 
diff --git a/mullvad/create_disposable.sls b/mullvad/create_disposable.sls
index de01de6..334bc35 100644
--- a/mullvad/create_disposable.sls
+++ b/mullvad/create_disposable.sls
@@ -27,3 +27,6 @@ mullvad-features:
       - menu-items: "start-mullvad-browser.desktop mullvad-vpn.desktop debian-xterm.desktop"
       - appmenus-dispvm: True
 
+'qvm-appmenus --update Mullvad':
+  cmd.run:
+    - runas: user