lib/overlay: init

flake-modules/overlays.nix

@@ -1,4 +1,8 @@
-{ inputs, ... }:
+{
+  self,
+  inputs,
+  ...
+}:
 {
   imports = [ inputs.flake-parts.flakeModules.easyOverlay ];
   perSystem =
@@ -15,4 +19,10 @@
         };
       };
     };
+  flake.overlays = {
+    # Export our lib extension overlay
+    # Note: this is an overlay for nixpkg's lib, not for nixpkgs itself
+    # You can pass the overlay to `lib.extend`
+    lib = import ../lib/overlay.nix { };
+  };
 }

lib/default.nix

@@ -11,10 +11,14 @@ lib.fix (
     # Used when importing parts of helpers
     call = lib.callPackageWith {
       inherit call pkgs self;
+      lib = extendedLib;
       helpers = self; # TODO: stop using `helpers` in the subsections
-      lib = self.extendedLib;
     };
 
+    # Handle "extended" lib
+    # FIXME: We probably don't need this internally within out lib...
+    extendedLib = if lib ? nixvim then lib else lib.extend (import ./overlay.nix { inherit self; });
+
     # Define this outside of the attrs to avoid infinite recursion,
     # since the final value will have been merged from two places
     builders = call ./builders.nix { };
@@ -35,7 +39,6 @@ lib.fix (
   {
     autocmd = call ./autocmd-helpers.nix { };
     deprecation = call ./deprecation.nix { };
-    extendedLib = call ./extend-lib.nix { inherit lib; };
     keymaps = call ./keymap-helpers.nix { };
     lua = call ./to-lua.nix { };
     modules = call ./modules.nix { };

lib/overlay.nix

@@ -0,0 +1,23 @@
+# TODO: remove `args` and standardise how we build lib.nixvim
+# Ideally, `lib` should be the _only_ argument expected by lib.nixvim
+{
+  self ? null,
+}:
+# Extends nixpkg's lib with our functions, as expected by our modules
+final: prev: {
+  # Include our custom lib
+  # To avoid redundant work, we allow a nixvim-lib instance to be supplied
+  # TODO: is this needed, or would nix's laziness do the same thing automagically?
+  nixvim = if self != null then self else import ./. {
+    # TODO: final vs prev here...
+    lib = prev;
+  };
+
+  # Merge in our maintainers
+  maintainers = prev.maintainers // import ./maintainers.nix;
+
+  # Merge in our custom types
+  types = prev.types // import ./types.nix {
+    lib = final;
+  };
+}

wrappers/_shared.nix

@@ -52,7 +52,7 @@ in
       lib.nixvim = lib.mkDefault (import ../lib { inherit pkgs lib; });
 
       # Make nixvim's "extended" lib available to the host's module args
-      _module.args.nixvimLib = lib.mkDefault config.lib.nixvim.extendedLib;
+      _module.args.nixvimLib = lib.mkDefault (lib.extend (import ../lib/overlay.nix { }));
     }
 
     # Use global packages by default in nixvim's submodule