Initialize installer properly

This commit is contained in:
Manuel Thalmann 2024-11-03 22:32:47 +01:00
parent ae426292a9
commit 3f507b60f3

View file

@ -4,7 +4,9 @@ function runAction -V dir
source "$dir/hooks.fish" source "$dir/hooks.fish"
source "$dir/nix.fish" source "$dir/nix.fish"
source "$dir/settings.fish" source "$dir/settings.fish"
echo "Preparing nix..." echo "Installing dependencies..."
and runHook --force installValhallaDeps 'Please set up a function `installValhallaDeps` for installing `fish`, `git`, `jq`, `nix`, `sudo` and `tmux`.'
and echo "Preparing nix..."
and runHook prepareNix || installNixPkgs and runHook prepareNix || installNixPkgs
if [ -z "$CONFIG_NAME" ] if [ -z "$CONFIG_NAME" ]
@ -13,8 +15,6 @@ function runAction -V dir
end end
and runHook prepareAction || true and runHook prepareAction || true
and echo "Installing dependencies..."
and runHook --force installValhallaDeps 'Please set up a function `installValhallaDeps` for installing `fish`, `git`, `jq`, `nix`, `sudo` and `tmux`.'
echo "Flagging repository as safe..." echo "Flagging repository as safe..."
git config --system --add safe.directory (realpath "$(status dirname)/../..") git config --system --add safe.directory (realpath "$(status dirname)/../..")