auxolotl/labs
22
8
Fork 4
Code Issues 1 Pull requests 3 Actions Packages Projects Releases Wiki Activity

WIP: feat: Namespaced includes #3

Closed
austreelis wants to merge 6 commits from austreelis/feat/namespaced-includes into main AGit
pull from: austreelis/feat/namespaced-includes
merge into: auxolotl:main
Conversation 2 Commits 6 Files changed 2 +6 -5
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 71bc768dc1 - Show all commits

11
lib/src/modules/default.nix
View file

@ -206,7 +206,7 @@ lib: {
in in
builtins.foldl' filter [ ] flattened; builtins.foldl' filter [ ] flattened;
austreelis marked this conversation as resolved
jakehamilton commented 2024-06-18 16:30:30 +00:00
Review
Copy link

nit: maybe a name like createNamespacedModule would be informative here?

nit: maybe a name like `createNamespacedModule` would be informative here?
👍 1
doNamespace = createNamespacedModule =
{ namespace, include }: { namespace, include }:
if namespace == null then if namespace == null then
include include
@ -221,16 +221,17 @@ lib: {
description = "include ${namespace}"; description = "include ${namespace}";
}; };
austreelis marked this conversation as resolved
jakehamilton commented 2024-06-18 16:29:34 +00:00
Review
Copy link

Is this comment needed?

Is this comment needed?
austreelis commented 2024-06-19 12:09:05 +00:00
Review
Copy link

No, I thought I left it out when cleaning up my patch.

No, I thought I left it out when cleaning up my patch.
}; };
# config.${namespace} = lib.modules.override 1000 {};
}; };
austreelis marked this conversation as resolved
jakehamilton commented 2024-06-18 16:31:57 +00:00
Review
Copy link

Can we extract the builtins.map doNamespace flattened bit to a variable so that this value is easier to read? Something like builtins.seq throwOnConflict namespacedModules might make it easier to understand.

Can we extract the `builtins.map doNamespace flattened` bit to a variable so that this value is easier to read? Something like `builtins.seq throwOnConflict namespacedModules` might make it easier to understand.
👍 1
namespacedModules = builtins.map createNamespacedModule flattened;
in in
builtins.seq throwOnConflict builtins.map doNamespace flattened; builtins.seq throwOnConflict namespacedModules;
in in
if lib.modules.validate.keys module then if lib.modules.validate.keys module then
{ {
austreelis marked this conversation as resolved
jakehamilton commented 2024-06-18 16:29:16 +00:00
Review
Copy link

Can we wrap usage of or in parens here? It can be a bit confusing otherwise.

Can we wrap usage of `or` in parens here? It can be a bit confusing otherwise.
👍 1
inherit __key__; inherit __key__;
__file__ = builtins.toString module.__file__ or file; __file__ = builtins.toString (module.__file__ or file);
includes = normalizeIncludes module.includes or [ ]; includes = normalizeIncludes (module.includes or [ ]);
excludes = module.excludes or [ ]; excludes = module.excludes or [ ];
options = module.options or { }; options = module.options or { };
config = config =