From a20260f3e5b19cd1abcbefc883678bc7ab4daded Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Thu, 12 Sep 2024 21:44:14 +0200 Subject: [PATCH] Use common script for Arch installation --- profiles/machines/manuel/DerGeret/Arch/setup.fish | 4 ---- scripts/Arch/OS/setup.fish | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/profiles/machines/manuel/DerGeret/Arch/setup.fish b/profiles/machines/manuel/DerGeret/Arch/setup.fish index f6ddde5f..7a60e020 100755 --- a/profiles/machines/manuel/DerGeret/Arch/setup.fish +++ b/profiles/machines/manuel/DerGeret/Arch/setup.fish @@ -2,10 +2,6 @@ begin set -l dir (status dirname) - function getInstallerScript -V dir -S - echo "$dir/install.fish" - end - CONFIG_NAME="DerGeret" \ ARCH_HOSTNAME="der-geret" \ USER_DISPLAYNAME="Manuel Thalmann" \ diff --git a/scripts/Arch/OS/setup.fish b/scripts/Arch/OS/setup.fish index 494c4705..2eede699 100755 --- a/scripts/Arch/OS/setup.fish +++ b/scripts/Arch/OS/setup.fish @@ -14,6 +14,10 @@ begin pacstrap -K "$mountDir" fish jq nix tmux end + function getInstallerScript -V dir -S + echo "$dir/install.fish" + end + function setupOS -S -V dir -V mountDir source "$dir/../../Common/Scripts/hooks.fish" source "$dir/../../Common/Scripts/wait-network.fish"