From aad1b16e7b44c70b1233dc1ac47f8d43dd906940 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Wed, 24 Sep 2025 12:28:40 +0300
Subject: [PATCH 01/18] flake: add ndg as an input

Signed-off-by: NotAShelf <raf@notashelf.dev>
Change-Id: I6a6a6964151352d958f0c64949769d98dd759bdc
---
 flake.lock | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 flake.nix  |  3 ++
 2 files changed, 89 insertions(+), 1 deletion(-)

diff --git a/flake.lock b/flake.lock
index 9e8b3eb5..20d64cb6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -16,6 +16,21 @@
         "url": "https://git.lix.systems/lix-project/flake-compat.git"
       }
     },
+    "flake-compat_2": {
+      "locked": {
+        "lastModified": 1747046372,
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -36,6 +51,24 @@
         "type": "github"
       }
     },
+    "flake-parts_2": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib"
+      },
+      "locked": {
+        "lastModified": 1756770412,
+        "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "4524271976b625a4a605beefd893f270620fd751",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "mnw": {
       "locked": {
         "lastModified": 1758834834,
@@ -51,7 +84,58 @@
         "type": "github"
       }
     },
+    "ndg": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "flake-parts": "flake-parts_2",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1758451644,
+        "narHash": "sha256-sP4hBXifUIrEk37N+NRp3p42Os4OahX/8w1CN74nig8=",
+        "owner": "feel-co",
+        "repo": "ndg",
+        "rev": "a7c8f6ca855335c4dff4826a0245ee93e1816b70",
+        "type": "github"
+      },
+      "original": {
+        "owner": "feel-co",
+        "repo": "ndg",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
+      "locked": {
+        "lastModified": 1764081664,
+        "narHash": "sha256-sUoHmPr/EwXzRMpv1u/kH+dXuvJEyyF2Q7muE+t0EU4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-lib": {
+      "locked": {
+        "lastModified": 1754788789,
+        "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "a73b9c743612e4244d865a2fdee11865283c04e6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1764081664,
         "narHash": "sha256-sUoHmPr/EwXzRMpv1u/kH+dXuvJEyyF2Q7muE+t0EU4=",
@@ -72,7 +156,8 @@
         "flake-compat": "flake-compat",
         "flake-parts": "flake-parts",
         "mnw": "mnw",
-        "nixpkgs": "nixpkgs",
+        "ndg": "ndg",
+        "nixpkgs": "nixpkgs_2",
         "systems": "systems"
       }
     },
diff --git a/flake.nix b/flake.nix
index 35820e0b..31e8d0f1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -105,5 +105,8 @@
 
     # Alternate neovim-wrapper
     mnw.url = "github:Gerg-L/mnw";
+
+    # Alternative documentation generator
+    ndg.url = "github:feel-co/ndg";
   };
 }

From 868c7c51b4f7b093438fa373f8e4ec0d813955de Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Fri, 26 Sep 2025 15:04:21 +0300
Subject: [PATCH 02/18] docs: adapt builder functions for ndg

Signed-off-by: NotAShelf <raf@notashelf.dev>
Change-Id: I6a6a6964720fae8f3db129835efa5d5df956c3ef
---
 docs/default.nix |   2 +-
 docs/manual.nix  | 182 ++++++++++++++++++++++++-----------------------
 2 files changed, 94 insertions(+), 90 deletions(-)

