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

fix specialArg handling + use mergeStructs

Browse source
This commit is contained in:
do butterflies cry? 2025-12-18 11:41:40 +10:00
parent 64d13428d0
commit 8734ca8835
1 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

29
flake.nix
View file

@ -74,11 +74,7 @@
in {
system = missing "its system type" "system"; # intentionally left missing!! (to raise errors)
modules = missing "its required modules" "modules";
specialArgs = Terminal {
inherit inputs;
pkgs = sys.pkgsFor system;
upkgs = sys.upkgsFor system;
};
specialArgs = Terminal {};
deploy = {
user = "root";
@ -113,32 +109,39 @@
else let
templateAttrs = templateNode name nodeAttrs.system;
in
nib.parse.parseStructFor templateAttrs nodeAttrs;
nib.parse.mergeStructs templateAttrs nodeAttrs;
# mapNodes = f: builtins.mapAttrs f (builtins.mapAttrs parseNode config.nexus.nodes);
mapNodes = f:
builtins.mapAttrs (
name: nodeAttrs: f name (parseNode name nodeAttrs)
)
builtins.mapAttrs
(nodeName: nodeAttrs: f nodeName (parseNode nodeName nodeAttrs))
config.nexus.nodes;
in rec {
nixosConfigurations = mapNodes (
_: node:
nodeName: node:
lib.nixosSystem {
system = node.system;
modules = node.modules;
# nix passes these to every single module
specialArgs = {} // node.modules.specialArgs;
specialArgs =
node.modules.specialArgs
// {
inherit inputs;
pkgs = sys.pkgsFor node.system;
upkgs = sys.upkgsFor node.system;
};
}
);
deploy.nodes = mapNodes (_: node: {
deploy.nodes = mapNodes (nodeName: node: let
nixosFor = system: deploy-rs.lib.${system}.activate.nixos;
in {
hostname = node.deploy.ssh.host;
profilesOrder = ["default"]; # profiles priority
profiles.default = {
path = deploy-rs.lib.${node.system}.activate.nixos nixosConfigurations.${node.system};
path = nixosFor node.system nixosConfigurations.${nodeName};
user = node.deploy.user;
sudo = node.deploy.sudo;