From 772b7adc0bf92a59b44e5fb41aab7d8f27c3b030 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Fri, 1 Nov 2024 01:40:16 +0100 Subject: [PATCH] Store nix version in common config file --- archiso/scripts/build.fish | 2 +- scripts/Common/OS/install.fish | 2 +- scripts/config.fish | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 scripts/config.fish diff --git a/archiso/scripts/build.fish b/archiso/scripts/build.fish index 344a04ca..143d1a63 100755 --- a/archiso/scripts/build.fish +++ b/archiso/scripts/build.fish @@ -1,6 +1,6 @@ #!/bin/env fish begin - set -l nixVersion nixos-24.05 + source "$(status dirname)/../../scripts/config.fish" set -l projectName archiso-valhalla set -l overlayDir (mktemp -d) set -l upperDir (mktemp -d) diff --git a/scripts/Common/OS/install.fish b/scripts/Common/OS/install.fish index e1f63b6c..935530a5 100755 --- a/scripts/Common/OS/install.fish +++ b/scripts/Common/OS/install.fish @@ -5,7 +5,7 @@ source "$dir/../Scripts/settings.fish" source "$dir/../Scripts/hooks.fish" if [ (id -u) -eq 0 ] - set -l nixVersion nixos-24.05 + source "$dir/../../config.fish" set -l sudoConfig "/etc/sudoers.d/PortValhalla" set -l channelDir /nix/var/nix/profiles/per-user/root/channels/nixpkgs rm ~/.bash_profile diff --git a/scripts/config.fish b/scripts/config.fish new file mode 100644 index 00000000..42442e2c --- /dev/null +++ b/scripts/config.fish @@ -0,0 +1 @@ +set nixVersion nixos-24.05