From da030f8b4fd8a7e6eba0d7a6d9286de8879248e7 Mon Sep 17 00:00:00 2001
From: Kiara Grouwstra <kiara@procolix.eu>
Date: Thu, 17 Apr 2025 17:52:07 +0200
Subject: [PATCH] move info passed to facilitate passing extra config

---
 launch/main.tf | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/launch/main.tf b/launch/main.tf
index 7fd13e0c..e89956ea 100644
--- a/launch/main.tf
+++ b/launch/main.tf
@@ -89,12 +89,6 @@ resource "terraform_data" "nixos" {
           os = import <nixpkgs/nixos> {
             system = "${local.system}";
             configuration = {
-              # needed info passed in thru json from TF
-              terraform = builtins.fromJSON "${replace(jsonencode({
-                domain = var.domain
-                hostname = each.value.hostname
-                initialUser = var.initialUser
-              }), "\"", "\\\"")}";
               # note interpolations here TF ones
               imports = [
                 ${path.root}/options.nix
@@ -105,7 +99,15 @@ resource "terraform_data" "nixos" {
               ];
               # nix path for debugging
               nix.nixPath = [ "${local.nix_path}" ];
-            };
+            } //
+            # info passed in thru json from TF
+            builtins.fromJSON "${replace(jsonencode({
+              terraform = {
+                domain = var.domain
+                hostname = each.value.hostname
+                initialUser = var.initialUser
+              }
+            }), "\"", "\\\"")}";
           };
         in
         # info we want to get back out