fricklerhandwerk/Fediversity
1
0
Fork 0
forked from Fediversity/Fediversity
Code Pull requests Activity

revert submodule wrapper to align with module functions already doing types #2

Closed
kiara wants to merge 37 commits from kiara/Fediversity:fix-submodule-type into main
pull from: kiara/Fediversity:fix-submodule-type
merge into: fricklerhandwerk:main
Conversation 1 Commits 37 Files changed 73 +25 -18
1 changed files with 25 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit c1f3aa6aed - Show all commits

19
deployment/data-model.nix
View file

@ -18,24 +18,31 @@ let
_class = "nixos"; _class = "nixos";
}; };
}; };
runtime-environment = attrTag { runtime-environment = attrTag (
nixos = mkOption { mapAttrs
(
name: options:
mkOption {
type = submoduleWith { type = submoduleWith {
modules = [ modules = [
{ {
options = { options = options // {
module = mkOption { module = mkOption {
description = "The NixOS module of the run-time environment"; description = "The NixOS module of the run-time environment";
type = deferredModule; type = deferredModule;
default = config.runtime-configurations.nixos; default = config.runtime-configurations.${name};
readOnly = true; readOnly = true;
}; };
}; };
} }
]; ];
}; };
}; }
}; )
{
nixos = { };
}
);
application = submoduleWith { application = submoduleWith {
description = "A Fediversity application"; description = "A Fediversity application";
modules = [ modules = [