From 86d845768ab82a61f0ecf602f2e903eff5a46bdb Mon Sep 17 00:00:00 2001
From: Manuel Thalmann <m@nuth.ch>
Date: Sun, 28 Jul 2024 23:45:30 +0200
Subject: [PATCH] Allow overwriting packages

---
 scripts/Arch/Scripts/software.fish                   | 12 ++++++++++--
 .../Arch/Software/Virtual Machine Manager/main.fish  |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/scripts/Arch/Scripts/software.fish b/scripts/Arch/Scripts/software.fish
index 2efed161..b6a7cb4e 100755
--- a/scripts/Arch/Scripts/software.fish
+++ b/scripts/Arch/Scripts/software.fish
@@ -3,11 +3,19 @@ begin
     set -l dir (status dirname)
     source "$dir/../../Common/Scripts/software.fish"
 
+    function runYay -d "Run yay with pre-configured defaults"
+        yay --needed --answerclean=None --answerdiff=None -Syu $argv
+    end
+
     function yayinst -d "Install yay-package non-interactively"
-        yay --noconfirm --needed --answerclean=None --answerdiff=None -Syu $argv
+        runYay --noconfirm $argv
+    end
+
+    function runPacman -d "Run pacman with pre-configured defaults"
+        sudo pacman --needed -Syu $argv
     end
 
     function pacinst -d "Install pacman-package non-interactively"
-        sudo pacman --noconfirm --needed -Syu $argv
+        sudo runPacman --noconfirm $argv
     end
 end
diff --git a/scripts/Arch/Software/Virtual Machine Manager/main.fish b/scripts/Arch/Software/Virtual Machine Manager/main.fish
index 4bcff98e..9d803ba1 100755
--- a/scripts/Arch/Software/Virtual Machine Manager/main.fish	
+++ b/scripts/Arch/Software/Virtual Machine Manager/main.fish	
@@ -5,12 +5,12 @@ begin
 
     function installSW
         yayinst qemu-full
+        yes | runPacman --asdeps iptables-nft
 
         yes | yayinst \
             virtiofsd \
             virt-manager \
             dnsmasq \
-            iptables-nft \
             swtpm \
             lxc \
             virt-bootstrap-git