From 4509d277d324e67c54d13a04c7c8da8723639273 Mon Sep 17 00:00:00 2001 From: Kiara Grouwstra Date: Wed, 23 Jul 2025 18:12:55 +0200 Subject: [PATCH] move arguments from `_module.args` to `specialArgs` (#469) Reviewed-on: https://git.fediversity.eu/Fediversity/Fediversity/pulls/469 Reviewed-by: Valentin Gagarin Co-authored-by: Kiara Grouwstra Co-committed-by: Kiara Grouwstra --- infra/flake-part.nix | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/infra/flake-part.nix b/infra/flake-part.nix index e970d190..41a8d72d 100644 --- a/infra/flake-part.nix +++ b/infra/flake-part.nix @@ -23,21 +23,17 @@ let makeResourceModule = { vmName, isTestVm }: { - # TODO(@fricklerhandwerk): this is terrible but IMO we should just ditch flake-parts and have our own data model for how the project is organised internally - _module.args = { - inherit - inputs - keys - secrets - ; - }; - nixos.module.imports = [ ./common/proxmox-qemu-vm.nix ]; nixos.specialArgs = { - inherit sources; + inherit + sources + inputs + keys + secrets + ; }; imports = @@ -79,7 +75,13 @@ let # TODO(@fricklerhandwerk): we may want to pass through all of `specialArgs` # once we're sure it's sane. leaving it here for better control during refactoring. specialArgs = { - inherit sources; + inherit + sources + inputs + keys + secrets + + ; }; }); };