manuth/PortValhalla
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Reorder installation steps

Browse source
This commit is contained in:
Manuel Thalmann 2024-07-16 22:15:37 +02:00
parent e2241e6924
commit 6955a140f5
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/Arch/OS/setup.fish
View file

@ -44,7 +44,6 @@ begin
man-pages \ man-pages \
texinfo texinfo
and runHook installDrivers "Installing drivers..." || true
and genfstab -U "$mountDir" >> "$mountDir/etc/fstab" and genfstab -U "$mountDir" >> "$mountDir/etc/fstab"
and arch-chroot "$mountDir" systemctl enable NetworkManager and arch-chroot "$mountDir" systemctl enable NetworkManager
@ -74,9 +73,10 @@ begin
and echo "$ARCH_HOSTNAME" | arch-chroot "$mountDir" tee /etc/hostname > /dev/null and echo "$ARCH_HOSTNAME" | arch-chroot "$mountDir" tee /etc/hostname > /dev/null
and arch-chroot "$mountDir" mkinitcpio -P and arch-chroot "$mountDir" mkinitcpio -P
and arch-chroot "$mountDir" bash "$tempDir/../Software/GRUB/install.sh" and runHook installDrivers "Installing drivers..." || true
and arch-chroot "$mountDir" bash "$tempDir/../Software/sudo/install.sh"
and pacstrap -K "$mountDir" fish jq nix tmux 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" \ and USER_NAME="$USER_NAME" \
USER_DISPLAYNAME="$USER_DISPLAYNAME" \ USER_DISPLAYNAME="$USER_DISPLAYNAME" \

7
scripts/Common/OS/setup.fish
View file

@ -39,9 +39,6 @@ function runSetup
getConfig valhalla.partition.script > "$script" getConfig valhalla.partition.script > "$script"
bash "$script" bash "$script"
and source "$dir/../../copy-repo.fish" "$mountDir$PROJECT_CLONE_ROOT"
and runHook setupOS || true
and runHook autologin || true
# Copy `nixpkgs` channel # Copy `nixpkgs` channel
and begin and begin
@ -50,6 +47,10 @@ function runSetup
cp -r "$channelDir" "$mountDir/$channelDir" cp -r "$channelDir" "$mountDir/$channelDir"
end end
and source "$dir/../../copy-repo.fish" "$mountDir$PROJECT_CLONE_ROOT"
and runHook setupOS || true
and runHook autologin || true
and begin and begin
set -l script (string escape (getCloneFile (getInstallerScript))) set -l script (string escape (getCloneFile (getInstallerScript)))
wrapScript "INSTALLER_SCRIPT=$(string escape "$script") $script" wrapScript "INSTALLER_SCRIPT=$(string escape "$script") $script"