1
1
Fork 1
mirror of https://github.com/oddlama/nix-config.git synced 2025-10-10 23:00:39 +02:00

fix: remove faulty agenix directory early and only if necessary

chore: change default microvm naming scheme to <host>-<name>
This commit is contained in:
oddlama 2023-05-21 01:29:54 +02:00
parent 43b2bd1982
commit 88f1ac54b8
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
9 changed files with 30 additions and 29 deletions

View file

@ -108,12 +108,12 @@
colmena = import ./nix/colmena.nix inputs;
colmenaNodes = ((colmena.lib.makeHive self.colmena).introspect (x: x)).nodes;
microvmNodes =
nixpkgs.lib.concatMapAttrs (
nodeName: nodeAttrs:
nixpkgs.lib.mapAttrs'
(n: nixpkgs.lib.nameValuePair "${nodeName}-microvm-${n}")
(self.colmenaNodes.${nodeName}.config.microvm.vms or {})
)
nixpkgs.lib.concatMapAttrs
(nodeName: nodeAttrs:
nixpkgs.lib.mapAttrs'
# TODO This is duplicated three times. This is microvm naming #3
(n: nixpkgs.lib.nameValuePair "${nodeName}-${n}")
(self.colmenaNodes.${nodeName}.config.microvm.vms or {}))
self.colmenaNodes;
nodes = self.colmenaNodes // self.microvmNodes;