Compare commits
2 commits
133f2ce61e
...
f74e1d681c
Author | SHA1 | Date | |
---|---|---|---|
f74e1d681c | |||
782155798f |
1 changed files with 2 additions and 12 deletions
|
@ -11,8 +11,6 @@ function runSetup
|
||||||
source "$dir/../../lib/restoration.fish"
|
source "$dir/../../lib/restoration.fish"
|
||||||
source "$dir/../../lib/settings.fish"
|
source "$dir/../../lib/settings.fish"
|
||||||
set -l mountDir (getOSConfig partition.rootDir)
|
set -l mountDir (getOSConfig partition.rootDir)
|
||||||
set -l script (mktemp)
|
|
||||||
chmod +x "$script"
|
|
||||||
|
|
||||||
if not type -q runChroot
|
if not type -q runChroot
|
||||||
function runChroot -S
|
function runChroot -S
|
||||||
|
@ -79,18 +77,10 @@ function runSetup
|
||||||
end | runChroot "$mountDir" tee /root/.bash_profile >/dev/null
|
end | runChroot "$mountDir" tee /root/.bash_profile >/dev/null
|
||||||
end
|
end
|
||||||
|
|
||||||
function prepareNix -V dir
|
|
||||||
source "$dir/../../lib/nix.fish"
|
|
||||||
source "$dir/../../lib/settings.fish"
|
|
||||||
set -l mountDir (getOSConfig partition.rootDir)
|
|
||||||
|
|
||||||
# Copy `nixpkgs` channel
|
|
||||||
mkdir -p (dirname "$mountDir/$nixPkgsDir")
|
|
||||||
cp -r "$nixPkgsDir" "$mountDir/$nixPkgsDir"
|
|
||||||
end
|
|
||||||
|
|
||||||
function actionPreRun
|
function actionPreRun
|
||||||
|
set -l script (mktemp)
|
||||||
echo "Partitioning drives..."
|
echo "Partitioning drives..."
|
||||||
|
chmod +x "$script"
|
||||||
and getOSConfig partition.script >"$script"
|
and getOSConfig partition.script >"$script"
|
||||||
and "$script"
|
and "$script"
|
||||||
and rm "$script"
|
and rm "$script"
|
||||||
|
|
Loading…
Reference in a new issue