diff --git a/flake-modules/checks.nix b/flake-modules/checks.nix
index bb168bf809..b6ffeff892 100644
--- a/flake-modules/checks.nix
+++ b/flake-modules/checks.nix
@@ -6,33 +6,28 @@
     makeNixvimWithModule,
     ...
   }: {
-    checks =
-      {
-        tests = import ../tests {
-          inherit pkgs;
-          inherit (pkgs) lib;
-          makeNixvim = configuration:
-            makeNixvimWithModuleUnfree {
-              module = {
-                config = configuration;
-              };
+    checks = {
+      tests = import ../tests {
+        inherit pkgs;
+        inherit (pkgs) lib;
+        makeNixvim = configuration:
+          makeNixvimWithModuleUnfree {
+            module = {
+              config = configuration;
             };
-        };
+          };
+      };
 
-        extra-args-tests = import ../tests/extra-args.nix {
-          inherit pkgs;
-          inherit makeNixvimWithModule;
-        };
+      extra-args-tests = import ../tests/extra-args.nix {
+        inherit pkgs;
+        inherit makeNixvimWithModule;
+      };
 
-        lib-tests = import ../tests/lib-tests.nix {
-          inherit pkgs;
-          inherit (pkgs) lib;
-        };
-      }
-      # Do not check if documentation builds fine on darwin as it fails:
-      # > sandbox-exec: pattern serialization length 69298 exceeds maximum (65535)
-      // (pkgs.lib.optionalAttrs (!pkgs.stdenv.isDarwin) {
-        inherit (config.packages) docs;
-      });
+      lib-tests = import ../tests/lib-tests.nix {
+        inherit pkgs;
+        inherit (pkgs) lib;
+      };
+      docs = config.packages.docs ? null;
+    };
   };
 }
diff --git a/flake-modules/packages.nix b/flake-modules/packages.nix
index dc3a777624..23b9d1aa64 100644
--- a/flake-modules/packages.nix
+++ b/flake-modules/packages.nix
@@ -7,7 +7,9 @@
     ...
   }: {
     packages = let
-      docs = {
+      # Do not check if documentation builds fine on darwin as it fails:
+      # > sandbox-exec: pattern serialization length 69298 exceeds maximum (65535)
+      docs = pkgs.lib.optionalAttrs (!pkgs.stdenv.isDarwin) {
         docs = pkgsUnfree.callPackage (import ../docs) {
           inherit modules;
         };