cry/cerulean
2
2
Fork 0
Code Issues Pull requests Projects Releases 3 Packages Wiki Activity Actions

use mergeStruct not mergeTypedStruct

Browse source
This commit is contained in:
do butterflies cry? 2025-12-14 10:55:36 +10:00
parent 7b11d1b7fa
commit 8b50a98ffb
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
flake.nix
View file

@ -98,14 +98,13 @@
'' ''
# TODO: nodeAttrs.system won't display any nice error messages!! # TODO: nodeAttrs.system won't display any nice error messages!!
# TODO: will mergeTypedStruct give nice error messages? or should I use mergeStructErr directly? # TODO: will mergeTypedStruct give nice error messages? or should I use mergeStructErr directly?
else nib.parse.mergeTypedStruct (templateNode name nodeAttrs.system) nodeAttrs; else nib.parse.mergeStruct (templateNode name nodeAttrs.system) nodeAttrs;
# TODO: mapNodes = f: builtins.mapAttrs (name: nodeAttrs: f name (parseNode name nodeAttrs)) config.nexus.nodes # TODO: mapNodes = f: builtins.mapAttrs (name: nodeAttrs: f name (parseNode name nodeAttrs)) config.nexus.nodes
mapNodes = f: builtins.mapAttrs f (builtins.mapAttrs parseNode config.nexus.nodes); mapNodes = f: builtins.mapAttrs f (builtins.mapAttrs parseNode config.nexus.nodes);
in rec { in rec {
nixosConfigurations = mapNodes ( nixosConfigurations = mapNodes (
# TODO: _: node: _: node:
name: node:
lib.nixosSystem { lib.nixosSystem {
system = node.system; system = node.system;
modules = node.modules; modules = node.modules;
@ -115,8 +114,7 @@
} }
); );
# TODO: deploy.nodes = mapNodes (_: node: { deploy.nodes = mapNodes (_: node: {
deploy.nodes = mapNodes (nodeName: node: {
hostname = node.deploy.ssh.host; hostname = node.deploy.ssh.host;
profilesOrder = ["default"]; # profiles priority profilesOrder = ["default"]; # profiles priority