refactor: expose project types as an option

which allows us to easily re-use them without inside the module system
with the proper arguments.

Author: eljamm

maintainers/types/default.nix

@@ -3,21 +3,47 @@
   ...
 }@args:
 let
-  inherit (lib.types)
-    submodule
+  inherit (lib)
+    types
+    mkOption
     ;
+
+  submodule =
+    modules:
+    types.submodule {
+      imports = [
+        {
+          config._module.args = args // {
+            ngiTypes = options.ngiTypes.default;
+          };
+        }
+      ]
+      ++ lib.toList modules;
+    };
+
+  options.ngiTypes = mkOption {
+    type = with types; attrs;
+    default = {
+      binary = submodule ./binary.nix;
+      demo = submodule ./demo.nix;
+      example = submodule ./example.nix;
+      link = submodule ./link.nix;
+      metadata = submodule ./metadata.nix;
+      problem = import ./problem.nix args;
+      program = submodule (import ./module.nix { type = "program"; });
+      plugin = submodule ./plugin.nix;
+      project = submodule ./project.nix;
+      projects = mkOption {
+        type = with types; attrsOf (submodule ./project.nix);
+        description = "NGI-funded software application";
+      };
+      service = submodule (import ./module.nix { type = "service"; });
+      subgrant = submodule ./subgrant.nix;
+      test = submodule ./test.nix;
+    };
+    description = "";
+  };
 in
 {
-  binary = submodule ./binary.nix;
-  demo = submodule ./demo.nix;
-  example = submodule ./example.nix;
-  link = submodule ./link.nix;
-  metadata = submodule ./metadata.nix;
-  problem = import ./problem.nix args;
-  program = submodule (import ./module.nix { type = "program"; });
-  plugin = submodule ./plugin.nix;
-  project = submodule ./project.nix;
-  service = submodule (import ./module.nix { type = "service"; });
-  subgrant = submodule ./subgrant.nix;
-  test = submodule ./test.nix;
+  inherit options;
 }

maintainers/types/demo.nix

@@ -87,6 +87,7 @@
 {
   lib,
   name,
+  ngiTypes,
   ...
 }:
 
@@ -96,8 +97,6 @@ let
     mkOption
     ;
 
-  ngiTypes = import ./. { inherit lib; };
-
   inherit (ngiTypes)
     example
     problem

maintainers/types/example.nix

@@ -39,6 +39,7 @@
 {
   lib,
   name,
+  ngiTypes,
   ...
 }:
 
@@ -48,8 +49,6 @@ let
     mkOption
     ;
 
-  ngiTypes = import ./. { inherit lib; };
-
   inherit (ngiTypes)
     test
     link

maintainers/types/metadata.nix

@@ -15,6 +15,7 @@
 */
 {
   lib,
+  ngiTypes,
   ...
 }:
 
@@ -24,8 +25,6 @@ let
     mkOption
     ;
 
-  ngiTypes = import ./. { inherit lib; };
-
   inherit (ngiTypes)
     link
     subgrant

maintainers/types/module.nix

@@ -94,6 +94,7 @@ assert builtins.elem type [
 {
   lib,
   name,
+  ngiTypes,
   ...
 }:
 
@@ -103,8 +104,6 @@ let
     mkOption
     ;
 
-  ngiTypes = import ./. { inherit lib; };
-
   inherit (ngiTypes)
     example
     link

maintainers/types/project.nix

@@ -42,6 +42,7 @@
 {
   lib,
   name,
+  ngiTypes,
   ...
 }:
 let
@@ -50,8 +51,6 @@ let
     mkOption
     ;
 
-  ngiTypes = import ./. { inherit lib; };
-
   inherit (ngiTypes)
     metadata
     binary

maintainers/types/projects.nix

@@ -39,6 +39,7 @@
 */
 {
   lib,
+  ngiTypes,
   ...
 }:
 
@@ -48,8 +49,6 @@ let
     mkOption
     ;
 
-  ngiTypes = import ./. { inherit lib; };
-
   inherit (ngiTypes)
     problem
     ;

maintainers/types/test.nix

@@ -17,14 +17,17 @@ let
     toString
     ;
 
-  ngiTypes = import ../maintainers/types { inherit lib; };
-
-  moduleArgs = {
-    config._module.args.pkgs = pkgs;
-    config._module.args.utils = utils;
-    config._module.args.ngiTypes = ngiTypes;
-    config._module.args.modulesPath = "${self.inputs.nixpkgs}/nixos/modules";
-  };
+  moduleArgs =
+    { options, ... }:
+    {
+      imports = [ ../maintainers/types ];
+
+      config._module.args.pkgs = pkgs;
+      config._module.args.utils = utils;
+      config._module.args.ngiTypes = options.ngiTypes.default;
+      config._module.args.toplevelOptions = options;
+      config._module.args.modulesPath = "${self.inputs.nixpkgs}/nixos/modules";
+    };
 
   submoduleWithArgs =
     modules:

overview/default.nix

@@ -42,7 +42,7 @@ let
 in
 rec {
   raw-projects = {
-    imports = [ ../maintainers/types/projects.nix ];
+    imports = [ ../maintainers/types ];
     config.projects = mapAttrs (name: directory: import directory args) projectDirectories;
   };
 
@@ -59,6 +59,13 @@ rec {
           _module.args = args;
         };
       }
+      # TODO: flatten when we fully migrate to the module system
+      (
+        { options, ... }:
+        {
+          options.projects = options.ngiTypes.default.projects;
+        }
+      )
     ];
   };