diff --git a/install_os.sh b/install_os.sh index b4dfa68..806d03f 100755 --- a/install_os.sh +++ b/install_os.sh @@ -61,7 +61,6 @@ fi flake="${flake_uri}#${name}" mountpoint="/mnt/nixos" -mountpoint_flake="${mountpoint}/etc/nixos/flake.nix" luks_pass_path="luks/$(basename "${name}")" set -x @@ -99,11 +98,11 @@ echo "{ modules = [ ./hardware-configuration.nix ]; }; }; -}" | sudo tee "$mountpoint_flake" > /dev/null +}" | sudo tee "${mountpoint}/etc/nixos/flake.nix" > /dev/null # Everything there should be covered by (and conflicts with) the repo anyways. # Install NixOS! Or create a new generation. -sudo nix --extra-experimental-features "nix-command flakes" run "${SCRIPT_DIR}#nixos-install" -- --no-root-password --root "$mountpoint" --flake "${mountpoint_flake}#${name}" +sudo nix --extra-experimental-features "nix-command flakes" run "${SCRIPT_DIR}#nixos-install" -- --no-root-password --root "$mountpoint" --flake "${mountpoint}/etc/nixos#${name}" # TODO Add this? --flake "$flake" set +x