launch/main.tf

@@ -109,24 +109,20 @@ module "deploy" {
   target_system = local.system
   NIX_PATH = join(":", [for name, path in local.pins : "${name}=${path}"])
   deploy_environment = var.deploy_environment
-  hermetic = true
   config_pwd = path.root
   config = <<-EOT
-    let
+    {
       terraform = builtins.fromJSON ''${jsonencode({
         domain = var.domain
         hostname = each.value.hostname
         initialUser = var.initialUser
       })}'';
-    in
-    import <nixpkgs/nixos/lib/eval-config.nix> {
-      system = "${local.system}";
-      specialArgs = { inherit terraform; };
-      modules = [
-        # ${path.root}/options.nix
+      imports = [
+        ${path.root}/options.nix
         ${path.root}/shared.nix
         ${path.root}/${each.key}.nix
-        # (terraform)
+        # FIXME: get VM details from TF
+        ${path.root}./infra/test-machines/${each.value.hostname}
       ];
     }
   EOT

launch/shared.nix

@@ -12,8 +12,6 @@ in
     <agenix/modules/age.nix>
     ../services/fediversity
     ./resource.nix
-    # FIXME: get VM details from TF
-    ../infra/test-machines/${hostname}
   ];
   fediversityVm.name = hostname;
   fediversity = {