Factorise the resource definition

This commit is contained in:
Nicolas Jeannerod 2025-01-30 09:53:45 +01:00
parent 2bb1590d54
commit 34eb7263cc
Signed by untrusted user: Niols
GPG key ID: 35DB9EC8886E1CB8
7 changed files with 36 additions and 120 deletions

View file

@ -2,7 +2,6 @@
{ {
imports = [ imports = [
../common
./forgejo-actions-runner.nix ./forgejo-actions-runner.nix
]; ];

View file

@ -1,5 +1,35 @@
{ self, inputs, ... }: { self, inputs, ... }:
let
makeResource =
vmid:
{ providers, ... }:
let
vmmodule = import (./. + "/${vmid}");
in
{
type = providers.local.exec;
imports = [ inputs.nixops4-nixos.modules.nixops4Resource.nixos ];
ssh = {
# FIXME: The following assumes that `vmmodule` does not use arguments
# and does not get `proxolix.vm.ip4` from an import, etc. I have tried
# an approach with `lib.evalModules` but I cannot get it to work.
host = vmmodule.procolix.vm.ip4;
opts = "";
hostPublicKey = self.keys.systems.${vmid};
};
nixpkgs = inputs.nixpkgs;
nixos.module = {
imports = [
vmmodule
./common
self.nixosModules.ageSecrets
{ fediversity.hostPublicKey = self.keys.systems.${vmid}; }
];
};
};
in
{ {
nixops4Deployments.git = nixops4Deployments.git =
{ providers, ... }: { providers, ... }:
@ -7,41 +37,8 @@
providers.local = inputs.nixops4-nixos.modules.nixops4Provider.local; providers.local = inputs.nixops4-nixos.modules.nixops4Provider.local;
resources = { resources = {
vm02116 = { vm02116 = makeResource "vm02116" { inherit providers; };
type = providers.local.exec; fedi300 = makeResource "fedi300" { inherit providers; };
imports = [ inputs.nixops4-nixos.modules.nixops4Resource.nixos ];
ssh = {
host = "185.206.232.34";
opts = "";
hostPublicKey = self.keys.systems.vm02116;
};
nixpkgs = inputs.nixpkgs;
nixos.module = {
imports = [
./vm02116
self.nixosModules.ageSecrets
{ fediversity.hostPublicKey = self.keys.systems.vm02116; }
];
};
};
fedi300 = {
type = providers.local.exec;
imports = [ inputs.nixops4-nixos.modules.nixops4Resource.nixos ];
ssh = {
host = "95.215.187.30";
opts = "";
hostPublicKey = self.keys.systems.fedi300;
};
nixpkgs = inputs.nixpkgs;
nixos.module = {
imports = [
./fedi300
self.nixosModules.ageSecrets
{ fediversity.hostPublicKey = self.keys.systems.fedi300; }
];
};
};
}; };
}; };
@ -51,23 +48,7 @@
providers.local = inputs.nixops4-nixos.modules.nixops4Provider.local; providers.local = inputs.nixops4-nixos.modules.nixops4Provider.local;
resources = { resources = {
vm02187 = { vm02187 = makeResource "vm02187" { inherit providers; };
type = providers.local.exec;
imports = [ inputs.nixops4-nixos.modules.nixops4Resource.nixos ];
ssh = {
host = "185.206.232.187";
opts = "";
hostPublicKey = self.keys.systems.vm02187;
};
nixpkgs = inputs.nixpkgs;
nixos.module = {
imports = [
./vm02187
self.nixosModules.ageSecrets
{ fediversity.hostPublicKey = self.keys.systems.vm02187; }
];
};
};
}; };
}; };
@ -77,59 +58,9 @@
providers.local = inputs.nixops4-nixos.modules.nixops4Provider.local; providers.local = inputs.nixops4-nixos.modules.nixops4Provider.local;
resources = { resources = {
vm02117 = { vm02117 = makeResource "vm02117" { inherit providers; };
type = providers.local.exec; vm02179 = makeResource "vm02179" { inherit providers; };
imports = [ inputs.nixops4-nixos.modules.nixops4Resource.nixos ]; vm02186 = makeResource "vm02186" { inherit providers; };
ssh = {
host = "185.206.232.106";
opts = "";
hostPublicKey = self.keys.systems.vm02117;
};
nixpkgs = inputs.nixpkgs;
nixos.module = {
imports = [
./vm02117
self.nixosModules.ageSecrets
{ fediversity.hostPublicKey = self.keys.systems.vm02117; }
];
};
};
vm02179 = {
type = providers.local.exec;
imports = [ inputs.nixops4-nixos.modules.nixops4Resource.nixos ];
ssh = {
host = "185.206.232.179";
opts = "";
hostPublicKey = self.keys.systems.vm02179;
};
nixpkgs = inputs.nixpkgs;
nixos.module = {
imports = [
./vm02179
self.nixosModules.ageSecrets
{ fediversity.hostPublicKey = self.keys.systems.vm02179; }
];
};
};
vm02186 = {
type = providers.local.exec;
imports = [ inputs.nixops4-nixos.modules.nixops4Resource.nixos ];
ssh = {
host = "185.206.232.186";
opts = "";
hostPublicKey = self.keys.systems.vm02186;
};
nixpkgs = inputs.nixpkgs;
nixos.module = {
imports = [
./vm02186
self.nixosModules.ageSecrets
{ fediversity.hostPublicKey = self.keys.systems.vm02186; }
];
};
};
}; };
}; };
} }

View file

@ -1,6 +1,5 @@
{ {
imports = [ imports = [
../common
./forgejo.nix ./forgejo.nix
]; ];

View file

@ -1,8 +1,4 @@
{ {
imports = [
../common
];
procolix.vm = { procolix.vm = {
name = "vm02117"; name = "vm02117";
ip4 = "185.206.232.106"; ip4 = "185.206.232.106";

View file

@ -1,8 +1,4 @@
{ {
imports = [
../common
];
procolix.vm = { procolix.vm = {
name = "vm02179"; name = "vm02179";
ip4 = "185.206.232.179"; ip4 = "185.206.232.179";

View file

@ -1,8 +1,4 @@
{ {
imports = [
../common
];
procolix.vm = { procolix.vm = {
name = "vm02186"; name = "vm02186";
ip4 = "185.206.232.186"; ip4 = "185.206.232.186";

View file

@ -1,6 +1,5 @@
{ {
imports = [ imports = [
../common
./wiki.nix ./wiki.nix
]; ];