lib: remove anythingConcatLists

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

flake.nix

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

flake/modules/home-manager.nix

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

flake/modules/nixos.nix

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

modules/wrapper/build/default.nix

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