From 8c3d521bff0142f9b690bccd62c29b3ce8c71ac8 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Fri, 20 Sep 2024 09:00:43 +0100
Subject: [PATCH] modules: move `nixpkgs` module to top-level modules

Make `pkgs` available to files submodules by passing _all_ module args
through. We already did this for `specialArgs`.
---
 modules/misc/default.nix                | 1 -
 modules/top-level/default.nix           | 1 +
 modules/top-level/files/default.nix     | 9 +++++++++
 modules/{misc => top-level}/nixpkgs.nix | 0
 4 files changed, 10 insertions(+), 1 deletion(-)
 rename modules/{misc => top-level}/nixpkgs.nix (100%)

diff --git a/modules/misc/default.nix b/modules/misc/default.nix
index bf5d616e..84c80418 100644
--- a/modules/misc/default.nix
+++ b/modules/misc/default.nix
@@ -3,7 +3,6 @@
     ./assertions.nix
     ./context.nix
     ./meta.nix
-    ./nixpkgs.nix
     ./nixvim-info.nix
   ];
 }
diff --git a/modules/top-level/default.nix b/modules/top-level/default.nix
index 289d82c6..b45a59af 100644
--- a/modules/top-level/default.nix
+++ b/modules/top-level/default.nix
@@ -7,6 +7,7 @@
   imports = [
     ../.
     ./files
+    ./nixpkgs.nix
     ./output.nix
     ./readonly-renames.nix
     ./test.nix
diff --git a/modules/top-level/files/default.nix b/modules/top-level/files/default.nix
index e64280cd..ef4a912e 100644
--- a/modules/top-level/files/default.nix
+++ b/modules/top-level/files/default.nix
@@ -15,6 +15,15 @@ let
     modules = lib.optionals (!config.isDocs) [
       ../../.
       ./submodule.nix
+      # Pass module args through to the submodule (except `name`)
+      # Wrap each arg with the correct priority
+      {
+        _module.args = lib.pipe options._module.args [
+          lib.modules.mergeAttrDefinitionsWithPrio
+          (lib.flip builtins.removeAttrs [ "name" ])
+          (lib.mapAttrs (_: { highestPrio, value }: lib.mkOverride highestPrio value))
+        ];
+      }
     ];
     description = "Nixvim configuration";
   };
diff --git a/modules/misc/nixpkgs.nix b/modules/top-level/nixpkgs.nix
similarity index 100%
rename from modules/misc/nixpkgs.nix
rename to modules/top-level/nixpkgs.nix