From 9c1b81b4f4c91b040b229f4ebcb96f39225f257b Mon Sep 17 00:00:00 2001
From: Manuel Thalmann <m@nuth.ch>
Date: Tue, 16 Jul 2024 15:22:15 +0200
Subject: [PATCH] Implement os setup using a function

---
 scripts/Arch/OS/setup.fish   | 3 ++-
 scripts/Common/OS/setup.fish | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/Arch/OS/setup.fish b/scripts/Arch/OS/setup.fish
index e4ab6112..7620564b 100644
--- a/scripts/Arch/OS/setup.fish
+++ b/scripts/Arch/OS/setup.fish
@@ -2,6 +2,7 @@
 begin
     set -l dir (status dirname)
     set -q CONFIG_MODULE || set -l CONFIG_MODULE "$dir/config.nix"
+    source "$dir/../../Common/OS/setup.fish"
     source "$dir/../../Common/Scripts/config.fish"
 
     set -l mountDir (getConfig valhalla.partition.rootDir)
@@ -108,5 +109,5 @@ begin
         end
     end
 
-    source "$dir/../../Common/OS/setup.fish"
+    runSetup
 end
diff --git a/scripts/Common/OS/setup.fish b/scripts/Common/OS/setup.fish
index c4d50dfa..7482faf0 100644
--- a/scripts/Common/OS/setup.fish
+++ b/scripts/Common/OS/setup.fish
@@ -1,5 +1,5 @@
 #!/bin/env fish
-begin
+function runSetup
     set -l dir (status dirname)
     source "$dir/../Scripts/config.fish"
     source "$dir/../Scripts/hooks.fish"