Compare commits
2 commits
ce0b241e50
...
1e330e0cc5
Author | SHA1 | Date | |
---|---|---|---|
1e330e0cc5 | |||
d5ffcf2a69 |
3 changed files with 14 additions and 4 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
|
||||||
|
|
|
@ -59,7 +59,7 @@ function runSetup
|
||||||
|
|
||||||
and echo "Cloning project..."
|
and echo "Cloning project..."
|
||||||
and source "$dir/../../lib/copy-repo.fish" "$mountDir$PROJECT_CLONE_ROOT"
|
and source "$dir/../../lib/copy-repo.fish" "$mountDir$PROJECT_CLONE_ROOT"
|
||||||
and runHook initOS "Please set up a function `initOS` for initializing the mounted OS"
|
and runHook initOS "Please set up a function `initOS` for initializing the mounted OS and installing valhalla dependencies"
|
||||||
and runChroot "$mountDir" git config --system --add safe.directory "$PROJECT_CLONE_ROOT"
|
and runChroot "$mountDir" git config --system --add safe.directory "$PROJECT_CLONE_ROOT"
|
||||||
and runHook --force bootstrapSetup "Please set up a function `bootstrapSetup` for installing `fish` into the "
|
and runHook --force bootstrapSetup "Please set up a function `bootstrapSetup` for installing `fish` into the "
|
||||||
and runHook setupOS
|
and runHook setupOS
|
||||||
|
|
Loading…
Reference in a new issue