complete data model migration to the module system

Author: fricklerhandwerk

default.nix

@@ -153,7 +153,7 @@ rec {
 
   ngipkgs = import ./pkgs/by-name { inherit pkgs lib dream2nix; };
 
-  raw-projects-new = import ./projects/default-module.nix {
+  raw-projects = import ./projects {
     inherit lib;
     pkgs = pkgs // ngipkgs;
     sources = {
@@ -163,8 +163,7 @@ rec {
     };
   };
 
-  projects-new = make-projects raw-projects-new.config.projects;
-  projects = projects-new;
+  projects = make-projects raw-projects.config.projects;
 
   # TODO: find a better place for this
   make-projects =

flake.nix

@@ -77,23 +77,18 @@
         in
         rec {
           packages = ngipkgs // {
-            # TODO: collapse when the migration to modules is complete
-            overview =
-              let
-                overview-new = import ./overview {
-                  inherit
-                    lib
-                    lib'
-                    self
-                    nixpkgs
-                    system
-                    ;
-                  pkgs = pkgs // ngipkgs;
-                  projects = classic.projects-new;
-                  options = optionsDoc.optionsNix;
-                };
-              in
-              overview-new;
+            overview = import ./overview {
+              inherit
+                lib
+                lib'
+                self
+                nixpkgs
+                system
+                ;
+              pkgs = pkgs // ngipkgs;
+              projects = classic.projects;
+              options = optionsDoc.optionsNix;
+            };
 
             options =
               pkgs.runCommand "options.json"

projects/default-module.nix projects/default.nixprojects/default-module.nix renamed to projects/default.nix

@@ -35,8 +35,7 @@ let
           { };
       allowedFiles = [
         "README.md"
-        # TODO: remove `-module` suffix when migration to modules is complete
-        "default-module.nix"
+        "default.nix"
         "types.nix"
       ];
     in