From 69cbbf983484005d519341702e1d7faa7ac7dc41 Mon Sep 17 00:00:00 2001
From: Manuel Thalmann <m@nuth.ch>
Date: Mon, 30 Sep 2024 14:56:49 +0200
Subject: [PATCH] Inherit `mountDir` from setup script

---
 scripts/Arch/OS/setup.fish | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/scripts/Arch/OS/setup.fish b/scripts/Arch/OS/setup.fish
index 29c53e7b..3f851f6a 100755
--- a/scripts/Arch/OS/setup.fish
+++ b/scripts/Arch/OS/setup.fish
@@ -4,17 +4,15 @@ begin
     source "$dir/../../Common/OS/setup.fish"
     source "$dir/../../Common/Scripts/config.fish"
 
-    set -l mountDir (getOSConfig partition.rootDir)
-
     function runChroot -S
         arch-chroot $argv
     end
 
-    function installValhallaDeps -V mountDir
+    function installValhallaDeps -S
         pacstrap -K "$mountDir" fish git jq nix sudo tmux
     end
 
-    function installDrivers -V mountDir
+    function installDrivers -S
         if isOSEnabled hardware.surfaceBook
             pacstrap -K "$mountDir" linux-firmware-marvell;
         end
@@ -24,7 +22,7 @@ begin
         echo "$dir/install.fish"
     end
 
-    function setupOS -S -V dir -V mountDir
+    function setupOS -S -V dir -S
         source "$dir/../../Common/Scripts/hooks.fish"
         source "$dir/../../Common/Scripts/wait-network.fish"