diff --git a/infra/_modules/nixos/flake.nix b/infra/_modules/nixos/flake.nix index bc132b2..1d28f91 100644 --- a/infra/_modules/nixos/flake.nix +++ b/infra/_modules/nixos/flake.nix @@ -16,12 +16,10 @@ hosts = builtins.fromJSON (builtins.readFile ./hosts.json); in { - nixos = nixpkgs.lib.nixosSystem { + installer = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ - disko.nixosModules.disko - ./configuration.nix - ./disks.nix + ./profiles/installer.nix ]; }; kube-1 = nixpkgs.lib.nixosSystem { diff --git a/infra/_modules/nixos/upload-installer-proxmox.sh b/infra/_modules/nixos/upload-installer-proxmox.sh new file mode 100755 index 0000000..67cf142 --- /dev/null +++ b/infra/_modules/nixos/upload-installer-proxmox.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env sh + +# TODO auto run this and avoid chicken and eggs +# Currently running ./upload-installer-proxmox.sh manually + +set -euo pipefail -x + +PROMOX_HOST="proxmox" + +nix build -L .#nixosConfigurations.installer.config.system.build.isoImage +ISO="$(readlink -e result/iso/*.iso)" + +echo "Uploading ${ISO} to Proxmox" +scp "${ISO}" root@proxmox:/var/lib/vz/template/iso/nixos-installer.iso + +rm result diff --git a/infra/_modules/proxmox-vm/variables.tf b/infra/_modules/proxmox-vm/variables.tf index 07e0f18..adc5f41 100644 --- a/infra/_modules/proxmox-vm/variables.tf +++ b/infra/_modules/proxmox-vm/variables.tf @@ -17,7 +17,7 @@ variable "cdrom" { }) default = { - file = "nixos-minimal-25.05.808723.b1b329146965-x86_64-linux.iso" + file = "nixos-installer.iso" } }