Install valhalla dependencies during setup
This commit is contained in:
parent
d5ffcf2a69
commit
1e330e0cc5
2 changed files with 13 additions and 3 deletions
|
@ -24,13 +24,15 @@ begin
|
||||||
end
|
end
|
||||||
|
|
||||||
function initOS -V dir
|
function initOS -V dir
|
||||||
|
source "$dir/../lib/dependencies.fish"
|
||||||
source "$dir/../../lib/wait-network.fish"
|
source "$dir/../../lib/wait-network.fish"
|
||||||
|
set -l mountDir (getOSConfig partition.rootDir)
|
||||||
|
|
||||||
waitNetwork
|
waitNetwork
|
||||||
and pacman-key --init
|
and pacman-key --init
|
||||||
and pacman-key --populate
|
and pacman-key --populate
|
||||||
|
|
||||||
and pacstrap -K (getOSConfig partition.rootDir) \
|
and pacstrap -K "$mountDir" \
|
||||||
base \
|
base \
|
||||||
linux \
|
linux \
|
||||||
linux-firmware \
|
linux-firmware \
|
||||||
|
@ -38,6 +40,8 @@ begin
|
||||||
man-db \
|
man-db \
|
||||||
man-pages \
|
man-pages \
|
||||||
texinfo
|
texinfo
|
||||||
|
|
||||||
|
installValhallaDeps "$mountDir"
|
||||||
end
|
end
|
||||||
|
|
||||||
function setupOS -S -V dir -S
|
function setupOS -S -V dir -S
|
||||||
|
|
|
@ -1,5 +1,11 @@
|
||||||
function installValhallaDeps -V dir
|
function installValhallaDeps -V dir -a mountDir
|
||||||
source "$dir/../lib/software.fish"
|
source "$dir/../lib/software.fish"
|
||||||
and pacinst fish git jq nix sudo tmux
|
set -l args
|
||||||
|
|
||||||
|
if [ -n "$mountDir" ]
|
||||||
|
set -a args --mnt "$mountDir"
|
||||||
|
end
|
||||||
|
|
||||||
|
and pacinst $args fish git jq nix sudo tmux
|
||||||
sudo systemctl enable --now nix-daemon
|
sudo systemctl enable --now nix-daemon
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue