kiara/Fediversity
1
0
Fork 0
forked from Fediversity/Fediversity
Code Pull requests Activity

ditch hermetic to simplify - still gets infinite recursion

Browse source
This commit is contained in:
Kiara Grouwstra 2025-04-13 13:24:45 +02:00
parent 9f689faa32
commit 1f5977468c
Signed by: kiara
SSH key fingerprint: SHA256:COspvLoLJ5WC5rFb9ZDe5urVCkK4LJZOsjfF4duRJFU
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
launch/main.tf
View file

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

2
launch/shared.nix
View file

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