Merge 3c3b08ff77 into b6a49b299a

the bulk of the build step is moved to modules/wrapper/build

flake.nix

@@ -31,7 +31,10 @@
         };
 
         homeManagerModules = {
-          nvf = import ./flake/modules/home-manager.nix self.packages lib inputs;
+          nvf = import ./flake/modules/home-manager.nix {
+            inherit lib inputs;
+            inherit (self) packages;
+          };
           default = self.homeManagerModules.nvf;
           neovim-flake =
             lib.warn ''
@@ -42,7 +45,10 @@
         };
 
         nixosModules = {
-          nvf = import ./flake/modules/nixos.nix self.packages lib inputs;
+          nvf = import ./flake/modules/nixos.nix {
+            inherit lib inputs;
+            inherit (self) packages;
+          };
           default = self.nixosModules.nvf;
           neovim-flake =
             lib.warn ''

flake/modules/home-manager.nix

@@ -1,5 +1,9 @@
 # Home Manager module
-packages: lib: inputs: {
+{
+  packages,
+  lib,
+  inputs,
+}: {
   config,
   pkgs,
   ...
@@ -18,9 +22,7 @@ packages: lib: inputs: {
     specialArgs = {
       inherit pkgs lib inputs;
     };
-    modules = [
+    modules = import ../../modules/modules.nix {inherit pkgs lib;};
-      {imports = import ../../modules/modules.nix {inherit pkgs lib;};}
-    ];
   };
 in {
   imports = [

flake/modules/nixos.nix

@@ -1,5 +1,9 @@
 # NixOS module
-packages: lib: inputs: {
+{
+  packages,
+  lib,
+  inputs,
+}: {
   config,
   pkgs,
   ...
@@ -18,9 +22,7 @@ packages: lib: inputs: {
     specialArgs = {
       inherit pkgs lib inputs;
     };
-    modules = [
+    modules = import ../../modules/modules.nix {inherit pkgs lib;};
-      {imports = import ../../modules/modules.nix {inherit pkgs lib;};}
-    ];
   };
 in {
   imports = [

modules/wrapper/build/default.nix

@@ -1,3 +1,6 @@
 {
-  imports = [./options.nix ./config.nix];
+  imports = [
+    ./options.nix
+    ./config.nix
+  ];
 }