Remove necessity of nix config

This commit is contained in:
Manuel Thalmann 2024-07-20 13:54:04 +02:00
parent aa2e535968
commit c1f296a7ce
5 changed files with 1 additions and 15 deletions

View file

@ -1 +0,0 @@
extra-experimental-features = nix-command flakes

View file

@ -79,7 +79,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"

View file

@ -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

View file

@ -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

View file

@ -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