From 8cfc943297f6e94abbe6e33723339cc27100c919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20=E2=80=9CNiols=E2=80=9D=20Jeannerod?= Date: Fri, 31 Jan 2025 16:36:18 +0100 Subject: [PATCH] Cleanup --- infra/flake-part.nix | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/infra/flake-part.nix b/infra/flake-part.nix index e059bfc..48bb26f 100644 --- a/infra/flake-part.nix +++ b/infra/flake-part.nix @@ -8,20 +8,6 @@ let inherit (lib) attrValues concatLists mapAttrs; inherit (lib.attrsets) genAttrs; - makeResource = - vmName: - { providers, ... }: - { - _module.args = { inherit inputs; }; - type = providers.local.exec; - imports = [ - inputs.nixops4-nixos.modules.nixops4Resource.nixos - ./common/procolixResource.nix - (./. + "/${vmName}") - ]; - procolixVm.name = vmName; - }; - addDefaultDeployment = deployments: deployments // { default = concatLists (attrValues deployments); }; @@ -30,7 +16,16 @@ let { providers, ... }: { providers.local = inputs.nixops4.modules.nixops4Provider.local; - resources = genAttrs vmNames (vmName: makeResource vmName { inherit providers; }); + resources = genAttrs vmNames (vmName: { + _module.args = { inherit inputs; }; + type = providers.local.exec; + imports = [ + inputs.nixops4-nixos.modules.nixops4Resource.nixos + ./common/procolixResource.nix + (./. + "/${vmName}") + ]; + procolixVm.name = vmName; + }); } );