diff --git a/archiso/airootfs/root/.config/nix/nix.conf b/archiso/airootfs/root/.config/nix/nix.conf deleted file mode 100644 index bff21ce5..00000000 --- a/archiso/airootfs/root/.config/nix/nix.conf +++ /dev/null @@ -1 +0,0 @@ -extra-experimental-features = nix-command flakes diff --git a/scripts/Arch/OS/setup.fish b/scripts/Arch/OS/setup.fish index d3c71640..3b94e5b7 100644 --- a/scripts/Arch/OS/setup.fish +++ b/scripts/Arch/OS/setup.fish @@ -87,7 +87,6 @@ begin and arch-chroot "$mountDir" mkinitcpio -P and runHook installDrivers "Installing drivers..." || true - and runInOS fish "$tempDir/../../Common/Software/nix/main.fish" configure user and arch-chroot "$mountDir" bash "$tempDir/../Software/sudo/install.sh" and runInOS fish "$tempDir/../Software/GRUB/main.fish" diff --git a/scripts/Common/OS/install.fish b/scripts/Common/OS/install.fish index 097936bb..6f2c5ed7 100644 --- a/scripts/Common/OS/install.fish +++ b/scripts/Common/OS/install.fish @@ -3,12 +3,7 @@ set -l dir (status dirname) source "$dir/../Scripts/config.fish" source "$dir/../Scripts/hooks.fish" -function configureNix -V dir - source "$dir/../Software/nix/main.fish" configure user -end - if [ (id -u) -eq 0 ] - configureNix set -l name (getConfig valhalla.setupUser.name) set -l sudoConfig "/etc/sudoers.d/PortValhalla" @@ -32,7 +27,6 @@ if [ (id -u) -eq 0 ] rm "$sudoConfig" userdel -r "$name" else - configureNix source "$dir/../Software/bash/main.fish" runHook initialize || true runHook installDrivers || true diff --git a/scripts/Common/Scripts/eval-module.fish b/scripts/Common/Scripts/eval-module.fish index 9d95a9df..37056d8d 100644 --- a/scripts/Common/Scripts/eval-module.fish +++ b/scripts/Common/Scripts/eval-module.fish @@ -8,7 +8,7 @@ function evalModule --argument-names modulePath property FILE=(realpath "$modulePath") \ PROPERTY="$property" \ - nix eval \ + nix eval --extra-experimental-features "nix-command flakes" \ --file "$(status dirname)/../../../lib/eval-module.nix" \ $argv end diff --git a/scripts/Common/Software/nix/main.fish b/scripts/Common/Software/nix/main.fish index 3b82f530..bba7c6f7 100644 --- a/scripts/Common/Software/nix/main.fish +++ b/scripts/Common/Software/nix/main.fish @@ -8,11 +8,5 @@ begin sudo nix-channel --update end - function userConfig -S -V dir -a name - set -l configFile ~"$name"/.config/nix/nix.conf - mkdir -p (dirname "$configFile") - cp "$dir/../../../../archiso/airootfs/root/.config/nix/nix.conf" "$configFile" - end - runInstaller $argv end