diff --git a/scripts/Arch/OS/setup.fish b/scripts/Arch/OS/setup.fish index 72d88248..44565f06 100755 --- a/scripts/Arch/OS/setup.fish +++ b/scripts/Arch/OS/setup.fish @@ -10,12 +10,12 @@ begin end function bootstrapSetup -S - pacstrap -K (getOSConfig partition.rootDir) fish + pacstrap -K (getOSConfig fileSystems.rootDir) fish end function installDrivers -S if isOSEnabled hardware.surfaceBook - pacstrap -K (getOSConfig partition.rootDir) linux-firmware-marvell + pacstrap -K (getOSConfig fileSystems.rootDir) linux-firmware-marvell end end @@ -26,7 +26,7 @@ begin function initOS -V dir source "$dir/../lib/dependencies.fish" source "$dir/../../lib/wait-network.fish" - set -l mountDir (getOSConfig partition.rootDir) + set -l mountDir (getOSConfig fileSystems.rootDir) waitNetwork and pacman-key --init @@ -47,7 +47,7 @@ begin function setupOS -S -V dir -S source "$dir/../../lib/hooks.fish" source "$dir/../../lib/wait-network.fish" - set -l mountDir (getOSConfig partition.rootDir) + set -l mountDir (getOSConfig fileSystems.rootDir) waitNetwork and begin @@ -108,7 +108,7 @@ begin end function autologin -S - set -l mountDir (getOSConfig partition.rootDir) + set -l mountDir (getOSConfig fileSystems.rootDir) set -l file "/etc/systemd/system/getty@tty1.service.d/autologin.conf" arch-chroot "$mountDir" mkdir -p (dirname "$file") diff --git a/scripts/Common/OS/setup.fish b/scripts/Common/OS/setup.fish index 30802010..962d32ec 100755 --- a/scripts/Common/OS/setup.fish +++ b/scripts/Common/OS/setup.fish @@ -11,7 +11,7 @@ function runSetup source "$dir/../../lib/nix.fish" source "$dir/../../lib/restoration.fish" source "$dir/../../lib/settings.fish" - set -l mountDir (getOSConfig partition.rootDir) + set -l mountDir (getOSConfig fileSystems.rootDir) if not type -q runChroot function runChroot -S @@ -45,7 +45,7 @@ function runSetup begin set -l script (mktemp) chmod +x "$script" - and getOSConfig partition.script >"$script" + and getOSConfig fileSystems.script >"$script" and "$script" and rm "$script" end