Use amazon image format for AMI import

Author: joshp123

AGENTS.md

@@ -38,7 +38,7 @@ The Zen of ~~Python~~ Clawdbot, ~~by~~ shamelessly stolen from Tim Peters:
 
 Deploy flow (automation-first):
 - Use `devenv.nix` for tooling (nixos-generators, awscli2).
-- Build a bootstrap NixOS image with nixos-generators (raw-efi) and upload it to S3.
+- Build a bootstrap NixOS image with nixos-generators (amazon) and upload it to S3.
   - Use `nix/hosts/clawdinator-1-image.nix` for image builds.
 - CI is preferred: `.github/workflows/image-build.yml` runs build → S3 upload → AMI import.
 - Bootstrap S3 bucket + scoped IAM user + VM Import role with `infra/opentofu/aws` (use homelab-admin creds).

README.md

@@ -46,7 +46,7 @@ Deploy (automation‑first):
 
 Image-based deploy (Option A, recommended):
 1) Build a bootstrap image with nixos-generators:
-   - `nix run github:nix-community/nixos-generators -- -f raw-efi -c nix/hosts/clawdinator-1-image.nix -o dist`
+   - `nix run github:nix-community/nixos-generators -- -f amazon -c nix/hosts/clawdinator-1-image.nix -o dist`
 2) Upload the raw image to S3 (private object).
 3) Import into AWS as an AMI (`aws ec2 import-image`).
 4) Launch hosts from the AMI.

docs/POC.md

@@ -18,7 +18,7 @@ Secrets wiring:
 - Infra: AWS credentials for OpenTofu and CI.
 
 Image pipeline:
-- Build a bootstrap image with nixos-generators (raw-efi) from `nix/hosts/clawdinator-1-image.nix`, upload to S3, import as an AMI via `aws ec2 import-image`.
+- Build a bootstrap image with nixos-generators (amazon) from `nix/hosts/clawdinator-1-image.nix`, upload to S3, import as an AMI via `aws ec2 import-image`.
 - Launch instances from the AMI, then nixos-rebuild applies full config.
 - Runtime: explicit token files via agenix (standard).
 - GitHub token is required. Prefer GitHub App (`services.clawdinator.githubApp.*`) to mint short-lived tokens.

scripts/build-image.sh

@@ -3,14 +3,18 @@ set -euo pipefail
 
 config_path="${CONFIG_PATH:-nix/hosts/clawdinator-1-image.nix}"
 out_dir="${OUT_DIR:-dist}"
+format="${IMAGE_FORMAT:-amazon}"
 
 if [ -e "${out_dir}" ]; then
   rm -rf "${out_dir}"
 fi
 
-nix run github:nix-community/nixos-generators -- -f raw-efi -c "${config_path}" -o "${out_dir}"
+nix run github:nix-community/nixos-generators -- -f "${format}" -c "${config_path}" -o "${out_dir}"
 
-if [ ! -f "${out_dir}/nixos.img" ]; then
-  echo "Expected image at ${out_dir}/nixos.img" >&2
+image_file="$(find "${out_dir}" -maxdepth 2 -type f \( -name "*.img" -o -name "*.vhd" -o -name "*.vhdx" -o -name "*.raw" \) | head -n 1)"
+if [ -z "${image_file}" ]; then
+  echo "No image found in ${out_dir} for format ${format}" >&2
   exit 1
 fi
+
+cp -f "${image_file}" "${out_dir}/nixos.img"

scripts/import-image.sh

@@ -5,7 +5,7 @@ bucket="${S3_BUCKET:?S3_BUCKET required}"
 key="${S3_KEY:?S3_KEY required}"
 region="${AWS_REGION:?AWS_REGION required}"
 
-boot_mode="${AMI_BOOT_MODE:-uefi}"
+boot_mode="legacy-bios"
 arch="${AMI_ARCH:-x86_64}"
 
 timestamp="$(date -u +%Y%m%d%H%M%S)"