diff --git a/docs/default.nix b/docs/default.nix
index 49f90b80..662dd403 100644
--- a/docs/default.nix
+++ b/docs/default.nix
@@ -92,7 +92,7 @@
 
   # Generate the HTML manual pages
   html = pkgs.callPackage ./manual.nix {
-    inherit release;
+    inherit inputs release;
     inherit (nvimModuleDocs) optionsJSON;
   };
 in {
diff --git a/docs/manual.nix b/docs/manual.nix
index 50a5dab4..1ce89126 100644
--- a/docs/manual.nix
+++ b/docs/manual.nix
@@ -1,114 +1,118 @@
 {
-  lib,
+  inputs,
   stdenvNoCC,
-  fetchzip,
   runCommandLocal,
   # build inputs
-  nixos-render-docs,
-  documentation-highlighter,
-  dart-sass,
   path,
   # nrd configuration
   release,
   optionsJSON,
 } @ args: let
   manual-release = args.release or "unstable";
+in
+  runCommandLocal "hjem-docs" {
+    nativeBuildInputs = [inputs.ndg.packages.${stdenvNoCC.system}.ndg];
+  } ''
+    mkdir -p $out/share/doc
 
-  scss-reset = fetchzip {
-    url = "https://github.com/Frontend-Layers/scss-reset/archive/refs/tags/1.4.2.zip";
-    hash = "sha256-cif5Sx8Ca5vxdw/mNAgpulLH15TwmzyJFNM7JURpoaE=";
+    # Copy the markdown sources to be processed by ndg
+    cp -rvf ${./manual} ./manual
+
+    substituteInPlace ./manual/options.md \
+      --subst-var-by OPTIONS_JSON ./config-options.json
+
+    substituteInPlace ./manual/index.md \
+      --subst-var-by NVF_VERSION ${manual-release}
+
+    substituteInPlace ./manual/hacking/additional-plugins.md \
+      --subst-var-by NVF_REPO "https://github.com/notashelf/nvf/blob/${manual-release}"
+
+    ndg html \
+      --jobs $NIX_BUILD_CORES --title "NVF" \
+      --module-options ${optionsJSON}/share/doc/nixos/options.json \
+      --manpage-urls ${path}/doc/manpage-urls.json \
+      --options-depth 3 \
+      --generate-search true \
+      --highlight-code true \
+      --input-dir ./manual \
+      --output-dir "$out/share/doc"
+
+    # Hydra support. Probably not necessary.
+    mkdir -p $out/nix-support/
+    echo "doc manual $dest index.html" >> $out/nix-support/hydra-build-products
+  ''
+/*
+stdenvNoCC.mkDerivation {
+  name = "nvf-manual";
+  src = builtins.path {
+    name = "nvf-manual-${manual-release}";
+    path = lib.sourceFilesBySuffices ./manual [".md" ".md.in"];
   };
 
-  compileStylesheet = runCommandLocal "compile-nvf-stylesheet" {} ''
-    mkdir -p $out
+  strictDependencies = true;
+  nativeBuildInputs = [nixos-render-docs];
 
-    tmpfile=$(mktemp -d)
-    trap "rm -r $tmpfile" EXIT
-
-    ln -s "${scss-reset}/build" "$tmpfile/scss-reset"
-
-    ${dart-sass}/bin/sass --load-path "$tmpfile" \
-      ${./static/style.scss} "$out/style.css"
-
-    echo "Generated styles"
+  postPatch = ''
+    ln -s ${optionsJSON}/share/doc/nixos/options.json ./config-options.json
   '';
-in
-  stdenvNoCC.mkDerivation {
-    name = "nvf-manual";
-    src = builtins.path {
-      name = "nvf-manual-${manual-release}";
-      path = lib.sourceFilesBySuffices ./manual [".md" ".md.in"];
-    };
 
-    strictDependencies = true;
-    nativeBuildInputs = [nixos-render-docs];
+  buildPhase = ''
+    dest="$out/share/doc/nvf"
+    mkdir -p "$(dirname "$dest")"
+    mkdir -p $dest/{highlightjs,script}
 
-    postPatch = ''
-      ln -s ${optionsJSON}/share/doc/nixos/options.json ./config-options.json
-    '';
+    # Copy highlight scripts to /highlights in document root.
+    cp -vt $dest/highlightjs \
+      ${documentation-highlighter}/highlight.pack.js \
+      ${documentation-highlighter}/LICENSE \
+      ${documentation-highlighter}/mono-blue.css \
+      ${documentation-highlighter}/loader.js
 
-    buildPhase = ''
-      dest="$out/share/doc/nvf"
-      mkdir -p "$(dirname "$dest")"
-      mkdir -p $dest/{highlightjs,script}
+    # Copy anchor scripts to the script directory in document root.
+    cp -vt "$dest"/script \
+      ${./static/script}/anchor-min.js \
+      ${./static/script}/anchor-use.js \
+      ${./static/script}/search.js
 
-      # Copy highlight scripts to /highlights in document root.
-      cp -vt $dest/highlightjs \
-        ${documentation-highlighter}/highlight.pack.js \
-        ${documentation-highlighter}/LICENSE \
-        ${documentation-highlighter}/mono-blue.css \
-        ${documentation-highlighter}/loader.js
 
-      # Copy anchor scripts to the script directory in document root.
-      cp -vt "$dest"/script \
-        ${./static/script}/anchor-min.js \
-        ${./static/script}/anchor-use.js \
-        ${./static/script}/search.js
 
-      substituteInPlace ./options.md \
-        --subst-var-by OPTIONS_JSON ./config-options.json
+    # Move compiled stylesheet
+    cp -vt $dest \
+      ${compileStylesheet}/style.css
 
-      substituteInPlace ./manual.md \
-        --subst-var-by NVF_VERSION ${manual-release}
+    # Move release notes
+    cp -vr ${./release-notes} release-notes
 
-      substituteInPlace ./hacking/additional-plugins.md \
-        --subst-var-by NVF_REPO "https://github.com/notashelf/nvf/blob/${manual-release}"
+    # Generate final manual from a set of parameters. Explanation of the CLI flags are
+    # as follows:
+    #
+    #  1. --manpage-urls will allow you to use manual pages as they are defined in
+    #  the nixpkgs documentation.
+    #  2. --revision is the project revision as it is defined in 'release.json' in the
+    #  repository root
+    #  3. --script will inject a given Javascript file into the resulting pages inside
+    #  the <script> tag.
+    #  4. --toc-depth will determine the depth of the initial Table of Contents while
+    #  --section-toc-depth will determine the depth of per-section Table of Contents
+    #  sections.
+    nixos-render-docs manual html \
+      --manpage-urls ${path + "/doc/manpage-urls.json"} \
+      --revision ${lib.trivial.revisionWithDefault manual-release} \
+      --stylesheet style.css \
+      --script highlightjs/highlight.pack.js \
+      --script highlightjs/loader.js \
+      --script script/anchor-use.js \
+      --script script/anchor-min.js \
+      --script script/search.js \
+      --toc-depth 1 \
+      --section-toc-depth 1 \
+      manual.md \
+      "$dest/index.xhtml"
 
-      # Move compiled stylesheet
-      cp -vt $dest \
-        ${compileStylesheet}/style.css
+      # Hydra support. Probably not necessary.
+      mkdir -p $out/nix-support/
+      echo "doc manual $dest index.html" >> $out/nix-support/hydra-build-products
+  '';
+}
+*/
 
-      # Move release notes
-      cp -vr ${./release-notes} release-notes
-
-      # Generate final manual from a set of parameters. Explanation of the CLI flags are
-      # as follows:
-      #
-      #  1. --manpage-urls will allow you to use manual pages as they are defined in
-      #  the nixpkgs documentation.
-      #  2. --revision is the project revision as it is defined in 'release.json' in the
-      #  repository root
-      #  3. --script will inject a given Javascript file into the resulting pages inside
-      #  the <script> tag.
-      #  4. --toc-depth will determine the depth of the initial Table of Contents while
-      #  --section-toc-depth will determine the depth of per-section Table of Contents
-      #  sections.
-      nixos-render-docs manual html \
-        --manpage-urls ${path + "/doc/manpage-urls.json"} \
-        --revision ${lib.trivial.revisionWithDefault manual-release} \
-        --stylesheet style.css \
-        --script highlightjs/highlight.pack.js \
-        --script highlightjs/loader.js \
-        --script script/anchor-use.js \
-        --script script/anchor-min.js \
-        --script script/search.js \
-        --toc-depth 1 \
-        --section-toc-depth 1 \
-        manual.md \
-        "$dest/index.xhtml"
-
-        # Hydra support. Probably not necessary.
-        mkdir -p $out/nix-support/
-        echo "doc manual $dest index.html" >> $out/nix-support/hydra-build-products
-    '';
-  }

From d363d00748752c558165204b5da0ebae259b2de6 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Fri, 26 Sep 2025 15:04:54 +0300
Subject: [PATCH 03/18] docs: rename entrypoing to index for ndg compat

Signed-off-by: NotAShelf <raf@notashelf.dev>
Change-Id: I6a6a696417907923e7def794fb49c28adb953ea7
---
 docs/manual/{manual.md => index.md} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename docs/manual/{manual.md => index.md} (100%)

diff --git a/docs/manual/manual.md b/docs/manual/index.md
similarity index 100%
rename from docs/manual/manual.md
rename to docs/manual/index.md

From 063a27ce7e1a26752b357a4d3279b054ef0d7380 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Fri, 14 Nov 2025 18:41:30 +0100
Subject: [PATCH 04/18] docs: move release-notes to manual/

---
 docs/{ => manual}/release-notes/release-notes.md | 0
 docs/{ => manual}/release-notes/rl-0.1.md        | 0
 docs/{ => manual}/release-notes/rl-0.2.md        | 0
 docs/{ => manual}/release-notes/rl-0.3.md        | 0
 docs/{ => manual}/release-notes/rl-0.4.md        | 0
 docs/{ => manual}/release-notes/rl-0.5.md        | 0
 docs/{ => manual}/release-notes/rl-0.6.md        | 0
 docs/{ => manual}/release-notes/rl-0.7.md        | 0
 docs/{ => manual}/release-notes/rl-0.8.md        | 0
 9 files changed, 0 insertions(+), 0 deletions(-)
 rename docs/{ => manual}/release-notes/release-notes.md (100%)
 rename docs/{ => manual}/release-notes/rl-0.1.md (100%)
 rename docs/{ => manual}/release-notes/rl-0.2.md (100%)
 rename docs/{ => manual}/release-notes/rl-0.3.md (100%)
 rename docs/{ => manual}/release-notes/rl-0.4.md (100%)
 rename docs/{ => manual}/release-notes/rl-0.5.md (100%)
 rename docs/{ => manual}/release-notes/rl-0.6.md (100%)
 rename docs/{ => manual}/release-notes/rl-0.7.md (100%)
 rename docs/{ => manual}/release-notes/rl-0.8.md (100%)

diff --git a/docs/release-notes/release-notes.md b/docs/manual/release-notes/release-notes.md
similarity index 100%
rename from docs/release-notes/release-notes.md
rename to docs/manual/release-notes/release-notes.md
diff --git a/docs/release-notes/rl-0.1.md b/docs/manual/release-notes/rl-0.1.md
similarity index 100%
rename from docs/release-notes/rl-0.1.md
rename to docs/manual/release-notes/rl-0.1.md
diff --git a/docs/release-notes/rl-0.2.md b/docs/manual/release-notes/rl-0.2.md
similarity index 100%
rename from docs/release-notes/rl-0.2.md
rename to docs/manual/release-notes/rl-0.2.md
diff --git a/docs/release-notes/rl-0.3.md b/docs/manual/release-notes/rl-0.3.md
similarity index 100%
rename from docs/release-notes/rl-0.3.md
rename to docs/manual/release-notes/rl-0.3.md
diff --git a/docs/release-notes/rl-0.4.md b/docs/manual/release-notes/rl-0.4.md
similarity index 100%
rename from docs/release-notes/rl-0.4.md
rename to docs/manual/release-notes/rl-0.4.md
diff --git a/docs/release-notes/rl-0.5.md b/docs/manual/release-notes/rl-0.5.md
similarity index 100%
rename from docs/release-notes/rl-0.5.md
rename to docs/manual/release-notes/rl-0.5.md
diff --git a/docs/release-notes/rl-0.6.md b/docs/manual/release-notes/rl-0.6.md
similarity index 100%
rename from docs/release-notes/rl-0.6.md
rename to docs/manual/release-notes/rl-0.6.md
diff --git a/docs/release-notes/rl-0.7.md b/docs/manual/release-notes/rl-0.7.md
similarity index 100%
rename from docs/release-notes/rl-0.7.md
rename to docs/manual/release-notes/rl-0.7.md
diff --git a/docs/release-notes/rl-0.8.md b/docs/manual/release-notes/rl-0.8.md
similarity index 100%
rename from docs/release-notes/rl-0.8.md
rename to docs/manual/release-notes/rl-0.8.md

From 06937516c7aa5f3fb82b8186b9f939d48a5c91c6 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Fri, 26 Sep 2025 18:06:52 +0300
Subject: [PATCH 05/18] docs: restructure to allow a clean migration to new
 documentation util

Signed-off-by: NotAShelf <raf@notashelf.dev>
Change-Id: I6a6a6964afba43bdda6a2cbf037404ca3fa4f8c9
---
 docs/manual.nix                               | 103 +--
 docs/manual/configuring.md                    |   3 +-
 .../{ => custom-plugins}/custom-package.md    |   0
 docs/manual/hacking.md                        | 589 +++++++++++++++++-
 docs/manual/hacking/additional-plugins.md     | 266 --------
 docs/manual/hacking/getting-started.md        |  17 -
 docs/manual/hacking/guidelines.md             | 188 ------
 docs/manual/hacking/keybinds.md               |  97 ---
 docs/manual/hacking/testing.md                |  15 -
 docs/manual/index.md                          | 107 +++-
 docs/manual/installation.md                   |  14 -
 docs/manual/options.md                        |  21 -
 docs/manual/preface.md                        |  20 -
 docs/manual/quirks.md                         |  42 +-
 docs/manual/quirks/nodejs.md                  |  24 -
 docs/manual/release-notes.md                  |  15 +
 docs/manual/release-notes/rl-0.1.md           |   4 +-
 docs/manual/release-notes/rl-0.2.md           |  20 +-
 docs/manual/release-notes/rl-0.3.md           |   4 +-
 docs/manual/release-notes/rl-0.4.md           |   4 +-
 docs/manual/release-notes/rl-0.5.md           |   6 +-
 docs/manual/release-notes/rl-0.6.md           |   2 +-
 docs/manual/release-notes/rl-0.7.md           |   4 +-
 docs/manual/release-notes/rl-0.8.md           |   4 +-
 docs/manual/tips.md                           |   2 +-
 docs/manual/try-it-out.md                     |  72 ---
 26 files changed, 760 insertions(+), 883 deletions(-)
 rename docs/manual/configuring/{ => custom-plugins}/custom-package.md (100%)
 delete mode 100644 docs/manual/hacking/additional-plugins.md
 delete mode 100644 docs/manual/hacking/getting-started.md
 delete mode 100644 docs/manual/hacking/guidelines.md
 delete mode 100644 docs/manual/hacking/keybinds.md
 delete mode 100644 docs/manual/hacking/testing.md
 delete mode 100644 docs/manual/installation.md
 delete mode 100644 docs/manual/options.md
 delete mode 100644 docs/manual/preface.md
 delete mode 100644 docs/manual/quirks/nodejs.md
 create mode 100644 docs/manual/release-notes.md
 delete mode 100644 docs/manual/try-it-out.md

diff --git a/docs/manual.nix b/docs/manual.nix
index 1ce89126..bf222204 100644
--- a/docs/manual.nix
+++ b/docs/manual.nix
@@ -1,32 +1,38 @@
 {
   inputs,
-  stdenvNoCC,
-  runCommandLocal,
-  # build inputs
   path,
-  # nrd configuration
-  release,
+  stdenvNoCC,
+  runCommandNoCCLocal,
   optionsJSON,
 } @ args: let
   manual-release = args.release or "unstable";
 in
-  runCommandLocal "hjem-docs" {
-    nativeBuildInputs = [inputs.ndg.packages.${stdenvNoCC.system}.ndg];
+  runCommandNoCCLocal "nvf-docs-html" {
+    nativeBuildInputs = [
+      (inputs.ndg.packages.${stdenvNoCC.system}.ndg.overrideAttrs
+        {
+          # FIXME: the tests take too long to build
+          doCheck = false;
+        })
+    ];
   } ''
     mkdir -p $out/share/doc
 
-    # Copy the markdown sources to be processed by ndg
+    # Copy the markdown sources to be processed by ndg. This is not
+    # strictly necessary, but allows us to modify the Markdown sources
+    # as we see fit.
     cp -rvf ${./manual} ./manual
 
-    substituteInPlace ./manual/options.md \
-      --subst-var-by OPTIONS_JSON ./config-options.json
-
+    # Replace variables following the @VARIABLE@ style in the manual
+    # pages. This can be built into ndg at a later date.
     substituteInPlace ./manual/index.md \
       --subst-var-by NVF_VERSION ${manual-release}
 
     substituteInPlace ./manual/hacking/additional-plugins.md \
       --subst-var-by NVF_REPO "https://github.com/notashelf/nvf/blob/${manual-release}"
 
+    # Generate the final manual from a set of parameters. This uses
+    # feel-co/ndg to render the web manual.
     ndg html \
       --jobs $NIX_BUILD_CORES --title "NVF" \
       --module-options ${optionsJSON}/share/doc/nixos/options.json \
@@ -41,78 +47,3 @@ in
     mkdir -p $out/nix-support/
     echo "doc manual $dest index.html" >> $out/nix-support/hydra-build-products
   ''
-/*
-stdenvNoCC.mkDerivation {
-  name = "nvf-manual";
-  src = builtins.path {
-    name = "nvf-manual-${manual-release}";
-    path = lib.sourceFilesBySuffices ./manual [".md" ".md.in"];
-  };
-
-  strictDependencies = true;
-  nativeBuildInputs = [nixos-render-docs];
-
-  postPatch = ''
-    ln -s ${optionsJSON}/share/doc/nixos/options.json ./config-options.json
-  '';
-
-  buildPhase = ''
-    dest="$out/share/doc/nvf"
-    mkdir -p "$(dirname "$dest")"
-    mkdir -p $dest/{highlightjs,script}
-
-    # Copy highlight scripts to /highlights in document root.
-    cp -vt $dest/highlightjs \
-      ${documentation-highlighter}/highlight.pack.js \
-      ${documentation-highlighter}/LICENSE \
-      ${documentation-highlighter}/mono-blue.css \
-      ${documentation-highlighter}/loader.js
-
-    # Copy anchor scripts to the script directory in document root.
-    cp -vt "$dest"/script \
-      ${./static/script}/anchor-min.js \
-      ${./static/script}/anchor-use.js \
-      ${./static/script}/search.js
-
-
-
-    # Move compiled stylesheet
-    cp -vt $dest \
-      ${compileStylesheet}/style.css
-
-    # Move release notes
-    cp -vr ${./release-notes} release-notes
-
-    # Generate final manual from a set of parameters. Explanation of the CLI flags are
-    # as follows:
-    #
-    #  1. --manpage-urls will allow you to use manual pages as they are defined in
-    #  the nixpkgs documentation.
-    #  2. --revision is the project revision as it is defined in 'release.json' in the
-    #  repository root
-    #  3. --script will inject a given Javascript file into the resulting pages inside
-    #  the <script> tag.
-    #  4. --toc-depth will determine the depth of the initial Table of Contents while
-    #  --section-toc-depth will determine the depth of per-section Table of Contents
-    #  sections.
-    nixos-render-docs manual html \
-      --manpage-urls ${path + "/doc/manpage-urls.json"} \
-      --revision ${lib.trivial.revisionWithDefault manual-release} \
-      --stylesheet style.css \
-      --script highlightjs/highlight.pack.js \
-      --script highlightjs/loader.js \
-      --script script/anchor-use.js \
-      --script script/anchor-min.js \
-      --script script/search.js \
-      --toc-depth 1 \
-      --section-toc-depth 1 \
-      manual.md \
-      "$dest/index.xhtml"
-
-      # Hydra support. Probably not necessary.
-      mkdir -p $out/nix-support/
-      echo "doc manual $dest index.html" >> $out/nix-support/hydra-build-products
-  '';
-}
-*/
-
diff --git a/docs/manual/configuring.md b/docs/manual/configuring.md
index 95195f78..4c119bee 100644
--- a/docs/manual/configuring.md
+++ b/docs/manual/configuring.md
@@ -1,6 +1,7 @@
 # Configuring nvf {#ch-configuring}
 
 [helpful tips section]: #ch-helpful-tips
+[options reference]: /nvf/options.html
 
 nvf allows for _very_ extensive configuration in Neovim through the Nix module
 interface. The below chapters describe several of the options exposed in nvf for
@@ -8,7 +9,7 @@ your convenience. You might also be interested in the [helpful tips section] for
 more advanced or unusual configuration options supported by nvf.
 
 Note that this section does not cover module _options_. For an overview of all
-module options provided by nvf, please visit the [appendix](/nvf/options.html)
+module options provided by nvf, please visit the [options reference]
 
 ```{=include=} chapters
 configuring/custom-package.md
diff --git a/docs/manual/configuring/custom-package.md b/docs/manual/configuring/custom-plugins/custom-package.md
similarity index 100%
rename from docs/manual/configuring/custom-package.md
rename to docs/manual/configuring/custom-plugins/custom-package.md
diff --git a/docs/manual/hacking.md b/docs/manual/hacking.md
index 6ff01fc6..85bb3ed1 100644
--- a/docs/manual/hacking.md
+++ b/docs/manual/hacking.md
@@ -21,10 +21,587 @@ ideally also include relevant context in which an issue occurs or a feature
 should be implemented. If you wish to make a contribution, but feel stuck -
 please do not be afraid to submit a pull request, we will help you get it in.
 
-```{=include=} sections
-hacking/getting-started.md
-hacking/guidelines.md
-hacking/testing.md
-hacking/keybinds.md
-hacking/additional-plugins.md
+## Getting Started {#sec-contrib-getting-started}
+
+You, naturally, would like to start by forking the repository to get started. If
+you are new to Git and GitHub, do have a look at GitHub's
+[Fork a repo guide](https://help.github.com/articles/fork-a-repo/) for
+instructions on how you can do this. Once you have a fork of **nvf**, you should
+create a separate branch based on the most recent `main` branch. Give your
+branch a reasonably descriptive name (e.g. `feature/debugger` or
+`fix/pesky-bug`) and you are ready to work on your changes
+
+Implement your changes and commit them to the newly created branch and when you
+are happy with the result, and positive that it fulfills our
+[Contributing Guidelines](#sec-guidelines), push the branch to GitHub and
+[create a pull request](https://help.github.com/articles/creating-a-pull-request).
+The default pull request template available on the **nvf** repository will guide
+you through the rest of the process, and we'll gently nudge you in the correct
+direction if there are any mistakes.
+
+## Guidelines {#sec-guidelines}
+
+If your contribution tightly follows the guidelines, then there is a good chance
+it will be merged without too much trouble. Some of the guidelines will be
+strictly enforced, others will remain as gentle nudges towards the correct
+direction. As we have no automated system enforcing those guidelines, please try
+to double check your changes before making your pull request in order to avoid
+"faulty" code slipping by.
+
+If you are uncertain how these rules affect the change you would like to make
+then feel free to start a discussion in the
+[discussions tab](https://github.com/NotAShelf/nvf/discussions) ideally (but not
+necessarily) before you start developing.
+
+### Adding Documentation {#sec-guidelines-documentation}
+
+[Nixpkgs Flavoured Markdown]: https://github.com/NixOS/nixpkgs/blob/master/doc/README.md#syntax
+
+Almost all changes warrant updates to the documentation: at the very least, you
+must update the changelog. Both the manual and module options use
+[Nixpkgs Flavoured Markdown].
+
+The HTML version of this manual containing both the module option descriptions
+and the documentation of **nvf** (such as this page) can be generated and opened
+by typing the following in a shell within a clone of the **nvf** Git repository:
+
+```console
+$ nix build .#docs-html
+$ xdg-open $PWD/result/share/doc/nvf/index.html
 ```
+
+### Formatting Code {#sec-guidelines-formatting}
+
+Make sure your code is formatted as described in
+[code-style section](#sec-guidelines-code-style). To maintain consistency
+throughout the project you are encouraged to browse through existing code and
+adopt its style also in new code.
+
+### Formatting Commits {#sec-guidelines-commit-message-style}
+
+Similar to [code style guidelines](#sec-guidelines-code-style) we encourage a
+consistent commit message format as described in
+[commit style guidelines](#sec-guidelines-commit-style).
+
+### Commit Style {#sec-guidelines-commit-style}
+
+The commits in your pull request should be reasonably self-contained. Which
+means each and every commit in a pull request should make sense both on its own
+and in general context. That is, a second commit should not resolve an issue
+that is introduced in an earlier commit. In particular, you will be asked to
+amend any commit that introduces syntax errors or similar problems even if they
+are fixed in a later commit.
+
+The commit messages should follow the
+[seven rules](https://chris.beams.io/posts/git-commit/#seven-rule), except for
+"Capitalize the subject line". We also ask you to include the affected code
+component or module in the first line. A commit message ideally, but not
+necessarily, follow the given template from home-manager's own documentation
+
+```
+  {component}: {description}
+
+  {long description}
+```
+
+where `{component}` refers to the code component (or module) your change
+affects, `{description}` is a very brief description of your change, and
+`{long description}` is an optional clarifying description. As a rare exception,
+if there is no clear component, or your change affects many components, then the
+`{component}` part is optional. See
+[example commit message](#sec-guidelines-ex-commit-message) for a commit message
+that fulfills these requirements.
+
+#### Example Commit {#sec-guidelines-ex-commit-message}
+
+The commit
+[69f8e47e9e74c8d3d060ca22e18246b7f7d988ef](https://github.com/nix-community/home-manager/commit/69f8e47e9e74c8d3d060ca22e18246b7f7d988ef)
+in home-manager contains the following commit message.
+
+```
+starship: allow running in Emacs if vterm is used
+
+The vterm buffer is backed by libvterm and can handle Starship prompts
+without issues.
+```
+
+Similarly, if you are contributing to **nvf**, you would include the scope of
+the commit followed by the description:
+
+```
+languages/ruby: init module
+
+Adds a language module for Ruby, adds appropriate formatters and Treesitter grammars
+```
+
+Long description can be omitted if the change is too simple to warrant it. A
+minor fix in spelling or a formatting change does not warrant long description,
+however, a module addition or removal does as you would like to provide the
+relevant context, i.e. the reasoning behind it, for your commit.
+
+Finally, when adding a new module, say `modules/foo.nix`, we use the fixed
+commit format `foo: add module`. You can, of course, still include a long
+description if you wish.
+
+In case of nested modules, i.e `modules/languages/java.nix` you are recommended
+to contain the parent as well - for example `languages/java: some major change`.
+
+### Code Style {#sec-guidelines-code-style}
+
+#### Treewide {#sec-code-style-treewide}
+
+Keep lines at a reasonable width, ideally 80 characters or less. This also
+applies to string literals and module descriptions and documentation.
+
+#### Nix {#sec-code-style-nix}
+
+[alejandra]: https://github.com/kamadorueda/alejandra
+
+**nvf** is formatted by the [alejandra] tool and the formatting is checked in
+the pull request and push workflows. Run the `nix fmt` command inside the
+project repository before submitting your pull request.
+
+While Alejandra is mostly opinionated on how code looks after formatting,
+certain changes are done at the user's discretion based on how the original code
+was structured.
+
+Please use one line code for attribute sets that contain only one subset. For
+example:
+
+```nix
+# parent modules should always be unfolded
+# which means module = { value = ... } instead of module.value = { ... }
+module = {
+  value = mkEnableOption "some description" // { default = true; }; # merges can be done inline where possible
+
+    # same as parent modules, unfold submodules
+    subModule = {
+        # this is an option that contains more than one nested value
+        # Note: try to be careful about the ordering of `mkOption` arguments.
+        # General rule of thumb is to order from least to most likely to change.
+        # This is, for most cases, type < default < description.
+        # Example, if present, would be between default and description
+        someOtherValue = mkOption {
+            type = lib.types.bool;
+            default = true;
+            description = "Some other description";
+        };
+    };
+}
+```
+
+If you move a line down after the merge operator, Alejandra will automatically
+unfold the whole merged attrset for you, which we **do not** want.
+
+```nix
+module = {
+  key = mkEnableOption "some description" // {
+    default = true; # we want this to be inline
+  }; # ...
+}
+```
+
+For lists, it is mostly up to your own discretion how you want to format them,
+but please try to unfold lists if they contain multiple items and especially if
+they are to include comments.
+
+```nix
+# this is ok
+acceptableList = [
+  item1 # comment
+  item2
+  item3 # some other comment
+  item4
+];
+
+# this is not ok
+listToBeAvoided = [item1 item2 /* comment */ item3 item4];
+
+# this is ok
+acceptableList = [item1 item2];
+
+# this is also ok if the list is expected to contain more elements
+acceptableList= [
+  item1
+  item2
+  # more items if needed...
+];
+```
+
+## Testing Changes {#sec-testing-changes}
+
+Once you have made your changes, you will need to test them thoroughly. If it is
+a module, add your module option to `configuration.nix` (located in the root of
+this project) inside `neovimConfiguration`. Enable it, and then run the maximal
+configuration with `nix run .#maximal -Lv` to check for build errors. If neovim
+opens in the current directory without any error messages (you can check the
+output of `:messages` inside neovim to see if there are any errors), then your
+changes are good to go. Open your pull request, and it will be reviewed as soon
+as possible.
+
+If it is not a new module, but a change to an existing one, then make sure the
+module you have changed is enabled in the maximal configuration by editing
+`configuration.nix`, and then run it with `nix run .#maximal -Lv`. Same
+procedure as adding a new module will apply here.
+
+## Keybinds {#sec-keybinds}
+
+As of 0.4, there exists an API for writing your own keybinds and a couple of
+useful utility functions are available in the
+[extended standard library](https://github.com/NotAShelf/nvf/tree/main/lib). The
+following section contains a general overview to how you may utilize said
+functions.
+
+## Custom Key Mappings Support for a Plugin {#sec-custom-key-mappings}
+
+To set a mapping, you should define it in `vim.keymaps`.
+
+An example, simple keybinding, can look like this:
+
+```nix
+{
+  vim.keymaps = [
+    {
+      key = "<leader>wq";
+      mode = ["n"];
+      action = ":wq<CR>";
+      silent = true;
+      desc = "Save file and quit";
+    }
+  ];
+}
+```
+
+There are many settings available in the options. Please refer to the
+[documentation](https://notashelf.github.io/nvf/options.html#opt-vim.keymaps) to
+see a list of them.
+
+**nvf** provides a helper function, so that you don't have to write the mapping
+attribute sets every time:
+
+- `mkKeymap`, which mimics neovim's `vim.keymap.set` function
+
+You can read the source code of some modules to see them in action, but the
+usage should look something like this:
+
+```nix
+# plugindefinition.nix
+{lib, ...}: let
+  inherit (lib.options) mkEnableOption;
+  inherit (lib.nvim.binds) mkMappingOption;
+in {
+  options.vim.plugin = {
+    enable = mkEnableOption "Enable plugin";
+
+    # Mappings should always be inside an attrset called mappings
+    mappings = {
+      workspaceDiagnostics = mkMappingOption "Workspace diagnostics [trouble]" "<leader>lwd";
+      documentDiagnostics = mkMappingOption "Document diagnostics [trouble]" "<leader>ld";
+      lspReferences = mkMappingOption "LSP References [trouble]" "<leader>lr";
+      quickfix = mkMappingOption "QuickFix [trouble]" "<leader>xq";
+      locList = mkMappingOption "LOCList [trouble]" "<leader>xl";
+      symbols = mkMappingOption "Symbols [trouble]" "<leader>xs";
+    };
+}
+```
+
+```nix
+# config.nix
+{
+  config,
+  lib,
+  options,
+  ...
+}: let
+  inherit (lib.modules) mkIf;
+  inherit (lib.nvim.binds) mkKeymap;
+
+  cfg = config.vim.plugin;
+
+  keys = cfg.mappings;
+  inherit (options.vim.lsp.trouble) mappings;
+in {
+  config = mkIf cfg.enable {
+    vim.keymaps = [
+      (mkKeymap "n" keys.workspaceDiagnostics "<cmd>Trouble toggle diagnostics<CR>" {desc = mappings.workspaceDiagnostics.description;})
+      (mkKeymap "n" keys.documentDiagnostics "<cmd>Trouble toggle diagnostics filter.buf=0<CR>" {desc = mappings.documentDiagnostics.description;})
+      (mkKeymap "n" keys.lspReferences "<cmd>Trouble toggle lsp_references<CR>" {desc = mappings.lspReferences.description;})
+      (mkKeymap "n" keys.quickfix "<cmd>Trouble toggle quickfix<CR>" {desc = mappings.quickfix.description;})
+      (mkKeymap "n" keys.locList "<cmd>Trouble toggle loclist<CR>" {desc = mappings.locList.description;})
+      (mkKeymap "n" keys.symbols "<cmd>Trouble toggle symbols<CR>" {desc = mappings.symbols.description;})
+    ];
+  };
+}
+```
+
+> [!NOTE]
+> If you have come across a plugin that has an API that doesn't seem to easily
+> allow custom keybindings, don't be scared to implement a draft PR. We'll help
+> you get it done.
+
+## Adding Plugins {#sec-additional-plugins}
+
+There are two methods for adding new Neovim plugins to **nvf**. npins is the
+faster option that should be preferred if the plugin consists of pure Lua or
+Vimscript code. In which case there is no building required, and we can easily
+handle the copying of plugin files. Alternative method, which is required when
+plugins try to build their own libraries (e.g., in Rust or C) that need to be
+built with Nix to function correctly.
+
+### With npins {#sec-npins-for-plugins}
+
+npins is the standard method of adding new plugins to **nvf**. You simply need
+the repository URL for the plugin, and can add it as a source to be built
+automatically with one command. To add a new Neovim plugin, use `npins`. For
+example:
+
+```bash
+nix-shell -p npins # or nix shell nixpkgs#npins if using flakes
+```
+
+Then run:
+
+```bash
+npins add --name <plugin name> github <owner> <repo> -b <branch>
+```
+
+::: {.note}
+
+Be sure to replace any non-alphanumeric characters with `-` for `--name`. For
+example
+
+```bash
+npins add --name lazydev-nvim github folke lazydev.nvim -b main
+```
+
+:::
+
+Once the `npins` command is done, you can start referencing the plugin as a
+**string**.
+
+```nix
+{
+  config.vim.startPlugins = ["lazydev-nvim"];
+}
+```
+
+### Packaging Complex Plugins {#sec-pkgs-for-plugins}
+
+[blink.cmp]: https://github.com/Saghen/blink.cmp
+
+Some plugins require additional packages to be built and substituted to function
+correctly. For example [blink.cmp] requires its own fuzzy matcher library, built
+with Rust, to be installed or else defaults to a much slower Lua implementation.
+In the Blink documentation, you are advised to build with `cargo` but that is
+not ideal since we are leveraging the power of Nix. In this case the ideal
+solution is to write a derivation for the plugin.
+
+We use `buildRustPackage` to build the library from the repository root, and
+copy everything in the `postInstall` phase.
+
+```nix
+postInstall = ''
+  cp -r {lua,plugin} "$out"
+
+  mkdir -p "$out/doc"
+  cp 'doc/'*'.txt' "$out/doc/"
+
+  mkdir -p "$out/target"
+  mv "$out/lib" "$out/target/release"
+'';
+```
+
+In a similar fashion, you may utilize `stdenv.mkDerivation` and other Nixpkgs
+builders to build your library from source, and copy the relevant files and Lua
+plugin files in the `postInstall` phase. Do note, however, that you still need
+to fetch the plugin sources somehow. npins is, once again, the recommended
+option to fetch the plugin sources. Refer to the previous section on how to use
+npins to add a new plugin.
+
+Plugins built from source must go into the `flake/pkgs/by-name` overlay. It will
+automatically create flake outputs for individual packages. Lastly, you must add
+your package to the plugin builder (`pluginBuilders`) function manually in
+`modules/wrapper/build/config.nix`. Once done, you may refer to your plugin as a
+**string**.
+
+```nix
+{
+  config.vim.startPlugins = ["blink-cmp"];
+}
+```
+
+### Modular setup options {#sec-modular-setup-options}
+
+Most plugins is initialized with a call to `require('plugin').setup({...})`.
+
+We use a special function that lets you easily add support for such setup
+options in a modular way: `mkPluginSetupOption`.
+
+Once you have added the source of the plugin as shown above, you can define the
+setup options like this:
+
+```nix
+# in modules/.../your-plugin/your-plugin.nix
+
+{lib, ...}:
+let
+  inherit (lib.types) bool int;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.your-plugin = {
+    setupOpts = mkPluginSetupOption "plugin name" {
+      enable_feature_a = mkOption {
+        type = bool;
+        default = false;
+        # ...
+      };
+
+      number_option = mkOption {
+        type = int;
+        default = 3;
+        # ...
+      };
+    };
+  };
+}
+```
+
+```nix
+# in modules/.../your-plugin/config.nix
+{lib, config, ...}:
+let
+  cfg = config.vim.your-plugin;
+in {
+  vim.luaConfigRC = lib.nvim.dag.entryAnywhere ''
+    require('plugin-name').setup(${lib.nvim.lua.toLuaObject cfg.setupOpts})
+  '';
+}
+```
+
+This above config will result in this Lua script:
+
+```lua
+require('plugin-name').setup({
+  enable_feature_a = false,
+  number_option = 3,
+})
+```
+
+Now users can set any of the pre-defined option field, and can also add their
+own fields!
+
+```nix
+# in user's config
+{
+  vim.your-plugin.setupOpts = {
+    enable_feature_a = true;
+    number_option = 4;
+    another_field = "hello";
+    size = { # nested fields work as well
+      top = 10;
+    };
+  };
+}
+```
+
+### Details of toLuaObject {#sec-details-of-toluaobject}
+
+As you've seen above, `toLuaObject` is used to convert our nix attrSet
+`cfg.setupOpts`, into a lua table. Here are some rules of the conversion:
+
+1. Nix `null` converts to lua `nil`
+2. Number and strings convert to their lua counterparts
+3. Nix attribute sets (`{}`) and lists (`[]`) convert into Lua dictionaries and
+   tables respectively. Here is an example of Nix -> Lua conversion.
+   - `{foo = "bar"}` -> `{["foo"] = "bar"}`
+   - `["foo" "bar"]` -> `{"foo", "bar"}`
+4. You can write raw Lua code using `lib.generators.mkLuaInline`. This function
+   is part of nixpkgs, and is accessible without relying on **nvf**'s extended
+   library.
+   - `mkLuaInline "function add(a, b) return a + b end"` will yield the
+     following result:
+
+   ```nix
+   {
+    _type = "lua-inline";
+    expr = "function add(a, b) return a + b end";
+   }
+   ```
+
+   The above expression will be interpreted as a Lua expression in the final
+   config. Without the `mkLuaInline` function, you will only receive a string
+   literal. You can use it to feed plugin configuration tables Lua functions
+   that return specific values as expected by the plugins.
+
+   ```nix
+   {
+      vim.your-plugin.setupOpts = {
+        on_init = lib.generators.mkLuaInline ''
+          function()
+            print('we can write lua!')
+          end
+        '';
+      };
+   }
+   ```
+
+### Lazy plugins {#sec-lazy-plugins}
+
+If the plugin can be lazy-loaded, `vim.lazy.plugins` should be used to add it.
+Lazy plugins are managed by `lz.n`.
+
+```nix
+# in modules/.../your-plugin/config.nix
+{config, ...}: let
+  cfg = config.vim.your-plugin;
+in {
+  vim.lazy.plugins.your-plugin = {
+    # Instead of vim.startPlugins, use this:
+    package = "your-plugin";
+
+    # ıf your plugin uses the `require('your-plugin').setup{...}` pattern
+    setupModule = "your-plugin";
+    inherit (cfg) setupOpts;
+
+    # Events that trigger this plugin to be loaded
+    event = ["DirChanged"];
+    cmd = ["YourPluginCommand"];
+
+    # Plugin Keymaps
+    keys = [
+      # We'll cover this in detail in the 'keybinds' section
+      {
+        key = "<leader>d";
+        mode = "n";
+        action = ":YourPluginCommand";
+      }
+    ];
+  };
+}
+```
+
+This results in the following lua code:
+
+```lua
+require('lz.n').load({
+  {
+    "name-of-your-plugin",
+    after = function()
+      require('your-plugin').setup({
+        --[[ your setupOpts ]]--
+      })
+    end,
+
+    event = {"DirChanged"},
+    cmd = {"YourPluginCommand"},
+    keys = {
+      {"<leader>d", ":YourPluginCommand", mode = {"n"}},
+    },
+  }
+})
+```
+
+[`vim.lazy.plugins` spec]: https://notashelf.github.io/nvf/options.html#opt-vim.lazy.plugins
+
+A full list of options can be found in the [`vim.lazy.plugins` spec] on the
+rendered manual.
diff --git a/docs/manual/hacking/additional-plugins.md b/docs/manual/hacking/additional-plugins.md
deleted file mode 100644
index 1f7ba778..00000000
--- a/docs/manual/hacking/additional-plugins.md
+++ /dev/null
@@ -1,266 +0,0 @@
-# Adding Plugins {#sec-additional-plugins}
-
-There are two methods for adding new Neovim plugins to **nvf**. npins is the
-faster option that should be preferred if the plugin consists of pure Lua or
-Vimscript code. In which case there is no building required, and we can easily
-handle the copying of plugin files. Alternative method, which is required when
-plugins try to build their own libraries (e.g., in Rust or C) that need to be
-built with Nix to function correctly.
-
-## With npins {#sec-npins-for-plugins}
-
-npins is the standard method of adding new plugins to **nvf**. You simply need
-the repository URL for the plugin, and can add it as a source to be built
-automatically with one command. To add a new Neovim plugin, use `npins`. For
-example:
-
-```bash
-nix-shell -p npins # or nix shell nixpkgs#npins if using flakes
-```
-
-Then run:
-
-```bash
-npins add --name <plugin name> github <owner> <repo> -b <branch>
-```
-
-::: {.note}
-
-Be sure to replace any non-alphanumeric characters with `-` for `--name`. For
-example
-
-```bash
-npins add --name lazydev-nvim github folke lazydev.nvim -b main
-```
-
-:::
-
-Once the `npins` command is done, you can start referencing the plugin as a
-**string**.
-
-```nix
-{
-  config.vim.startPlugins = ["lazydev-nvim"];
-}
-```
-
-## Packaging Complex Plugins {#sec-pkgs-for-plugins}
-
-[blink.cmp]: https://github.com/Saghen/blink.cmp
-
-Some plugins require additional packages to be built and substituted to function
-correctly. For example [blink.cmp] requires its own fuzzy matcher library, built
-with Rust, to be installed or else defaults to a much slower Lua implementation.
-In the Blink documentation, you are advised to build with `cargo` but that is
-not ideal since we are leveraging the power of Nix. In this case the ideal
-solution is to write a derivation for the plugin.
-
-We use `buildRustPackage` to build the library from the repository root, and
-copy everything in the `postInstall` phase.
-
-```nix
-postInstall = ''
-  cp -r {lua,plugin} "$out"
-
-  mkdir -p "$out/doc"
-  cp 'doc/'*'.txt' "$out/doc/"
-
-  mkdir -p "$out/target"
-  mv "$out/lib" "$out/target/release"
-'';
-```
-
-In a similar fashion, you may utilize `stdenv.mkDerivation` and other Nixpkgs
-builders to build your library from source, and copy the relevant files and Lua
-plugin files in the `postInstall` phase. Do note, however, that you still need
-to fetch the plugin sources somehow. npins is, once again, the recommended
-option to fetch the plugin sources. Refer to the previous section on how to use
-npins to add a new plugin.
-
-Plugins built from source must go into the `flake/pkgs/by-name` overlay. It will
-automatically create flake outputs for individual packages. Lastly, you must add
-your package to the plugin builder (`pluginBuilders`) function manually in
-`modules/wrapper/build/config.nix`. Once done, you may refer to your plugin as a
-**string**.
-
-```nix
-{
-  config.vim.startPlugins = ["blink-cmp"];
-}
-```
-
-## Modular setup options {#sec-modular-setup-options}
-
-Most plugins is initialized with a call to `require('plugin').setup({...})`.
-
-We use a special function that lets you easily add support for such setup
-options in a modular way: `mkPluginSetupOption`.
-
-Once you have added the source of the plugin as shown above, you can define the
-setup options like this:
-
-```nix
-# in modules/.../your-plugin/your-plugin.nix
-
-{lib, ...}:
-let
-  inherit (lib.types) bool int;
-  inherit (lib.nvim.types) mkPluginSetupOption;
-in {
-  options.vim.your-plugin = {
-    setupOpts = mkPluginSetupOption "plugin name" {
-      enable_feature_a = mkOption {
-        type = bool;
-        default = false;
-        # ...
-      };
-
-      number_option = mkOption {
-        type = int;
-        default = 3;
-        # ...
-      };
-    };
-  };
-}
-```
-
-```nix
-# in modules/.../your-plugin/config.nix
-{lib, config, ...}:
-let
-  cfg = config.vim.your-plugin;
-in {
-  vim.luaConfigRC = lib.nvim.dag.entryAnywhere ''
-    require('plugin-name').setup(${lib.nvim.lua.toLuaObject cfg.setupOpts})
-  '';
-}
-```
-
-This above config will result in this Lua script:
-
-```lua
-require('plugin-name').setup({
-  enable_feature_a = false,
-  number_option = 3,
-})
-```
-
-Now users can set any of the pre-defined option field, and can also add their
-own fields!
-
-```nix
-# in user's config
-{
-  vim.your-plugin.setupOpts = {
-    enable_feature_a = true;
-    number_option = 4;
-    another_field = "hello";
-    size = { # nested fields work as well
-      top = 10;
-    };
-  };
-}
-```
-
-## Details of toLuaObject {#sec-details-of-toluaobject}
-
-As you've seen above, `toLuaObject` is used to convert our nix attrSet
-`cfg.setupOpts`, into a lua table. Here are some rules of the conversion:
-
-1. Nix `null` converts to lua `nil`
-2. Number and strings convert to their lua counterparts
-3. Nix attribute sets (`{}`) and lists (`[]`) convert into Lua dictionaries and
-   tables respectively. Here is an example of Nix -> Lua conversion.
-   - `{foo = "bar"}` -> `{["foo"] = "bar"}`
-   - `["foo" "bar"]` -> `{"foo", "bar"}`
-4. You can write raw Lua code using `lib.generators.mkLuaInline`. This function
-   is part of nixpkgs, and is accessible without relying on **nvf**'s extended
-   library.
-   - `mkLuaInline "function add(a, b) return a + b end"` will yield the
-     following result:
-
-   ```nix
-   {
-    _type = "lua-inline";
-    expr = "function add(a, b) return a + b end";
-   }
-   ```
-
-   The above expression will be interpreted as a Lua expression in the final
-   config. Without the `mkLuaInline` function, you will only receive a string
-   literal. You can use it to feed plugin configuration tables Lua functions
-   that return specific values as expected by the plugins.
-
-   ```nix
-   {
-      vim.your-plugin.setupOpts = {
-        on_init = lib.generators.mkLuaInline ''
-          function()
-            print('we can write lua!')
-          end
-        '';
-      };
-   }
-   ```
-
-## Lazy plugins {#sec-lazy-plugins}
-
-If the plugin can be lazy-loaded, `vim.lazy.plugins` should be used to add it.
-Lazy plugins are managed by `lz.n`.
-
-```nix
-# in modules/.../your-plugin/config.nix
-{config, ...}: let
-  cfg = config.vim.your-plugin;
-in {
-  vim.lazy.plugins.your-plugin = {
-    # Instead of vim.startPlugins, use this:
-    package = "your-plugin";
-
-    # ıf your plugin uses the `require('your-plugin').setup{...}` pattern
-    setupModule = "your-plugin";
-    inherit (cfg) setupOpts;
-
-    # Events that trigger this plugin to be loaded
-    event = ["DirChanged"];
-    cmd = ["YourPluginCommand"];
-
-    # Plugin Keymaps
-    keys = [
-      # We'll cover this in detail in the 'keybinds' section
-      {
-        key = "<leader>d";
-        mode = "n";
-        action = ":YourPluginCommand";
-      }
-    ];
-  };
-}
-```
-
-This results in the following lua code:
-
-```lua
-require('lz.n').load({
-  {
-    "name-of-your-plugin",
-    after = function()
-      require('your-plugin').setup({
-        --[[ your setupOpts ]]--
-      })
-    end,
-
-    event = {"DirChanged"},
-    cmd = {"YourPluginCommand"},
-    keys = {
-      {"<leader>d", ":YourPluginCommand", mode = {"n"}},
-    },
-  }
-})
-```
-
-[`vim.lazy.plugins` spec]: https://notashelf.github.io/nvf/options.html#opt-vim.lazy.plugins
-
-A full list of options can be found in the [`vim.lazy.plugins` spec] on the
-rendered manual.
diff --git a/docs/manual/hacking/getting-started.md b/docs/manual/hacking/getting-started.md
deleted file mode 100644
index 798e203a..00000000
--- a/docs/manual/hacking/getting-started.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Getting Started {#sec-contrib-getting-started}
-
-You, naturally, would like to start by forking the repository to get started. If
-you are new to Git and GitHub, do have a look at GitHub's
-[Fork a repo guide](https://help.github.com/articles/fork-a-repo/) for
-instructions on how you can do this. Once you have a fork of **nvf**, you should
-create a separate branch based on the most recent `main` branch. Give your
-branch a reasonably descriptive name (e.g. `feature/debugger` or
-`fix/pesky-bug`) and you are ready to work on your changes
-
-Implement your changes and commit them to the newly created branch and when you
-are happy with the result, and positive that it fulfills our
-[Contributing Guidelines](#sec-guidelines), push the branch to GitHub and
-[create a pull request](https://help.github.com/articles/creating-a-pull-request).
-The default pull request template available on the **nvf** repository will guide
-you through the rest of the process, and we'll gently nudge you in the correct
-direction if there are any mistakes.
diff --git a/docs/manual/hacking/guidelines.md b/docs/manual/hacking/guidelines.md
deleted file mode 100644
index a1db27e8..00000000
--- a/docs/manual/hacking/guidelines.md
+++ /dev/null
@@ -1,188 +0,0 @@
-# Guidelines {#sec-guidelines}
-
-If your contribution tightly follows the guidelines, then there is a good chance
-it will be merged without too much trouble. Some of the guidelines will be
-strictly enforced, others will remain as gentle nudges towards the correct
-direction. As we have no automated system enforcing those guidelines, please try
-to double check your changes before making your pull request in order to avoid
-"faulty" code slipping by.
-
-If you are uncertain how these rules affect the change you would like to make
-then feel free to start a discussion in the
-[discussions tab](https://github.com/NotAShelf/nvf/discussions) ideally (but not
-necessarily) before you start developing.
-
-## Adding Documentation {#sec-guidelines-documentation}
-
-[Nixpkgs Flavoured Markdown]: https://github.com/NixOS/nixpkgs/blob/master/doc/README.md#syntax
-
-Almost all changes warrant updates to the documentation: at the very least, you
-must update the changelog. Both the manual and module options use
-[Nixpkgs Flavoured Markdown].
-
-The HTML version of this manual containing both the module option descriptions
-and the documentation of **nvf** (such as this page) can be generated and opened
-by typing the following in a shell within a clone of the **nvf** Git repository:
-
-```console
-$ nix build .#docs-html
-$ xdg-open $PWD/result/share/doc/nvf/index.html
-```
-
-## Formatting Code {#sec-guidelines-formatting}
-
-Make sure your code is formatted as described in
-[code-style section](#sec-guidelines-code-style). To maintain consistency
-throughout the project you are encouraged to browse through existing code and
-adopt its style also in new code.
-
-## Formatting Commits {#sec-guidelines-commit-message-style}
-
-Similar to [code style guidelines](#sec-guidelines-code-style) we encourage a
-consistent commit message format as described in
-[commit style guidelines](#sec-guidelines-commit-style).
-
-## Commit Style {#sec-guidelines-commit-style}
-
-The commits in your pull request should be reasonably self-contained. Which
-means each and every commit in a pull request should make sense both on its own
-and in general context. That is, a second commit should not resolve an issue
-that is introduced in an earlier commit. In particular, you will be asked to
-amend any commit that introduces syntax errors or similar problems even if they
-are fixed in a later commit.
-
-The commit messages should follow the
-[seven rules](https://chris.beams.io/posts/git-commit/#seven-rule), except for
-"Capitalize the subject line". We also ask you to include the affected code
-component or module in the first line. A commit message ideally, but not
-necessarily, follow the given template from home-manager's own documentation
-
-```
-  {component}: {description}
-
-  {long description}
-```
-
-where `{component}` refers to the code component (or module) your change
-affects, `{description}` is a very brief description of your change, and
-`{long description}` is an optional clarifying description. As a rare exception,
-if there is no clear component, or your change affects many components, then the
-`{component}` part is optional. See
-[example commit message](#sec-guidelines-ex-commit-message) for a commit message
-that fulfills these requirements.
-
-## Example Commit {#sec-guidelines-ex-commit-message}
-
-The commit
-[69f8e47e9e74c8d3d060ca22e18246b7f7d988ef](https://github.com/nix-community/home-manager/commit/69f8e47e9e74c8d3d060ca22e18246b7f7d988ef)
-in home-manager contains the following commit message.
-
-```
-starship: allow running in Emacs if vterm is used
-
-The vterm buffer is backed by libvterm and can handle Starship prompts
-without issues.
-```
-
-Similarly, if you are contributing to **nvf**, you would include the scope of
-the commit followed by the description:
-
-```
-languages/ruby: init module
-
-Adds a language module for Ruby, adds appropriate formatters and Treesitter grammars
-```
-
-Long description can be omitted if the change is too simple to warrant it. A
-minor fix in spelling or a formatting change does not warrant long description,
-however, a module addition or removal does as you would like to provide the
-relevant context, i.e. the reasoning behind it, for your commit.
-
-Finally, when adding a new module, say `modules/foo.nix`, we use the fixed
-commit format `foo: add module`. You can, of course, still include a long
-description if you wish.
-
-In case of nested modules, i.e `modules/languages/java.nix` you are recommended
-to contain the parent as well - for example `languages/java: some major change`.
-
-## Code Style {#sec-guidelines-code-style}
-
-### Treewide {#sec-code-style-treewide}
-
-Keep lines at a reasonable width, ideally 80 characters or less. This also
-applies to string literals and module descriptions and documentation.
-
-### Nix {#sec-code-style-nix}
-
-[alejandra]: https://github.com/kamadorueda/alejandra
-
-**nvf** is formatted by the [alejandra] tool and the formatting is checked in
-the pull request and push workflows. Run the `nix fmt` command inside the
-project repository before submitting your pull request.
-
-While Alejandra is mostly opinionated on how code looks after formatting,
-certain changes are done at the user's discretion based on how the original code
-was structured.
-
-Please use one line code for attribute sets that contain only one subset. For
-example:
-
-```nix
-# parent modules should always be unfolded
-# which means module = { value = ... } instead of module.value = { ... }
-module = {
-  value = mkEnableOption "some description" // { default = true; }; # merges can be done inline where possible
-
-    # same as parent modules, unfold submodules
-    subModule = {
-        # this is an option that contains more than one nested value
-        # Note: try to be careful about the ordering of `mkOption` arguments.
-        # General rule of thumb is to order from least to most likely to change.
-        # This is, for most cases, type < default < description.
-        # Example, if present, would be between default and description
-        someOtherValue = mkOption {
-            type = lib.types.bool;
-            default = true;
-            description = "Some other description";
-        };
-    };
-}
-```
-
-If you move a line down after the merge operator, Alejandra will automatically
-unfold the whole merged attrset for you, which we **do not** want.
-
-```nix
-module = {
-  key = mkEnableOption "some description" // {
-    default = true; # we want this to be inline
-  }; # ...
-}
-```
-
-For lists, it is mostly up to your own discretion how you want to format them,
-but please try to unfold lists if they contain multiple items and especially if
-they are to include comments.
-
-```nix
-# this is ok
-acceptableList = [
-  item1 # comment
-  item2
-  item3 # some other comment
-  item4
-];
-
-# this is not ok
-listToBeAvoided = [item1 item2 /* comment */ item3 item4];
-
-# this is ok
-acceptableList = [item1 item2];
-
-# this is also ok if the list is expected to contain more elements
-acceptableList= [
-  item1
-  item2
-  # more items if needed...
-];
-```
diff --git a/docs/manual/hacking/keybinds.md b/docs/manual/hacking/keybinds.md
deleted file mode 100644
index 90623dd3..00000000
--- a/docs/manual/hacking/keybinds.md
+++ /dev/null
@@ -1,97 +0,0 @@
-# Keybinds {#sec-keybinds}
-
-As of 0.4, there exists an API for writing your own keybinds and a couple of
-useful utility functions are available in the
-[extended standard library](https://github.com/NotAShelf/nvf/tree/main/lib). The
-following section contains a general overview to how you may utilize said
-functions.
-
-## Custom Key Mappings Support for a Plugin {#sec-custom-key-mappings}
-
-To set a mapping, you should define it in `vim.keymaps`.
-
-An example, simple keybinding, can look like this:
-
-```nix
-{
-  vim.keymaps = [
-    {
-      key = "<leader>wq";
-      mode = ["n"];
-      action = ":wq<CR>";
-      silent = true;
-      desc = "Save file and quit";
-    }
-  ];
-}
-```
-
-There are many settings available in the options. Please refer to the
-[documentation](https://notashelf.github.io/nvf/options.html#opt-vim.keymaps) to
-see a list of them.
-
-**nvf** provides a helper function, so that you don't have to write the mapping
-attribute sets every time:
-
-- `mkKeymap`, which mimics neovim's `vim.keymap.set` function
-
-You can read the source code of some modules to see them in action, but the
-usage should look something like this:
-
-```nix
-# plugindefinition.nix
-{lib, ...}: let
-  inherit (lib.options) mkEnableOption;
-  inherit (lib.nvim.binds) mkMappingOption;
-in {
-  options.vim.plugin = {
-    enable = mkEnableOption "Enable plugin";
-
-    # Mappings should always be inside an attrset called mappings
-    mappings = {
-      workspaceDiagnostics = mkMappingOption "Workspace diagnostics [trouble]" "<leader>lwd";
-      documentDiagnostics = mkMappingOption "Document diagnostics [trouble]" "<leader>ld";
-      lspReferences = mkMappingOption "LSP References [trouble]" "<leader>lr";
-      quickfix = mkMappingOption "QuickFix [trouble]" "<leader>xq";
-      locList = mkMappingOption "LOCList [trouble]" "<leader>xl";
-      symbols = mkMappingOption "Symbols [trouble]" "<leader>xs";
-    };
-}
-```
-
-```nix
-# config.nix
-{
-  config,
-  lib,
-  options,
-  ...
-}: let
-  inherit (lib.modules) mkIf;
-  inherit (lib.nvim.binds) mkKeymap;
-
-  cfg = config.vim.plugin;
-
-  keys = cfg.mappings;
-  inherit (options.vim.lsp.trouble) mappings;
-in {
-  config = mkIf cfg.enable {
-    vim.keymaps = [
-      (mkKeymap "n" keys.workspaceDiagnostics "<cmd>Trouble toggle diagnostics<CR>" {desc = mappings.workspaceDiagnostics.description;})
-      (mkKeymap "n" keys.documentDiagnostics "<cmd>Trouble toggle diagnostics filter.buf=0<CR>" {desc = mappings.documentDiagnostics.description;})
-      (mkKeymap "n" keys.lspReferences "<cmd>Trouble toggle lsp_references<CR>" {desc = mappings.lspReferences.description;})
-      (mkKeymap "n" keys.quickfix "<cmd>Trouble toggle quickfix<CR>" {desc = mappings.quickfix.description;})
-      (mkKeymap "n" keys.locList "<cmd>Trouble toggle loclist<CR>" {desc = mappings.locList.description;})
-      (mkKeymap "n" keys.symbols "<cmd>Trouble toggle symbols<CR>" {desc = mappings.symbols.description;})
-    ];
-  };
-}
-```
-
-::: {.note}
-
-If you have come across a plugin that has an API that doesn't seem to easily
-allow custom keybindings, don't be scared to implement a draft PR. We'll help
-you get it done.
-
-:::
diff --git a/docs/manual/hacking/testing.md b/docs/manual/hacking/testing.md
deleted file mode 100644
index a721cf2e..00000000
--- a/docs/manual/hacking/testing.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Testing Changes {#sec-testing-changes}
-
-Once you have made your changes, you will need to test them thoroughly. If it is
-a module, add your module option to `configuration.nix` (located in the root of
-this project) inside `neovimConfiguration`. Enable it, and then run the maximal
-configuration with `nix run .#maximal -Lv` to check for build errors. If neovim
-opens in the current directory without any error messages (you can check the
-output of `:messages` inside neovim to see if there are any errors), then your
-changes are good to go. Open your pull request, and it will be reviewed as soon
-as possible.
-
-If it is not a new module, but a change to an existing one, then make sure the
-module you have changed is enabled in the maximal configuration by editing
-`configuration.nix`, and then run it with `nix run .#maximal -Lv`. Same
-procedure as adding a new module will apply here.
diff --git a/docs/manual/index.md b/docs/manual/index.md
index 18932896..b07a8aca 100644
--- a/docs/manual/index.md
+++ b/docs/manual/index.md
@@ -1,30 +1,101 @@
-# nvf manual {#nvf-manual}
+# Introduction {#nvf-manual}
 
-## Version @NVF_VERSION@
+Version @NVF_VERSION@
 
-```{=include=} preface
-preface.md
-try-it-out.md
+## Preface {#ch-preface}
+
+### What is nvf {#sec-what-is-it}
+
+**nvf** is a highly modular, configurable, extensible and easy to use Neovim
+configuration framework built and designed to be used with Nix. Boasting
+flexibility, robustness and ease of use, this projecct allows you to configure a
+fully featured Neovim instance with a few lines of Nix with lots of options for
+advanced users as well.
+
+## Try it out {#ch-try-it-out}
+
+Thanks to the portability of Nix, you can try out nvf without actually
+installing it to your machine. Below are the commands you may run to try out
+different configurations provided by this flake. As of v0.5, two specialized
+configurations are provided:
+
+- **Nix** (`packages.nix`) - Nix language server + simple utility plugins
+- **Maximal** (`packages.maximal`) - Variable language servers + utility and
+  decorative plugins
+
+You may try out any of the provided configurations using the `nix run` command
+on a system where Nix is installed.
+
+```sh
+$ cachix use nvf                   # Optional: it'll save you CPU resources and time
+$ nix run github:notashelf/nvf#nix # Will run the default minimal configuration
 ```
 
-```{=include=} parts
-installation.md
-configuring.md
-tips.md
+Do keep in mind that this is **susceptible to garbage collection** meaning that
+the built outputs will be removed from your Nix store once you garbage collect.
+
+## Using Prebuilt Configs {#sec-using-prebuilt-configs}
+
+```bash
+$ nix run github:notashelf/nvf#nix
+$ nix run github:notashelf/nvf#maximal
 ```
 
-```{=include=} chapters
-hacking.md
+### Available Configurations {#sec-available-configs}
+
+> [!NOTE]
+> The below configurations are provided for demonstration purposes, and are
+> **not** designed to be installed as is. You may refer to the installation
+> steps below and the helpful tips section for details on creating your own
+> configurations.
+
+#### Nix {#sec-configs-nix}
+
+`Nix` configuration by default provides LSP/diagnostic support for Nix alongside
+a set of visual and functional plugins. By running `nix run .#`, which is the
+default package, you will build Neovim with this config.
+
+```bash
+$ nix run github:notashelf/nvf#nix test.nix
+# => This will open a file called `test.nix` with Nix LSP and syntax highlighting
 ```
 
-```{=include=} appendix html:into-file=//quirks.html
-quirks.md
+This command will start Neovim with some opinionated plugin configurations, and
+is designed specifically for Nix. the `nix` configuration lets you see how a
+fully configured Neovim setup _might_ look like without downloading too many
+packages or shell utilities.
+
+#### Maximal {#sec-configs-maximal}
+
+`Maximal` is the ultimate configuration that will enable support for more
+commonly used language as well as additional complementary plugins. Keep in
+mind, however, that this will pull a lot of dependencies.
+
+```bash
+$ nix run github:notashelf/nvf#maximal -- test.nix
+# => This will open a file called `test.nix` with a variety of plugins available
 ```
 
-```{=include=} appendix html:into-file=//options.html
-options.md
-```
+It uses the same configuration template with the [Nix](#sec-configs-nix)
+configuration, but supports many more languages, and enables more utility,
+companion or fun plugins.
 
-```{=include=} appendix html:into-file=//release-notes.html
-release-notes/release-notes.md
+> [!WARNING]
+> Running the maximal config will download _a lot_ of packages as it is
+> downloading language servers, formatters, and more. If CPU time and bandwidth
+> are concerns, please use the default package instead.
+
+## Installing nvf {#ch-installation}
+
+[module installation section]: #ch-module-installation
+
+There are multiple ways of installing nvf on your system. You may either choose
+the standalone installation method, which does not depend on a module system and
+may be done on any system that has the Nix package manager or the appropriate
+modules for NixOS and home-manager as described in the
+[module installation section].
+
+```{=include=}
+installation/custom-configuration.md
+installation/modules.md
 ```
diff --git a/docs/manual/installation.md b/docs/manual/installation.md
deleted file mode 100644
index 33dd8979..00000000
--- a/docs/manual/installation.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Installing nvf {#ch-installation}
-
-[module installation section]: #ch-module-installation
-
-There are multiple ways of installing nvf on your system. You may either choose
-the standalone installation method, which does not depend on a module system and
-may be done on any system that has the Nix package manager or the appropriate
-modules for NixOS and home-manager as described in the
-[module installation section].
-
-```{=include=} chapters
-installation/custom-configuration.md
-installation/modules.md
-```
diff --git a/docs/manual/options.md b/docs/manual/options.md
deleted file mode 100644
index beab4f16..00000000
--- a/docs/manual/options.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# nvf Configuration Options {#ch-options}
-
-Below are the module options provided by nvf, in no particular order. Most
-options will include useful comments, warnings or setup tips on how a module
-option is meant to be used as well as examples in complex cases.
-
-An offline version of this page is bundled with nvf as a part of the manpages
-which you can access with `man 5 nvf`. Please let us know if you believe any of
-the options below are missing useful examples.
-
-<!--
-In the manual, individual options may be referenced in Hyperlinks as follows:
-[](#opt-vim.*) If changing the prefix here, do keep in mind the #opt- suffix will have
-to be changed everywhere.
--->
-
-```{=include=} options
-id-prefix: opt-
-list-id: nvf-options
-source: @OPTIONS_JSON@
-```
diff --git a/docs/manual/preface.md b/docs/manual/preface.md
deleted file mode 100644
index ce3e42e6..00000000
--- a/docs/manual/preface.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# Preface {#ch-preface}
-
-## What is nvf {#sec-what-is-it}
-
-nvf is a highly modular, configurable, extensible and easy to use Neovim
-configuration in Nix. Designed for flexibility and ease of use, nvf allows you
-to easily configure your fully featured Neovim instance with a few lines of Nix.
-
-## Bugs & Suggestions {#sec-bugs-suggestions}
-
-[issue tracker]: https://github.com/notashelf/nvf/issues
-[discussions tab]: https://github.com/notashelf/nvf/discussions
-[pull requests tab]: https://github.com/notashelf/nvf/pulls
-
-If you notice any issues with nvf, or this documentation, then please consider
-reporting them over at the [issue tracker]. Issues tab, in addition to the
-[discussions tab] is a good place as any to request new features.
-
-You may also consider submitting bugfixes, feature additions and upstreamed
-changes that you think are critical over at the [pull requests tab].
diff --git a/docs/manual/quirks.md b/docs/manual/quirks.md
index 553d6cf3..17f7abaf 100644
--- a/docs/manual/quirks.md
+++ b/docs/manual/quirks.md
@@ -5,9 +5,41 @@ be it a result of generating Lua from Nix, or the state of packaging. This page,
 in turn, will list any known modules or plugins that are known to misbehave, and
 possible workarounds that you may apply.
 
-<!-- If adding a new known quirk, please create a new page in quirks/ and include
-the name of the file here.-->
+## NodeJS {#ch-quirks-nodejs}
 
-```{=include=} chapters
-quirks/nodejs.md
-```
+### eslint-plugin-prettier {#sec-eslint-plugin-prettier}
+
+When working with NodeJS, everything works as expected, but some projects have
+settings that can fool nvf.
+
+If [this plugin](https://github.com/prettier/eslint-plugin-prettier) or similar
+is included, you might get a situation where your eslint configuration diagnoses
+your formatting according to its own config (usually `.eslintrc.js`).
+
+The issue there is your formatting is made via prettierd.
+
+This results in auto-formatting relying on your prettier config, while your
+eslint config diagnoses formatting
+[which it's not supposed to](https://prettier.io/docs/en/comparison.html))
+
+In the end, you get discrepancies between what your editor does and what it
+wants.
+
+Solutions are:
+
+1. Don't add a formatting config to eslint, and separate prettier and eslint.
+2. PR this repo to add an ESLint formatter and configure nvf to use it.
+
+## Bugs & Suggestions {#ch-bugs-suggestions}
+
+[issue tracker]: https://github.com/notashelf/nvf/issues
+[discussions tab]: https://github.com/notashelf/nvf/discussions
+[pull requests tab]: https://github.com/notashelf/nvf/pulls
+
+Some quirks are not exactly quirks, but bugs in the module systeme. If you
+notice any issues with nvf, or this documentation, then please consider
+reporting them over at the [issue tracker]. Issues tab, in addition to the
+[discussions tab] is a good place as any to request new features.
+
+You may also consider submitting bugfixes, feature additions and upstreamed
+changes that you think are critical over at the [pull requests tab].
diff --git a/docs/manual/quirks/nodejs.md b/docs/manual/quirks/nodejs.md
deleted file mode 100644
index 57444909..00000000
--- a/docs/manual/quirks/nodejs.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# NodeJS {#ch-quirks-nodejs}
-
-## eslint-plugin-prettier {#sec-eslint-plugin-prettier}
-
-When working with NodeJS, everything works as expected, but some projects have
-settings that can fool nvf.
-
-If [this plugin](https://github.com/prettier/eslint-plugin-prettier) or similar
-is included, you might get a situation where your eslint configuration diagnoses
-your formatting according to its own config (usually `.eslintrc.js`).
-
-The issue there is your formatting is made via prettierd.
-
-This results in auto-formatting relying on your prettier config, while your
-eslint config diagnoses formatting
-[which it's not supposed to](https://prettier.io/docs/en/comparison.html))
-
-In the end, you get discrepancies between what your editor does and what it
-wants.
-
-Solutions are:
-
-1. Don't add a formatting config to eslint, and separate prettier and eslint.
-2. PR this repo to add an ESLint formatter and configure nvf to use it.
diff --git a/docs/manual/release-notes.md b/docs/manual/release-notes.md
new file mode 100644
index 00000000..296b20b1
--- /dev/null
+++ b/docs/manual/release-notes.md
@@ -0,0 +1,15 @@
+# Release Notes {#ch-release-notes}
+
+This section lists the release notes for tagged version of **nvf** and the
+current main current main branch
+
+```{=include=} chapters
+release-notes/rl-0.1.md
+release-notes/rl-0.2.md
+release-notes/rl-0.3.md
+release-notes/rl-0.4.md
+release-notes/rl-0.5.md
+release-notes/rl-0.6.md
+release-notes/rl-0.7.md
+release-notes/rl-0.8.md
+```
diff --git a/docs/manual/release-notes/rl-0.1.md b/docs/manual/release-notes/rl-0.1.md
index f5737a86..5bfc1b45 100644
--- a/docs/manual/release-notes/rl-0.1.md
+++ b/docs/manual/release-notes/rl-0.1.md
@@ -1,4 +1,4 @@
-# Release 0.1 {#sec-release-0.1}
+# Release 0.1 {#sec-release-0-1}
 
 This is the current master branch and information here is not final. These are
 changes from the v0.1 tag.
@@ -7,7 +7,7 @@ Special thanks to [home-manager](https://github.com/nix-community/home-manager/)
 for this release. Docs/manual generation, the new module evaluation system, and
 DAG implementation are from them.
 
-## Changelog {#sec-release-0.1-changelog}
+## Changelog {#sec-release-0-1-changelog}
 
 [jordanisaacs](https://github.com/jordanisaacs):
 
diff --git a/docs/manual/release-notes/rl-0.2.md b/docs/manual/release-notes/rl-0.2.md
index 4d3b61f9..d3ac1384 100644
--- a/docs/manual/release-notes/rl-0.2.md
+++ b/docs/manual/release-notes/rl-0.2.md
@@ -1,8 +1,8 @@
-# Release 0.2 {#sec-release-0.2}
+# Release 0.2 {#sec-release-0-2}
 
 Release notes for release 0.2
 
-## Changelog {#sec-release-0.2-changelog}
+## Changelog {#sec-release-0-2-changelog}
 
 [notashelf](https://github.com/notashelf):
 
@@ -10,55 +10,39 @@ Release notes for release 0.2
   default, while `minimap.vim` is available with its code-minimap dependency.
 - A complementary plugin, `obsidian.nvim` and the Neovim alternative for Emacs'
   orgmode with `orgmode.nvim` have been added. Both will be disabled by default.
-
 - Smooth scrolling for ANY movement command is now available with
   `cinnamon.nvim`
-
 - You will now notice a dashboard on startup. This is provided by the
   `alpha.nvim` plugin. You can use any of the three available dashboard plugins,
   or disable them entirely.
-
 - There is now a scrollbar on active buffers, which can highlight errors by
   hooking to your LSPs. This is on by default, but can be toggled off under
   `vim.visuals` if seen necessary.
-
 - Discord Rich Presence has been added through `presence.nvim` for those who
   want to flex that they are using the _superior_ text editor.
-
 - An icon picker is now available with telescope integration. You can use
   `:IconPickerInsert` or `:IconPickerYank` to add icons to your code.
-
 - A general-purpose cheatsheet has been added through `cheatsheet.nvim`. Forget
   no longer!
-
 - `ccc.nvim` has been added to the default plugins to allow picking colors with
   ease.
-
 - Most UI components of Neovim have been replaced through the help of
   `noice.nvim`. There are also notifications and custom UI elements available
   for Neovim messages and prompts.
-
 - A (floating by default) terminal has been added through `toggleterm.nvim`.
-
 - Harness the power of ethical (`tabnine.nvim`) and not-so-ethical
   (`copilot.lua`) AI by those new assistant plugins. Both are off by default,
   TabNine needs to be wrapped before it's working.
-
 - Experimental mouse gestures have been added through `gesture.nvim`. See plugin
   page and the relevant module for more details on how to use.
-
 - Re-open last visited buffers via `nvim-session-manager`. Disabled by default
   as deleting buffers seems to be problematic at the moment.
-
 - Most of NvimTree's configuration options have been changed with some options
   being toggled to off by default.
-
 - Lualine had its configuration simplified and style toned down. Less color,
   more info.
-
 - Modules where multiple plugin configurations were in the same directory have
   been simplified. Each plugin inside a single module gets its directory to be
   imported.
-
 - Separate config options with the same parent attribute have been merged into
   one for simplicity.
diff --git a/docs/manual/release-notes/rl-0.3.md b/docs/manual/release-notes/rl-0.3.md
index 089f01f7..c3ab2496 100644
--- a/docs/manual/release-notes/rl-0.3.md
+++ b/docs/manual/release-notes/rl-0.3.md
@@ -1,4 +1,4 @@
-# Release 0.3 {#sec-release-0.3}
+# Release 0.3 {#sec-release-0-3}
 
 Release 0.3 had to come out before I wanted it to due to Neovim 0.9 dropping
 into nixpkgs-unstable. The Treesitter changes have prompted a Treesitter rework,
@@ -7,7 +7,7 @@ those are downstreamed from the original repository. The feature requests that
 was originally planned for 0.3 have been moved to 0.4, which should come out
 soon.
 
-## Changelog {#sec-release-0.3-changelog}
+## Changelog {#sec-release-0-3-changelog}
 
 - We have transitioned to flake-parts, from flake-utils to extend the
   flexibility of this flake. This means the flake structure is different than
diff --git a/docs/manual/release-notes/rl-0.4.md b/docs/manual/release-notes/rl-0.4.md
index f5c2c338..ce788413 100644
--- a/docs/manual/release-notes/rl-0.4.md
+++ b/docs/manual/release-notes/rl-0.4.md
@@ -1,4 +1,4 @@
-# Release 0.4 {#sec-release-0.4}
+# Release 0.4 {#sec-release-0-4}
 
 Following the release of v0.3, I have decided to release v0.4 with a massive new
 change: customizable keybinds. As of the 0.4 release, keybinds will no longer be
@@ -12,7 +12,7 @@ as `lazygit` integration and the new experimental Lua loader of Neovim 0.9
 thanks to our awesome contributors who made this update possible during my
 absence.
 
-## Changelog {#sec-release-0.4-changelog}
+## Changelog {#sec-release-0-4-changelog}
 
 [n3oney](https://github.com/n3oney):
 
diff --git a/docs/manual/release-notes/rl-0.5.md b/docs/manual/release-notes/rl-0.5.md
index 910c93d5..523ddb40 100644
--- a/docs/manual/release-notes/rl-0.5.md
+++ b/docs/manual/release-notes/rl-0.5.md
@@ -1,8 +1,6 @@
-# Release 0.5 {#sec-release-0.5}
+# Release 0.5 {#sec-release-0-5}
 
-Release notes for release 0.5
-
-## Changelog {#sec-release-0.5-changelog}
+## Changelog {#sec-release-0-5-changelog}
 
 [vagahbond](https://github.com/vagahbond):
 
diff --git a/docs/manual/release-notes/rl-0.6.md b/docs/manual/release-notes/rl-0.6.md
index 309d6b16..983c3d06 100644
--- a/docs/manual/release-notes/rl-0.6.md
+++ b/docs/manual/release-notes/rl-0.6.md
@@ -1,4 +1,4 @@
-# Release 0.6 {#sec-release-0.6}
+# Release 0.6 {#sec-release-0-6}
 
 Release notes for release 0.6
 
diff --git a/docs/manual/release-notes/rl-0.7.md b/docs/manual/release-notes/rl-0.7.md
index dca9319a..a803b1b9 100644
--- a/docs/manual/release-notes/rl-0.7.md
+++ b/docs/manual/release-notes/rl-0.7.md
@@ -1,4 +1,4 @@
-# Release 0.7 {#sec-release-0.7}
+# Release 0.7 {#sec-release-0-7}
 
 Release notes for release 0.7
 
@@ -170,7 +170,7 @@ The changes are, in no particular order:
 
 - Add [ocaml-lsp] support
 
-- Fix misspelled "Emacs"
+- Fix "Emac" typo
 
 - Add [new-file-template.nvim] to automatically fill new file contents using
   templates
diff --git a/docs/manual/release-notes/rl-0.8.md b/docs/manual/release-notes/rl-0.8.md
index 35a42618..3242d09a 100644
--- a/docs/manual/release-notes/rl-0.8.md
+++ b/docs/manual/release-notes/rl-0.8.md
@@ -1,4 +1,4 @@
-# Release 0.8 {#sec-release-0.8}
+# Release 0.8 {#sec-release-0-8}
 
 ## Breaking changes
 
@@ -32,6 +32,8 @@
   autocmd event. If you were calling `default_on_attach()` in your LSP setup you
   can remove them now.
 
+## Changelog {#sec-release-0-8-changelog}
+
 [NotAShelf](https://github.com/notashelf):
 
 [typst-preview.nvim]: https://github.com/chomosuke/typst-preview.nvim
diff --git a/docs/manual/tips.md b/docs/manual/tips.md
index 01bddc40..0a121ae9 100644
--- a/docs/manual/tips.md
+++ b/docs/manual/tips.md
@@ -6,7 +6,7 @@ documentation, configuring **nvf** with pure Lua and using custom plugin sources
 in **nvf** in this section. For general configuration tips, please see previous
 chapters.
 
-```{=include=} chapters
+```{=include=}
 tips/debugging-nvf.md
 tips/offline-docs.md
 tips/pure-lua-config.md
diff --git a/docs/manual/try-it-out.md b/docs/manual/try-it-out.md
deleted file mode 100644
index a5d20363..00000000
--- a/docs/manual/try-it-out.md
+++ /dev/null
@@ -1,72 +0,0 @@
-# Try it out {#ch-try-it-out}
-
-Thanks to the portability of Nix, you can try out nvf without actually
-installing it to your machine. Below are the commands you may run to try out
-different configurations provided by this flake. As of v0.5, two specialized
-configurations are provided:
-
-- **Nix** (`packages.nix`) - Nix language server + simple utility plugins
-- **Maximal** (`packages.maximal`) - Variable language servers + utility and
-  decorative plugins
-
-You may try out any of the provided configurations using the `nix run` command
-on a system where Nix is installed.
-
-```sh
-$ cachix use nvf                   # Optional: it'll save you CPU resources and time
-$ nix run github:notashelf/nvf#nix # Will run the default minimal configuration
-```
-
-Do keep in mind that this is **susceptible to garbage collection** meaning that
-the built outputs will be removed from your Nix store once you garbage collect.
-
-## Using Prebuilt Configs {#sec-using-prebuilt-configs}
-
-```bash
-$ nix run github:notashelf/nvf#nix
-$ nix run github:notashelf/nvf#maximal
-```
-
-### Available Configurations {#sec-available-configs}
-
-::: {.info}
-
-The below configurations are provided for demonstration purposes, and are
-**not** designed to be installed as is. You may
-
-#### Nix {#sec-configs-nix}
-
-`Nix` configuration by default provides LSP/diagnostic support for Nix alongside
-a set of visual and functional plugins. By running `nix run .#`, which is the
-default package, you will build Neovim with this config.
-
-```bash
-$ nix run github:notashelf/nvf#nix test.nix
-```
-
-This command will start Neovim with some opinionated plugin configurations, and
-is designed specifically for Nix. the `nix` configuration lets you see how a
-fully configured Neovim setup _might_ look like without downloading too many
-packages or shell utilities.
-
-#### Maximal {#sec-configs-maximal}
-
-`Maximal` is the ultimate configuration that will enable support for more
-commonly used language as well as additional complementary plugins. Keep in
-mind, however, that this will pull a lot of dependencies.
-
-```bash
-$ nix run github:notashelf/nvf#maximal -- test.nix
-```
-
-It uses the same configuration template with the [Nix](#sec-configs-nix)
-configuration, but supports many more languages, and enables more utility,
-companion or fun plugins.
-
-::: {.warning}
-
-Running the maximal config will download _a lot_ of packages as it is
-downloading language servers, formatters, and more. If CPU time and bandwidth
-are concerns, please use the default package instead.
-
-:::

From d436031468df65d11261e82c4db29bcdfeddc9a8 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Fri, 26 Sep 2025 21:08:40 +0300
Subject: [PATCH 06/18] docs: remove dupliate page

Signed-off-by: NotAShelf <raf@notashelf.dev>
Change-Id: I6a6a6964ab066fe88fe52b53b619971a27f23a5b
---
 docs/manual.nix                               |  4 +---
 .../custom-plugins/custom-package.md          | 22 -------------------
 2 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 docs/manual/configuring/custom-plugins/custom-package.md

diff --git a/docs/manual.nix b/docs/manual.nix
index bf222204..8b80f2e4 100644
--- a/docs/manual.nix
+++ b/docs/manual.nix
@@ -4,6 +4,7 @@
   stdenvNoCC,
   runCommandNoCCLocal,
   optionsJSON,
+  release,
 } @ args: let
   manual-release = args.release or "unstable";
 in
@@ -28,9 +29,6 @@ in
     substituteInPlace ./manual/index.md \
       --subst-var-by NVF_VERSION ${manual-release}
 
-    substituteInPlace ./manual/hacking/additional-plugins.md \
-      --subst-var-by NVF_REPO "https://github.com/notashelf/nvf/blob/${manual-release}"
-
     # Generate the final manual from a set of parameters. This uses
     # feel-co/ndg to render the web manual.
     ndg html \
diff --git a/docs/manual/configuring/custom-plugins/custom-package.md b/docs/manual/configuring/custom-plugins/custom-package.md
deleted file mode 100644
index 3e9e324a..00000000
--- a/docs/manual/configuring/custom-plugins/custom-package.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# Custom Neovim Package {#ch-custom-package}
-
-As of v0.5, you may now specify the Neovim package that will be wrapped with
-your configuration. This is done with the [](#opt-vim.package) option.
-
-```nix
-{inputs, pkgs, ...}: {
-  # using the neovim-nightly overlay
-  vim.package = inputs.neovim-overlay.packages.${pkgs.stdenv.system}.neovim;
-}
-```
-
-The neovim-nightly-overlay always exposes an unwrapped package. If using a
-different source, you are highly recommended to get an "unwrapped" version of
-the neovim package, similar to `neovim-unwrapped` in nixpkgs.
-
-```nix
-{ pkgs, ...}: {
-  # using the neovim-nightly overlay
-  vim.package = pkgs.neovim-unwrapped;
-}
-```

From 0c411120aebb443ba43394a260a1900b44fff08e Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Fri, 26 Sep 2025 23:18:28 +0300
Subject: [PATCH 07/18] flake: bump ndg

Signed-off-by: NotAShelf <raf@notashelf.dev>
Change-Id: I6a6a69649ea7dd5c40657b8b8a30324b5f710ca9
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 20d64cb6..a62e2909 100644
--- a/flake.lock
+++ b/flake.lock
@@ -91,11 +91,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1758451644,
-        "narHash": "sha256-sP4hBXifUIrEk37N+NRp3p42Os4OahX/8w1CN74nig8=",
+        "lastModified": 1759819052,
+        "narHash": "sha256-/PiEHW2x72ZunFBfk5RXKqD99tfwLeIa3UhexabCRyk=",
         "owner": "feel-co",
         "repo": "ndg",
-        "rev": "a7c8f6ca855335c4dff4826a0245ee93e1816b70",
+        "rev": "40f1c0633ffa2e3548a0452c0ed09edb01773dfb",
         "type": "github"
       },
       "original": {

From 2d823de83e1c31fd16d1d982b17f140b38dd85dd Mon Sep 17 00:00:00 2001
From: yum <contact@meyume.com>
Date: Mon, 8 Dec 2025 10:24:40 -0500
Subject: [PATCH 08/18] docs: update neodev.nvim to lazydev.nvim

---
 docs/manual/configuring/overriding-plugins.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/manual/configuring/overriding-plugins.md b/docs/manual/configuring/overriding-plugins.md
index 25a71559..223bf5b6 100644
--- a/docs/manual/configuring/overriding-plugins.md
+++ b/docs/manual/configuring/overriding-plugins.md
@@ -22,7 +22,7 @@ vim.pluginOverrides = {
 };
 ```
 
-This will override the source for the `neodev.nvim` plugin that is used in nvf
+This will override the source for the `lazydev.nvim` plugin that is used in nvf
 with your own plugin.
 
 ::: {.warning}

From 3c90fdc9982e3a5795eab6eb659d51126a862862 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 18 Oct 2025 13:02:44 +0300
Subject: [PATCH 09/18] flake: bump ndg

Signed-off-by: NotAShelf <raf@notashelf.dev>
Change-Id: I6a6a6964075af959c6e20f0eb9772e17922b2531
---
 flake.lock | 42 ++++--------------------------------------
 1 file changed, 4 insertions(+), 38 deletions(-)

diff --git a/flake.lock b/flake.lock
index a62e2909..63ebb3b9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -51,24 +51,6 @@
         "type": "github"
       }
     },
-    "flake-parts_2": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
-      },
-      "locked": {
-        "lastModified": 1756770412,
-        "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "4524271976b625a4a605beefd893f270620fd751",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
     "mnw": {
       "locked": {
         "lastModified": 1758834834,
@@ -87,15 +69,14 @@
     "ndg": {
       "inputs": {
         "flake-compat": "flake-compat_2",
-        "flake-parts": "flake-parts_2",
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1759819052,
-        "narHash": "sha256-/PiEHW2x72ZunFBfk5RXKqD99tfwLeIa3UhexabCRyk=",
+        "lastModified": 1760777965,
+        "narHash": "sha256-PHmDh1GxoBixpgtRCrBCvXJee/tCb6T57MLbwKfIURg=",
         "owner": "feel-co",
         "repo": "ndg",
-        "rev": "40f1c0633ffa2e3548a0452c0ed09edb01773dfb",
+        "rev": "30b955582f0cd869a86007f491252bbffde48f8b",
         "type": "github"
       },
       "original": {
@@ -110,7 +91,7 @@
         "narHash": "sha256-sUoHmPr/EwXzRMpv1u/kH+dXuvJEyyF2Q7muE+t0EU4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1",
+        "rev": "8913c168d1c56dc49a7718685968f38752171c3b",
         "type": "github"
       },
       "original": {
@@ -120,21 +101,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-lib": {
-      "locked": {
-        "lastModified": 1754788789,
-        "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "a73b9c743612e4244d865a2fdee11865283c04e6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "type": "github"
-      }
-    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1764081664,

From 4498d3b3fa6081ae2ea8e74bee1987167934f3ae Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Wed, 10 Dec 2025 19:00:00 +0100
Subject: [PATCH 10/18] docs: remove duplicate release-notes.md

---
 docs/manual/release-notes/release-notes.md | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100644 docs/manual/release-notes/release-notes.md

diff --git a/docs/manual/release-notes/release-notes.md b/docs/manual/release-notes/release-notes.md
deleted file mode 100644
index daeb03ea..00000000
--- a/docs/manual/release-notes/release-notes.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Release Notes {#ch-release-notes}
-
-This section lists the release notes for tagged version of **nvf** and the
-current main current main branch
-
-```{=include=} chapters
-rl-0.1.md
-rl-0.2.md
-rl-0.3.md
-rl-0.4.md
-rl-0.5.md
-rl-0.6.md
-rl-0.7.md
-```

From 1f398824827437ba7d87a615192977a27b31c3ba Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Wed, 10 Dec 2025 19:00:00 +0100
Subject: [PATCH 11/18] ndg: update cli flags

---
 docs/manual.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/manual.nix b/docs/manual.nix
index 8b80f2e4..5c2a234d 100644
--- a/docs/manual.nix
+++ b/docs/manual.nix
@@ -36,8 +36,8 @@ in
       --module-options ${optionsJSON}/share/doc/nixos/options.json \
       --manpage-urls ${path}/doc/manpage-urls.json \
       --options-depth 3 \
-      --generate-search true \
-      --highlight-code true \
+      --generate-search \
+      --highlight-code \
       --input-dir ./manual \
       --output-dir "$out/share/doc"
 

From da8c682af72e6959198e94423562620aa1ac7ee1 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Thu, 11 Dec 2025 15:15:58 +0100
Subject: [PATCH 12/18] treewide: replace auto option links with {option} role

---
 docs/manual/configuring/custom-plugins.md     |  2 +-
 .../custom-plugins/legacy-method.md           |  6 ++--
 .../custom-plugins/non-lazy-method.md         |  2 +-
 docs/manual/release-notes/rl-0.1.md           | 10 +++---
 docs/manual/release-notes/rl-0.3.md           | 10 +++---
 docs/manual/release-notes/rl-0.5.md           | 12 +++----
 docs/manual/release-notes/rl-0.6.md           |  8 ++---
 docs/manual/release-notes/rl-0.7.md           | 32 +++++++++----------
 docs/manual/release-notes/rl-0.8.md           | 16 +++++-----
 docs/manual/tips/pure-lua-config.md           |  4 +--
 modules/neovim/init/clipboard.nix             |  2 +-
 .../plugins/treesitter/ts-context/context.nix |  2 +-
 .../plugins/utility/telescope/telescope.nix   |  2 +-
 .../plugins/visuals/fidget-nvim/fidget.nix    |  2 +-
 modules/wrapper/lazy/lazy.nix                 |  2 +-
 modules/wrapper/rc/options.nix                |  4 +--
 16 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/docs/manual/configuring/custom-plugins.md b/docs/manual/configuring/custom-plugins.md
index bf986a0f..1552e7b1 100644
--- a/docs/manual/configuring/custom-plugins.md
+++ b/docs/manual/configuring/custom-plugins.md
@@ -19,7 +19,7 @@ as a module.
 :::{.info}
 
 To add a plugin to your runtime, you will need to add it to
-[](#opt-vim.startPlugins) list in your configuration. This is akin to cloning a
+{option}`vim.startPlugins` list in your configuration. This is akin to cloning a
 plugin to `~/.config/nvim`, but they are only ever placed in the Nix store and
 never exposed to the outside world for purity and full isolation.
 
diff --git a/docs/manual/configuring/custom-plugins/legacy-method.md b/docs/manual/configuring/custom-plugins/legacy-method.md
index 6c399aaf..e7821712 100644
--- a/docs/manual/configuring/custom-plugins/legacy-method.md
+++ b/docs/manual/configuring/custom-plugins/legacy-method.md
@@ -1,8 +1,8 @@
 # Legacy Method {#sec-legacy-method}
 
 Prior to version **0.5**, the method of adding new plugins was adding the plugin
-package to [](#opt-vim.startPlugins) and adding its configuration as a DAG under
-one of `vim.configRC` or [](#opt-vim.luaConfigRC). While `configRC` has been
+package to {option}`vim.startPlugins` and adding its configuration as a DAG under
+one of `vim.configRC` or {option}`vim.luaConfigRC`. While `configRC` has been
 deprecated, users who have not yet updated to 0.5 or those who prefer a more
 hands-on approach may choose to use the old method where the load order of the
 plugins is explicitly determined by DAGs without internal abstractions.
@@ -10,7 +10,7 @@ plugins is explicitly determined by DAGs without internal abstractions.
 ## Adding New Plugins {#sec-adding-new-plugins}
 
 To add a plugin not available in **nvf** as a module to your configuration using
-the legacy method, you must add it to [](#opt-vim.startPlugins) in order to make
+the legacy method, you must add it to {option}`vim.startPlugins` in order to make
 it available to Neovim at runtime.
 
 ```nix
diff --git a/docs/manual/configuring/custom-plugins/non-lazy-method.md b/docs/manual/configuring/custom-plugins/non-lazy-method.md
index 24ef7688..5174d0a8 100644
--- a/docs/manual/configuring/custom-plugins/non-lazy-method.md
+++ b/docs/manual/configuring/custom-plugins/non-lazy-method.md
@@ -2,7 +2,7 @@
 
 As of version **0.5**, we have a more extensive API for configuring plugins that
 should be preferred over the legacy method. This API is available as
-[](#opt-vim.extraPlugins). Instead of using DAGs exposed by the library
+{option}`vim.extraPlugins`. Instead of using DAGs exposed by the library
 _directly_, you may use the extra plugin module as follows:
 
 ```nix
diff --git a/docs/manual/release-notes/rl-0.1.md b/docs/manual/release-notes/rl-0.1.md
index 5bfc1b45..91037f2a 100644
--- a/docs/manual/release-notes/rl-0.1.md
+++ b/docs/manual/release-notes/rl-0.1.md
@@ -15,7 +15,7 @@ DAG implementation are from them.
   longer defined. If you use hare and would like it added back, please file an
   issue.
 
-- [](#opt-vim.startPlugins) & [](#opt-vim.optPlugins) are now an enum of
+- {option}`vim.startPlugins) & [](#opt-vim.optPlugins` are now an enum of
   `string` for options sourced from the flake inputs. Users can still provide
   vim plugin packages.
 
@@ -28,13 +28,13 @@ DAG implementation are from them.
 [relevant discourse post]: https://discourse.nixos.org/t/psa-if-you-are-on-unstable-try-out-nvim-treesitter-withallgrammars/23321?u=snowytrees
 
 - Treesitter grammars are now configurable with
-  [](#opt-vim.treesitter.grammars). Utilizes the nixpkgs `nvim-treesitter`
+  {option}`vim.treesitter.grammars`. Utilizes the nixpkgs `nvim-treesitter`
   plugin rather than a custom input in order to take advantage of build support
   of pinned versions. See the [relevant discourse post] for more information.
   Packages can be found under the `vimPlugins.nvim-treesitter.builtGrammars`
   namespace.
 
-- `vim.configRC` and [](#opt-vim.luaConfigRC) are now of type DAG lines. This
+- `vim.configRC` and {option}`vim.luaConfigRC` are now of type DAG lines. This
   allows for ordering of the config. Usage is the same is in home-manager's
   `home.activation` option.
 
@@ -44,5 +44,5 @@ vim.luaConfigRC = lib.nvim.dag.entryAnywhere "config here"
 
 [MoritzBoehme](https://github.com/MoritzBoehme):
 
-- `catppuccin` theme is now available as a neovim theme [](#opt-vim.theme.style)
-  and Lualine theme [](#opt-vim.statusline.lualine.theme).
+- `catppuccin` theme is now available as a neovim theme {option}`vim.theme.style`
+  and Lualine theme {option}`vim.statusline.lualine.theme`.
diff --git a/docs/manual/release-notes/rl-0.3.md b/docs/manual/release-notes/rl-0.3.md
index c3ab2496..0658f1f0 100644
--- a/docs/manual/release-notes/rl-0.3.md
+++ b/docs/manual/release-notes/rl-0.3.md
@@ -39,7 +39,7 @@ soon.
   [discourse]: https://discourse.nixos.org/t/psa-if-you-are-on-unstable-try-out-nvim-treesitter-withallgrammars/23321?u=snowytrees
 
 - Treesitter grammars are now configurable with
-  [](#opt-vim.treesitter.grammars). Utilizes the nixpkgs `nvim-treesitter`
+  {option}`vim.treesitter.grammars`. Utilizes the nixpkgs `nvim-treesitter`
   plugin rather than a custom input in order to take advantage of build support
   of pinned versions. See [discourse] for more information. Packages can be
   found under the `pkgs.vimPlugins.nvim-treesitter.builtGrammars` attribute.
@@ -50,20 +50,20 @@ soon.
 
 - A new section has been added for language support: `vim.languages.<language>`.
 
-  - The options `enableLSP` [](#opt-vim.languages.enableTreesitter), etc. will
+  - The options `enableLSP` {option}`vim.languages.enableTreesitter`, etc. will
     enable the respective section for all languages that have been enabled.
   - All LSP languages have been moved here
   - `plantuml` and `markdown` have been moved here
   - A new section has been added for `html`. The old
     `vim.treesitter.autotagHtml` can be found at
-    [](#opt-vim.languages.html.treesitter.autotagHtml).
+    {option}`vim.languages.html.treesitter.autotagHtml`.
 
 - `vim.git.gitsigns.codeActions` has been added, allowing you to turn on
   Gitsigns' code actions.
 
 - Removed the plugins document in the docs. Was too unwieldy to keep updated.
 
-- `vim.visual.lspkind` has been moved to [](#opt-vim.lsp.lspkind.enable)
+- `vim.visual.lspkind` has been moved to {option}`vim.lsp.lspkind.enable`
 
 - Improved handling of completion formatting. When setting
   `vim.autocomplete.sources`, can also include optional menu mapping. And can
@@ -74,7 +74,7 @@ soon.
   by using `null` rather than `""` now.
 
 - Transparency has been made optional and has been disabled by default.
-  [](#opt-vim.theme.transparent) option can be used to enable or disable
+  {option}`vim.theme.transparent` option can be used to enable or disable
   transparency for your configuration.
 
 - Fixed deprecated configuration method for Tokyonight, and added new style
diff --git a/docs/manual/release-notes/rl-0.5.md b/docs/manual/release-notes/rl-0.5.md
index 523ddb40..51e144a2 100644
--- a/docs/manual/release-notes/rl-0.5.md
+++ b/docs/manual/release-notes/rl-0.5.md
@@ -15,14 +15,14 @@
 - Fixed a bug where cmp's close and scrollDocs mappings wasn't working
 
 - Streamlined and simplified extra plugin API with the addition of
-  [](#opt-vim.extraPlugins)
+  {option}`vim.extraPlugins`
 
 - Allow using command names in place of LSP packages to avoid automatic
   installation
 
 - Add lua LSP and Treesitter support, and neodev.nvim plugin support
 
-- Add [](#opt-vim.lsp.mappings.toggleFormatOnSave) keybind
+- Add {option}`vim.lsp.mappings.toggleFormatOnSave` keybind
 
 [amanse](https://github.com/amanse):
 
@@ -50,10 +50,10 @@
 
 - Added GitHub Copilot to nvim-cmp completion sources.
 
-- Added [](#opt-vim.ui.borders.enable) for global and individual plugin border
+- Added {option}`vim.ui.borders.enable` for global and individual plugin border
   configuration.
 
-- LSP integrated breadcrumbs with [](#opt-vim.ui.breadcrumbs.enable) through
+- LSP integrated breadcrumbs with {option}`vim.ui.breadcrumbs.enable` through
   nvim-navic
 
 - LSP navigation helper with nvim-navbuddy, depends on nvim-navic (automatically
@@ -64,14 +64,14 @@
 - Fixed mismatching Zig language description
 
 - Added support for `statix` and `deadnix` through
-  [](#opt-vim.languages.nix.extraDiagnostics.types)
+  {option}`vim.languages.nix.extraDiagnostics.types`
 
 - Added `lsp_lines` plugin for showing diagnostic messages
 
 - Added a configuration option for choosing the leader key
 
 - The package used for neovim is now customizable by the user, using
-  [](#opt-vim.package). For best results, always use an unwrapped package
+  {option}`vim.package`. For best results, always use an unwrapped package
 
 - Added highlight-undo plugin for highlighting undo/redo targets
 
diff --git a/docs/manual/release-notes/rl-0.6.md b/docs/manual/release-notes/rl-0.6.md
index 983c3d06..b40e2930 100644
--- a/docs/manual/release-notes/rl-0.6.md
+++ b/docs/manual/release-notes/rl-0.6.md
@@ -48,7 +48,7 @@ vim.api.nvim_set_keymap('n', '<leader>a', ':lua camelToSnake()<CR>', { noremap =
 - Added Terraform language support.
 
 - Added `ChatGPT.nvim`, which can be enabled with
-  [](#opt-vim.assistant.chatgpt.enable). Do keep in mind that this option
+  {option}`vim.assistant.chatgpt.enable`. Do keep in mind that this option
   requires `OPENAI_API_KEY` environment variable to be set.
 
 [donnerinoern](https://github.com/donnerinoern):
@@ -159,7 +159,7 @@ vim.api.nvim_set_keymap('n', '<leader>a', ':lua camelToSnake()<CR>', { noremap =
   arguments to take `luaBefore`, `luaConfig` and `luaAfter` as strings, which
   are then concatted inside a lua block.
 
-- Added [](#opt-vim.luaConfigPre) and [](#opt-vim.luaConfigPost) for inserting
+- Added {option}`vim.luaConfigPre) and [](#opt-vim.luaConfigPost` for inserting
   verbatim Lua configuration before and after the resolved Lua DAG respectively.
   Both of those options take strings as the type, so you may read the contents
   of a Lua file from a given path.
@@ -172,12 +172,12 @@ vim.api.nvim_set_keymap('n', '<leader>a', ':lua camelToSnake()<CR>', { noremap =
 - Exposed `withRuby`, `withNodeJs`, `withPython3`, and `python3Packages` from
   the `makeNeovimConfig` function under their respective options.
 
-- Added [](#opt-vim.extraPackages) for appending additional packages to the
+- Added {option}`vim.extraPackages` for appending additional packages to the
   wrapper PATH, making said packages available while inside the Neovim session.
 
 - Made Treesitter options configurable, and moved treesitter-context to
   `setupOpts` while it is enabled.
 
-- Added [](#opt-vim.notify.nvim-notify.setupOpts.render) which takes either a
+- Added {option}`vim.notify.nvim-notify.setupOpts.render` which takes either a
   string of enum, or a Lua function. The default is "compact", but you may
   change it according to nvim-notify documentation.
diff --git a/docs/manual/release-notes/rl-0.7.md b/docs/manual/release-notes/rl-0.7.md
index a803b1b9..4a3db6ca 100644
--- a/docs/manual/release-notes/rl-0.7.md
+++ b/docs/manual/release-notes/rl-0.7.md
@@ -98,7 +98,7 @@ options that were under `vim` as convenient shorthands for `vim.o.*` options.
 
 ::: {.warning}
 
-As v0.7 features the addition of [](#opt-vim.options), those options are now
+As v0.7 features the addition of {option}`vim.options`, those options are now
 considered as deprecated. You should migrate to the appropriate options in the
 `vim.options` submodule.
 
@@ -108,7 +108,7 @@ The changes are, in no particular order:
 
 - `colourTerm`, `mouseSupport`, `cmdHeight`, `updateTime`, `mapTime`,
   `cursorlineOpt`, `splitBelow`, `splitRight`, `autoIndent` and `wordWrap` have
-  been mapped to their [](#opt-vim.options) equivalents. Please see the module
+  been mapped to their {option}`vim.options` equivalents. Please see the module
   definition for the updated options.
 
 - `tabWidth` has been **removed** as it lead to confusing behaviour. You can
@@ -125,7 +125,7 @@ The changes are, in no particular order:
 [frothymarrow](https://github.com/frothymarrow):
 
 - Modified type for
-  [](#opt-vim.visuals.fidget-nvim.setupOpts.progress.display.overrides) from
+  {option}`vim.visuals.fidget-nvim.setupOpts.progress.display.overrides` from
   `anything` to a `submodule` for better type checking.
 
 - Fix null `vim.lsp.mappings` generating an error and not being filtered out.
@@ -134,7 +134,7 @@ The changes are, in no particular order:
   group for `Normal`, `NormalFloat`, `LineNr`, `SignColumn` and optionally
   `NvimTreeNormal` to `none`.
 
-- Fix [](#opt-vim.ui.smartcolumn.setupOpts.custom_colorcolumn) using the wrong
+- Fix {option}`vim.ui.smartcolumn.setupOpts.custom_colorcolumn` using the wrong
   type `int` instead of the expected type `string`.
 
 [horriblename](https://github.com/horriblename):
@@ -216,18 +216,18 @@ The changes are, in no particular order:
 
 - Remove `autopairs.type`, and rename `autopairs.enable` to
   `autopairs.nvim-autopairs.enable`. The new
-  [](#opt-vim.autopairs.nvim-autopairs.enable) supports `setupOpts` format by
+  {option}`vim.autopairs.nvim-autopairs.enable` supports `setupOpts` format by
   default.
 
 - Refactor of `nvim-cmp` and completion related modules
 
   - Remove `autocomplete.type` in favor of per-plugin enable options such as
-    [](#opt-vim.autocomplete.nvim-cmp.enable).
+    {option}`vim.autocomplete.nvim-cmp.enable`.
   - Deprecate legacy Vimsnip in favor of Luasnip, and integrate
-    friendly-snippets for bundled snippets. [](#opt-vim.snippets.luasnip.enable)
+    friendly-snippets for bundled snippets. {option}`vim.snippets.luasnip.enable`
     can be used to toggle Luasnip.
   - Add sorting function options for completion sources under
-    [](#opt-vim.autocomplete.nvim-cmp.setupOpts.sorting.comparators)
+    {option}`vim.autocomplete.nvim-cmp.setupOpts.sorting.comparators`
 
 - Add C# support under `vim.languages.csharp`, with support for both
   omnisharp-roslyn and csharp-language-server.
@@ -297,11 +297,11 @@ The changes are, in no particular order:
   Lualine. Only `vim.ui.breadcrumbs.lualine.winbar` is supported for the time
   being.
 
-  - [](#opt-vim.ui.breadcrumbs.lualine.winbar.enable) has been added to allow
+  - {option}`vim.ui.breadcrumbs.lualine.winbar.enable` has been added to allow
     controlling the default behaviour of the `nvim-navic` component on Lualine,
     which used to occupy `winbar.lualine_c` as long as breadcrumbs are enabled.
   - `vim.ui.breadcrumbs.alwaysRender` has been renamed to
-    [](#opt-vim.ui.breadcrumbs.lualine.winbar.alwaysRender) to be conform to the
+    {option}`vim.ui.breadcrumbs.lualine.winbar.alwaysRender` to be conform to the
     new format.
 
 - Add [basedpyright](https://github.com/detachhead/basedpyright) as a Python LSP
@@ -310,10 +310,10 @@ The changes are, in no particular order:
 - Add [python-lsp-server](https://github.com/python-lsp/python-lsp-server) as an
   additional Python LSP server.
 
-- Add [](#opt-vim.options) to set `vim.o` values in in your nvf configuration
+- Add {option}`vim.options` to set `vim.o` values in in your nvf configuration
   without using additional Lua. See option documentation for more details.
 
-- Add [](#opt-vim.dashboard.dashboard-nvim.setupOpts) to allow user
+- Add {option}`vim.dashboard.dashboard-nvim.setupOpts` to allow user
   configuration for [dashboard.nvim](https://github.com/nvimdev/dashboard-nvim)
 
 - Update `lualine.nvim` input and add missing themes:
@@ -321,7 +321,7 @@ The changes are, in no particular order:
   - Adds `ayu`, `gruvbox_dark`, `iceberg`, `moonfly`, `onedark`,
     `powerline_dark` and `solarized_light` themes.
 
-- Add [](#opt-vim.spellcheck.extraSpellWords) to allow adding arbitrary
+- Add {option}`vim.spellcheck.extraSpellWords` to allow adding arbitrary
   spellfiles to Neovim's runtime with ease.
 
 - Add combined nvf configuration (`config.vim`) into the final package's
@@ -375,9 +375,9 @@ The changes are, in no particular order:
 [nezia1](https://github.com/nezia1):
 
 - Add [biome](https://github.com/biomejs/biome) support for Typescript, CSS and
-  Svelte. Enable them via [](#opt-vim.languages.ts.format.type),
-  [](#opt-vim.languages.css.format.type) and
-  [](#opt-vim.languages.svelte.format.type) respectively.
+  Svelte. Enable them via {option}`vim.languages.ts.format.type`,
+  {option}`vim.languages.css.format.type` and
+  {option}`vim.languages.svelte.format.type` respectively.
 - Replace [nixpkgs-fmt](https://github.com/nix-community/nixpkgs-fmt) with
   [nixfmt](https://github.com/NixOS/nixfmt) (nixfmt-rfc-style).
 
diff --git a/docs/manual/release-notes/rl-0.8.md b/docs/manual/release-notes/rl-0.8.md
index 3242d09a..3fe354c5 100644
--- a/docs/manual/release-notes/rl-0.8.md
+++ b/docs/manual/release-notes/rl-0.8.md
@@ -21,7 +21,7 @@
 
 - `vim.useSystemClipboard` has been deprecated as a part of removing most
   top-level convenience options, and should instead be configured in the new
-  module interface. You may set [](#opt-vim.clipboard.registers) appropriately
+  module interface. You may set {option}`vim.clipboard.registers` appropriately
   to configure Neovim to use the system clipboard.
 
 - Changed which-key group used for gitsigns from `<leader>g` to `<leader>h` to
@@ -54,16 +54,16 @@
 - Add [render-markdown.nvim] under
   `languages.markdown.extensions.render-markdown-nvim`.
 
-- Implement [](#opt-vim.git.gitsigns.setupOpts) for user-specified setup table
+- Implement {option}`vim.git.gitsigns.setupOpts` for user-specified setup table
   in gitsigns configuration.
 
-- [](#opt-vim.options.mouse) no longer compares values to an enum of available
+- {option}`vim.options.mouse` no longer compares values to an enum of available
   mouse modes. This means you can provide any string without the module system
   warning you that it is invalid. Do keep in mind that this value is no longer
   checked, so you will be responsible for ensuring its validity.
 
 - Deprecate `vim.enableEditorconfig` in favor of
-  [](#opt-vim.globals.editorconfig).
+  {option}`vim.globals.editorconfig`.
 
 - Deprecate rnix-lsp as it has been abandoned and archived upstream.
 
@@ -72,7 +72,7 @@
   your Editorconfig configuration, or use an autocommand to set indentation
   values for buffers with the Nix filetype.
 
-- Add [](#opt-vim.lsp.lightbulb.autocmd.enable) for manually managing the
+- Add {option}`vim.lsp.lightbulb.autocmd.enable` for manually managing the
   previously managed lightbulb autocommand.
   - A warning will occur if [](#opt-vim.lsp.lightbulb.autocmd.enable) and
     `vim.lsp.lightbulb.setupOpts.autocmd.enabled` are both set at the same time.
@@ -85,7 +85,7 @@
 
 - Add [yazi.nvim] as a companion plugin for Yazi, the terminal file manager.
 
-- Add [](#opt-vim.autocmds) and [](#opt-vim.augroups) to allow declaring
+- Add {option}`vim.autocmds) and [](#opt-vim.augroups` to allow declaring
   autocommands via Nix.
 
 - Fix plugin `setupOpts` for yanky.nvim and assert if shada is configured as a
@@ -107,7 +107,7 @@
   `vim.utility.oil-nvim`.
 - Add `vim.diagnostics` to interact with Neovim's diagnostics module. Available
   options for `vim.diagnostic.config()` can now be customized through the
-  [](#opt-vim.diagnostics.config) in nvf.
+  {option}`vim.diagnostics.config` in nvf.
 
 - Add `vim.clipboard` module for easily managing Neovim clipboard providers and
   relevant packages in a simple UI.
@@ -209,7 +209,7 @@
 - Add [fzf-lua](https://github.com/ibhagwan/fzf-lua) in `vim.fzf-lua`
 - Add [rainbow-delimiters](https://github.com/HiPhish/rainbow-delimiters.nvim)
   in `vim.visuals.rainbow-delimiters`
-- Add options to define highlights under [](#opt-vim.highlight)
+- Add options to define highlights under {option}`vim.highlight`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/docs/manual/tips/pure-lua-config.md b/docs/manual/tips/pure-lua-config.md
index 1dca8296..e4ce03df 100644
--- a/docs/manual/tips/pure-lua-config.md
+++ b/docs/manual/tips/pure-lua-config.md
@@ -36,7 +36,7 @@ manner.
 This will add the `nvim` directory, or rather, the _store path_ that will be
 realised after your flake gets copied to the Nix store, to Neovim's runtime
 directory. You may now create a `lua/myconfig` directory within this nvim
-directory, and call it with [](#opt-vim.luaConfigRC).
+directory, and call it with {option}`vim.luaConfigRC`.
 
 ```nix
 {pkgs, ...}: {
@@ -90,7 +90,7 @@ vim.keymap.set("n", " ", "<Nop>", { silent = true, remap = false })
 vim.g.mapleader = " "
 ```
 
-The following Nix configuration via [](#opt-vim.luaConfigRC) will allow loading
+The following Nix configuration via {option}`vim.luaConfigRC` will allow loading
 this
 
 ```nix
diff --git a/modules/neovim/init/clipboard.nix b/modules/neovim/init/clipboard.nix
index 132079b4..b99f5508 100644
--- a/modules/neovim/init/clipboard.nix
+++ b/modules/neovim/init/clipboard.nix
@@ -15,7 +15,7 @@ in {
       clipboard = {
         enable = mkEnableOption ''
           clipboard management for Neovim. Users may still choose to manage their
-          clipboard through [](#opt-vim.options) should they wish to avoid using
+          clipboard through {option}`vim.options` should they wish to avoid using
           this module.
         '';
 
diff --git a/modules/plugins/treesitter/ts-context/context.nix b/modules/plugins/treesitter/ts-context/context.nix
index d29ba68e..f6886f9c 100644
--- a/modules/plugins/treesitter/ts-context/context.nix
+++ b/modules/plugins/treesitter/ts-context/context.nix
@@ -62,7 +62,7 @@ in {
         default = "outer";
         description = ''
           Which context lines to discard if
-          [](#opt-vim.treesitter.context.setupOpts.max_lines) is exceeded.
+          {option}`vim.treesitter.context.setupOpts.max_lines` is exceeded.
         '';
       };
 
diff --git a/modules/plugins/utility/telescope/telescope.nix b/modules/plugins/utility/telescope/telescope.nix
index 70fc92c7..3aa75ca6 100644
--- a/modules/plugins/utility/telescope/telescope.nix
+++ b/modules/plugins/utility/telescope/telescope.nix
@@ -43,7 +43,7 @@
         default = ["${pkgs.fd}/bin/fd"];
         description = ''
           Command to use for finding files. If using an executable from {env}`PATH` then you must
-          make sure that the package is available in [](#opt-vim.extraPackages).
+          make sure that the package is available in {option}`vim.extraPackages`.
         '';
       };
 
diff --git a/modules/plugins/visuals/fidget-nvim/fidget.nix b/modules/plugins/visuals/fidget-nvim/fidget.nix
index fa2ecb44..f5bdf397 100644
--- a/modules/plugins/visuals/fidget-nvim/fidget.nix
+++ b/modules/plugins/visuals/fidget-nvim/fidget.nix
@@ -180,7 +180,7 @@ in {
           overrides = mkOption {
             description = ''
               Overrides the default configuration for a notification group defined
-              in [](#opt-vim.visuals.fidget-nvim.setupOpts.notification.configs).
+              in {option}`vim.visuals.fidget-nvim.setupOpts.notification.configs`.
 
               If any of the fields are null, the value from the default
               configuration is used.
diff --git a/modules/wrapper/lazy/lazy.nix b/modules/wrapper/lazy/lazy.nix
index cef54360..7ff38b12 100644
--- a/modules/wrapper/lazy/lazy.nix
+++ b/modules/wrapper/lazy/lazy.nix
@@ -121,7 +121,7 @@
         description = ''
           Lua code to run after plugin is loaded. This will be wrapped in a function.
 
-          If [](#opt-vim.lazy.plugins._name_.setupModule) is provided, the setup will be ran before `after`.
+          If {option}`vim.lazy.plugins._name_.setupModule` is provided, the setup will be ran before `after`.
         '';
       };
 
diff --git a/modules/wrapper/rc/options.nix b/modules/wrapper/rc/options.nix
index c0bb6915..7ba15bd8 100644
--- a/modules/wrapper/rc/options.nix
+++ b/modules/wrapper/rc/options.nix
@@ -284,9 +284,9 @@ in {
       default = "";
       defaultText = literalMD ''
         By default, this option will **append** paths in
-        [](#opt-vim.additionalRuntimePaths)
+        {option}`vim.additionalRuntimePaths`
         to the `runtimepath` and enable the experimental Lua module loader
-        if [](#opt-vim.enableLuaLoader) is set to true.
+        if {option}`vim.enableLuaLoader` is set to true.
       '';
 
       example = literalExpression "\${builtins.readFile ./my-lua-config-pre.lua}";

From e47306b27639c752dbfd3dbd057311660a222314 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Wed, 10 Dec 2025 19:11:35 +0100
Subject: [PATCH 13/18] flake: bump ndg

---
 flake.lock | 28 ++++++----------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/flake.lock b/flake.lock
index 63ebb3b9..e55e64f1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -16,21 +16,6 @@
         "url": "https://git.lix.systems/lix-project/flake-compat.git"
       }
     },
-    "flake-compat_2": {
-      "locked": {
-        "lastModified": 1747046372,
-        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -68,15 +53,14 @@
     },
     "ndg": {
       "inputs": {
-        "flake-compat": "flake-compat_2",
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1760777965,
-        "narHash": "sha256-PHmDh1GxoBixpgtRCrBCvXJee/tCb6T57MLbwKfIURg=",
+        "lastModified": 1765435293,
+        "narHash": "sha256-HRp4g6qBCb8vpJ17s2FacMRXRszM73uBiR56aILMELA=",
         "owner": "feel-co",
         "repo": "ndg",
-        "rev": "30b955582f0cd869a86007f491252bbffde48f8b",
+        "rev": "65bf834b332d5f8b28d95ea14c7974be7c272971",
         "type": "github"
       },
       "original": {
@@ -87,11 +71,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1764081664,
-        "narHash": "sha256-sUoHmPr/EwXzRMpv1u/kH+dXuvJEyyF2Q7muE+t0EU4=",
+        "lastModified": 1764242076,
+        "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8913c168d1c56dc49a7718685968f38752171c3b",
+        "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4",
         "type": "github"
       },
       "original": {

From a95149588222d6bd66af5d9392bfbcd3493602b1 Mon Sep 17 00:00:00 2001
From: Soliprem <franci.solidoro@gmail.com>
Date: Thu, 11 Dec 2025 15:39:41 +0100
Subject: [PATCH 14/18] docs: fix formatting

---
 .../configuring/custom-plugins/legacy-method.md    | 14 +++++++-------
 docs/manual/release-notes/rl-0.1.md                |  5 +++--
 docs/manual/release-notes/rl-0.7.md                |  4 ++--
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/docs/manual/configuring/custom-plugins/legacy-method.md b/docs/manual/configuring/custom-plugins/legacy-method.md
index e7821712..e0228ee9 100644
--- a/docs/manual/configuring/custom-plugins/legacy-method.md
+++ b/docs/manual/configuring/custom-plugins/legacy-method.md
@@ -1,17 +1,17 @@
 # Legacy Method {#sec-legacy-method}
 
 Prior to version **0.5**, the method of adding new plugins was adding the plugin
-package to {option}`vim.startPlugins` and adding its configuration as a DAG under
-one of `vim.configRC` or {option}`vim.luaConfigRC`. While `configRC` has been
-deprecated, users who have not yet updated to 0.5 or those who prefer a more
-hands-on approach may choose to use the old method where the load order of the
-plugins is explicitly determined by DAGs without internal abstractions.
+package to {option}`vim.startPlugins` and adding its configuration as a DAG 
+under one of `vim.configRC` or {option}`vim.luaConfigRC`. While `configRC` has
+been deprecated, users who have not yet updated to 0.5 or those who prefer a
+more hands-on approach may choose to use the old method where the load order of
+the plugins is explicitly determined by DAGs without internal abstractions.
 
 ## Adding New Plugins {#sec-adding-new-plugins}
 
 To add a plugin not available in **nvf** as a module to your configuration using
-the legacy method, you must add it to {option}`vim.startPlugins` in order to make
-it available to Neovim at runtime.
+the legacy method, you must add it to {option}`vim.startPlugins` in order to
+make it available to Neovim at runtime.
 
 ```nix
 {pkgs, ...}: {
diff --git a/docs/manual/release-notes/rl-0.1.md b/docs/manual/release-notes/rl-0.1.md
index 91037f2a..8fc48ca8 100644
--- a/docs/manual/release-notes/rl-0.1.md
+++ b/docs/manual/release-notes/rl-0.1.md
@@ -44,5 +44,6 @@ vim.luaConfigRC = lib.nvim.dag.entryAnywhere "config here"
 
 [MoritzBoehme](https://github.com/MoritzBoehme):
 
-- `catppuccin` theme is now available as a neovim theme {option}`vim.theme.style`
-  and Lualine theme {option}`vim.statusline.lualine.theme`.
+- `catppuccin` theme is now available as a neovim theme
+  {option}`vim.theme.style` and Lualine theme
+  {option}`vim.statusline.lualine.theme`.
diff --git a/docs/manual/release-notes/rl-0.7.md b/docs/manual/release-notes/rl-0.7.md
index 4a3db6ca..8829abbd 100644
--- a/docs/manual/release-notes/rl-0.7.md
+++ b/docs/manual/release-notes/rl-0.7.md
@@ -301,8 +301,8 @@ The changes are, in no particular order:
     controlling the default behaviour of the `nvim-navic` component on Lualine,
     which used to occupy `winbar.lualine_c` as long as breadcrumbs are enabled.
   - `vim.ui.breadcrumbs.alwaysRender` has been renamed to
-    {option}`vim.ui.breadcrumbs.lualine.winbar.alwaysRender` to be conform to the
-    new format.
+    {option}`vim.ui.breadcrumbs.lualine.winbar.alwaysRender` to be conform to
+    the new format.
 
 - Add [basedpyright](https://github.com/detachhead/basedpyright) as a Python LSP
   server and make it default.

From e18932d3ebac1cd4ffa20b4f4540ff2c56a95fe6 Mon Sep 17 00:00:00 2001
From: Soliprem <franci.solidoro@gmail.com>
Date: Thu, 11 Dec 2025 15:47:42 +0100
Subject: [PATCH 15/18] docs: fix more formatting

---
 docs/manual/configuring/custom-plugins/legacy-method.md | 2 +-
 docs/manual/release-notes/rl-0.7.md                     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/manual/configuring/custom-plugins/legacy-method.md b/docs/manual/configuring/custom-plugins/legacy-method.md
index e0228ee9..f4976e5f 100644
--- a/docs/manual/configuring/custom-plugins/legacy-method.md
+++ b/docs/manual/configuring/custom-plugins/legacy-method.md
@@ -1,7 +1,7 @@
 # Legacy Method {#sec-legacy-method}
 
 Prior to version **0.5**, the method of adding new plugins was adding the plugin
-package to {option}`vim.startPlugins` and adding its configuration as a DAG 
+package to {option}`vim.startPlugins` and adding its configuration as a DAG
 under one of `vim.configRC` or {option}`vim.luaConfigRC`. While `configRC` has
 been deprecated, users who have not yet updated to 0.5 or those who prefer a
 more hands-on approach may choose to use the old method where the load order of
diff --git a/docs/manual/release-notes/rl-0.7.md b/docs/manual/release-notes/rl-0.7.md
index 8829abbd..d5bb7a51 100644
--- a/docs/manual/release-notes/rl-0.7.md
+++ b/docs/manual/release-notes/rl-0.7.md
@@ -224,8 +224,8 @@ The changes are, in no particular order:
   - Remove `autocomplete.type` in favor of per-plugin enable options such as
     {option}`vim.autocomplete.nvim-cmp.enable`.
   - Deprecate legacy Vimsnip in favor of Luasnip, and integrate
-    friendly-snippets for bundled snippets. {option}`vim.snippets.luasnip.enable`
-    can be used to toggle Luasnip.
+    friendly-snippets for bundled snippets.
+    {option}`vim.snippets.luasnip.enable` can be used to toggle Luasnip.
   - Add sorting function options for completion sources under
     {option}`vim.autocomplete.nvim-cmp.setupOpts.sorting.comparators`
 

From 313ad612f6f387375ca2574087737211e94b90d5 Mon Sep 17 00:00:00 2001
From: Soliprem <franci.solidoro@gmail.com>
Date: Thu, 11 Dec 2025 15:57:13 +0100
Subject: [PATCH 16/18] docs/manual: runCommandNoCCLocal was renamed to
 runCommandLocal

---
 docs/manual.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/manual.nix b/docs/manual.nix
index 5c2a234d..132c20ef 100644
--- a/docs/manual.nix
+++ b/docs/manual.nix
@@ -2,13 +2,13 @@
   inputs,
   path,
   stdenvNoCC,
-  runCommandNoCCLocal,
+  runCommandLocal,
   optionsJSON,
   release,
 } @ args: let
   manual-release = args.release or "unstable";
 in
-  runCommandNoCCLocal "nvf-docs-html" {
+  runCommandLocal "nvf-docs-html" {
     nativeBuildInputs = [
       (inputs.ndg.packages.${stdenvNoCC.system}.ndg.overrideAttrs
         {

From b4abb3c82d50ee2f47e8173e4b427839d65173f9 Mon Sep 17 00:00:00 2001
From: Soliprem <franci.solidoro@gmail.com>
Date: Thu, 11 Dec 2025 18:32:09 +0100
Subject: [PATCH 17/18] treewide: fix a lot of broken / dead links

---
 docs/manual/configuring.md                    |  4 +-
 docs/manual/configuring/languages.md          | 84 +++++++++----------
 docs/manual/configuring/overriding-plugins.md |  2 +-
 docs/manual/hacking.md                        |  4 +-
 docs/manual/release-notes/rl-0.1.md           |  2 +-
 docs/manual/release-notes/rl-0.6.md           | 12 +--
 docs/manual/release-notes/rl-0.7.md           |  2 +-
 docs/manual/release-notes/rl-0.8.md           | 10 +--
 docs/manual/tips/plugin-sources.md            |  4 +-
 docs/manual/tips/pure-lua-config.md           |  2 +-
 modules/neovim/init/spellcheck.nix            |  2 +-
 modules/plugins/languages/julia.nix           |  2 +-
 modules/wrapper/environment/options.nix       |  2 +-
 modules/wrapper/rc/options.nix                |  2 +-
 14 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/docs/manual/configuring.md b/docs/manual/configuring.md
index 4c119bee..99e1755f 100644
--- a/docs/manual/configuring.md
+++ b/docs/manual/configuring.md
@@ -1,7 +1,7 @@
 # Configuring nvf {#ch-configuring}
 
-[helpful tips section]: #ch-helpful-tips
-[options reference]: /nvf/options.html
+[helpful tips section]: ./tips.html#ch-helpful-tips
+[options reference]: ./options.html
 
 nvf allows for _very_ extensive configuration in Neovim through the Nix module
 interface. The below chapters describe several of the options exposed in nvf for
diff --git a/docs/manual/configuring/languages.md b/docs/manual/configuring/languages.md
index bd2e487d..1b8c5330 100644
--- a/docs/manual/configuring/languages.md
+++ b/docs/manual/configuring/languages.md
@@ -6,49 +6,49 @@ formatters, and `nvim-lint` linter integration. This gets you capabilities
 ranging from autocompletion to formatting to diagnostics. The following
 languages have sections under the `vim.languages` attribute.
 
-- Rust: [vim.languages.rust.enable](#opt-vim.languages.rust.enable)
-- Nix: [vim.languages.nix.enable](#opt-vim.languages.nix.enable)
-- SQL: [vim.languages.sql.enable](#opt-vim.languages.sql.enable)
-- C/C++: [vim.languages.clang.enable](#opt-vim.languages.clang.enable)
-- Typescript/Javascript: [vim.languages.ts.enable](#opt-vim.languages.ts.enable)
-- Python: [vim.languages.python.enable](#opt-vim.languages.python.enable):
-- Zig: [vim.languages.zig.enable](#opt-vim.languages.zig.enable)
-- Markdown: [vim.languages.markdown.enable](#opt-vim.languages.markdown.enable)
-- HTML: [vim.languages.html.enable](#opt-vim.languages.html.enable)
-- Dart: [vim.languages.dart.enable](#opt-vim.languages.dart.enable)
-- Go: [vim.languages.go.enable](#opt-vim.languages.go.enable)
-- Lua: [vim.languages.lua.enable](#opt-vim.languages.lua.enable)
-- PHP: [vim.languages.php.enable](#opt-vim.languages.php.enable)
-- F#: [vim.languages.fsharp.enable](#opt-vim.languages.fsharp.enable)
-- Assembly: [vim.languages.assembly.enable](#opt-vim.languages.assembly.enable)
-- Astro: [vim.languages.astro.enable](#opt-vim.languages.astro.enable)
-- Bash: [vim.languages.bash.enable](#opt-vim.languages.bash.enable)
-- Clang: [vim.languages.clang.enable](#opt-vim.languages.clang.enable)
-- Clojure: [vim.languages.clojure.enable](#opt-vim.languages.clojure.enable)
-- C#: [vim.languages.csharp.enable](#opt-vim.languages.csharp.enable)
-- CSS: [vim.languages.css.enable](#opt-vim.languages.css.enable)
-- CUE: [vim.languages.cue.enable](#opt-vim.languages.cue.enable)
-- Elixir: [vim.languages.elixir.enable](#opt-vim.languages.elixir.enable)
-- Gleam: [vim.languages.gleam.enable](#opt-vim.languages.gleam.enable)
-- HCL: [vim.languages.hcl.enable](#opt-vim.languages.hcl.enable)
-- Helm: [vim.languages.helm.enable](#opt-vim.languages.helm.enable)
-- Julia: [vim.languages.julia.enable](#opt-vim.languages.julia.enable)
-- Kotlin: [vim.languages.kotlin.enable](#opt-vim.languages.kotlin.enable)
-- Nim: [vim.languages.nim.enable](#opt-vim.languages.nim.enable)
-- Nu: [vim.languages.nu.enable](#opt-vim.languages.nu.enable)
-- OCaml: [vim.languages.ocaml.enable](#opt-vim.languages.ocaml.enable)
-- Odin: [vim.languages.odin.enable](#opt-vim.languages.odin.enable)
-- R: [vim.languages.r.enable](#opt-vim.languages.r.enable)
-- Ruby: [vim.languages.ruby.enable](#opt-vim.languages.ruby.enable)
-- Scala: [vim.languages.scala.enable](#opt-vim.languages.scala.enable)
-- Svelte: [vim.languages.svelte.enable](#opt-vim.languages.svelte.enable)
-- Tailwind: [vim.languages.tailwind.enable](#opt-vim.languages.tailwind.enable)
+- Rust: [vim.languages.rust.enable](./options.html#option-vim-languages-rust-enable)
+- Nix: [vim.languages.nix.enable](./options.html#option-vim-languages-nix-enable)
+- SQL: [vim.languages.sql.enable](./options.html#option-vim-languages-sql-enable)
+- C/C++: [vim.languages.clang.enable](./options.html#option-vim-languages-clang-enable)
+- Typescript/Javascript: [vim.languages.ts.enable](./options.html#option-vim-languages-ts-enable)
+- Python: [vim.languages.python.enable](./options.html#option-vim-languages-python-enable):
+- Zig: [vim.languages.zig.enable](./options.html#option-vim-languages-zig-enable)
+- Markdown: [vim.languages.markdown.enable](./options.html#option-vim-languages-markdown-enable)
+- HTML: [vim.languages.html.enable](./options.html#option-vim-languages-html-enable)
+- Dart: [vim.languages.dart.enable](./options.html#option-vim-languages-dart-enable)
+- Go: [vim.languages.go.enable](./options.html#option-vim-languages-go-enable)
+- Lua: [vim.languages.lua.enable](./options.html#option-vim-languages-lua-enable)
+- PHP: [vim.languages.php.enable](./options.html#option-vim-languages-php-enable)
+- F#: [vim.languages.fsharp.enable](./options.html#option-vim-languages-fsharp-enable)
+- Assembly: [vim.languages.assembly.enable](./options.html#option-vim-languages-assembly-enable)
+- Astro: [vim.languages.astro.enable](./options.html#option-vim-languages-astro-enable)
+- Bash: [vim.languages.bash.enable](./options.html#option-vim-languages-bash-enable)
+- Clang: [vim.languages.clang.enable](./options.html#option-vim-languages-clang-enable)
+- Clojure: [vim.languages.clojure.enable](./options.html#option-vim-languages-clojure-enable)
+- C#: [vim.languages.csharp.enable](./options.html#option-vim-languages-csharp-enable)
+- CSS: [vim.languages.css.enable](./options.html#option-vim-languages-css-enable)
+- CUE: [vim.languages.cue.enable](./options.html#option-vim-languages-cue-enable)
+- Elixir: [vim.languages.elixir.enable](./options.html#option-vim-languages-elixir-enable)
+- Gleam: [vim.languages.gleam.enable](./options.html#option-vim-languages-gleam-enable)
+- HCL: [vim.languages.hcl.enable](./options.html#option-vim-languages-hcl-enable)
+- Helm: [vim.languages.helm.enable](./options.html#option-vim-languages-helm-enable)
+- Julia: [vim.languages.julia.enable](./options.html#option-vim-languages-julia-enable)
+- Kotlin: [vim.languages.kotlin.enable](./options.html#option-vim-languages-kotlin-enable)
+- Nim: [vim.languages.nim.enable](./options.html#option-vim-languages-nim-enable)
+- Nu: [vim.languages.nu.enable](./options.html#option-vim-languages-nu-enable)
+- OCaml: [vim.languages.ocaml.enable](./options.html#option-vim-languages-ocaml-enable)
+- Odin: [vim.languages.odin.enable](./options.html#option-vim-languages-odin-enable)
+- R: [vim.languages.r.enable](./options.html#option-vim-languages-r-enable)
+- Ruby: [vim.languages.ruby.enable](./options.html#option-vim-languages-ruby-enable)
+- Scala: [vim.languages.scala.enable](./options.html#option-vim-languages-scala-enable)
+- Svelte: [vim.languages.svelte.enable](./options.html#option-vim-languages-svelte-enable)
+- Tailwind: [vim.languages.tailwind.enable](./options.html#option-vim-languages-tailwind-enable)
 - Terraform:
-  [vim.languages.terraform.enable](#opt-vim.languages.terraform.enable)
-- Typst: [vim.languages.typst.enable](#opt-vim.languages.typst.enable)
-- Vala: [vim.languages.vala.enable](#opt-vim.languages.vala.enable)
-- WGSL: [vim.languages.wgsl.enable](#opt-vim.languages.wgsl.enable)
-- YAML: [vim.languages.yaml.enable](#opt-vim.languages.yaml.enable)
+  [vim.languages.terraform.enable](./options.html#option-vim-languages-terraform-enable)
+- Typst: [vim.languages.typst.enable](./options.html#option-vim-languages-typst-enable)
+- Vala: [vim.languages.vala.enable](./options.html#option-vim-languages-vala-enable)
+- WGSL: [vim.languages.wgsl.enable](./options.html#option-vim-languages-wgsl-enable)
+- YAML: [vim.languages.yaml.enable](./options.html#option-vim-languages-yaml-enable)
 
 Adding support for more languages, and improving support for existing ones are
 great places where you can contribute with a PR.
diff --git a/docs/manual/configuring/overriding-plugins.md b/docs/manual/configuring/overriding-plugins.md
index 223bf5b6..e44c1d08 100644
--- a/docs/manual/configuring/overriding-plugins.md
+++ b/docs/manual/configuring/overriding-plugins.md
@@ -1,6 +1,6 @@
 # Overriding plugins {#ch-overriding-plugins}
 
-The [additional plugins section](#sec-additional-plugins) details the addition
+The [additional plugins section](./hacking.html#sec-additional-plugins) details the addition
 of new plugins to nvf under regular circumstances, i.e. while making a pull
 request to the project. You may _override_ those plugins in your config to
 change source versions, e.g., to use newer versions of plugins that are not yet
diff --git a/docs/manual/hacking.md b/docs/manual/hacking.md
index 85bb3ed1..609ddc92 100644
--- a/docs/manual/hacking.md
+++ b/docs/manual/hacking.md
@@ -273,7 +273,7 @@ An example, simple keybinding, can look like this:
 ```
 
 There are many settings available in the options. Please refer to the
-[documentation](https://notashelf.github.io/nvf/options.html#opt-vim.keymaps) to
+[documentation](./options.html#option-vim-keymaps) to
 see a list of them.
 
 **nvf** provides a helper function, so that you don't have to write the mapping
@@ -601,7 +601,7 @@ require('lz.n').load({
 })
 ```
 
-[`vim.lazy.plugins` spec]: https://notashelf.github.io/nvf/options.html#opt-vim.lazy.plugins
+[`vim.lazy.plugins` spec]: ./options.html#option-vim-lazy-plugins
 
 A full list of options can be found in the [`vim.lazy.plugins` spec] on the
 rendered manual.
diff --git a/docs/manual/release-notes/rl-0.1.md b/docs/manual/release-notes/rl-0.1.md
index 8fc48ca8..bdb922b5 100644
--- a/docs/manual/release-notes/rl-0.1.md
+++ b/docs/manual/release-notes/rl-0.1.md
@@ -15,7 +15,7 @@ DAG implementation are from them.
   longer defined. If you use hare and would like it added back, please file an
   issue.
 
-- {option}`vim.startPlugins) & [](#opt-vim.optPlugins` are now an enum of
+- {option}`vim.startPlugins` & {option} `vim-optPlugins` are now an enum of
   `string` for options sourced from the flake inputs. Users can still provide
   vim plugin packages.
 
diff --git a/docs/manual/release-notes/rl-0.6.md b/docs/manual/release-notes/rl-0.6.md
index b40e2930..13cdd7bb 100644
--- a/docs/manual/release-notes/rl-0.6.md
+++ b/docs/manual/release-notes/rl-0.6.md
@@ -41,7 +41,7 @@ end
 vim.api.nvim_set_keymap('n', '<leader>a', ':lua camelToSnake()<CR>', { noremap = true, silent = true })
 ```
 
-## Changelog {#sec-release-0.6-changelog}
+## Changelog {#sec-release-0-6-changelog}
 
 [ksonj](https://github.com/ksonj):
 
@@ -95,7 +95,7 @@ vim.api.nvim_set_keymap('n', '<leader>a', ':lua camelToSnake()<CR>', { noremap =
   and also has been removed.
 
 - `which-key.nvim` categories can now be customized through
-  [vim.binds.whichKey.register](#opt-vim.binds.whichKey.register)
+  [vim.binds.whichKey.register](./options.html#option-vim-binds-whichKey-register)
 
 - Added `magick` to `vim.luaPackages` for `image.nvim`.
 
@@ -125,10 +125,10 @@ vim.api.nvim_set_keymap('n', '<leader>a', ':lua camelToSnake()<CR>', { noremap =
 
 - Lualine module now allows customizing `always_divide_middle`, `ignore_focus`
   and `disabled_filetypes` through the new options:
-  [vim.statusline.lualine.alwaysDivideMiddle](#opt-vim.statusline.lualine.alwaysDivideMiddle),
-  [vim.statusline.lualine.ignoreFocus](#opt-vim.statusline.lualine.ignoreFocus)
+  [vim.statusline.lualine.alwaysDivideMiddle](./options.html#option-vim-statusline-lualine-alwaysDivideMiddle),
+  [vim.statusline.lualine.ignoreFocus](./options.html#option-vim-statusline-lualine-ignoreFocus)
   and
-  [vim.statusline.lualine.disabledFiletypes](#opt-vim.statusline.lualine.disabledFiletypes).
+  [vim.statusline.lualine.disabledFiletypes](./options.html#option-vim-statusline-lualine-disabledFiletypes).
 
 - Updated all plugin inputs to their latest versions (**21.04.2024**) - this
   brought minor color changes to the Catppuccin theme.
@@ -159,7 +159,7 @@ vim.api.nvim_set_keymap('n', '<leader>a', ':lua camelToSnake()<CR>', { noremap =
   arguments to take `luaBefore`, `luaConfig` and `luaAfter` as strings, which
   are then concatted inside a lua block.
 
-- Added {option}`vim.luaConfigPre) and [](#opt-vim.luaConfigPost` for inserting
+- Added {option}`vim.luaConfigPre` and {option} `vim-luaConfigPost` for inserting
   verbatim Lua configuration before and after the resolved Lua DAG respectively.
   Both of those options take strings as the type, so you may read the contents
   of a Lua file from a given path.
diff --git a/docs/manual/release-notes/rl-0.7.md b/docs/manual/release-notes/rl-0.7.md
index d5bb7a51..36d61105 100644
--- a/docs/manual/release-notes/rl-0.7.md
+++ b/docs/manual/release-notes/rl-0.7.md
@@ -115,7 +115,7 @@ The changes are, in no particular order:
   replicate the same functionality by setting `shiftwidth`, `tabstop` and
   `softtabstop` under `vim.options` as you see fit.
 
-## Changelog {#sec-release-0.7-changelog}
+## Changelog {#sec-release-0-7-changelog}
 
 [ItsSorae](https://github.com/ItsSorae):
 
diff --git a/docs/manual/release-notes/rl-0.8.md b/docs/manual/release-notes/rl-0.8.md
index 3fe354c5..62f42638 100644
--- a/docs/manual/release-notes/rl-0.8.md
+++ b/docs/manual/release-notes/rl-0.8.md
@@ -74,7 +74,7 @@
 
 - Add {option}`vim.lsp.lightbulb.autocmd.enable` for manually managing the
   previously managed lightbulb autocommand.
-  - A warning will occur if [](#opt-vim.lsp.lightbulb.autocmd.enable) and
+  - A warning will occur if {option} vim-lsp-lightbulb-autocmd-enable) and
     `vim.lsp.lightbulb.setupOpts.autocmd.enabled` are both set at the same time.
     Pick only one.
 
@@ -85,7 +85,7 @@
 
 - Add [yazi.nvim] as a companion plugin for Yazi, the terminal file manager.
 
-- Add {option}`vim.autocmds) and [](#opt-vim.augroups` to allow declaring
+- Add {option}`vim.autocmds` and {option}`vim-augroups` to allow declaring
   autocommands via Nix.
 
 - Fix plugin `setupOpts` for yanky.nvim and assert if shada is configured as a
@@ -225,8 +225,8 @@
 
 [thamenato](https://github.com/thamenato):
 
-[ruff]: (https://github.com/astral-sh/ruff)
-[cue]: (https://cuelang.org/)
+[ruff]: https://github.com/astral-sh/ruff
+[cue]: https://cuelang.org/
 
 - Add [ruff] as a formatter option in `vim.languages.python.format.type`.
 - Add [cue] support under `vim.languages.cue`.
@@ -553,7 +553,7 @@
 
 [valterschutz](https://github.com/valterschutz):
 
-[ruff]: (https://github.com/astral-sh/ruff)
+[ruff]: https://github.com/astral-sh/ruff
 
 - Add [ruff-fix] as a formatter option in `vim.languages.python.format.type`.
 
diff --git a/docs/manual/tips/plugin-sources.md b/docs/manual/tips/plugin-sources.md
index 7cf6a470..a6f8d71d 100644
--- a/docs/manual/tips/plugin-sources.md
+++ b/docs/manual/tips/plugin-sources.md
@@ -26,7 +26,7 @@ startup.
 }
 ```
 
-[`vim.extraPlugins`]: https://notashelf.github.io/nvf/options.html#opt-vim.extraPlugins
+[`vim.extraPlugins`]: ./options.html#option-vim-extraPlugins
 
 This will fetch aerial.nvim from nixpkgs, and add it to Neovim's runtime path to
 be loaded manually. Although for plugins that require manual setup, you are
@@ -43,7 +43,7 @@ encouraged to use [`vim.extraPlugins`].
 }
 ```
 
-[custom plugins section]: https://notashelf.github.io/nvf/index.xhtml#ch-custom-plugins
+[custom plugins section]: ./configuring.html#ch-custom-plugins
 
 More details on the extraPlugins API is documented in the
 [custom plugins section].
diff --git a/docs/manual/tips/pure-lua-config.md b/docs/manual/tips/pure-lua-config.md
index e4ce03df..d81d9ee5 100644
--- a/docs/manual/tips/pure-lua-config.md
+++ b/docs/manual/tips/pure-lua-config.md
@@ -105,7 +105,7 @@ this
 }
 ```
 
-[DAG system]: https://notashelf.github.io/nvf/index.xhtml#ch-using-dags
+[DAG system]: ./configuring.html#ch-using-dags
 
 After you load your custom configuration, you may use an `init.lua` located in
 your custom configuration directory to configure Neovim exactly as you would
diff --git a/modules/neovim/init/spellcheck.nix b/modules/neovim/init/spellcheck.nix
index 9f635bf5..724b432d 100644
--- a/modules/neovim/init/spellcheck.nix
+++ b/modules/neovim/init/spellcheck.nix
@@ -29,7 +29,7 @@ in {
 
         To add your own language files, you may place your `spell` directory in either
         {file}`$XDG_CONFIG_HOME/nvf` or in a path that is included in the
-        [additionalRuntimePaths](#opt-vim.additionalRuntimePaths) list provided by nvf.
+        [additionalRuntimePaths](./options.html#option-vim-additionalRuntimePaths) list provided by nvf.
       '';
     };
 
diff --git a/modules/plugins/languages/julia.nix b/modules/plugins/languages/julia.nix
index 577798c7..971e9f03 100644
--- a/modules/plugins/languages/julia.nix
+++ b/modules/plugins/languages/julia.nix
@@ -107,7 +107,7 @@ in {
             option, since there is no way to provide only the LSP server.
 
             If you want to avoid that, you have to change
-            [vim.lsp.servers.julials.cmd](#opt-vim.lsp.servers._name_.cmd) to use
+            {option}`vim.lsp.servers.julials.cmd` to use
             the Julia binary in {env}`PATH`, and add the `LanguageServer`
             package to Julia in your devshells.
 
diff --git a/modules/wrapper/environment/options.nix b/modules/wrapper/environment/options.nix
index d3b28b0f..5b2f1f63 100644
--- a/modules/wrapper/environment/options.nix
+++ b/modules/wrapper/environment/options.nix
@@ -47,7 +47,7 @@ in {
         internally to add plugins to Neovim's runtime.
 
         To add additional plugins to your configuration, consider
-        using the [{option}`vim.extraPlugins`](#opt-vim.extraPlugins)
+        using the {option}`vim.extraPlugins`
         option.
       '';
     };
diff --git a/modules/wrapper/rc/options.nix b/modules/wrapper/rc/options.nix
index 7ba15bd8..f1baaa17 100644
--- a/modules/wrapper/rc/options.nix
+++ b/modules/wrapper/rc/options.nix
@@ -284,7 +284,7 @@ in {
       default = "";
       defaultText = literalMD ''
         By default, this option will **append** paths in
-        {option}`vim.additionalRuntimePaths`
+        {option}`vim-additionalRuntimePaths`
         to the `runtimepath` and enable the experimental Lua module loader
         if {option}`vim.enableLuaLoader` is set to true.
       '';

From 71f352d41ee17150a7b8cf8dab6135edd020fc4c Mon Sep 17 00:00:00 2001
From: Soliprem <franci.solidoro@gmail.com>
Date: Thu, 11 Dec 2025 19:06:49 +0100
Subject: [PATCH 18/18] docs: formatting

---
 docs/manual/configuring/languages.md          | 114 ++++++++++++------
 docs/manual/configuring/overriding-plugins.md |  10 +-
 docs/manual/hacking.md                        |   3 +-
 docs/manual/release-notes/rl-0.6.md           |   8 +-
 4 files changed, 86 insertions(+), 49 deletions(-)

diff --git a/docs/manual/configuring/languages.md b/docs/manual/configuring/languages.md
index 1b8c5330..f956a0e3 100644
--- a/docs/manual/configuring/languages.md
+++ b/docs/manual/configuring/languages.md
@@ -6,49 +6,87 @@ formatters, and `nvim-lint` linter integration. This gets you capabilities
 ranging from autocompletion to formatting to diagnostics. The following
 languages have sections under the `vim.languages` attribute.
 
-- Rust: [vim.languages.rust.enable](./options.html#option-vim-languages-rust-enable)
-- Nix: [vim.languages.nix.enable](./options.html#option-vim-languages-nix-enable)
-- SQL: [vim.languages.sql.enable](./options.html#option-vim-languages-sql-enable)
-- C/C++: [vim.languages.clang.enable](./options.html#option-vim-languages-clang-enable)
-- Typescript/Javascript: [vim.languages.ts.enable](./options.html#option-vim-languages-ts-enable)
-- Python: [vim.languages.python.enable](./options.html#option-vim-languages-python-enable):
-- Zig: [vim.languages.zig.enable](./options.html#option-vim-languages-zig-enable)
-- Markdown: [vim.languages.markdown.enable](./options.html#option-vim-languages-markdown-enable)
-- HTML: [vim.languages.html.enable](./options.html#option-vim-languages-html-enable)
-- Dart: [vim.languages.dart.enable](./options.html#option-vim-languages-dart-enable)
+- Rust:
+  [vim.languages.rust.enable](./options.html#option-vim-languages-rust-enable)
+- Nix:
+  [vim.languages.nix.enable](./options.html#option-vim-languages-nix-enable)
+- SQL:
+  [vim.languages.sql.enable](./options.html#option-vim-languages-sql-enable)
+- C/C++:
+  [vim.languages.clang.enable](./options.html#option-vim-languages-clang-enable)
+- Typescript/Javascript:
+  [vim.languages.ts.enable](./options.html#option-vim-languages-ts-enable)
+- Python:
+  [vim.languages.python.enable](./options.html#option-vim-languages-python-enable):
+- Zig:
+  [vim.languages.zig.enable](./options.html#option-vim-languages-zig-enable)
+- Markdown:
+  [vim.languages.markdown.enable](./options.html#option-vim-languages-markdown-enable)
+- HTML:
+  [vim.languages.html.enable](./options.html#option-vim-languages-html-enable)
+- Dart:
+  [vim.languages.dart.enable](./options.html#option-vim-languages-dart-enable)
 - Go: [vim.languages.go.enable](./options.html#option-vim-languages-go-enable)
-- Lua: [vim.languages.lua.enable](./options.html#option-vim-languages-lua-enable)
-- PHP: [vim.languages.php.enable](./options.html#option-vim-languages-php-enable)
-- F#: [vim.languages.fsharp.enable](./options.html#option-vim-languages-fsharp-enable)
-- Assembly: [vim.languages.assembly.enable](./options.html#option-vim-languages-assembly-enable)
-- Astro: [vim.languages.astro.enable](./options.html#option-vim-languages-astro-enable)
-- Bash: [vim.languages.bash.enable](./options.html#option-vim-languages-bash-enable)
-- Clang: [vim.languages.clang.enable](./options.html#option-vim-languages-clang-enable)
-- Clojure: [vim.languages.clojure.enable](./options.html#option-vim-languages-clojure-enable)
-- C#: [vim.languages.csharp.enable](./options.html#option-vim-languages-csharp-enable)
-- CSS: [vim.languages.css.enable](./options.html#option-vim-languages-css-enable)
-- CUE: [vim.languages.cue.enable](./options.html#option-vim-languages-cue-enable)
-- Elixir: [vim.languages.elixir.enable](./options.html#option-vim-languages-elixir-enable)
-- Gleam: [vim.languages.gleam.enable](./options.html#option-vim-languages-gleam-enable)
-- HCL: [vim.languages.hcl.enable](./options.html#option-vim-languages-hcl-enable)
-- Helm: [vim.languages.helm.enable](./options.html#option-vim-languages-helm-enable)
-- Julia: [vim.languages.julia.enable](./options.html#option-vim-languages-julia-enable)
-- Kotlin: [vim.languages.kotlin.enable](./options.html#option-vim-languages-kotlin-enable)
-- Nim: [vim.languages.nim.enable](./options.html#option-vim-languages-nim-enable)
+- Lua:
+  [vim.languages.lua.enable](./options.html#option-vim-languages-lua-enable)
+- PHP:
+  [vim.languages.php.enable](./options.html#option-vim-languages-php-enable)
+- F#:
+  [vim.languages.fsharp.enable](./options.html#option-vim-languages-fsharp-enable)
+- Assembly:
+  [vim.languages.assembly.enable](./options.html#option-vim-languages-assembly-enable)
+- Astro:
+  [vim.languages.astro.enable](./options.html#option-vim-languages-astro-enable)
+- Bash:
+  [vim.languages.bash.enable](./options.html#option-vim-languages-bash-enable)
+- Clang:
+  [vim.languages.clang.enable](./options.html#option-vim-languages-clang-enable)
+- Clojure:
+  [vim.languages.clojure.enable](./options.html#option-vim-languages-clojure-enable)
+- C#:
+  [vim.languages.csharp.enable](./options.html#option-vim-languages-csharp-enable)
+- CSS:
+  [vim.languages.css.enable](./options.html#option-vim-languages-css-enable)
+- CUE:
+  [vim.languages.cue.enable](./options.html#option-vim-languages-cue-enable)
+- Elixir:
+  [vim.languages.elixir.enable](./options.html#option-vim-languages-elixir-enable)
+- Gleam:
+  [vim.languages.gleam.enable](./options.html#option-vim-languages-gleam-enable)
+- HCL:
+  [vim.languages.hcl.enable](./options.html#option-vim-languages-hcl-enable)
+- Helm:
+  [vim.languages.helm.enable](./options.html#option-vim-languages-helm-enable)
+- Julia:
+  [vim.languages.julia.enable](./options.html#option-vim-languages-julia-enable)
+- Kotlin:
+  [vim.languages.kotlin.enable](./options.html#option-vim-languages-kotlin-enable)
+- Nim:
+  [vim.languages.nim.enable](./options.html#option-vim-languages-nim-enable)
 - Nu: [vim.languages.nu.enable](./options.html#option-vim-languages-nu-enable)
-- OCaml: [vim.languages.ocaml.enable](./options.html#option-vim-languages-ocaml-enable)
-- Odin: [vim.languages.odin.enable](./options.html#option-vim-languages-odin-enable)
+- OCaml:
+  [vim.languages.ocaml.enable](./options.html#option-vim-languages-ocaml-enable)
+- Odin:
+  [vim.languages.odin.enable](./options.html#option-vim-languages-odin-enable)
 - R: [vim.languages.r.enable](./options.html#option-vim-languages-r-enable)
-- Ruby: [vim.languages.ruby.enable](./options.html#option-vim-languages-ruby-enable)
-- Scala: [vim.languages.scala.enable](./options.html#option-vim-languages-scala-enable)
-- Svelte: [vim.languages.svelte.enable](./options.html#option-vim-languages-svelte-enable)
-- Tailwind: [vim.languages.tailwind.enable](./options.html#option-vim-languages-tailwind-enable)
+- Ruby:
+  [vim.languages.ruby.enable](./options.html#option-vim-languages-ruby-enable)
+- Scala:
+  [vim.languages.scala.enable](./options.html#option-vim-languages-scala-enable)
+- Svelte:
+  [vim.languages.svelte.enable](./options.html#option-vim-languages-svelte-enable)
+- Tailwind:
+  [vim.languages.tailwind.enable](./options.html#option-vim-languages-tailwind-enable)
 - Terraform:
   [vim.languages.terraform.enable](./options.html#option-vim-languages-terraform-enable)
-- Typst: [vim.languages.typst.enable](./options.html#option-vim-languages-typst-enable)
-- Vala: [vim.languages.vala.enable](./options.html#option-vim-languages-vala-enable)
-- WGSL: [vim.languages.wgsl.enable](./options.html#option-vim-languages-wgsl-enable)
-- YAML: [vim.languages.yaml.enable](./options.html#option-vim-languages-yaml-enable)
+- Typst:
+  [vim.languages.typst.enable](./options.html#option-vim-languages-typst-enable)
+- Vala:
+  [vim.languages.vala.enable](./options.html#option-vim-languages-vala-enable)
+- WGSL:
+  [vim.languages.wgsl.enable](./options.html#option-vim-languages-wgsl-enable)
+- YAML:
+  [vim.languages.yaml.enable](./options.html#option-vim-languages-yaml-enable)
 
 Adding support for more languages, and improving support for existing ones are
 great places where you can contribute with a PR.
diff --git a/docs/manual/configuring/overriding-plugins.md b/docs/manual/configuring/overriding-plugins.md
index e44c1d08..55979ce7 100644
--- a/docs/manual/configuring/overriding-plugins.md
+++ b/docs/manual/configuring/overriding-plugins.md
@@ -1,10 +1,10 @@
 # Overriding plugins {#ch-overriding-plugins}
 
-The [additional plugins section](./hacking.html#sec-additional-plugins) details the addition
-of new plugins to nvf under regular circumstances, i.e. while making a pull
-request to the project. You may _override_ those plugins in your config to
-change source versions, e.g., to use newer versions of plugins that are not yet
-updated in **nvf**.
+The [additional plugins section](./hacking.html#sec-additional-plugins) details
+the addition of new plugins to nvf under regular circumstances, i.e. while
+making a pull request to the project. You may _override_ those plugins in your
+config to change source versions, e.g., to use newer versions of plugins that
+are not yet updated in **nvf**.
 
 ```nix
 vim.pluginOverrides = {
diff --git a/docs/manual/hacking.md b/docs/manual/hacking.md
index 609ddc92..7af0fed9 100644
--- a/docs/manual/hacking.md
+++ b/docs/manual/hacking.md
@@ -273,8 +273,7 @@ An example, simple keybinding, can look like this:
 ```
 
 There are many settings available in the options. Please refer to the
-[documentation](./options.html#option-vim-keymaps) to
-see a list of them.
+[documentation](./options.html#option-vim-keymaps) to see a list of them.
 
 **nvf** provides a helper function, so that you don't have to write the mapping
 attribute sets every time:
diff --git a/docs/manual/release-notes/rl-0.6.md b/docs/manual/release-notes/rl-0.6.md
index 13cdd7bb..f40ecb43 100644
--- a/docs/manual/release-notes/rl-0.6.md
+++ b/docs/manual/release-notes/rl-0.6.md
@@ -159,10 +159,10 @@ vim.api.nvim_set_keymap('n', '<leader>a', ':lua camelToSnake()<CR>', { noremap =
   arguments to take `luaBefore`, `luaConfig` and `luaAfter` as strings, which
   are then concatted inside a lua block.
 
-- Added {option}`vim.luaConfigPre` and {option} `vim-luaConfigPost` for inserting
-  verbatim Lua configuration before and after the resolved Lua DAG respectively.
-  Both of those options take strings as the type, so you may read the contents
-  of a Lua file from a given path.
+- Added {option}`vim.luaConfigPre` and {option} `vim-luaConfigPost` for
+  inserting verbatim Lua configuration before and after the resolved Lua DAG
+  respectively. Both of those options take strings as the type, so you may read
+  the contents of a Lua file from a given path.
 
 - Added `vim.spellchecking.ignoredFiletypes` and
   `vim.spellChecking.programmingWordlist.enable` for ignoring certain filetypes