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:
parent
43b2bd1982
commit
88f1ac54b8
9 changed files with 30 additions and 29 deletions
12
flake.nix
12
flake.nix
|
@ -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;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue