diff --git a/scripts/Arch/OS/setup.fish b/scripts/Arch/OS/setup.fish
index 9d32767d..e14bef49 100644
--- a/scripts/Arch/OS/setup.fish
+++ b/scripts/Arch/OS/setup.fish
@@ -48,7 +48,6 @@ begin
                 man-pages \
                 texinfo
 
-            and runHook installDrivers "Installing drivers..." || true
             and genfstab -U "$mountDir" >> "$mountDir/etc/fstab"
             and arch-chroot "$mountDir" systemctl enable NetworkManager
 
@@ -82,9 +81,10 @@ begin
             and echo "$ARCH_HOSTNAME" | arch-chroot "$mountDir" tee /etc/hostname > /dev/null
             
             and arch-chroot "$mountDir" mkinitcpio -P
-            and arch-chroot "$mountDir" bash "$tempDir/../Software/GRUB/install.sh"
-            and arch-chroot "$mountDir" bash "$tempDir/../Software/sudo/install.sh"
+            and runHook installDrivers "Installing drivers..." || true
             and pacstrap -K "$mountDir" fish jq nix tmux
+            and arch-chroot "$mountDir" bash "$tempDir/../Software/sudo/install.sh"
+            and arch-chroot "$mountDir" bash "$tempDir/../Software/GRUB/install.sh"
 
             and USER_NAME="$USER_NAME" \
             USER_DISPLAYNAME="$USER_DISPLAYNAME" \
diff --git a/scripts/Common/OS/setup.fish b/scripts/Common/OS/setup.fish
index 93a3bd90..20eb8294 100644
--- a/scripts/Common/OS/setup.fish
+++ b/scripts/Common/OS/setup.fish
@@ -39,9 +39,6 @@ function runSetup
 
     getConfig valhalla.partition.script > "$script"
     bash "$script"
-    and source "$dir/../../copy-repo.fish" "$mountDir$PROJECT_CLONE_ROOT"
-    and runHook setupOS || true
-    and runHook autologin || true
 
     # Copy `nixpkgs` channel
     and begin
@@ -50,6 +47,10 @@ function runSetup
         cp -r "$channelDir" "$mountDir/$channelDir"
     end
 
+    and source "$dir/../../copy-repo.fish" "$mountDir$PROJECT_CLONE_ROOT"
+    and runHook setupOS || true
+    and runHook autologin || true
+
     and begin
         set -l script (string escape (getCloneFile (getInstallerScript)))
         wrapScript "INSTALLER_SCRIPT=$(string escape "$script") $script"