From 7ea2b3952affc0a342c64bb9ff932d7ec478a650 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Thu, 5 Dec 2024 14:13:52 +0100 Subject: [PATCH] Install `nixpkgs` during setup --- scripts/Common/OS/setup.fish | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/Common/OS/setup.fish b/scripts/Common/OS/setup.fish index ccb54d45..f7a1719b 100755 --- a/scripts/Common/OS/setup.fish +++ b/scripts/Common/OS/setup.fish @@ -8,6 +8,7 @@ function runSetup function setupAction -V dir -V projectRoot -V PROJECT_CLONE_ROOT source "$dir/../../lib/hooks.fish" + source "$dir/../../lib/nix.fish" source "$dir/../../lib/restoration.fish" source "$dir/../../lib/settings.fish" set -l mountDir (getOSConfig partition.rootDir) @@ -59,6 +60,8 @@ function runSetup and echo "Cloning project..." and source "$dir/../../lib/copy-repo.fish" "$mountDir$PROJECT_CLONE_ROOT" + and mkdir -p "$mountDir/$nixPkgsDir" + and cp -r "$nixPkgsDir"/* "$mountDir/$nixPkgsDir" 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 runHook --force bootstrapSetup "Please set up a function `bootstrapSetup` for installing `fish` into the "