From df78965bf44fc25455511ca94edc15a08348e2b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20=E2=80=9CNiols=E2=80=9D=20Jeannerod?=
<nicolas.jeannerod@moduscreate.com>
Date: Fri, 21 Feb 2025 12:28:06 +0100
Subject: [PATCH] Extract resource module from `makeDeployments`
---
infra/flake-part.nix | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/infra/flake-part.nix b/infra/flake-part.nix
index 949c6154..b4f10dc0 100644
--- a/infra/flake-part.nix
+++ b/infra/flake-part.nix
@@ -11,20 +11,26 @@ let
addDefaultDeployment =
deployments: deployments // { default = concatLists (attrValues deployments); };
+ makeResourceModule = vmName: {
+ _module.args = { inherit inputs; };
+ imports = [
+ ./common/resource.nix
+ (./. + "/${vmName}")
+ ];
+ procolixVm.name = vmName;
+ };
+
makeDeployments = mapAttrs (
_: vmNames:
{ providers, ... }:
{
providers.local = inputs.nixops4.modules.nixops4Provider.local;
resources = genAttrs vmNames (vmName: {
- _module.args = { inherit inputs; };
type = providers.local.exec;
imports = [
inputs.nixops4-nixos.modules.nixops4Resource.nixos
- ./common/resource.nix
- (./. + "/${vmName}")
+ (makeResourceModule vmName)
];
- procolixVm.name = vmName;
});
}
);