diff --git a/hosts/common/configs/system/nix-install/install.sh b/hosts/common/configs/system/nix-install/install.sh index e2b07de..3417d4f 100644 --- a/hosts/common/configs/system/nix-install/install.sh +++ b/hosts/common/configs/system/nix-install/install.sh @@ -54,7 +54,7 @@ set_password_file() { exit 1 fi - ln -sf "$password_file" /tmp/installer.key + ln -sf "$(realpath "$password_file")" /tmp/installer.key else echo "Enter password for LUKS encryption:" IFS= read -r -s password @@ -68,6 +68,7 @@ set_password_file() { prepare_disk() { local disko_mode="$1" + mkdir -p /mnt root=$(mktemp -d /mnt/install.XXXXXX) disko -m "$disko_mode" --yes-wipe-all-disks --root-mountpoint "$root" "$flake/hosts/$host/format.nix" --arg device "\"$device\"" } diff --git a/hosts/installer/default.nix b/hosts/installer/default.nix index 1f622db..e408cb5 100644 --- a/hosts/installer/default.nix +++ b/hosts/installer/default.nix @@ -42,5 +42,5 @@ sops.defaultSopsFile = ./secrets/secrets.yaml; environment.impermanence.device = - config.disko.devices.disk.usb.content.partitions.root.content.name; + config.disko.devices.disk.installer.content.partitions.root.content.name; } diff --git a/hosts/installer/format.nix b/hosts/installer/format.nix index a808984..aa531e7 100644 --- a/hosts/installer/format.nix +++ b/hosts/installer/format.nix @@ -4,7 +4,7 @@ }: { disko.devices = { - disk.usb = { + disk.installer = { inherit device; type = "disk"; content = { @@ -30,7 +30,7 @@ name = "root"; size = "100%"; content = { - name = "usb"; + name = "installer"; type = "luks"; passwordFile = "/tmp/installer.key"; settings = { diff --git a/hosts/installer/users/nick/default.nix b/hosts/installer/users/nick/default.nix index 0ed8193..0a5bdd6 100644 --- a/hosts/installer/users/nick/default.nix +++ b/hosts/installer/users/nick/default.nix @@ -15,6 +15,7 @@ in (import ../../../common/configs/user/console/git { inherit user home; }) (import ../../../common/configs/user/console/gpg-agent { inherit user home; }) (import ../../../common/configs/user/console/home-manager { inherit user home; }) + (import ../../../common/configs/user/console/jq { inherit user home; }) (import ../../../common/configs/user/console/lsof { inherit user home; }) (import ../../../common/configs/user/console/ncdu { inherit user home; }) (import ../../../common/configs/user/console/neovim { inherit user home; })