From 472526d7aa7f9ff16ae9d443f2fe62596ac0f2eb Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Sat, 21 Dec 2024 12:58:33 +0000
Subject: [PATCH] wrappers: extract nixvim-lib from extended lib

Use the overridden nixivim-lib from the overlayed/extended nixpkgs lib.

This ensures consistency between `nixvimLib.nixvim` and `config.lib.nixvim.`
---
 wrappers/_shared.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/wrappers/_shared.nix b/wrappers/_shared.nix
index 3e9c9f39..33c002b6 100644
--- a/wrappers/_shared.nix
+++ b/wrappers/_shared.nix
@@ -59,9 +59,9 @@ in
   config = mkMerge [
     {
       # Make our lib available to the host modules
-      lib.nixvim = lib.mkDefault self.lib.nixvim;
-
-      # Make nixvim's "extended" lib available to the host's module args
+      # - the `config.lib.nixvim` option is the nixvim-lib
+      # - the `nixvimLib` arg is `lib` extended with our overlay
+      lib.nixvim = lib.mkDefault config._module.args.nixvimLib.nixvim;
       _module.args.nixvimLib = lib.mkDefault (lib.extend self.lib.overlay);
     }