Remove necessity of nix
config
This commit is contained in:
parent
aa2e535968
commit
c1f296a7ce
|
@ -1 +0,0 @@
|
||||||
extra-experimental-features = nix-command flakes
|
|
|
@ -79,7 +79,6 @@ begin
|
||||||
|
|
||||||
and arch-chroot "$mountDir" mkinitcpio -P
|
and arch-chroot "$mountDir" mkinitcpio -P
|
||||||
and runHook installDrivers "Installing drivers..." || true
|
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 arch-chroot "$mountDir" bash "$tempDir/../Software/sudo/install.sh"
|
||||||
and runInOS fish "$tempDir/../Software/GRUB/main.fish"
|
and runInOS fish "$tempDir/../Software/GRUB/main.fish"
|
||||||
|
|
||||||
|
|
|
@ -3,12 +3,7 @@ set -l dir (status dirname)
|
||||||
source "$dir/../Scripts/config.fish"
|
source "$dir/../Scripts/config.fish"
|
||||||
source "$dir/../Scripts/hooks.fish"
|
source "$dir/../Scripts/hooks.fish"
|
||||||
|
|
||||||
function configureNix -V dir
|
|
||||||
source "$dir/../Software/nix/main.fish" configure user
|
|
||||||
end
|
|
||||||
|
|
||||||
if [ (id -u) -eq 0 ]
|
if [ (id -u) -eq 0 ]
|
||||||
configureNix
|
|
||||||
set -l name (getConfig valhalla.setupUser.name)
|
set -l name (getConfig valhalla.setupUser.name)
|
||||||
set -l sudoConfig "/etc/sudoers.d/PortValhalla"
|
set -l sudoConfig "/etc/sudoers.d/PortValhalla"
|
||||||
|
|
||||||
|
@ -32,7 +27,6 @@ if [ (id -u) -eq 0 ]
|
||||||
rm "$sudoConfig"
|
rm "$sudoConfig"
|
||||||
userdel -r "$name"
|
userdel -r "$name"
|
||||||
else
|
else
|
||||||
configureNix
|
|
||||||
source "$dir/../Software/bash/main.fish"
|
source "$dir/../Software/bash/main.fish"
|
||||||
runHook initialize || true
|
runHook initialize || true
|
||||||
runHook installDrivers || true
|
runHook installDrivers || true
|
||||||
|
|
|
@ -8,7 +8,7 @@ function evalModule --argument-names modulePath property
|
||||||
|
|
||||||
FILE=(realpath "$modulePath") \
|
FILE=(realpath "$modulePath") \
|
||||||
PROPERTY="$property" \
|
PROPERTY="$property" \
|
||||||
nix eval \
|
nix eval --extra-experimental-features "nix-command flakes" \
|
||||||
--file "$(status dirname)/../../../lib/eval-module.nix" \
|
--file "$(status dirname)/../../../lib/eval-module.nix" \
|
||||||
$argv
|
$argv
|
||||||
end
|
end
|
||||||
|
|
|
@ -8,11 +8,5 @@ begin
|
||||||
sudo nix-channel --update
|
sudo nix-channel --update
|
||||||
end
|
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
|
runInstaller $argv
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue