diff --git a/docs/default.nix b/docs/default.nix
index f149fe39..db954469 100644
--- a/docs/default.nix
+++ b/docs/default.nix
@@ -4,19 +4,37 @@
   pkgs,
 }:
 let
-  pkgsDoc =
-    import
-      (pkgs.applyPatches {
-        name = "nixpkgs-nixvim-doc";
-        src = pkgs.path;
-        patches = [ ./either_recursive.patch ];
-      })
-      {
-        inherit (pkgs) system;
-        config.allowUnfree = true;
-      };
+  # Extend nixpkg's lib, so that we can handle recursive leaf types such as `either`
+  lib = pkgs.lib.extend (
+    final: prev: {
+      types = prev.types // {
+        either =
+          t1: t2:
+          (prev.types.either t1 t2)
+          // {
+            getSubOptions = prefix: (t1.getSubOptions prefix) // (t2.getSubOptions prefix);
+          };
 
-  inherit (pkgsDoc) lib;
+        eitherRecursive = t1: t2: (final.types.either t1 t2) // { getSubOptions = _: { }; };
+
+        oneOfRecursive =
+          ts:
+          let
+            head' =
+              if ts == [ ] then
+                throw "types.oneOfRecursive needs to get at least one type in its argument"
+              else
+                builtins.head ts;
+            tail' = builtins.tail ts;
+          in
+          builtins.foldl' final.types.eitherRecursive head' tail';
+      };
+    }
+  );
+
+  pkgsDoc = pkgs // {
+    inherit lib;
+  };
 
   nixvimPath = toString ./..;
 
diff --git a/docs/either_recursive.patch b/docs/either_recursive.patch
deleted file mode 100644
index ccb02dc6..00000000
--- a/docs/either_recursive.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-commit e067eb1f6da7994150f10854e5fd635ca8bd0e92
-Author: traxys <quentin+dev@familleboyer.net>
-Date:   Sun Jan 14 17:54:55 2024 +0100
-
-    lib.types: Include the suboptions of both types for either
-    
-    This allows to correctly gather the sub options for types of the form
-    `either <type> (submodule {...})`.
-    
-    This requires adding two new types: `eitherRecursive` and
-    `oneOfRecursive` that avoid infinite recursions for types like
-    configuration types that are often of the form `oneOf [atom (listOf
-    configType)]`
-
-diff --git a/lib/types.nix b/lib/types.nix
-index cea63c598321..d26982db6cc0 100644
---- a/lib/types.nix
-+++ b/lib/types.nix
-@@ -906,10 +906,16 @@ rec {
-            then functor.type mt1 mt2
-            else null;
-       functor = (defaultFunctor name) // { wrapped = [ t1 t2 ]; };
-+      getSubOptions = prefix: (t1.getSubOptions prefix) // (t2.getSubOptions prefix);
-       nestedTypes.left = t1;
-       nestedTypes.right = t2;
-     };
- 
-+    # Handle recursive leaf types, avoiding an infinite recursion
-+    eitherRecursive = t1: t2: (either t1 t2) // {
-+      getSubOptions = _: {};
-+    };
-+
-     # Any of the types in the given list
-     oneOf = ts:
-       let
-@@ -917,6 +923,13 @@ rec {
-         tail' = tail ts;
-       in foldl' either head' tail';
- 
-+    # Handle recursive leaf types, avoiding an infinite recursion
-+    oneOfRecursive = ts:
-+      let
-+        head' = if ts == [] then throw "types.oneOfRecursive needs to get at least one type in its argument" else head ts;
-+        tail' = tail ts;
-+      in foldl' eitherRecursive head' tail';
-+
-     # Either value of type `coercedType` or `finalType`, the former is
-     # converted to `finalType` using `coerceFunc`.
-     coercedTo = coercedType: coerceFunc: finalType:
diff --git a/flake-modules/packages.nix b/flake-modules/packages.nix
index bff7b46b..888d201c 100644
--- a/flake-modules/packages.nix
+++ b/flake-modules/packages.nix
@@ -1,14 +1,18 @@
 {
   perSystem =
     {
-      pkgs,
+      pkgsUnfree,
       config,
       rawModules,
       helpers,
       ...
     }:
     {
-      packages = import ../docs { inherit rawModules pkgs helpers; };
+      packages = import ../docs {
+        inherit rawModules helpers;
+        # Building the docs evaluates each plugin's default package, some of which are unfree
+        pkgs = pkgsUnfree;
+      };
 
       # Test that all packages build fine when running `nix flake check`.
       checks = config.packages;