Reorder installation steps

This commit is contained in:
Manuel Thalmann 2024-07-16 22:15:37 +02:00
commit 6955a140f5
2 changed files with 7 additions and 6 deletions
scripts/Common/OS

View file

@ -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"