From 5cd8c9cf3104027b42ffe531fb68463ecb08ebc9 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Fri, 11 Oct 2024 00:27:45 +0100
Subject: [PATCH] wrappers: define `pkgs` default within type declaration

This fixes #2378
---
 wrappers/_shared.nix | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/wrappers/_shared.nix b/wrappers/_shared.nix
index 2c4fe68b..9f4fba4c 100644
--- a/wrappers/_shared.nix
+++ b/wrappers/_shared.nix
@@ -28,7 +28,19 @@ let
     setAttrByPath
     ;
   cfg = config.programs.nixvim;
-  nixvimConfiguration = config.lib.nixvim.modules.evalNixvim evalArgs;
+  nixvimConfiguration = config.lib.nixvim.modules.evalNixvim (
+    evalArgs
+    // {
+      modules = evalArgs.modules or [ ] ++ [
+        # Use global packages by default in nixvim's submodule
+        # TODO: `useGlobalPackages` option and/or deprecate using host packages?
+        {
+          _file = ./_shared.nix;
+          nixpkgs.pkgs = lib.mkDefault pkgs;
+        }
+      ];
+    }
+  );
   extraFiles = lib.filter (file: file.enable) (lib.attrValues cfg.extraFiles);
 in
 {
@@ -63,10 +75,6 @@ in
       _module.args.nixvimLib = lib.mkDefault config.lib.nixvim.extendedLib;
     }
 
-    # Use global packages by default in nixvim's submodule
-    # TODO: `useGlobalPackages` option and/or deprecate using host packages?
-    { programs.nixvim.nixpkgs.pkgs = lib.mkDefault pkgs; }
-
     # Propagate nixvim's assertions to the host modules
     (lib.mkIf cfg.enable { inherit (cfg) warnings assertions; })