From 097d53807d9eee48385c42aa1cc3df9cd0276a4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?= Date: Sun, 18 Feb 2024 00:09:08 +0100 Subject: [PATCH] install_os: Fix flake selection --- install_os.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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