diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 8ca4ed01..162fed05 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,7 +1,11 @@
 version: 2
 updates:
   - package-ecosystem: github-actions
-    open-pull-requests-limit: 15
     directory: "/"
     schedule:
       interval: daily
+    open-pull-requests-limit: 15
+    reviewers:
+      - NotAShelf
+    assignees:
+      - NotAShelf
diff --git a/.github/typos.toml b/.github/typos.toml
index 25d5c0e1..26be7d9b 100644
--- a/.github/typos.toml
+++ b/.github/typos.toml
@@ -6,9 +6,6 @@ default.extend-ignore-words-re = [
   "annote",
   "viw",
   "typ",
-  "edn",
-  "esy",
   "BA", # somehow "BANanaD3V" is valid, but BA is not...
-  "Emac"
 ]
 
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index cb2927e4..7868e55b 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -17,7 +17,7 @@ jobs:
     if: |
       github.event.pull_request.merged == true && startsWith(github.event.label.name, 'backport-')
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           token: ${{ steps.app-token.outputs.token }}
diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml
index a67ec928..13995cb6 100644
--- a/.github/workflows/cachix.yml
+++ b/.github/workflows/cachix.yml
@@ -21,7 +21,7 @@ jobs:
           - nix
           - maximal
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         name: Checkout
 
       - name: Install Nix
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 2413fb1c..90bfb431 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -17,7 +17,7 @@ jobs:
     if: "!contains(github.event.pull_request.title, '[skip ci]')"
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Install Nix
         uses: DeterminateSystems/nix-installer-action@main
@@ -31,7 +31,7 @@ jobs:
     if: "!contains(github.event.pull_request.title, '[skip ci]')"
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Install Nix
         uses: DeterminateSystems/nix-installer-action@main
@@ -56,7 +56,7 @@ jobs:
     if: "!contains(github.event.pull_request.title, '[skip ci]')"
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Check for typos
         uses: crate-ci/typos@master
@@ -87,7 +87,7 @@ jobs:
         uses: DeterminateSystems/nix-installer-action@main
 
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Set default git branch (to reduce log spam)
         run: git config --global init.defaultBranch main
@@ -109,13 +109,13 @@ jobs:
   flake-docs-linkcheck:
     name: "Validate hyperlinks in documentation sources"
     runs-on: ubuntu-latest
-    if: false # disabled until we fix ndg docs
+    if: "!contains(github.event.pull_request.title, '[skip ci]')"
     steps:
       - name: Install Nix
         uses: DeterminateSystems/nix-installer-action@main
 
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Build linkcheck package
         run: nix build .#docs-linkcheck -Lv
@@ -126,7 +126,7 @@ jobs:
     if: "!contains(github.event.pull_request.title, '[skip ci]')"
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
         with:
           fetch-depth: 2 # slows down checkout, but we need to compare against the previous commit on push events
 
diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml
index ec153088..1ed6a1ec 100644
--- a/.github/workflows/cleanup.yml
+++ b/.github/workflows/cleanup.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Checkout"
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: "Delete old branches"
         uses: beatlabs/delete-old-branches-action@v0.0.11
diff --git a/.github/workflows/docs-preview.yml b/.github/workflows/docs-preview.yml
index e33b5571..a238a41d 100644
--- a/.github/workflows/docs-preview.yml
+++ b/.github/workflows/docs-preview.yml
@@ -28,7 +28,7 @@ jobs:
         uses: DeterminateSystems/nix-installer-action@main
 
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Set default git branch (to reduce log spam)
         run: git config --global init.defaultBranch main
@@ -49,7 +49,7 @@ jobs:
           mkdir -p $PREVIEW_DIR
 
           # Copy the build files to the preview subdirectory
-          cp -rvf ../result/share/doc/* ./$PREVIEW_DIR
+          cp -rvf ../result/share/doc/nvf/* ./$PREVIEW_DIR
 
           # Configure git to use the GitHub Actions token for authentication
           git config --global user.name "GitHub Actions"
@@ -127,7 +127,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Delete preview for closed/merged PR
         run: |
@@ -164,7 +164,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Double check preview directory deletion
         run: |
diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml
index b9505527..3b4cc38b 100644
--- a/.github/workflows/manual.yml
+++ b/.github/workflows/manual.yml
@@ -28,7 +28,7 @@ jobs:
     outputs:
       should_run: ${{ steps.should_run.outputs.should_run }}
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
       - name: print latest_commit
         run: echo ${{ github.sha }}
 
@@ -43,11 +43,11 @@ jobs:
     if: ${{ needs.check_date.outputs.should_run != 'false' }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
       - uses: DeterminateSystems/nix-installer-action@main
       - run: |
           nix build .#docs -Lv
-          cp -r result/share/doc public
+          cp -r result/share/doc/nvf public
       - uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
deleted file mode 100644
index f1c5cc4b..00000000
--- a/.github/workflows/update.yml
+++ /dev/null
@@ -1,91 +0,0 @@
-name: Weekly Dependency Updates
-on:
-  workflow_dispatch:
-  schedule:
-    #  8 PM UTC every Friday
-    - cron: '0 20 * * 5'
-jobs:
-  update-dependencies:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v6
-
-      - name: "Install Nix"
-        uses: cachix/install-nix-action@v31.9.0
-
-      - name: Set up Git
-        run: |
-          git config user.name "GitHub Actions Bot"
-          git config user.email "actions@github.com"
-
-      - name: Create branch for updates
-        run: |
-          DATE=$(date +%Y-%m-%d)
-          BRANCH_NAME="update/dependencies-$DATE"
-          git checkout -b $BRANCH_NAME
-          echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV
-
-      - name: Update npins
-        run: nix run nixpkgs#npins update
-
-      # Only update Nixpkgs. mnw might break on update, better to track it manually to avoid
-      # unexpected breakage.
-      - name: Update nixpkgs
-        run: nix flake update nixpkgs
-
-      - name: Check for changes
-        id: check_changes
-        run: |
-          if git diff --quiet; then
-            echo "No changes detected"
-            echo "changes_detected=false" >> "$GITHUB_OUTPUT"
-            exit 0
-          else
-            echo "Changes detected"
-            echo "changes_detected=true" >> "$GITHUB_OUTPUT"
-          fi
-
-      # FIXME: Worth adding additional checks for, e.g., fragile plugins
-      # or modules
-      # nix build .#checks.<system>.<check-name>
-      # We'll probably want to handle this with machine tests
-      - name: Verify changes
-        if: steps.check_changes.outputs.changes_detected == 'true'
-        run: |
-          # Run verification tests to ensure updates don't break anything
-          nix flake check
-
-
-      - name: Set date variable
-        run: echo "DATE=$(date +%Y-%m-%d)" >> "$GITHUB_ENV"
-
-      - name: Commit and push changes
-        if: steps.check_changes.outputs.changes_detected == 'true'
-        run: |
-          git add .
-          git commit -m "pins: bump all plugins (${{ env.DATE }})"
-          git push -u origin $BRANCH_NAME
-
-      - name: Create Pull Request
-        if: steps.check_changes.outputs.changes_detected == 'true'
-        uses: peter-evans/create-pull-request@v8
-        with:
-          branch: ${{ env.BRANCH_NAME }}
-          base: main
-          labels: dependencies,automated pr
-          token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: "npins: bump all plugins (${{ env.DATE }})"
-          title: "Weekly Dependency Updates: ${{ env.DATE }}"
-          body: |
-            > [!NOTE]
-            > This PR was automatically generated by the Weekly Dependency Updates workflow. Please wait
-            > for all CI steps to complete, and test any major changes personally.
-
-            Updates Performed:
-
-            - Updated dependencies using `npins update`
-            - Updated nixpkgs using `nix flake update nixpkgs`
-
-            If the verification steps have passed, updates should be safe to merge. For failing CI steps
-            submit a Pull Request targetting ${{ env.BRANCH_NAME }}
diff --git a/configuration.nix b/configuration.nix
index cc314288..68776638 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -31,7 +31,6 @@ isMaximal: {
       lspSignature.enable = !isMaximal; # conflicts with blink in maximal
       otter-nvim.enable = isMaximal;
       nvim-docs-view.enable = isMaximal;
-      harper-ls.enable = isMaximal;
     };
 
     debugger = {
@@ -57,7 +56,6 @@ isMaximal: {
       clang.enable = isMaximal;
       css.enable = isMaximal;
       html.enable = isMaximal;
-      json.enable = isMaximal;
       sql.enable = isMaximal;
       java.enable = isMaximal;
       kotlin.enable = isMaximal;
@@ -69,7 +67,7 @@ isMaximal: {
       typst.enable = isMaximal;
       rust = {
         enable = isMaximal;
-        extensions.crates-nvim.enable = isMaximal;
+        crates.enable = isMaximal;
       };
 
       # Language modules that are not as common.
@@ -86,11 +84,8 @@ isMaximal: {
       ocaml.enable = false;
       elixir.enable = false;
       haskell.enable = false;
-      hcl.enable = false;
       ruby.enable = false;
       fsharp.enable = false;
-      just.enable = false;
-      qml.enable = false;
 
       tailwind.enable = false;
       svelte.enable = false;
@@ -193,7 +188,6 @@ isMaximal: {
       vim-wakatime.enable = false;
       diffview-nvim.enable = true;
       yanky-nvim.enable = false;
-      qmk-nvim.enable = false; # requires hardware specific options
       icon-picker.enable = isMaximal;
       surround.enable = isMaximal;
       leetcode-nvim.enable = isMaximal;
diff --git a/docs/default.nix b/docs/default.nix
index 662dd403..49f90b80 100644
--- a/docs/default.nix
+++ b/docs/default.nix
@@ -92,7 +92,7 @@
 
   # Generate the HTML manual pages
   html = pkgs.callPackage ./manual.nix {
-    inherit inputs release;
+    inherit release;
     inherit (nvimModuleDocs) optionsJSON;
   };
 in {
diff --git a/docs/manual.nix b/docs/manual.nix
index 132c20ef..50a5dab4 100644
--- a/docs/manual.nix
+++ b/docs/manual.nix
@@ -1,47 +1,114 @@
 {
-  inputs,
-  path,
+  lib,
   stdenvNoCC,
+  fetchzip,
   runCommandLocal,
-  optionsJSON,
+  # build inputs
+  nixos-render-docs,
+  documentation-highlighter,
+  dart-sass,
+  path,
+  # nrd configuration
   release,
+  optionsJSON,
 } @ args: let
   manual-release = args.release or "unstable";
+
+  scss-reset = fetchzip {
+    url = "https://github.com/Frontend-Layers/scss-reset/archive/refs/tags/1.4.2.zip";
+    hash = "sha256-cif5Sx8Ca5vxdw/mNAgpulLH15TwmzyJFNM7JURpoaE=";
+  };
+
+  compileStylesheet = runCommandLocal "compile-nvf-stylesheet" {} ''
+    mkdir -p $out
+
+    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"
+  '';
 in
-  runCommandLocal "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
+  stdenvNoCC.mkDerivation {
+    name = "nvf-manual";
+    src = builtins.path {
+      name = "nvf-manual-${manual-release}";
+      path = lib.sourceFilesBySuffices ./manual [".md" ".md.in"];
+    };
 
-    # 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
+    strictDependencies = true;
+    nativeBuildInputs = [nixos-render-docs];
 
-    # 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}
+    postPatch = ''
+      ln -s ${optionsJSON}/share/doc/nixos/options.json ./config-options.json
+    '';
 
-    # 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 \
-      --manpage-urls ${path}/doc/manpage-urls.json \
-      --options-depth 3 \
-      --generate-search \
-      --highlight-code \
-      --input-dir ./manual \
-      --output-dir "$out/share/doc"
+    buildPhase = ''
+      dest="$out/share/doc/nvf"
+      mkdir -p "$(dirname "$dest")"
+      mkdir -p $dest/{highlightjs,script}
 
-    # Hydra support. Probably not necessary.
-    mkdir -p $out/nix-support/
-    echo "doc manual $dest index.html" >> $out/nix-support/hydra-build-products
-  ''
+      # 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
+
+      substituteInPlace ./manual.md \
+        --subst-var-by NVF_VERSION ${manual-release}
+
+      substituteInPlace ./hacking/additional-plugins.md \
+        --subst-var-by NVF_REPO "https://github.com/notashelf/nvf/blob/${manual-release}"
+
+      # 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 99e1755f..95195f78 100644
--- a/docs/manual/configuring.md
+++ b/docs/manual/configuring.md
@@ -1,7 +1,6 @@
 # Configuring nvf {#ch-configuring}
 
-[helpful tips section]: ./tips.html#ch-helpful-tips
-[options reference]: ./options.html
+[helpful tips section]: #ch-helpful-tips
 
 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
@@ -9,7 +8,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 [options reference]
+module options provided by nvf, please visit the [appendix](/nvf/options.html)
 
 ```{=include=} chapters
 configuring/custom-package.md
diff --git a/docs/manual/configuring/custom-package.md b/docs/manual/configuring/custom-package.md
new file mode 100644
index 00000000..3e9e324a
--- /dev/null
+++ b/docs/manual/configuring/custom-package.md
@@ -0,0 +1,22 @@
+# 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;
+}
+```
diff --git a/docs/manual/configuring/custom-plugins.md b/docs/manual/configuring/custom-plugins.md
index 1552e7b1..bf986a0f 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
-{option}`vim.startPlugins` list in your configuration. This is akin to cloning a
+[](#opt-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 f4976e5f..6c399aaf 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 [](#opt-vim.startPlugins) and adding its configuration as a DAG under
+one of `vim.configRC` or [](#opt-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 [](#opt-vim.startPlugins) in order to make
+it available to Neovim at runtime.
 
 ```nix
 {pkgs, ...}: {
diff --git a/docs/manual/configuring/custom-plugins/non-lazy-method.md b/docs/manual/configuring/custom-plugins/non-lazy-method.md
index 5174d0a8..24ef7688 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
-{option}`vim.extraPlugins`. Instead of using DAGs exposed by the library
+[](#opt-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/configuring/languages.md b/docs/manual/configuring/languages.md
index f956a0e3..252163fb 100644
--- a/docs/manual/configuring/languages.md
+++ b/docs/manual/configuring/languages.md
@@ -1,92 +1,25 @@
 # Language Support {#ch-languages}
 
 Language specific support means there is a combination of language specific
-plugins, `treesitter` support, `nvim-lspconfig` language servers, `conform-nvim`
-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.
+plugins, `treesitter` support, `nvim-lspconfig` language servers, and `null-ls`
+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)
-- 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](./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)
+- 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)
 
 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 55979ce7..25a71559 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](#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 = {
@@ -22,7 +22,7 @@ vim.pluginOverrides = {
 };
 ```
 
-This will override the source for the `lazydev.nvim` plugin that is used in nvf
+This will override the source for the `neodev.nvim` plugin that is used in nvf
 with your own plugin.
 
 ::: {.warning}
diff --git a/docs/manual/hacking.md b/docs/manual/hacking.md
index 7af0fed9..6ff01fc6 100644
--- a/docs/manual/hacking.md
+++ b/docs/manual/hacking.md
@@ -21,586 +21,10 @@ 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.
 
-## 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
+```{=include=} sections
+hacking/getting-started.md
+hacking/guidelines.md
+hacking/testing.md
+hacking/keybinds.md
+hacking/additional-plugins.md
 ```
-
-### 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](./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:
-
-- `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]: ./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/hacking/additional-plugins.md b/docs/manual/hacking/additional-plugins.md
new file mode 100644
index 00000000..1f7ba778
--- /dev/null
+++ b/docs/manual/hacking/additional-plugins.md
@@ -0,0 +1,266 @@
+# 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
new file mode 100644
index 00000000..798e203a
--- /dev/null
+++ b/docs/manual/hacking/getting-started.md
@@ -0,0 +1,17 @@
+# 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
new file mode 100644
index 00000000..a1db27e8
--- /dev/null
+++ b/docs/manual/hacking/guidelines.md
@@ -0,0 +1,188 @@
+# 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
new file mode 100644
index 00000000..90623dd3
--- /dev/null
+++ b/docs/manual/hacking/keybinds.md
@@ -0,0 +1,97 @@
+# 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
new file mode 100644
index 00000000..a721cf2e
--- /dev/null
+++ b/docs/manual/hacking/testing.md
@@ -0,0 +1,15 @@
+# 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/installation.md b/docs/manual/installation.md
new file mode 100644
index 00000000..33dd8979
--- /dev/null
+++ b/docs/manual/installation.md
@@ -0,0 +1,14 @@
+# 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/manual.md b/docs/manual/manual.md
new file mode 100644
index 00000000..18932896
--- /dev/null
+++ b/docs/manual/manual.md
@@ -0,0 +1,30 @@
+# nvf manual {#nvf-manual}
+
+## Version @NVF_VERSION@
+
+```{=include=} preface
+preface.md
+try-it-out.md
+```
+
+```{=include=} parts
+installation.md
+configuring.md
+tips.md
+```
+
+```{=include=} chapters
+hacking.md
+```
+
+```{=include=} appendix html:into-file=//quirks.html
+quirks.md
+```
+
+```{=include=} appendix html:into-file=//options.html
+options.md
+```
+
+```{=include=} appendix html:into-file=//release-notes.html
+release-notes/release-notes.md
+```
diff --git a/docs/manual/options.md b/docs/manual/options.md
new file mode 100644
index 00000000..beab4f16
--- /dev/null
+++ b/docs/manual/options.md
@@ -0,0 +1,21 @@
+# 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
new file mode 100644
index 00000000..ce3e42e6
--- /dev/null
+++ b/docs/manual/preface.md
@@ -0,0 +1,20 @@
+# 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 17f7abaf..553d6cf3 100644
--- a/docs/manual/quirks.md
+++ b/docs/manual/quirks.md
@@ -5,41 +5,9 @@ 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.
 
-## NodeJS {#ch-quirks-nodejs}
+<!-- If adding a new known quirk, please create a new page in quirks/ and include
+the name of the file here.-->
 
-### 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].
+```{=include=} chapters
+quirks/nodejs.md
+```
diff --git a/docs/manual/quirks/nodejs.md b/docs/manual/quirks/nodejs.md
new file mode 100644
index 00000000..57444909
--- /dev/null
+++ b/docs/manual/quirks/nodejs.md
@@ -0,0 +1,24 @@
+# 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
deleted file mode 100644
index 296b20b1..00000000
--- a/docs/manual/release-notes.md
+++ /dev/null
@@ -1,15 +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
-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/tips.md b/docs/manual/tips.md
index 0a121ae9..01bddc40 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=}
+```{=include=} chapters
 tips/debugging-nvf.md
 tips/offline-docs.md
 tips/pure-lua-config.md
diff --git a/docs/manual/tips/plugin-sources.md b/docs/manual/tips/plugin-sources.md
index a6f8d71d..7cf6a470 100644
--- a/docs/manual/tips/plugin-sources.md
+++ b/docs/manual/tips/plugin-sources.md
@@ -26,7 +26,7 @@ startup.
 }
 ```
 
-[`vim.extraPlugins`]: ./options.html#option-vim-extraPlugins
+[`vim.extraPlugins`]: https://notashelf.github.io/nvf/options.html#opt-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]: ./configuring.html#ch-custom-plugins
+[custom plugins section]: https://notashelf.github.io/nvf/index.xhtml#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 d81d9ee5..1dca8296 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 {option}`vim.luaConfigRC`.
+directory, and call it with [](#opt-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 {option}`vim.luaConfigRC` will allow loading
+The following Nix configuration via [](#opt-vim.luaConfigRC) will allow loading
 this
 
 ```nix
@@ -105,7 +105,7 @@ this
 }
 ```
 
-[DAG system]: ./configuring.html#ch-using-dags
+[DAG system]: https://notashelf.github.io/nvf/index.xhtml#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/docs/manual/index.md b/docs/manual/try-it-out.md
similarity index 56%
rename from docs/manual/index.md
rename to docs/manual/try-it-out.md
index b07a8aca..a5d20363 100644
--- a/docs/manual/index.md
+++ b/docs/manual/try-it-out.md
@@ -1,18 +1,4 @@
-# Introduction {#nvf-manual}
-
-Version @NVF_VERSION@
-
-## 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}
+# 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
@@ -43,11 +29,10 @@ $ nix run github:notashelf/nvf#maximal
 
 ### 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.
+::: {.info}
+
+The below configurations are provided for demonstration purposes, and are
+**not** designed to be installed as is. You may
 
 #### Nix {#sec-configs-nix}
 
@@ -57,7 +42,6 @@ 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
 ```
 
 This command will start Neovim with some opinionated plugin configurations, and
@@ -73,29 +57,16 @@ 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
 ```
 
 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.
+::: {.warning}
 
-## Installing nvf {#ch-installation}
+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.
 
-[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/release-notes/release-notes.md b/docs/release-notes/release-notes.md
new file mode 100644
index 00000000..daeb03ea
--- /dev/null
+++ b/docs/release-notes/release-notes.md
@@ -0,0 +1,14 @@
+# 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
+```
diff --git a/docs/manual/release-notes/rl-0.1.md b/docs/release-notes/rl-0.1.md
similarity index 77%
rename from docs/manual/release-notes/rl-0.1.md
rename to docs/release-notes/rl-0.1.md
index bdb922b5..f5737a86 100644
--- a/docs/manual/release-notes/rl-0.1.md
+++ b/docs/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):
 
@@ -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` & {option} `vim-optPlugins` are now an enum of
+- [](#opt-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
-  {option}`vim.treesitter.grammars`. Utilizes the nixpkgs `nvim-treesitter`
+  [](#opt-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 {option}`vim.luaConfigRC` are now of type DAG lines. This
+- `vim.configRC` and [](#opt-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,6 +44,5 @@ 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 [](#opt-vim.theme.style)
+  and Lualine theme [](#opt-vim.statusline.lualine.theme).
diff --git a/docs/manual/release-notes/rl-0.2.md b/docs/release-notes/rl-0.2.md
similarity index 96%
rename from docs/manual/release-notes/rl-0.2.md
rename to docs/release-notes/rl-0.2.md
index d3ac1384..4d3b61f9 100644
--- a/docs/manual/release-notes/rl-0.2.md
+++ b/docs/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,39 +10,55 @@ 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/release-notes/rl-0.3.md
similarity index 90%
rename from docs/manual/release-notes/rl-0.3.md
rename to docs/release-notes/rl-0.3.md
index 0658f1f0..089f01f7 100644
--- a/docs/manual/release-notes/rl-0.3.md
+++ b/docs/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
@@ -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
-  {option}`vim.treesitter.grammars`. Utilizes the nixpkgs `nvim-treesitter`
+  [](#opt-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` {option}`vim.languages.enableTreesitter`, etc. will
+  - The options `enableLSP` [](#opt-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
-    {option}`vim.languages.html.treesitter.autotagHtml`.
+    [](#opt-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 {option}`vim.lsp.lspkind.enable`
+- `vim.visual.lspkind` has been moved to [](#opt-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.
-  {option}`vim.theme.transparent` option can be used to enable or disable
+  [](#opt-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.4.md b/docs/release-notes/rl-0.4.md
similarity index 97%
rename from docs/manual/release-notes/rl-0.4.md
rename to docs/release-notes/rl-0.4.md
index ce788413..f5c2c338 100644
--- a/docs/manual/release-notes/rl-0.4.md
+++ b/docs/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/release-notes/rl-0.5.md
similarity index 86%
rename from docs/manual/release-notes/rl-0.5.md
rename to docs/release-notes/rl-0.5.md
index 51e144a2..910c93d5 100644
--- a/docs/manual/release-notes/rl-0.5.md
+++ b/docs/release-notes/rl-0.5.md
@@ -1,6 +1,8 @@
-# Release 0.5 {#sec-release-0-5}
+# Release 0.5 {#sec-release-0.5}
 
-## Changelog {#sec-release-0-5-changelog}
+Release notes for release 0.5
+
+## Changelog {#sec-release-0.5-changelog}
 
 [vagahbond](https://github.com/vagahbond):
 
@@ -15,14 +17,14 @@
 - Fixed a bug where cmp's close and scrollDocs mappings wasn't working
 
 - Streamlined and simplified extra plugin API with the addition of
-  {option}`vim.extraPlugins`
+  [](#opt-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 {option}`vim.lsp.mappings.toggleFormatOnSave` keybind
+- Add [](#opt-vim.lsp.mappings.toggleFormatOnSave) keybind
 
 [amanse](https://github.com/amanse):
 
@@ -50,10 +52,10 @@
 
 - Added GitHub Copilot to nvim-cmp completion sources.
 
-- Added {option}`vim.ui.borders.enable` for global and individual plugin border
+- Added [](#opt-vim.ui.borders.enable) for global and individual plugin border
   configuration.
 
-- LSP integrated breadcrumbs with {option}`vim.ui.breadcrumbs.enable` through
+- LSP integrated breadcrumbs with [](#opt-vim.ui.breadcrumbs.enable) through
   nvim-navic
 
 - LSP navigation helper with nvim-navbuddy, depends on nvim-navic (automatically
@@ -64,14 +66,14 @@
 - Fixed mismatching Zig language description
 
 - Added support for `statix` and `deadnix` through
-  {option}`vim.languages.nix.extraDiagnostics.types`
+  [](#opt-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
-  {option}`vim.package`. For best results, always use an unwrapped package
+  [](#opt-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/release-notes/rl-0.6.md
similarity index 86%
rename from docs/manual/release-notes/rl-0.6.md
rename to docs/release-notes/rl-0.6.md
index f40ecb43..309d6b16 100644
--- a/docs/manual/release-notes/rl-0.6.md
+++ b/docs/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
 
@@ -41,14 +41,14 @@ 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):
 
 - Added Terraform language support.
 
 - Added `ChatGPT.nvim`, which can be enabled with
-  {option}`vim.assistant.chatgpt.enable`. Do keep in mind that this option
+  [](#opt-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):
@@ -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](./options.html#option-vim-binds-whichKey-register)
+  [vim.binds.whichKey.register](#opt-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](./options.html#option-vim-statusline-lualine-alwaysDivideMiddle),
-  [vim.statusline.lualine.ignoreFocus](./options.html#option-vim-statusline-lualine-ignoreFocus)
+  [vim.statusline.lualine.alwaysDivideMiddle](#opt-vim.statusline.lualine.alwaysDivideMiddle),
+  [vim.statusline.lualine.ignoreFocus](#opt-vim.statusline.lualine.ignoreFocus)
   and
-  [vim.statusline.lualine.disabledFiletypes](./options.html#option-vim-statusline-lualine-disabledFiletypes).
+  [vim.statusline.lualine.disabledFiletypes](#opt-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,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 [](#opt-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.
 
 - Added `vim.spellchecking.ignoredFiletypes` and
   `vim.spellChecking.programmingWordlist.enable` for ignoring certain filetypes
@@ -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 {option}`vim.extraPackages` for appending additional packages to the
+- Added [](#opt-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 {option}`vim.notify.nvim-notify.setupOpts.render` which takes either a
+- Added [](#opt-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/release-notes/rl-0.7.md
similarity index 91%
rename from docs/manual/release-notes/rl-0.7.md
rename to docs/release-notes/rl-0.7.md
index 36d61105..dca9319a 100644
--- a/docs/manual/release-notes/rl-0.7.md
+++ b/docs/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
 
@@ -98,7 +98,7 @@ options that were under `vim` as convenient shorthands for `vim.o.*` options.
 
 ::: {.warning}
 
-As v0.7 features the addition of {option}`vim.options`, those options are now
+As v0.7 features the addition of [](#opt-vim.options), those options are now
 considered as deprecated. You should migrate to the appropriate options in the
 `vim.options` submodule.
 
@@ -108,14 +108,14 @@ The changes are, in no particular order:
 
 - `colourTerm`, `mouseSupport`, `cmdHeight`, `updateTime`, `mapTime`,
   `cursorlineOpt`, `splitBelow`, `splitRight`, `autoIndent` and `wordWrap` have
-  been mapped to their {option}`vim.options` equivalents. Please see the module
+  been mapped to their [](#opt-vim.options) equivalents. Please see the module
   definition for the updated options.
 
 - `tabWidth` has been **removed** as it lead to confusing behaviour. You can
   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):
 
@@ -125,7 +125,7 @@ The changes are, in no particular order:
 [frothymarrow](https://github.com/frothymarrow):
 
 - Modified type for
-  {option}`vim.visuals.fidget-nvim.setupOpts.progress.display.overrides` from
+  [](#opt-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 {option}`vim.ui.smartcolumn.setupOpts.custom_colorcolumn` using the wrong
+- Fix [](#opt-vim.ui.smartcolumn.setupOpts.custom_colorcolumn) using the wrong
   type `int` instead of the expected type `string`.
 
 [horriblename](https://github.com/horriblename):
@@ -170,7 +170,7 @@ The changes are, in no particular order:
 
 - Add [ocaml-lsp] support
 
-- Fix "Emac" typo
+- Fix misspelled "Emacs"
 
 - Add [new-file-template.nvim] to automatically fill new file contents using
   templates
@@ -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
-  {option}`vim.autopairs.nvim-autopairs.enable` supports `setupOpts` format by
+  [](#opt-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
-    {option}`vim.autocomplete.nvim-cmp.enable`.
+    [](#opt-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. [](#opt-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`
+    [](#opt-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,12 +297,12 @@ The changes are, in no particular order:
   Lualine. Only `vim.ui.breadcrumbs.lualine.winbar` is supported for the time
   being.
 
-  - {option}`vim.ui.breadcrumbs.lualine.winbar.enable` has been added to allow
+  - [](#opt-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
-    {option}`vim.ui.breadcrumbs.lualine.winbar.alwaysRender` to be conform to
-    the new format.
+    [](#opt-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.
@@ -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 {option}`vim.options` to set `vim.o` values in in your nvf configuration
+- Add [](#opt-vim.options) to set `vim.o` values in in your nvf configuration
   without using additional Lua. See option documentation for more details.
 
-- Add {option}`vim.dashboard.dashboard-nvim.setupOpts` to allow user
+- Add [](#opt-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 {option}`vim.spellcheck.extraSpellWords` to allow adding arbitrary
+- Add [](#opt-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 {option}`vim.languages.ts.format.type`,
-  {option}`vim.languages.css.format.type` and
-  {option}`vim.languages.svelte.format.type` respectively.
+  Svelte. Enable them via [](#opt-vim.languages.ts.format.type),
+  [](#opt-vim.languages.css.format.type) and
+  [](#opt-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/release-notes/rl-0.8.md
similarity index 78%
rename from docs/manual/release-notes/rl-0.8.md
rename to docs/release-notes/rl-0.8.md
index 62f42638..96819a48 100644
--- a/docs/manual/release-notes/rl-0.8.md
+++ b/docs/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
 
@@ -21,19 +21,13 @@
 
 - `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 {option}`vim.clipboard.registers` appropriately
+  module interface. You may set [](#opt-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
   align with the "hunks" themed mapping and avoid conflict with the new [neogit]
   group.
 
-- LSP keybinds and related plugin integrations are now attached in an LspAttach
-  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
@@ -54,16 +48,16 @@
 - Add [render-markdown.nvim] under
   `languages.markdown.extensions.render-markdown-nvim`.
 
-- Implement {option}`vim.git.gitsigns.setupOpts` for user-specified setup table
+- Implement [](#opt-vim.git.gitsigns.setupOpts) for user-specified setup table
   in gitsigns configuration.
 
-- {option}`vim.options.mouse` no longer compares values to an enum of available
+- [](#opt-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
-  {option}`vim.globals.editorconfig`.
+  [](#opt-vim.globals.editorconfig).
 
 - Deprecate rnix-lsp as it has been abandoned and archived upstream.
 
@@ -72,9 +66,10 @@
   your Editorconfig configuration, or use an autocommand to set indentation
   values for buffers with the Nix filetype.
 
-- Add {option}`vim.lsp.lightbulb.autocmd.enable` for manually managing the
+- Add [](#opt-vim.lsp.lightbulb.autocmd.enable) for manually managing the
   previously managed lightbulb autocommand.
-  - A warning will occur if {option} vim-lsp-lightbulb-autocmd-enable) and
+
+  - 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.
     Pick only one.
 
@@ -85,7 +80,7 @@
 
 - Add [yazi.nvim] as a companion plugin for Yazi, the terminal file manager.
 
-- Add {option}`vim.autocmds` and {option}`vim-augroups` to allow declaring
+- Add [](#opt-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 +102,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
-  {option}`vim.diagnostics.config` in nvf.
+  [](#opt-vim.diagnostics.config) in nvf.
 
 - Add `vim.clipboard` module for easily managing Neovim clipboard providers and
   relevant packages in a simple UI.
@@ -116,14 +111,6 @@
 - Add [hunk.nvim], Neovim plugin & tool for splitting diffs in Neovim. Available
   as `vim.git.hunk-nvim`
 
-- Move `crates.nvim` into `languages.rust.extensions and support` `setupOpts`
-  for the plugin. Deprecates the top level "crates" option in `languages.rust`.
-
-[sjcobb2022](https://github.com/sjcobb2022):
-
-- Migrate all current lsp configurations to `vim.lsp.server` and remove internal
-  dependency on `nvim-lspconfig`
-
 [amadaluzia](https://github.com/amadaluzia):
 
 [haskell-tools.nvim]: https://github.com/MrcJkb/haskell-tools.nvim
@@ -143,11 +130,6 @@
 - Moved code setting `additionalRuntimePaths` and `enableLuaLoader` out of
   `luaConfigPre`'s default to prevent being overridden
 - Use conform over custom autocmds for LSP format on save
-- Move LSP keybinds and other related plugin integrations into an LspAttach
-  event.
-- Allow multiple formatters in language modules.
-- Fixed `prettier` in astro and svelte, and removed `prettierd` due to high
-  complexity that would be needed to support it.
 
 [diniamo](https://github.com/diniamo):
 
@@ -209,7 +191,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 {option}`vim.highlight`
+- Add options to define highlights under [](#opt-vim.highlight)
 
 [kaktu5](https://github.com/kaktu5):
 
@@ -225,8 +207,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`.
@@ -302,13 +284,6 @@
 - Fix [blink.cmp] breaking when built-in sources were modified.
 - Fix [conform.nvim] not allowing disabling formatting on and after save. Use
   `null` value to disable them if conform is enabled.
-- Add [markdown-oxide](https://github.com/Feel-ix-343/markdown-oxide) option to
-  markdown language module.
-- Fix Helm-YAML language module integration. YAML diagnostics will now remain in
-  `helmfile`s when both are enabled.
-- Fix YAML language module not activating LSP keybinds if the Helm language
-  module was also enabled.
-- Fix `json` language module (default) language server not activating.
 
 [TheColorman](https://github.com/TheColorman):
 
@@ -344,7 +319,6 @@
 - Add global function `nvf_lint` under
   `vim.diagnostics.nvim-lint.lint_function`.
 - Deprecate `vim.scrollOffset` in favor of `vim.options.scrolloff`.
-- Fix `svelte-language-server` not reloading .js/.ts files on change.
 
 [Sc3l3t0n](https://github.com/Sc3l3t0n):
 
@@ -407,7 +381,7 @@
 
 [aionoid](https://github.com/aionoid):
 
-[avante.nvim]: https://github.com/yetone/avante.nvim
+[avante-nvim]: https://github.com/yetone/avante.nvim
 
 - Fix [render-markdown.nvim] file_types option type to list, to accept merging.
 - Add [avante.nvim] plugin under `vim.assistant.avante-nvim`.
@@ -415,12 +389,9 @@
 [poz](https://poz.pet):
 
 [everforest]: https://github.com/sainnhe/everforest
-[oil]: https://github.com/stevearc/oil.nvim
-[oil-git-status]: https://github.com/refractalize/oil-git-status.nvim
 
 - Fix gitsigns null-ls issue.
 - Add [everforest] theme support.
-- Add [oil-git-status] support to [oil] module.
 
 [Haskex](https://github.com/haskex):
 
@@ -508,8 +479,13 @@
 
 - fix broken `neorg` grammars
 - remove obsolete warning in the `otter` module
-- add mainProgram attribute to vala language server wrapper
-- fix `crates-nvim`'s completions by using the in-program lsp
+
+[Cool-Game-Dev](https://github.com/Cool-Game-Dev):
+
+[nvim-biscuits]: https://github.com/code-biscuits/nvim-biscuits
+
+- Add [nvim-biscuits] to show block context. Available at
+  `vim.utility.nvim-biscuits`.
 
 [JManch](https://github.com/JManch):
 
@@ -517,56 +493,6 @@
   `autocomplete.nvim-cmp.enable` was disabled and
   `autocomplete.nvim-cmp.sources` had not been modified.
 
-[Poseidon](https://github.com/poseidon-rises):
-
-[nvim-biscuits]: https://github.com/code-biscuits/nvim-biscuits
-[just-lsp]: https://github.com/terror/just-lsp
-[roslyn-ls]: https://github.com/dotnet/vscode-csharp
-[jsonls]: https://github.com/microsoft/vscode/tree/1.101.2/extensions/json-language-features/server
-[jsonfmt]: https://github.com/caarlos0/jsonfmt
-[superhtml]: https://github.com/kristoff-it/superhtml
-[htmlHINT]: https://github.com/htmlhint/HTMLHint
-[qmk-nvim]: https://github.com/codethread/qmk.nvim
-[qmlls]: https://doc.qt.io/qt-6/qtqml-tooling-qmlls.html
-[qmlformat]: https://doc.qt.io/qt-6/qtqml-tooling-qmlformat.html
-
-- Add [nvim-biscuits] support under `vim.utility.nvim-biscuits`.
-- Add just support under `vim.languages.just` using [just-lsp].
-- Add [roslyn-ls] to the `vim.languages.csharp` module.
-- Add JSON support under `vim.languages.json` using [jsonls] and [jsonfmt].
-- Add advanced HTML support under `vim.languages.html` using [superhtml] and
-  [htmlHINT].
-- Add QMK support under `vim.utility.qmk-nvim` via [qmk-nvim].
-- Add QML support under `vim.languages.qml` using [qmlls] and [qmlformat].
-
-[Morsicus](https://github.com/Morsicus):
-
-- Add [EEx Treesitter Grammar](https://github.com/connorlay/tree-sitter-eex) for
-  Elixir
-- Add
-  [HEEx Treesitter Grammar](https://github.com/phoenixframework/tree-sitter-heex)
-  for Elixir
-
-[diced](https://github.com/diced):
-
-- Fixed `typescript` treesitter grammar not being included by default.
-
-[valterschutz](https://github.com/valterschutz):
-
-[ruff]: https://github.com/astral-sh/ruff
-
-- Add [ruff-fix] as a formatter option in `vim.languages.python.format.type`.
-
-[gmvar](https://github.com/gmvar):
-
-[harper-ls]: https://github.com/Automattic/harper
-
-- Add [harper-ls] to the `vim.lsp` module.
-
-[derethil](https://github.com/derethil):
-
-- Fix `vim.lazy.plugins.<name>.enabled` Lua evaluation.
-
 [Jules](https://github.com/jules-sommer):
 
 [nvim-highlight-colors]: https://github.com/brenoprata10/nvim-highlight-colors
@@ -585,38 +511,11 @@
 - Add inline typst concealing support under `vim.languages.typst` using
   [typst-concealer].
 
-[KrappRamiro](https://github.com/KrappRamiro):
-
-[phaazon/hop.nvim]: https://github.com/hadronized/hop.nvim
-[smoka7/hop.nvim]: https://github.com/smoka7/hop.nvim
-
-- Migrate [phaazon/hop.nvim] to [smoka7/hop.nvim]
-
-[simon-wg](https://github.com/simon-wg):
-
-- Update `python` language module to use correct lsp binary.
-- Fix `python` pyright and basedpyright language servers not using default on
-  attach behavior.
-
-[critical](https://github.com/critical):
-
-[mellow.nvim]: https://github.com/mellow-theme/mellow.nvim
-
-- Add [mellow.nvim] plugin for vim and lualine theme support
-
-[valyntyler](https://github.com/valyntyler):
-
-[emmet-ls]: https://github.com/aca/emmet-ls
-
-- Enable `languages.ts.format` for `.js` files
-- Add [emmet-ls] to `html.lsp.servers`
-
 [axelbdt](https://github.com/axelbdt):
 
 [neocodeium]: https://github.com/monkoose/neocodeium
 
-- Add [neocodeium] plugin in `vim.assistant.neocodeium` with `enable`,
-  `setupOpts` and `keymaps`
+- Add [neocodeium] plugin in `vim.assistant.neocodeium` with `enable`, `setupOpts` and `keymaps`
 
 [JudahZF](https://github.com/JudahZF):
 
diff --git a/flake.lock b/flake.lock
index e55e64f1..5a357a75 100644
--- a/flake.lock
+++ b/flake.lock
@@ -51,47 +51,13 @@
         "type": "github"
       }
     },
-    "ndg": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1765435293,
-        "narHash": "sha256-HRp4g6qBCb8vpJ17s2FacMRXRszM73uBiR56aILMELA=",
-        "owner": "feel-co",
-        "repo": "ndg",
-        "rev": "65bf834b332d5f8b28d95ea14c7974be7c272971",
-        "type": "github"
-      },
-      "original": {
-        "owner": "feel-co",
-        "repo": "ndg",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1764242076,
-        "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1764081664,
-        "narHash": "sha256-sUoHmPr/EwXzRMpv1u/kH+dXuvJEyyF2Q7muE+t0EU4=",
+        "lastModified": 1761880412,
+        "narHash": "sha256-QoJjGd4NstnyOG4mm4KXF+weBzA2AH/7gn1Pmpfcb0A=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "dc205f7b4fdb04c8b7877b43edb7b73be7730081",
+        "rev": "a7fc11be66bdfb5cdde611ee5ce381c183da8386",
         "type": "github"
       },
       "original": {
@@ -106,8 +72,7 @@
         "flake-compat": "flake-compat",
         "flake-parts": "flake-parts",
         "mnw": "mnw",
-        "ndg": "ndg",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "systems": "systems"
       }
     },
diff --git a/flake.nix b/flake.nix
index 31e8d0f1..35820e0b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -105,8 +105,5 @@
 
     # Alternate neovim-wrapper
     mnw.url = "github:Gerg-L/mnw";
-
-    # Alternative documentation generator
-    ndg.url = "github:feel-co/ndg";
   };
 }
diff --git a/flake/develop.nix b/flake/develop.nix
index 71c13688..aae9d92f 100644
--- a/flake/develop.nix
+++ b/flake/develop.nix
@@ -3,6 +3,7 @@
     pkgs,
     config,
     self',
+    inputs',
     ...
   }: {
     devShells = {
diff --git a/flake/pkgs/by-name/avante-nvim/package.nix b/flake/pkgs/by-name/avante-nvim/package.nix
index 20b6f3c5..c7b5ac76 100644
--- a/flake/pkgs/by-name/avante-nvim/package.nix
+++ b/flake/pkgs/by-name/avante-nvim/package.nix
@@ -1,5 +1,4 @@
 {
-  lib,
   pins,
   openssl,
   pkg-config,
@@ -12,8 +11,6 @@
 }: let
   # From npins
   pin = pins.avante-nvim;
-
-  pname = "avante-nvim-lib";
   version = pin.branch;
   src = pkgs.fetchFromGitHub {
     inherit (pin.repository) owner repo;
@@ -22,7 +19,8 @@
   };
 
   avante-nvim-lib = rustPlatform.buildRustPackage {
-    inherit pname version src;
+    pname = "avante-nvim-lib";
+    inherit version src;
 
     cargoHash = "sha256-pTWCT2s820mjnfTscFnoSKC37RE7DAPKxP71QuM+JXQ=";
 
@@ -45,8 +43,6 @@
       "--skip=test_roundtrip"
       "--skip=test_fetch_md"
     ];
-
-    env.RUSTFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-C link-arg=-undefined -C link-arg=dynamic_lookup";
   };
 in
   vimUtils.buildVimPlugin {
@@ -68,15 +64,7 @@ in
       # Requires setup with corresponding provider
       "avante.providers.azure"
       "avante.providers.copilot"
-      "avante.providers.gemini"
-      "avante.providers.ollama"
-      "avante.providers.vertex"
       "avante.providers.vertex_claude"
+      "avante.providers.ollama"
     ];
-
-    meta = {
-      description = "Neovim plugin designed to emulate the behaviour of the Cursor AI IDE";
-      homepage = "https://github.com/yetone/avante.nvim";
-      license = lib.licenses.asl20;
-    };
   }
diff --git a/flake/pkgs/by-name/blink-cmp/package.nix b/flake/pkgs/by-name/blink-cmp/package.nix
index 7c6371d1..5dba17a6 100644
--- a/flake/pkgs/by-name/blink-cmp/package.nix
+++ b/flake/pkgs/by-name/blink-cmp/package.nix
@@ -1,19 +1,17 @@
 {
-  lib,
-  stdenv,
   rustPlatform,
   fetchFromGitHub,
   writeShellScriptBin,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "blink-cmp";
-  version = "1.8.0";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "Saghen";
     repo = "blink.cmp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JjlcPj7v9J+v1SDBYIub6jFEslLhZGHmsipV1atUAFo=";
+    hash = "sha256-IHRYgKcYP+JDGu8Vtawgzlhq25vpROFqb8KmpfVMwCk=";
   };
 
   forceShare = [
@@ -31,24 +29,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mv "$out/lib" "$out/target/release"
   '';
 
-  cargoHash = "sha256-Qdt8O7IGj2HySb1jxsv3m33ZxJg96Ckw26oTEEyQjfs=";
+  cargoHash = "sha256-QsVCugYWRri4qu64wHnbJQZBhy4tQrr+gCYbXtRBlqE=";
 
   nativeBuildInputs = [
     (writeShellScriptBin "git" "exit 1")
   ];
 
-  env = {
-    RUSTC_BOOTSTRAP = true;
-
-    # Those are the Linker args used by upstream. Without those, the build fails.
-    # See:
-    #  <https://github.com/saghen/blink.cmp/blob/main/.cargo/config.toml#L1C1-L11C2>
-    RUSTFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-C link-arg=-undefined -C link-arg=dynamic_lookup";
-  };
-
-  meta = {
-    description = "Performant, batteries-included completion plugin for Neovim";
-    homepage = "https://github.com/saghen/blink.cmp";
-    changelog = "https://github.com/Saghen/blink.cmp/blob/v${finalAttrs.version}/CHANGELOG.md";
-  };
+  env.RUSTC_BOOTSTRAP = true;
 })
diff --git a/flake/pkgs/by-name/prettier-plugin-astro/package.nix b/flake/pkgs/by-name/prettier-plugin-astro/package.nix
deleted file mode 100644
index d893da7c..00000000
--- a/flake/pkgs/by-name/prettier-plugin-astro/package.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  stdenv,
-  fetchFromGitHub,
-  nodejs,
-  pnpm_9,
-  pins,
-}: let
-  pin = pins.prettier-plugin-astro;
-in
-  stdenv.mkDerivation (finalAttrs: {
-    pname = "prettier-plugin-astro";
-    version = pin.version or pin.revision;
-
-    src = fetchFromGitHub {
-      inherit (pin.repository) owner repo;
-      rev = finalAttrs.version;
-      sha256 = pin.hash;
-    };
-
-    pnpmDeps = pnpm_9.fetchDeps {
-      inherit (finalAttrs) pname src;
-      fetcherVersion = 2;
-      hash = "sha256-K7pIWLkIIbUKDIcysfEtcf/eVMX9ZgyFHdqcuycHCNE=";
-    };
-
-    nativeBuildInputs = [
-      nodejs
-      pnpm_9.configHook
-    ];
-
-    buildPhase = ''
-      runHook preBuild
-
-      pnpm run build
-
-      runHook postBuild
-    '';
-
-    installPhase = ''
-      runHook preInstall
-
-      # mkdir -p $out/dist
-      cp -r dist/ $out
-      cp -r node_modules $out
-
-      runHook postInstall
-    '';
-  })
diff --git a/flake/pkgs/by-name/prettier-plugin-svelte/package.nix b/flake/pkgs/by-name/prettier-plugin-svelte/package.nix
deleted file mode 100644
index 540ff2b7..00000000
--- a/flake/pkgs/by-name/prettier-plugin-svelte/package.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  buildNpmPackage,
-  fetchFromGitHub,
-  pins,
-}: let
-  pin = pins.prettier-plugin-svelte;
-in
-  buildNpmPackage (finalAttrs: {
-    pname = "prettier-plugin-svelte";
-    version = pin.version or pin.revision;
-
-    src = fetchFromGitHub {
-      inherit (pin.repository) owner repo;
-      rev = finalAttrs.version;
-      sha256 = pin.hash;
-    };
-
-    npmDepsHash = "sha256-D+gDdKiIG38jV+M/BqTKf0yYj1KXpbIodtQFdzocpn8=";
-  })
diff --git a/lib/dag.nix b/lib/dag.nix
index db5d53b7..cbf52083 100644
--- a/lib/dag.nix
+++ b/lib/dag.nix
@@ -8,7 +8,7 @@
 #  - the addition of the function `entryBefore` indicating a "wanted
 #    by" relationship.
 {lib}: let
-  inherit (builtins) isAttrs attrValues attrNames elem all head tail length toJSON isString removeAttrs;
+  inherit (builtins) isAttrs attrValues attrNames elem all head tail length toJSON isString;
   inherit (lib.attrsets) filterAttrs mapAttrs;
   inherit (lib.lists) toposort;
   inherit (lib.nvim.dag) empty isEntry entryBetween entryAfter entriesBetween entryAnywhere topoSort;
@@ -169,11 +169,10 @@ in {
       else value)
     dag;
     sortedDag = topoSort finalDag;
-    loopDetail = map (loops: removeAttrs loops ["data"]) sortedDag.loops;
     result =
       if sortedDag ? result
       then mapResult sortedDag.result
-      else abort ("Dependency cycle in ${name}: " + toJSON loopDetail);
+      else abort ("Dependency cycle in ${name}: " + toJSON sortedDag);
   in
     result;
 }
diff --git a/lib/languages.nix b/lib/languages.nix
index 899d9ea8..c4074144 100644
--- a/lib/languages.nix
+++ b/lib/languages.nix
@@ -1,7 +1,7 @@
 {lib}: let
   inherit (builtins) isString getAttr;
   inherit (lib.options) mkOption;
-  inherit (lib.types) listOf bool str submodule attrsOf anything either nullOr uniq;
+  inherit (lib.types) listOf bool str submodule attrsOf anything either nullOr;
   inherit (lib.nvim.attrsets) mapListToAttrs;
   inherit (lib.nvim.types) luaInline;
 in {
@@ -46,7 +46,7 @@ in {
       capabilities = mkOption {
         type = nullOr (either luaInline (attrsOf anything));
         default = null;
-        description = "LSP capabilities to pass to LSP server configuration";
+        description = "LSP capabilitiess to pass to lspconfig";
       };
 
       on_attach = mkOption {
@@ -58,11 +58,11 @@ in {
       filetypes = mkOption {
         type = nullOr (listOf str);
         default = null;
-        description = "Filetypes to auto-attach LSP server in";
+        description = "Filetypes to auto-attach LSP in";
       };
 
       cmd = mkOption {
-        type = nullOr (either luaInline (uniq (listOf str)));
+        type = nullOr (listOf str);
         default = null;
         description = "Command used to start the LSP server";
       };
diff --git a/lib/lua.nix b/lib/lua.nix
index bf879031..4106a4c2 100644
--- a/lib/lua.nix
+++ b/lib/lua.nix
@@ -1,52 +1,92 @@
 # Helpers for converting values to lua
 {lib}: let
+  inherit (builtins) hasAttr head throw typeOf isList isAttrs isBool isInt isString isPath isFloat toJSON;
+  inherit (lib.attrsets) mapAttrsToList filterAttrs;
+  inherit (lib.strings) concatStringsSep concatMapStringsSep stringToCharacters;
+  inherit (lib.trivial) boolToString warn;
+in rec {
+  # Convert a null value to lua's nil
+  nullString = value:
+    if value == null
+    then "nil"
+    else "'${value}'";
+
+  # convert an expression to lua
+  expToLua = exp:
+    if isList exp
+    then listToLuaTable exp # if list, convert to lua table
+    else if isAttrs exp
+    then attrsetToLuaTable exp # if attrs, convert to table
+    else if isBool exp
+    then boolToString exp # if bool, convert to string
+    else if isInt exp
+    then toString exp # if int, convert to string
+    else if exp == null
+    then "nil"
+    else (toJSON exp); # otherwise jsonify the value and print as is
+
+  # convert list to a lua table
+  listToLuaTable = list:
+    "{ " + (concatStringsSep ", " (map expToLua list)) + " }";
+
+  # convert attrset to a lua table
+  attrsetToLuaTable = attrset:
+    "{ "
+    + (
+      concatStringsSep ", "
+      (
+        mapAttrsToList (
+          name: value:
+            name
+            + " = "
+            + (expToLua value)
+        )
+        attrset
+      )
+    )
+    + " }";
+  # Convert a list of lua expressions to a lua table. The difference to listToLuaTable is that the elements here are expected to be lua expressions already, whereas listToLuaTable converts from nix types to lua first
+  luaTable = items: ''{${concatStringsSep "," items}}'';
+
   isLuaInline = object: (object._type or null) == "lua-inline";
 
   toLuaObject = args:
-    {
-      int = toString args;
-      float = toString args;
-
-      # escapes \ and quotes
-      string = builtins.toJSON args;
-      path = builtins.toJSON args;
-
-      bool = lib.boolToString args;
-      null = "nil";
-
-      list = "{${lib.concatMapStringsSep ",\n" toLuaObject args}}";
-
-      set =
-        if lib.isDerivation args
-        then ''"${args}"''
-        else if isLuaInline args
-        then args.expr
-        else "{${
-          lib.pipe args [
-            (lib.filterAttrs (_: v: v != null))
-            (builtins.mapAttrs (
-              n: v:
-                if lib.hasPrefix "@" n
-                then toLuaObject v
-                else "[${toLuaObject n}] = ${toLuaObject v}"
-            ))
-            builtins.attrValues
-            (lib.concatStringsSep ",\n")
-          ]
-        }}";
-    }
-    .${
-      builtins.typeOf args
-    }
-    or (builtins.throw "Could not convert object of type `${builtins.typeOf args}` to lua object");
-in
-  {
-    inherit isLuaInline toLuaObject;
-    luaTable = x: (toLuaObject (map lib.mkLuaInline x));
-  }
-  // lib.genAttrs [
-    "nullString"
-    "expToLua"
-    "listToLuaTable"
-    "attrsetToLuaTable"
-  ] (name: lib.warn "${name} is deprecated use toLuaObject instead" toLuaObject)
+    if isAttrs args
+    then
+      if isLuaInline args
+      then args.expr
+      else if hasAttr "__empty" args
+      then
+        warn ''
+          Using `__empty` to define an empty lua table is deprecated. Use an empty attrset instead.
+        '' "{ }"
+      else
+        "{"
+        + (concatStringsSep ","
+          (mapAttrsToList
+            (n: v:
+              if head (stringToCharacters n) == "@"
+              then toLuaObject v
+              else "[${toLuaObject n}] = " + (toLuaObject v))
+            (filterAttrs
+              (_: v: v != null)
+              args)))
+        + "}"
+    else if isList args
+    then "{" + concatMapStringsSep "," toLuaObject args + "}"
+    else if isString args
+    then
+      # This should be enough!
+      toJSON args
+    else if isPath args
+    then toJSON (toString args)
+    else if isBool args
+    then "${boolToString args}"
+    else if isFloat args
+    then "${toString args}"
+    else if isInt args
+    then "${toString args}"
+    else if (args == null)
+    then "nil"
+    else throw "could not convert object of type `${typeOf args}` to lua object";
+}
diff --git a/lib/types/custom.nix b/lib/types/custom.nix
index f6905b02..8e8be8a2 100644
--- a/lib/types/custom.nix
+++ b/lib/types/custom.nix
@@ -1,10 +1,7 @@
 {lib}: let
-  inherit (builtins) toJSON;
   inherit (lib.options) mergeEqualOption;
-  inherit (lib.lists) singleton;
   inherit (lib.strings) isString stringLength match;
-  inherit (lib.types) listOf mkOptionType coercedTo;
-  inherit (lib.trivial) warn;
+  inherit (lib.types) listOf mkOptionType;
 in {
   mergelessListOf = elemType:
     mkOptionType {
@@ -28,15 +25,4 @@ in {
     description = "RGB color in hex format";
     check = v: isString v && (match "#?[0-9a-fA-F]{6}" v) != null;
   };
-
-  # no compound types please
-  deprecatedSingleOrListOf = option: t:
-    coercedTo
-    t
-    (x:
-      warn ''
-        ${option} no longer accepts non-list values, use [${toJSON x}] instead
-      ''
-      (singleton x))
-    (listOf t);
 }
diff --git a/lib/types/default.nix b/lib/types/default.nix
index 66adfbbc..044a8221 100644
--- a/lib/types/default.nix
+++ b/lib/types/default.nix
@@ -10,5 +10,5 @@ in {
   inherit (typesDag) dagOf;
   inherit (typesPlugin) pluginsOpt extraPluginType mkPluginSetupOption luaInline pluginType borderType;
   inherit (typesLanguage) diagnostics mkGrammarOption;
-  inherit (customTypes) char hexColor mergelessListOf deprecatedSingleOrListOf;
+  inherit (customTypes) char hexColor mergelessListOf;
 }
diff --git a/modules/extra/deprecations.nix b/modules/extra/deprecations.nix
index 7012feac..0a5733ab 100644
--- a/modules/extra/deprecations.nix
+++ b/modules/extra/deprecations.nix
@@ -1,9 +1,7 @@
 {lib, ...}: let
-  inherit (builtins) head;
-  inherit (lib.modules) mkRemovedOptionModule mkRenamedOptionModule doRename;
+  inherit (lib.modules) mkRemovedOptionModule mkRenamedOptionModule;
   inherit (lib.lists) concatLists;
   inherit (lib.nvim.config) batchRenameOptions;
-  inherit (lib.trivial) warn;
 
   renamedVimOpts = batchRenameOptions ["vim"] ["vim" "options"] {
     # 2024-12-01
@@ -22,31 +20,6 @@
     # 2025-02-07
     scrollOffset = "scrolloff";
   };
-
-  mkRemovedLspOpt = lang: (mkRemovedOptionModule ["vim" "languages" lang "lsp" "opts"] ''
-    `vim.languages.${lang}.lsp.opts` is now moved to `vim.lsp.servers.<server_name>.init_options`
-  '');
-
-  mkRemovedLspPackage = lang: (mkRemovedOptionModule ["vim" "languages" lang "lsp" "package"] ''
-    `vim.languages.${lang}.lsp.package` is now moved to `vim.lsp.servers.<server_name>.cmd`
-  '');
-
-  mkRenamedLspServer = lang:
-    doRename
-    {
-      from = ["vim" "languages" lang "lsp" "server"];
-      to = ["vim" "languages" lang "lsp" "servers"];
-      visible = false;
-      warn = true;
-      use = x:
-        warn
-        "Obsolete option `vim.languages.${lang}.lsp.server` used, use `vim.languages.${lang}.lsp.servers` instead."
-        (head x);
-    };
-
-  mkRemovedFormatPackage = lang: (mkRemovedOptionModule ["vim" "languages" lang "format" "package"] ''
-    `vim.languages.${lang}.format.package` is removed, please use `vim.formatter.conform-nvim.formatters.<formatter_name>.command` instead.
-  '');
 in {
   imports = concatLists [
     [
@@ -147,165 +120,8 @@ in {
         in 'vim.clipboard.registers'. Please see the documentation for the new module for more
         details, or open an issue if you are confused.
       '')
-
-      # 2025-07-12
-      (mkRenamedLspServer "assembly")
-
-      (mkRenamedLspServer "astro")
-      (mkRemovedLspPackage "astro")
-
-      (mkRenamedLspServer "bash")
-      (mkRemovedLspPackage "bash")
-
-      (mkRemovedLspOpt "clang")
-      (mkRemovedLspPackage "clang")
-      (mkRenamedLspServer "clang")
-
-      (mkRemovedLspPackage "clojure")
-
-      (mkRenamedLspServer "csharp")
-      (mkRemovedLspPackage "csharp")
-
-      (mkRenamedLspServer "css")
-      (mkRemovedLspPackage "css")
-
-      (mkRemovedLspPackage "cue")
-
-      (mkRenamedLspServer "dart")
-      (mkRemovedLspPackage "dart")
-      (mkRemovedLspOpt "dart")
-
-      (mkRenamedLspServer "elixir")
-      (mkRemovedLspPackage "elixir")
-
-      (mkRenamedLspServer "fsharp")
-      (mkRemovedLspPackage "fsharp")
-
-      (mkRenamedLspServer "gleam")
-      (mkRemovedLspPackage "gleam")
-
-      (mkRenamedLspServer "go")
-      (mkRemovedLspPackage "go")
-
-      (mkRemovedLspPackage "haskell")
-
-      (mkRemovedLspPackage "hcl")
-
-      (mkRenamedLspServer "helm")
-      (mkRemovedLspPackage "helm")
-
-      (mkRemovedLspPackage "java")
-
-      (mkRenamedLspServer "julia")
-      (mkRemovedLspPackage "julia")
-
-      (mkRemovedLspPackage "kotlin")
-
-      (mkRemovedLspPackage "lua")
-
-      (mkRenamedLspServer "markdown")
-      (mkRemovedLspPackage "markdown")
-
-      (mkRenamedLspServer "nim")
-      (mkRemovedLspPackage "nim")
-
-      (mkRenamedLspServer "nix")
-      (mkRemovedLspPackage "nix")
-      (mkRemovedOptionModule ["vim" "languages" "nix" "lsp" "options"] ''
-        `vim.languages.nix.lsp.options` has been moved to `vim.lsp.servers.<server_name>.init_options`.
-      '')
-
-      (mkRenamedLspServer "nu")
-      (mkRemovedLspPackage "nu")
-
-      (mkRenamedLspServer "ocaml")
-      (mkRemovedLspPackage "ocaml")
-
-      (mkRenamedLspServer "odin")
-      (mkRemovedLspPackage "odin")
-
-      (mkRenamedLspServer "php")
-      (mkRemovedLspPackage "php")
-
-      (mkRenamedLspServer "python")
-      (mkRemovedLspPackage "python")
-
-      (mkRenamedLspServer "r")
-      (mkRemovedLspPackage "r")
-
-      (mkRenamedLspServer "ruby")
-      (mkRemovedLspPackage "ruby")
-
-      (mkRenamedLspServer "sql")
-      (mkRemovedLspPackage "sql")
-
-      (mkRenamedLspServer "svelte")
-      (mkRemovedLspPackage "svelte")
-
-      (mkRenamedLspServer "tailwind")
-      (mkRemovedLspPackage "tailwind")
-
-      (mkRemovedLspPackage "terraform")
-
-      (mkRenamedLspServer "ts")
-      (mkRemovedLspPackage "ts")
-
-      (mkRenamedLspServer "typst")
-      (mkRemovedLspPackage "typst")
-
-      (mkRenamedLspServer "vala")
-      (mkRemovedLspPackage "vala")
-
-      (mkRenamedLspServer "wgsl")
-      (mkRemovedLspPackage "wgsl")
-
-      (mkRenamedLspServer "yaml")
-      (mkRemovedLspPackage "yaml")
-
-      (mkRenamedLspServer "zig")
-      (mkRemovedLspPackage "zig")
-
-      # 2025-10-22
-      (mkRenamedOptionModule ["vim" "languages" "rust" "crates" "enable"] ["vim" "languages" "rust" "extensions" "crates-nvim" "enable"])
-      (mkRemovedOptionModule ["vim" "languages" "rust" "crates" "codeActions"] ''
-        'vim.languages.rust.crates' option has been moved to 'vim.languages.rust.extensions.crates-nvim' in full and the
-        codeActions option has been removed. To set up code actions again, you may use the the new 'setupOpts' option
-        located under 'vim.languages.rust.extensions.crates-nvim'. Refer to crates.nvim documentation for setup steps:
-
-        <https://github.com/Saecki/crates.nvim/wiki/Documentation-v0.7.1#in-process-language-server>
-      '')
-
-      (mkRemovedOptionModule ["vim" "language" "astro" "format"] ''
-        This option has been removed due to being broken for a long time.
-      '')
-      (mkRemovedOptionModule ["vim" "language" "svelte" "format"] ''
-        This option has been removed due to being broken for a long time.
-      '')
     ]
 
-    (map mkRemovedFormatPackage [
-      "bash"
-      "css"
-      "elixir"
-      "fsharp"
-      "go"
-      "hcl"
-      "html"
-      "json"
-      "lua"
-      "markdown"
-      "nim"
-      "nix"
-      "ocaml"
-      "python"
-      "qml"
-      "r"
-      "ruby"
-      "rust"
-      "sql"
-      "ts"
-      "typst"
-    ])
     # Migrated via batchRenameOptions. Further batch renames must be below this line.
     renamedVimOpts
   ];
diff --git a/modules/neovim/init/autocmds.nix b/modules/neovim/init/autocmds.nix
index 579a211e..07656134 100644
--- a/modules/neovim/init/autocmds.nix
+++ b/modules/neovim/init/autocmds.nix
@@ -9,7 +9,7 @@
   inherit (lib.types) nullOr submodule listOf str bool;
   inherit (lib.nvim.types) luaInline;
   inherit (lib.nvim.lua) toLuaObject;
-  inherit (lib.nvim.dag) entryAfter entryBetween;
+  inherit (lib.nvim.dag) entryAfter;
 
   autocommandType = submodule {
     options = {
@@ -144,7 +144,7 @@ in {
       enabledAutogroups = filter (au: au.enable) cfg.augroups;
     in {
       luaConfigRC = {
-        augroups = entryBetween ["autocmds"] ["pluginConfigs"] (optionalString (enabledAutogroups != []) ''
+        augroups = entryAfter ["pluginConfigs"] (optionalString (enabledAutogroups != []) ''
           local nvf_autogroups = {}
           for _, group in ipairs(${toLuaObject enabledAutogroups}) do
             if group.name then
diff --git a/modules/neovim/init/clipboard.nix b/modules/neovim/init/clipboard.nix
index b99f5508..132079b4 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 {option}`vim.options` should they wish to avoid using
+          clipboard through [](#opt-vim.options) should they wish to avoid using
           this module.
         '';
 
diff --git a/modules/neovim/init/default.nix b/modules/neovim/init/default.nix
index 3f195085..30a481a1 100644
--- a/modules/neovim/init/default.nix
+++ b/modules/neovim/init/default.nix
@@ -8,6 +8,5 @@
     ./highlight.nix
     ./lsp.nix
     ./spellcheck.nix
-    ./util.nix
   ];
 }
diff --git a/modules/neovim/init/lsp.nix b/modules/neovim/init/lsp.nix
index b17c5554..b89c3fde 100644
--- a/modules/neovim/init/lsp.nix
+++ b/modules/neovim/init/lsp.nix
@@ -16,7 +16,6 @@
 
   cfg = config.vim.lsp;
 
-  # TODO: lspConfigurations filter on enabledServers instead of cfg.servers?
   lspConfigurations =
     mapAttrsToList (
       name: value: ''
@@ -77,6 +76,7 @@ in {
     {
       vim.lsp.servers."*" = {
         capabilities = mkDefault (mkLuaInline "capabilities");
+        on_attach = mkDefault (mkLuaInline "default_on_attach");
       };
     }
 
diff --git a/modules/neovim/init/spellcheck.nix b/modules/neovim/init/spellcheck.nix
index 724b432d..5c593a65 100644
--- a/modules/neovim/init/spellcheck.nix
+++ b/modules/neovim/init/spellcheck.nix
@@ -9,7 +9,7 @@
   inherit (lib.strings) concatLines concatStringsSep optionalString;
   inherit (lib.attrsets) mapAttrsToList;
   inherit (lib.types) listOf str attrsOf;
-  inherit (lib.nvim.lua) toLuaObject;
+  inherit (lib.nvim.lua) listToLuaTable;
   inherit (lib.nvim.dag) entryAfter;
 
   cfg = config.vim.spellcheck;
@@ -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](./options.html#option-vim-additionalRuntimePaths) list provided by nvf.
+        [additionalRuntimePaths](#opt-vim.additionalRuntimePaths) list provided by nvf.
       '';
     };
 
@@ -152,7 +152,7 @@ in {
         vim.api.nvim_create_augroup("nvf_autocmds", {clear = false})
         vim.api.nvim_create_autocmd({ "FileType" }, {
           group = "nvf_autocmds",
-          pattern = ${toLuaObject cfg.ignoredFiletypes},
+          pattern = ${listToLuaTable cfg.ignoredFiletypes},
           callback = function()
             vim.opt_local.spell = false
           end,
diff --git a/modules/neovim/init/util.nix b/modules/neovim/init/util.nix
deleted file mode 100644
index d151e53a..00000000
--- a/modules/neovim/init/util.nix
+++ /dev/null
@@ -1,177 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.nvim.dag) entryBefore;
-
-  cfg = config.vim.lsp;
-in {
-  config = mkMerge [
-    (mkIf (cfg.servers != {}) {
-      vim.luaConfigRC.lsp-util =
-        entryBefore ["lsp-servers"]
-        /*
-        lua
-        */
-        ''
-          -- Port of nvim-lspconfig util
-          local util = { path = {} }
-
-          util.default_config = {
-            log_level = vim.lsp.protocol.MessageType.Warning,
-            message_level = vim.lsp.protocol.MessageType.Warning,
-            settings = vim.empty_dict(),
-            init_options = vim.empty_dict(),
-            handlers = {},
-            autostart = true,
-            capabilities = vim.lsp.protocol.make_client_capabilities(),
-          }
-
-          -- global on_setup hook
-          util.on_setup = nil
-
-          do
-            local validate = vim.validate
-            local api = vim.api
-            local lsp = vim.lsp
-            local nvim_eleven = vim.fn.has 'nvim-0.11' == 1
-
-            local iswin = vim.uv.os_uname().version:match 'Windows'
-
-            local function escape_wildcards(path)
-              return path:gsub('([%[%]%?%*])', '\\%1')
-            end
-
-            local function is_fs_root(path)
-              if iswin then
-                return path:match '^%a:$'
-              else
-                return path == '/'
-              end
-            end
-
-            local function traverse_parents(path, cb)
-              path = vim.uv.fs_realpath(path)
-              local dir = path
-              -- Just in case our algo is buggy, don't infinite loop.
-              for _ = 1, 100 do
-                dir = vim.fs.dirname(dir)
-                if not dir then
-                  return
-                end
-                -- If we can't ascend further, then stop looking.
-                if cb(dir, path) then
-                  return dir, path
-                end
-                if is_fs_root(dir) then
-                  break
-                end
-              end
-            end
-
-            util.root_pattern = function(...)
-              local patterns = util.tbl_flatten { ... }
-              return function(startpath)
-                startpath = util.strip_archive_subpath(startpath)
-                for _, pattern in ipairs(patterns) do
-                  local match = util.search_ancestors(startpath, function(path)
-                    for _, p in ipairs(vim.fn.glob(table.concat({ escape_wildcards(path), pattern }, '/'), true, true)) do
-                      if vim.uv.fs_stat(p) then
-                        return path
-                      end
-                    end
-                  end)
-
-                  if match ~= nil then
-                    return match
-                  end
-                end
-              end
-            end
-
-            util.root_markers_with_field = function(root_files, new_names, field, fname)
-              local path = vim.fn.fnamemodify(fname, ':h')
-              local found = vim.fs.find(new_names, { path = path, upward = true })
-
-              for _, f in ipairs(found or {}) do
-                -- Match the given `field`.
-                for line in io.lines(f) do
-                  if line:find(field) then
-                    root_files[#root_files + 1] = vim.fs.basename(f)
-                    break
-                  end
-                end
-              end
-
-              return root_files
-            end
-
-            util.insert_package_json = function(root_files, field, fname)
-              return util.root_markers_with_field(root_files, { 'package.json', 'package.json5' }, field, fname)
-            end
-
-            util.strip_archive_subpath = function(path)
-              -- Matches regex from zip.vim / tar.vim
-              path = vim.fn.substitute(path, 'zipfile://\\(.\\{-}\\)::[^\\\\].*$', '\\1', ''')
-              path = vim.fn.substitute(path, 'tarfile:\\(.\\{-}\\)::.*$', '\\1', ''')
-              return path
-            end
-
-            util.get_typescript_server_path = function(root_dir)
-              local project_roots = vim.fs.find('node_modules', { path = root_dir, upward = true, limit = math.huge })
-              for _, project_root in ipairs(project_roots) do
-                local typescript_path = project_root .. '/typescript'
-                local stat = vim.loop.fs_stat(typescript_path)
-                if stat and stat.type == 'directory' then
-                  return typescript_path .. '/lib'
-                end
-              end
-              return '''
-            end
-
-            util.search_ancestors = function(startpath, func)
-              if nvim_eleven then
-                validate('func', func, 'function')
-              end
-              if func(startpath) then
-                return startpath
-              end
-              local guard = 100
-              for path in vim.fs.parents(startpath) do
-                -- Prevent infinite recursion if our algorithm breaks
-                guard = guard - 1
-                if guard == 0 then
-                  return
-                end
-
-                if func(path) then
-                  return path
-                end
-              end
-            end
-
-            util.path.is_descendant = function(root, path)
-              if not path then
-                return false
-              end
-
-              local function cb(dir, _)
-                return dir == root
-              end
-
-              local dir, _ = traverse_parents(path, cb)
-
-              return dir == root
-            end
-
-            util.tbl_flatten = function(t)
-              --- @diagnostic disable-next-line:deprecated
-              return nvim_eleven and vim.iter(t):flatten(math.huge):totable() or vim.tbl_flatten(t)
-            end
-          end
-        '';
-    })
-  ];
-}
diff --git a/modules/plugins/assistant/chatgpt/config.nix b/modules/plugins/assistant/chatgpt/config.nix
index bf4d9972..b1066e5a 100644
--- a/modules/plugins/assistant/chatgpt/config.nix
+++ b/modules/plugins/assistant/chatgpt/config.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  options,
   ...
 }: let
   inherit (lib.modules) mkIf mkMerge;
@@ -11,7 +10,8 @@
 
   cfg = config.vim.assistant.chatgpt;
 
-  mappingDefinitions = options.vim.assistant.chatgpt.mappings;
+  self = import ./chatgpt.nix {inherit lib;};
+  mappingDefinitions = self.options.vim.assistant.chatgpt.mappings;
   mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
   maps = mkMerge [
     (mkSetBinding mappings.editWithInstructions "<cmd>ChatGPTEditWithInstruction<CR>")
diff --git a/modules/plugins/formatter/conform-nvim/conform-nvim.nix b/modules/plugins/formatter/conform-nvim/conform-nvim.nix
index 4e27f9f0..cfe89bf3 100644
--- a/modules/plugins/formatter/conform-nvim/conform-nvim.nix
+++ b/modules/plugins/formatter/conform-nvim/conform-nvim.nix
@@ -1,58 +1,13 @@
 {lib, ...}: let
   inherit (lib.generators) mkLuaInline;
   inherit (lib.options) mkOption mkEnableOption literalMD;
-  inherit (lib.types) attrs either nullOr listOf submodule str;
+  inherit (lib.types) attrs either nullOr;
   inherit (lib.nvim.lua) toLuaObject;
   inherit (lib.nvim.types) luaInline mkPluginSetupOption;
-
-  formattersType = submodule {
-    freeformType = attrs;
-    options = {
-      command = mkOption {
-        type = nullOr (either str luaInline);
-        default = null;
-        description = "The command to run.";
-      };
-
-      args = mkOption {
-        type = nullOr (either (listOf str) luaInline);
-        default = null;
-        description = ''
-          A list of strings, or a lua function that returns a list of strings.
-
-          Return a single string instead of a list to run the command in a
-          shell.
-        '';
-      };
-
-      prepend_args = mkOption {
-        type = nullOr (either (listOf str) luaInline);
-        default = null;
-        description = ''
-          When inherit = true, add additional arguments to the beginning of
-          args. Can also be a function, like args.
-        '';
-      };
-
-      append_args = mkOption {
-        type = nullOr (either (listOf str) luaInline);
-        default = null;
-        description = ''
-          When inherit = true, add additional arguments to the end of args.
-          Can also be a function, like args.
-        '';
-      };
-    };
-  };
 in {
   options.vim.formatter.conform-nvim = {
     enable = mkEnableOption "lightweight yet powerful formatter plugin for Neovim [conform-nvim]";
     setupOpts = mkPluginSetupOption "conform.nvim" {
-      formatters = mkOption {
-        type = formattersType;
-        default = {};
-        description = "Custom formatters and overrides for built-in formatters.";
-      };
       formatters_by_ft = mkOption {
         type = attrs;
         default = {};
diff --git a/modules/plugins/git/git-conflict/config.nix b/modules/plugins/git/git-conflict/config.nix
index 9d99aacc..bc9905d6 100644
--- a/modules/plugins/git/git-conflict/config.nix
+++ b/modules/plugins/git/git-conflict/config.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  options,
   ...
 }: let
   inherit (lib.modules) mkIf mkMerge;
@@ -11,7 +10,8 @@
 
   cfg = config.vim.git.git-conflict;
 
-  gcMappingDefinitions = options.vim.git.git-conflict.mappings;
+  self = import ./git-conflict.nix {inherit lib config;};
+  gcMappingDefinitions = self.options.vim.git.git-conflict.mappings;
 
   gcMappings = addDescriptionsToMappings cfg.mappings gcMappingDefinitions;
 in {
diff --git a/modules/plugins/git/gitsigns/config.nix b/modules/plugins/git/gitsigns/config.nix
index e2d31df5..e89eebcf 100644
--- a/modules/plugins/git/gitsigns/config.nix
+++ b/modules/plugins/git/gitsigns/config.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  options,
   ...
 }: let
   inherit (builtins) toJSON;
@@ -13,7 +12,8 @@
 
   cfg = config.vim.git.gitsigns;
 
-  gsMappingDefinitions = options.vim.git.gitsigns.mappings;
+  self = import ./gitsigns.nix {inherit lib config;};
+  gsMappingDefinitions = self.options.vim.git.gitsigns.mappings;
 
   gsMappings = addDescriptionsToMappings cfg.mappings gsMappingDefinitions;
 in {
diff --git a/modules/plugins/languages/asm.nix b/modules/plugins/languages/asm.nix
index 4fb36f4c..9fe58a76 100644
--- a/modules/plugins/languages/asm.nix
+++ b/modules/plugins/languages/asm.nix
@@ -4,24 +4,12 @@
   lib,
   ...
 }: let
-  inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.types) enum;
-  inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
-  inherit (lib.meta) getExe;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
+  inherit (lib.types) package;
+  inherit (lib.nvim.types) mkGrammarOption;
 
   cfg = config.vim.languages.assembly;
-  defaultServers = ["asm-lsp"];
-  servers = {
-    asm-lsp = {
-      enable = true;
-      cmd = [(getExe pkgs.asm-lsp)];
-      filetypes = ["asm" "vmasm"];
-      root_markers = [".asm-lsp.toml" ".git"];
-    };
-  };
 in {
   options.vim.languages.assembly = {
     enable = mkEnableOption "Assembly support";
@@ -32,11 +20,12 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "Assembly LSP support" // {default = config.vim.lsp.enable;};
-      servers = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.asm.lsp.servers" (enum (attrNames servers));
-        default = defaultServers;
-        description = "Assembly LSP server to use";
+      enable = mkEnableOption "Assembly LSP support (asm-lsp)" // {default = config.vim.lsp.enable;};
+
+      package = mkOption {
+        type = package;
+        default = pkgs.asm-lsp;
+        description = "asm-lsp package";
       };
     };
   };
@@ -47,12 +36,14 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (n: {
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.asm-lsp = ''
+        lspconfig.asm_lsp.setup {
+          capabilities = capabilities,
+          on_attach = default_on_attach,
+          cmd = {"${cfg.lsp.package}/bin/asm-lsp"},
+        }
+      '';
     })
   ]);
 }
diff --git a/modules/plugins/languages/astro.nix b/modules/plugins/languages/astro.nix
index 2cf6ee04..21b6e5a3 100644
--- a/modules/plugins/languages/astro.nix
+++ b/modules/plugins/languages/astro.nix
@@ -1,5 +1,4 @@
 {
-  self,
   config,
   pkgs,
   lib,
@@ -8,54 +7,49 @@
   inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.lists) isList;
   inherit (lib.meta) getExe;
-  inherit (lib.types) enum coercedTo;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
-  inherit (lib.nvim.types) mkGrammarOption diagnostics deprecatedSingleOrListOf;
-  inherit (lib.generators) mkLuaInline;
+  inherit (lib.types) enum either listOf package str;
+  inherit (lib.nvim.lua) expToLua;
+  inherit (lib.nvim.types) mkGrammarOption diagnostics;
 
   cfg = config.vim.languages.astro;
 
-  defaultServers = ["astro"];
+  defaultServer = "astro";
   servers = {
     astro = {
-      enable = true;
-      cmd = [(getExe pkgs.astro-language-server) "--stdio"];
-      filetypes = ["astro"];
-      root_markers = ["package.json" "tsconfig.json" "jsconfig.json" ".git"];
-      init_options = {
-        typescript = {};
-      };
-      before_init =
-        mkLuaInline
-        /*
-        lua
-        */
-        ''
-          function(_, config)
-            if config.init_options and config.init_options.typescript and not config.init_options.typescript.tsdk then
-              config.init_options.typescript.tsdk = util.get_typescript_server_path(config.root_dir)
-            end
-          end
-        '';
+      package = pkgs.astro-language-server;
+      lspConfig = ''
+        lspconfig.astro.setup {
+          capabilities = capabilities,
+          on_attach = attach_keymaps,
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''{"${cfg.lsp.package}/bin/astro-ls", "--stdio"}''
+        }
+        }
+      '';
     };
   };
 
-  defaultFormat = ["prettier"];
-  formats = let
-    parser = "${self.packages.${pkgs.stdenv.hostPlatform.system}.prettier-plugin-astro}/index.js";
-  in {
+  # TODO: specify packages
+  defaultFormat = "prettier";
+  formats = {
     prettier = {
-      command = getExe pkgs.prettier;
-      options.ft_parsers.astro = "astro";
-      prepend_args = ["--plugin=${parser}"];
+      package = pkgs.prettier;
+    };
+
+    prettierd = {
+      package = pkgs.prettierd;
     };
 
     biome = {
-      command = getExe pkgs.biome;
+      package = pkgs.biome;
     };
   };
 
+  # TODO: specify packages
   defaultDiagnosticsProvider = ["eslint_d"];
   diagnosticsProviders = {
     eslint_d = let
@@ -75,15 +69,6 @@
       };
     };
   };
-
-  formatType =
-    deprecatedSingleOrListOf
-    "vim.languages.astro.format.type"
-    (coercedTo (enum ["prettierd"]) (_:
-      lib.warn
-      "vim.languages.astro.format.type: prettierd is deprecated, use prettier instead"
-      "prettier")
-    (enum (attrNames formats)));
 in {
   options.vim.languages.astro = {
     enable = mkEnableOption "Astro language support";
@@ -96,20 +81,34 @@ in {
 
     lsp = {
       enable = mkEnableOption "Astro LSP support" // {default = config.vim.lsp.enable;};
-      servers = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.astro.lsp.servers" (enum (attrNames servers));
-        default = defaultServers;
+
+      server = mkOption {
+        type = enum (attrNames servers);
+        default = defaultServer;
         description = "Astro LSP server to use";
       };
+
+      package = mkOption {
+        type = either package (listOf str);
+        default = servers.${cfg.lsp.server}.package;
+        example = ''[lib.getExe pkgs.astro-language-server "--minify" "--stdio"]'';
+        description = "Astro LSP server package, or the command to run as a list of strings";
+      };
     };
 
     format = {
       enable = mkEnableOption "Astro formatting" // {default = config.vim.languages.enableFormat;};
 
       type = mkOption {
-        type = formatType;
-        default = defaultFormat;
         description = "Astro formatter to use";
+        type = enum (attrNames formats);
+        default = defaultFormat;
+      };
+
+      package = mkOption {
+        description = "Astro formatter package";
+        type = package;
+        default = formats.${cfg.format.type}.package;
       };
     };
 
@@ -131,25 +130,16 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (n: {
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.astro-lsp = servers.${cfg.lsp.server}.lspConfig;
     })
 
     (mkIf cfg.format.enable {
       vim.formatter.conform-nvim = {
         enable = true;
-        setupOpts = {
-          formatters_by_ft.astro = cfg.format.type;
-          formatters =
-            mapListToAttrs (name: {
-              inherit name;
-              value = formats.${name};
-            })
-            cfg.format.type;
+        setupOpts.formatters_by_ft.astro = [cfg.format.type];
+        setupOpts.formatters.${cfg.format.type} = {
+          command = getExe cfg.format.package;
         };
       };
     })
diff --git a/modules/plugins/languages/bash.nix b/modules/plugins/languages/bash.nix
index 467f3f63..9a5e3e13 100644
--- a/modules/plugins/languages/bash.nix
+++ b/modules/plugins/languages/bash.nix
@@ -5,35 +5,38 @@
   ...
 }: let
   inherit (builtins) attrNames;
-  inherit (lib.options) mkOption mkEnableOption;
+  inherit (lib.options) mkOption mkEnableOption literalExpression;
   inherit (lib.meta) getExe;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.types) enum bool;
-  inherit (lib.generators) mkLuaInline;
-  inherit (lib.nvim.types) diagnostics mkGrammarOption deprecatedSingleOrListOf;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
+  inherit (lib.lists) isList;
+  inherit (lib.types) enum either package listOf str bool;
+  inherit (lib.nvim.types) diagnostics mkGrammarOption;
+  inherit (lib.nvim.lua) expToLua;
 
   cfg = config.vim.languages.bash;
 
-  defaultServers = ["bash-ls"];
+  defaultServer = "bash-ls";
   servers = {
     bash-ls = {
-      enable = true;
-      cmd = [(getExe pkgs.bash-language-server) "start"];
-      filetypes = ["bash" "sh"];
-      root_markers = [".git"];
-      settings = {
-        basheIde = {
-          globPattern = mkLuaInline "vim.env.GLOB_PATTERN or '*@(.sh|.inc|.bash|.command)'";
+      package = pkgs.bash-language-server;
+      lspConfig = ''
+        lspconfig.bashls.setup{
+          capabilities = capabilities;
+          on_attach = default_on_attach;
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''{"${cfg.lsp.package}/bin/bash-language-server",  "start"}''
         };
-      };
+        }
+      '';
     };
   };
 
-  defaultFormat = ["shfmt"];
+  defaultFormat = "shfmt";
   formats = {
     shfmt = {
-      command = getExe pkgs.shfmt;
+      package = pkgs.shfmt;
     };
   };
 
@@ -53,24 +56,38 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "Bash LSP support" // {default = config.vim.lsp.enable;};
-      servers = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.bash.lsp.servers" (enum (attrNames servers));
-        default = defaultServers;
+      enable = mkEnableOption "Enable Bash LSP support" // {default = config.vim.lsp.enable;};
+
+      server = mkOption {
         description = "Bash LSP server to use";
+        type = enum (attrNames servers);
+        default = defaultServer;
+      };
+
+      package = mkOption {
+        description = "bash-language-server package, or the command to run as a list of strings";
+        example = literalExpression ''[lib.getExe pkgs.bash-language-server "start"]'';
+        type = either package (listOf str);
+        default = pkgs.bash-language-server;
       };
     };
 
     format = {
       enable = mkOption {
+        description = "Enable Bash formatting";
         type = bool;
         default = config.vim.languages.enableFormat;
-        description = "Enable Bash formatting";
       };
       type = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.bash.format.type" (enum (attrNames formats));
-        default = defaultFormat;
         description = "Bash formatter to use";
+        type = enum (attrNames formats);
+        default = defaultFormat;
+      };
+
+      package = mkOption {
+        description = "Bash formatter package";
+        type = package;
+        default = formats.${cfg.format.type}.package;
       };
     };
 
@@ -91,25 +108,16 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (n: {
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.bash-lsp = servers.${cfg.lsp.server}.lspConfig;
     })
 
     (mkIf cfg.format.enable {
       vim.formatter.conform-nvim = {
         enable = true;
-        setupOpts = {
-          formatters_by_ft.sh = cfg.format.type;
-          formatters =
-            mapListToAttrs (name: {
-              inherit name;
-              value = formats.${name};
-            })
-            cfg.format.type;
+        setupOpts.formatters_by_ft.sh = [cfg.format.type];
+        setupOpts.formatters.${cfg.format.type} = {
+          command = getExe cfg.format.package;
         };
       };
     })
diff --git a/modules/plugins/languages/clang.nix b/modules/plugins/languages/clang.nix
index cfc86131..2db178e9 100644
--- a/modules/plugins/languages/clang.nix
+++ b/modules/plugins/languages/clang.nix
@@ -5,139 +5,47 @@
   ...
 }: let
   inherit (builtins) attrNames;
+  inherit (lib.lists) isList;
+  inherit (lib.strings) optionalString;
   inherit (lib.options) mkEnableOption mkOption;
-  inherit (lib.types) bool enum package;
-  inherit (lib.meta) getExe;
+  inherit (lib.types) bool enum package either listOf str nullOr;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.generators) mkLuaInline;
-  inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
+  inherit (lib.nvim.lua) expToLua;
+  inherit (lib.nvim.types) mkGrammarOption;
   inherit (lib.nvim.dag) entryAfter;
 
+  packageToCmd = package: defaultCmd:
+    if isList cfg.lsp.package
+    then expToLua cfg.lsp.package
+    else ''{ "${cfg.lsp.package}/bin/${defaultCmd}" }'';
+
   cfg = config.vim.languages.clang;
 
-  defaultServers = ["clangd"];
+  defaultServer = "clangd";
   servers = {
     ccls = {
-      cmd = [(getExe pkgs.ccls)];
-      filetypes = ["c" "cpp" "objc" "objcpp" "cuda"];
-      offset_encoding = "utf-32";
-      root_markers = ["compile_commands.json" ".ccls" ".git"];
-      workspace_required = true;
-      on_attach = mkLuaInline ''
-        function(client, bufnr)
-          local function switch_source_header(bufnr)
-            local method_name = "textDocument/switchSourceHeader"
-            local params = vim.lsp.util.make_text_document_params(bufnr)
-            client:request(method_name, params, function(err, result)
-              if err then
-                error(tostring(err))
-              end
-              if not result then
-                vim.notify('corresponding file cannot be determined')
-                return
-              end
-              vim.cmd.edit(vim.uri_to_fname(result))
-            end, bufnr)
-          end
-
-          vim.api.nvim_buf_create_user_command(
-            bufnr,
-            "LspCclsSwitchSourceHeader",
-            function(arg)
-              switch_source_header(client, 0)
-            end,
-            {desc = "Switch between source/header"}
-          )
-        end
+      package = pkgs.ccls;
+      lspConfig = ''
+        lspconfig.ccls.setup{
+          capabilities = capabilities;
+          on_attach=default_on_attach;
+          cmd = ${packageToCmd cfg.lsp.package "ccls"};
+          ${optionalString (cfg.lsp.opts != null) "init_options = ${cfg.lsp.opts}"}
+        }
       '';
     };
-
     clangd = {
-      cmd = ["${pkgs.clang-tools}/bin/clangd"];
-      filetypes = ["c" "cpp" "objc" "objcpp" "cuda" "proto"];
-      root_markers = [
-        ".clangd"
-        ".clang-tidy"
-        ".clang-format"
-        "compile_commands.json"
-        "compile_flags.txt"
-        "configure.ac"
-        ".git"
-      ];
-      capabilities = {
-        textDocument = {
-          completion = {
-            editsNearCursor = true;
-          };
-        };
-        offsetEncoding = ["utf-8" "utf-16"];
-      };
-      on_attach = mkLuaInline ''
-        function(client, bufnr)
-          local function switch_source_header(bufnr)
-            local method_name = "textDocument/switchSourceHeader"
-            local client = vim.lsp.get_clients({ bufnr = bufnr, name = "clangd", })[1]
-            if not client then
-              return vim.notify(('method %s is not supported by any servers active on the current buffer'):format(method_name))
-            end
-            local params = vim.lsp.util.make_text_document_params(bufnr)
-            client.request(method_name, params, function(err, result)
-              if err then
-                error(tostring(err))
-              end
-              if not result then
-                vim.notify('corresponding file cannot be determined')
-                return
-              end
-              vim.cmd.edit(vim.uri_to_fname(result))
-            end, bufnr)
-          end
-
-          local function symbol_info()
-            local bufnr = vim.api.nvim_get_current_buf()
-            local clangd_client = vim.lsp.get_clients({ bufnr = bufnr, name = "clangd" })[1]
-            if not clangd_client or not clangd_client.supports_method 'textDocument/symbolInfo' then
-              return vim.notify('Clangd client not found', vim.log.levels.ERROR)
-            end
-            local win = vim.api.nvim_get_current_win()
-            local params = vim.lsp.util.make_position_params(win, clangd_client.offset_encoding)
-            clangd_client:request('textDocument/symbolInfo', params, function(err, res)
-              if err or #res == 0 then
-                -- Clangd always returns an error, there is not reason to parse it
-                return
-              end
-              local container = string.format('container: %s', res[1].containerName) ---@type string
-              local name = string.format('name: %s', res[1].name) ---@type string
-              vim.lsp.util.open_floating_preview({ name, container }, "", {
-                height = 2,
-                width = math.max(string.len(name), string.len(container)),
-                focusable = false,
-                focus = false,
-                border = 'single',
-                title = 'Symbol Info',
-              })
-            end, bufnr)
-          end
-
-          vim.api.nvim_buf_create_user_command(
-            bufnr,
-            "ClangdSwitchSourceHeader",
-            function(arg)
-              switch_source_header(0)
-            end,
-            {desc = "Switch between source/header"}
-          )
-
-          vim.api.nvim_buf_create_user_command(
-            bufnr,
-            "ClangdShowSymbolInfo",
-            function(arg)
-              symbol_info()
-            end,
-            {desc = "Show symbol info"}
-          )
-        end
+      package = pkgs.clang-tools;
+      lspConfig = ''
+        local clangd_cap = capabilities
+        -- use same offsetEncoding as null-ls
+        clangd_cap.offsetEncoding = {"utf-16"}
+        lspconfig.clangd.setup{
+          capabilities = clangd_cap;
+          on_attach=default_on_attach;
+          cmd = ${packageToCmd cfg.lsp.package "clangd"};
+          ${optionalString (cfg.lsp.opts != null) "init_options = ${cfg.lsp.opts}"}
+        }
       '';
     };
   };
@@ -192,10 +100,23 @@ in {
     lsp = {
       enable = mkEnableOption "clang LSP support" // {default = config.vim.lsp.enable;};
 
-      servers = mkOption {
+      server = mkOption {
         description = "The clang LSP server to use";
-        type = deprecatedSingleOrListOf "vim.language.clang.lsp.servers" (enum (attrNames servers));
-        default = defaultServers;
+        type = enum (attrNames servers);
+        default = defaultServer;
+      };
+
+      package = mkOption {
+        description = "clang LSP server package, or the command to run as a list of strings";
+        example = ''[lib.getExe pkgs.jdt-language-server " - data " " ~/.cache/jdtls/workspace "]'';
+        type = either package (listOf str);
+        default = servers.${cfg.lsp.server}.package;
+      };
+
+      opts = mkOption {
+        description = "Options to pass to clang LSP server";
+        type = nullOr str;
+        default = null;
       };
     };
 
@@ -229,12 +150,9 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (name: {
-          inherit name;
-          value = servers.${name};
-        })
-        cfg.lsp.servers;
+      vim.lsp.lspconfig.enable = true;
+
+      vim.lsp.lspconfig.sources.clang-lsp = servers.${cfg.lsp.server}.lspConfig;
     })
 
     (mkIf cfg.dap.enable {
diff --git a/modules/plugins/languages/clojure.nix b/modules/plugins/languages/clojure.nix
index 53c7fbbe..0b932708 100644
--- a/modules/plugins/languages/clojure.nix
+++ b/modules/plugins/languages/clojure.nix
@@ -4,25 +4,15 @@
   lib,
   ...
 }: let
-  inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.meta) getExe;
-  inherit (lib.types) enum listOf;
+  inherit (lib.lists) isList;
+  inherit (lib.types) either listOf package str;
   inherit (lib.nvim.types) mkGrammarOption;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
+  inherit (lib.nvim.lua) expToLua;
 
   cfg = config.vim.languages.clojure;
-
-  defaultServers = ["clojure-lsp"];
-  servers = {
-    clojure-lsp = {
-      enable = true;
-      cmd = [(getExe pkgs.clojure-lsp)];
-      filetypes = ["clojure" "edn"];
-      root_markers = ["project.clj" "deps.edn" "build.boot" "shadow-cljs.edn" ".git" "bb.edn"];
-    };
-  };
 in {
   options.vim.languages.clojure = {
     enable = mkEnableOption "Clojure language support";
@@ -34,22 +24,28 @@ in {
 
     lsp = {
       enable = mkEnableOption "Clojure LSP support" // {default = config.vim.lsp.enable;};
-      servers = mkOption {
-        type = listOf (enum (attrNames servers));
-        default = defaultServers;
-        description = "Clojure LSP server to use";
+      package = mkOption {
+        type = either package (listOf str);
+        default = pkgs.clojure-lsp;
+        description = "Clojure LSP";
       };
     };
   };
 
   config = mkIf cfg.enable (mkMerge [
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (n: {
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.clojure-lsp = ''
+        lspconfig.clojure_lsp.setup {
+          capabilities = capabilities;
+          on_attach = default_on_attach;
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''{"${getExe cfg.lsp.package}"}''
+        };
+        }
+      '';
     })
 
     (mkIf cfg.treesitter.enable {
diff --git a/modules/plugins/languages/csharp.nix b/modules/plugins/languages/csharp.nix
index 20e5bd72..49ae4985 100644
--- a/modules/plugins/languages/csharp.nix
+++ b/modules/plugins/languages/csharp.nix
@@ -5,16 +5,14 @@
   options,
   ...
 }: let
-  inherit (builtins) attrNames concatMap;
+  inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
-  inherit (lib.types) enum;
+  inherit (lib.types) either listOf package str enum;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.meta) getExe;
-  inherit (lib.generators) mkLuaInline;
+  inherit (lib.lists) isList;
   inherit (lib.strings) optionalString;
-  inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
-  inherit (lib.nvim.lua) toLuaObject;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
+  inherit (lib.nvim.types) mkGrammarOption;
+  inherit (lib.nvim.lua) expToLua;
 
   lspKeyConfig = config.vim.lsp.mappings;
   lspKeyOptions = options.vim.lsp.mappings;
@@ -27,147 +25,58 @@
   # Omnisharp doesn't have colors in popup docs for some reason, and I've also
   # seen mentions of it being way slower, so until someone finds missing
   # functionality, this will be the default.
-  defaultServers = ["csharp_ls"];
+  defaultServer = "csharp_ls";
   servers = {
     omnisharp = {
-      cmd = mkLuaInline ''
-        {
-          ${toLuaObject (getExe pkgs.omnisharp-roslyn)},
-          '-z', -- https://github.com/OmniSharp/omnisharp-vscode/pull/4300
-          '--hostPID',
-          tostring(vim.fn.getpid()),
-          'DotNet:enablePackageRestore=false',
-          '--encoding',
-          'utf-8',
-          '--languageserver',
+      package = pkgs.omnisharp-roslyn;
+      internalFormatter = true;
+      lspConfig = ''
+        lspconfig.omnisharp.setup {
+          capabilities = capabilities,
+          on_attach = function(client, bufnr)
+            default_on_attach(client, bufnr)
+
+            local oe = require("omnisharp_extended")
+            ${mkLspBinding "goToDefinition" "oe.lsp_definition"}
+            ${mkLspBinding "goToType" "oe.lsp_type_definition"}
+            ${mkLspBinding "listReferences" "oe.lsp_references"}
+            ${mkLspBinding "listImplementations" "oe.lsp_implementation"}
+          end,
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else "{'${cfg.lsp.package}/bin/OmniSharp'}"
+        }
         }
       '';
-      filetypes = ["cs" "vb"];
-      root_dir = mkLuaInline ''
-        function(bufnr, on_dir)
-          local function find_root_pattern(fname, lua_pattern)
-            return vim.fs.root(0, function(name, path)
-              return name:match(lua_pattern)
-            end)
-          end
-
-          local fname = vim.api.nvim_buf_get_name(bufnr)
-          on_dir(find_root_pattern(fname, "%.sln$") or find_root_pattern(fname, "%.csproj$"))
-        end
-      '';
-      init_options = {};
-      capabilities = {
-        workspace = {
-          workspaceFolders = false; # https://github.com/OmniSharp/omnisharp-roslyn/issues/909
-        };
-      };
-      on_attach = mkLuaInline ''
-        function(client, bufnr)
-          local oe = require("omnisharp_extended")
-          ${mkLspBinding "goToDefinition" "oe.lsp_definition"}
-          ${mkLspBinding "goToType" "oe.lsp_type_definition"}
-          ${mkLspBinding "listReferences" "oe.lsp_references"}
-          ${mkLspBinding "listImplementations" "oe.lsp_implementation"}
-        end
-      '';
-      settings = {
-        FormattingOptions = {
-          # Enables support for reading code style, naming convention and analyzer
-          # settings from .editorconfig.
-          EnableEditorConfigSupport = true;
-          # Specifies whether 'using' directives should be grouped and sorted during
-          # document formatting.
-          OrganizeImports = null;
-        };
-        MsBuild = {
-          # If true, MSBuild project system will only load projects for files that
-          # were opened in the editor. This setting is useful for big C# codebases
-          # and allows for faster initialization of code navigation features only
-          # for projects that are relevant to code that is being edited. With this
-          # setting enabled OmniSharp may load fewer projects and may thus display
-          # incomplete reference lists for symbols.
-          LoadProjectsOnDemand = null;
-        };
-        RoslynExtensionsOptions = {
-          # Enables support for roslyn analyzers, code fixes and rulesets.
-          EnableAnalyzersSupport = null;
-          # Enables support for showing unimported types and unimported extension
-          # methods in completion lists. When committed, the appropriate using
-          # directive will be added at the top of the current file. This option can
-          # have a negative impact on initial completion responsiveness;
-          # particularly for the first few completion sessions after opening a
-          # solution.
-          EnableImportCompletion = null;
-          # Only run analyzers against open files when 'enableRoslynAnalyzers' is
-          # true
-          AnalyzeOpenDocumentsOnly = null;
-          # Enables the possibility to see the code in external nuget dependencies
-          EnableDecompilationSupport = null;
-        };
-        RenameOptions = {
-          RenameInComments = null;
-          RenameOverloads = null;
-          RenameInStrings = null;
-        };
-        Sdk = {
-          # Specifies whether to include preview versions of the .NET SDK when
-          # determining which version to use for project loading.
-          IncludePrereleases = true;
-        };
-      };
     };
 
     csharp_ls = {
-      cmd = [(lib.getExe pkgs.csharp-ls)];
-      filetypes = ["cs"];
-      root_dir = mkLuaInline ''
-        function(bufnr, on_dir)
-          local function find_root_pattern(fname, lua_pattern)
-            return vim.fs.root(0, function(name, path)
-              return name:match(lua_pattern)
-            end)
-          end
+      package = pkgs.csharp-ls;
+      internalFormatter = true;
+      lspConfig = ''
+        local extended_handler = require("csharpls_extended").handler
 
-          local fname = vim.api.nvim_buf_get_name(bufnr)
-          on_dir(find_root_pattern(fname, "%.sln$") or find_root_pattern(fname, "%.csproj$"))
-        end
-      '';
-      init_options = {
-        AutomaticWorkspaceInit = true;
-      };
-    };
-
-    roslyn_ls = {
-      cmd = mkLuaInline ''
-        {
-          ${toLuaObject (getExe pkgs.roslyn-ls)},
-          '--logLevel=Warning',
-          '--extensionLogDirectory=' .. vim.fs.dirname(vim.lsp.get_log_path()),
-          '--stdio',
+        lspconfig.csharp_ls.setup {
+          capabilities = capabilities,
+          on_attach = default_on_attach,
+          handlers = {
+            ["textDocument/definition"] = extended_handler,
+            ["textDocument/typeDefinition"] = extended_handler
+          },
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else "{'${cfg.lsp.package}/bin/csharp-ls'}"
+        }
         }
       '';
-
-      filetypes = ["cs"];
-      root_dir = mkLuaInline ''
-        function(bufnr, on_dir)
-          local function find_root_pattern(fname, lua_pattern)
-            return vim.fs.root(0, function(name, path)
-              return name:match(lua_pattern)
-            end)
-          end
-
-          local fname = vim.api.nvim_buf_get_name(bufnr)
-          on_dir(find_root_pattern(fname, "%.sln$") or find_root_pattern(fname, "%.csproj$"))
-        end
-      '';
-      init_options = {};
     };
   };
 
   extraServerPlugins = {
     omnisharp = ["omnisharp-extended-lsp-nvim"];
     csharp_ls = ["csharpls-extended-lsp-nvim"];
-    roslyn_ls = [];
   };
 
   cfg = config.vim.languages.csharp;
@@ -183,10 +92,16 @@ in {
 
       lsp = {
         enable = mkEnableOption "C# LSP support" // {default = config.vim.lsp.enable;};
-        servers = mkOption {
+        server = mkOption {
           description = "C# LSP server to use";
-          type = deprecatedSingleOrListOf "vim.language.csharp.lsp.servers" (enum (attrNames servers));
-          default = defaultServers;
+          type = enum (attrNames servers);
+          default = defaultServer;
+        };
+
+        package = mkOption {
+          description = "C# LSP server package, or the command to run as a list of strings";
+          type = either package (listOf str);
+          default = servers.${cfg.lsp.server}.package;
         };
       };
     };
@@ -199,13 +114,9 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.startPlugins = concatMap (server: extraServerPlugins.${server}) cfg.lsp.servers;
-      vim.lsp.servers =
-        mapListToAttrs (name: {
-          inherit name;
-          value = servers.${name};
-        })
-        cfg.lsp.servers;
+      vim.startPlugins = extraServerPlugins.${cfg.lsp.server} or [];
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.csharp-lsp = servers.${cfg.lsp.server}.lspConfig;
     })
   ]);
 }
diff --git a/modules/plugins/languages/css.nix b/modules/plugins/languages/css.nix
index 28e94151..1075bbc7 100644
--- a/modules/plugins/languages/css.nix
+++ b/modules/plugins/languages/css.nix
@@ -8,40 +8,65 @@
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.meta) getExe;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.types) enum;
-  inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
+  inherit (lib.lists) isList;
+  inherit (lib.types) enum either listOf package str;
+  inherit (lib.nvim.types) mkGrammarOption;
+  inherit (lib.nvim.lua) expToLua;
 
   cfg = config.vim.languages.css;
 
-  defaultServer = ["cssls"];
+  defaultServer = "vscode-langservers-extracted";
   servers = {
-    cssls = {
-      cmd = ["${pkgs.vscode-langservers-extracted}/bin/vscode-css-language-server" "--stdio"];
-      filetypes = ["css" "scss" "less"];
-      # needed to enable formatting
-      init_options = {provideFormatter = true;};
-      root_markers = [".git" "package.json"];
-      settings = {
-        css.validate = true;
-        scss.validate = true;
-        less.validate = true;
-      };
+    vscode-langservers-extracted = {
+      package = pkgs.vscode-langservers-extracted;
+      lspConfig = ''
+        -- enable (broadcasting) snippet capability for completion
+        -- see <https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#cssls>
+        local css_capabilities = vim.lsp.protocol.make_client_capabilities()
+        css_capabilities.textDocument.completion.completionItem.snippetSupport = true
+
+        -- cssls setup
+        lspconfig.cssls.setup {
+          capabilities = css_capabilities;
+          on_attach = default_on_attach;
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''{"${cfg.lsp.package}/bin/vscode-css-language-server", "--stdio"}''
+        }
+        }
+      '';
     };
   };
 
-  defaultFormat = ["prettier"];
+  defaultFormat = "prettier";
   formats = {
     prettier = {
-      command = getExe pkgs.prettier;
+      package = pkgs.prettier;
     };
 
     prettierd = {
-      command = getExe pkgs.prettierd;
+      package = pkgs.prettierd;
+      nullConfig = ''
+        table.insert(
+          ls_sources,
+          null_ls.builtins.formatting.prettier.with({
+            command = "${cfg.format.package}/bin/prettierd",
+          })
+        )
+      '';
     };
 
     biome = {
-      command = getExe pkgs.biome;
+      package = pkgs.biome;
+      nullConfig = ''
+        table.insert(
+          ls_sources,
+          null_ls.builtins.formatting.biome.with({
+            command = "${cfg.format.package}/bin/biome",
+          })
+        )
+      '';
     };
   };
 in {
@@ -57,10 +82,17 @@ in {
     lsp = {
       enable = mkEnableOption "CSS LSP support" // {default = config.vim.lsp.enable;};
 
-      servers = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.css.lsp.servers" (enum (attrNames servers));
-        default = defaultServer;
+      server = mkOption {
         description = "CSS LSP server to use";
+        type = enum (attrNames servers);
+        default = defaultServer;
+      };
+
+      package = mkOption {
+        description = "CSS LSP server package, or the command to run as a list of strings";
+        example = ''[lib.getExe pkgs.jdt-language-server " - data " " ~/.cache/jdtls/workspace "]'';
+        type = either package (listOf str);
+        default = servers.${cfg.lsp.server}.package;
       };
     };
 
@@ -69,9 +101,15 @@ in {
 
       type = mkOption {
         description = "CSS formatter to use";
-        type = deprecatedSingleOrListOf "vim.language.css.format.type" (enum (attrNames formats));
+        type = enum (attrNames formats);
         default = defaultFormat;
       };
+
+      package = mkOption {
+        description = "CSS formatter package";
+        type = package;
+        default = formats.${cfg.format.type}.package;
+      };
     };
   };
 
@@ -82,25 +120,16 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (name: {
-          inherit name;
-          value = servers.${name};
-        })
-        cfg.lsp.servers;
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.css-lsp = servers.${cfg.lsp.server}.lspConfig;
     })
 
     (mkIf cfg.format.enable {
       vim.formatter.conform-nvim = {
         enable = true;
-        setupOpts = {
-          formatters_by_ft.css = cfg.format.type;
-          formatters =
-            mapListToAttrs (name: {
-              inherit name;
-              value = formats.${name};
-            })
-            cfg.format.type;
+        setupOpts.formatters_by_ft.css = [cfg.format.type];
+        setupOpts.formatters.${cfg.format.type} = {
+          command = getExe cfg.format.package;
         };
       };
     })
diff --git a/modules/plugins/languages/cue.nix b/modules/plugins/languages/cue.nix
index a22ff91c..bd446cbf 100644
--- a/modules/plugins/languages/cue.nix
+++ b/modules/plugins/languages/cue.nix
@@ -4,17 +4,11 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption;
-  inherit (lib.meta) getExe;
+  inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.types) package;
   inherit (lib.nvim.types) mkGrammarOption;
 
-  lspOptions = {
-    cmd = [(getExe pkgs.cue) "lsp"];
-    filetypes = ["cue"];
-    root_markers = ["cue.mod" ".git"];
-  };
-
   cfg = config.vim.languages.cue;
 in {
   options.vim.languages.cue = {
@@ -28,6 +22,12 @@ in {
 
     lsp = {
       enable = mkEnableOption "CUE LSP support" // {default = config.vim.lsp.enable;};
+
+      package = mkOption {
+        type = package;
+        default = pkgs.cue;
+        description = "cue lsp implementation";
+      };
     };
   };
 
@@ -38,7 +38,14 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers.cue = lspOptions;
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.cue-lsp = ''
+        lspconfig.cue.setup {
+          capabilities = capabilities,
+          on_attach = default_on_attach,
+          cmd = {"${cfg.lsp.package}/bin/cue", "lsp"},
+        }
+      '';
     })
   ]);
 }
diff --git a/modules/plugins/languages/dart.nix b/modules/plugins/languages/dart.nix
index 291999c2..c2a1810d 100644
--- a/modules/plugins/languages/dart.nix
+++ b/modules/plugins/languages/dart.nix
@@ -6,38 +6,34 @@
 }: let
   inherit (builtins) attrNames;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.meta) getExe;
   inherit (lib.trivial) boolToString;
+  inherit (lib.lists) isList;
   inherit (lib.options) mkEnableOption mkOption;
-  inherit (lib.types) enum package nullOr str bool;
+  inherit (lib.types) enum either listOf package nullOr str bool;
   inherit (lib.strings) optionalString;
-  inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
+  inherit (lib.nvim.lua) expToLua;
+  inherit (lib.nvim.types) mkGrammarOption;
   inherit (lib.nvim.dag) entryAfter;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
 
   cfg = config.vim.languages.dart;
   ftcfg = cfg.flutter-tools;
 
-  defaultServers = ["dart"];
+  defaultServer = "dart";
   servers = {
     dart = {
-      enable = true;
-      cmd = [(getExe pkgs.dart) "language-server" "--protocol=lsp"];
-      filetypes = ["dart"];
-      root_markers = ["pubspec.yaml"];
-      init_options = {
-        onlyAnalyzeProjectsWithOpenFiles = true;
-        suggestFromUnimportedLibraries = true;
-        closingLabels = true;
-        outline = true;
-        flutterOutline = true;
-      };
-      settings = {
-        dart = {
-          completeFunctionCalls = true;
-          showTodos = true;
+      package = pkgs.dart;
+      lspConfig = ''
+        lspconfig.dartls.setup{
+          capabilities = capabilities;
+          on_attach=default_on_attach;
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''{"${cfg.lsp.package}/bin/dart", "language-server", "--protocol=lsp"}''
         };
-      };
+          ${optionalString (cfg.lsp.opts != null) "init_options = ${cfg.lsp.dartOpts}"}
+        }
+      '';
     };
   };
 in {
@@ -50,11 +46,23 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "Dart LSP support" // {default = config.vim.lsp.enable;};
-      servers = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.dart.lsp.servers" (enum (attrNames servers));
-        default = defaultServers;
-        description = "Dart LSP server to use";
+      enable = mkEnableOption "Dart LSP support";
+      server = mkOption {
+        description = "The Dart LSP server to use";
+        type = enum (attrNames servers);
+        default = defaultServer;
+      };
+      package = mkOption {
+        type = either package (listOf str);
+        default = servers.${cfg.lsp.server}.package;
+        example = ''[lib.getExe pkgs.jdt-language-server "-data" "~/.cache/jdtls/workspace"]'';
+        description = "Dart LSP server package, or the command to run as a list of strings";
+      };
+
+      opts = mkOption {
+        type = nullOr str;
+        default = null;
+        description = "Options to pass to Dart LSP server";
       };
     };
 
@@ -123,23 +131,19 @@ in {
     };
   };
 
-  config = mkIf cfg.enable (mkMerge [
+  config.vim = mkIf cfg.enable (mkMerge [
     (mkIf cfg.treesitter.enable {
-      vim.treesitter.enable = true;
-      vim.treesitter.grammars = [cfg.treesitter.package];
+      treesitter.enable = true;
+      treesitter.grammars = [cfg.treesitter.package];
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (n: {
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
+      lsp.lspconfig.enable = true;
+      lsp.lspconfig.sources.dart-lsp = servers.${cfg.lsp.server}.lspConfig;
     })
 
     (mkIf ftcfg.enable {
-      vim.startPlugins = [
+      startPlugins = [
         (
           if ftcfg.enableNoResolvePatch
           then "flutter-tools-patched"
@@ -148,7 +152,7 @@ in {
         "plenary-nvim"
       ];
 
-      vim.pluginRC.flutter-tools = entryAfter ["lsp-servers"] ''
+      pluginRC.flutter-tools = entryAfter ["lsp-setup"] ''
         require('flutter-tools').setup {
           ${optionalString (ftcfg.flutterPackage != null) "flutter_path = \"${ftcfg.flutterPackage}/bin/flutter\","}
           lsp = {
@@ -161,6 +165,7 @@ in {
             },
 
             capabilities = capabilities,
+            on_attach = default_on_attach;
           },
           ${optionalString cfg.dap.enable ''
           debugger = {
diff --git a/modules/plugins/languages/default.nix b/modules/plugins/languages/default.nix
index fd45758f..961d7cc5 100644
--- a/modules/plugins/languages/default.nix
+++ b/modules/plugins/languages/default.nix
@@ -21,7 +21,6 @@ in {
     ./html.nix
     ./haskell.nix
     ./java.nix
-    ./json.nix
     ./lua.nix
     ./markdown.nix
     ./nim.nix
@@ -30,7 +29,6 @@ in {
     ./ocaml.nix
     ./php.nix
     ./python.nix
-    ./qml.nix
     ./r.nix
     ./rust.nix
     ./scala.nix
@@ -48,7 +46,6 @@ in {
     ./wgsl.nix
     ./yaml.nix
     ./ruby.nix
-    ./just.nix
 
     # This is now a hard deprecation.
     (mkRenamedOptionModule ["vim" "languages" "enableLSP"] ["vim" "lsp" "enable"])
diff --git a/modules/plugins/languages/elixir.nix b/modules/plugins/languages/elixir.nix
index 0aa32453..241efd8e 100644
--- a/modules/plugins/languages/elixir.nix
+++ b/modules/plugins/languages/elixir.nix
@@ -7,43 +7,40 @@
   inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.meta) getExe;
-  inherit (lib.types) enum;
-  inherit (lib.generators) mkLuaInline;
-  inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
+  inherit (lib.lists) isList;
+  inherit (lib.types) enum either listOf package str;
+  inherit (lib.nvim.types) mkGrammarOption;
+  inherit (lib.nvim.lua) expToLua;
   inherit (lib.nvim.dag) entryAnywhere;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
 
   cfg = config.vim.languages.elixir;
 
-  defaultServers = ["elixirls"];
+  defaultServer = "elixirls";
   servers = {
     elixirls = {
-      enable = true;
-      cmd = [(getExe pkgs.elixir-ls)];
-      filetypes = ["elixir" "eelixir" "heex" "surface"];
-      root_dir =
-        mkLuaInline
-        /*
-        lua
-        */
-        ''
-          function(bufnr, on_dir)
-            local fname = vim.api.nvim_buf_get_name(bufnr)
-            local matches = vim.fs.find({ 'mix.exs' }, { upward = true, limit = 2, path = fname })
-            local child_or_root_path, maybe_umbrella_path = unpack(matches)
-            local root_dir = vim.fs.dirname(maybe_umbrella_path or child_or_root_path)
-
-            on_dir(root_dir)
-          end
-        '';
+      package = pkgs.elixir-ls;
+      lspConfig = ''
+        -- elixirls setup
+        lspconfig.elixirls.setup {
+          capabilities = capabilities,
+          on_attach = default_on_attach,
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''{"${cfg.lsp.package}/bin/elixir-ls"}''
+        }
+        }
+      '';
     };
   };
 
-  defaultFormat = ["mix"];
+  defaultFormat = "mix";
   formats = {
     mix = {
-      command = "${pkgs.elixir}/bin/mix";
+      package = pkgs.elixir;
+      config = {
+        command = "${cfg.format.package}/bin/mix";
+      };
     };
   };
 in {
@@ -53,16 +50,22 @@ in {
     treesitter = {
       enable = mkEnableOption "Elixir treesitter" // {default = config.vim.languages.enableTreesitter;};
       package = mkGrammarOption pkgs "elixir";
-      heexPackage = mkGrammarOption pkgs "heex";
-      eexPackage = mkGrammarOption pkgs "eex";
     };
 
     lsp = {
       enable = mkEnableOption "Elixir LSP support" // {default = config.vim.lsp.enable;};
-      servers = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.elixir.lsp.servers" (enum (attrNames servers));
-        default = defaultServers;
+
+      server = mkOption {
         description = "Elixir LSP server to use";
+        type = enum (attrNames servers);
+        default = defaultServer;
+      };
+
+      package = mkOption {
+        description = "Elixir LSP server package, or the command to run as a list of strings";
+        example = ''[lib.getExe pkgs.jdt-language-server " - data " " ~/.cache/jdtls/workspace "]'';
+        type = either package (listOf str);
+        default = servers.${cfg.lsp.server}.package;
       };
     };
 
@@ -70,9 +73,15 @@ in {
       enable = mkEnableOption "Elixir formatting" // {default = config.vim.languages.enableFormat;};
 
       type = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.elixir.format.type" (enum (attrNames formats));
-        default = defaultFormat;
         description = "Elixir formatter to use";
+        type = enum (attrNames formats);
+        default = defaultFormat;
+      };
+
+      package = mkOption {
+        description = "Elixir formatter package";
+        type = package;
+        default = formats.${cfg.format.type}.package;
       };
     };
 
@@ -84,34 +93,20 @@ in {
   config = mkIf cfg.enable (mkMerge [
     (mkIf cfg.treesitter.enable {
       vim.treesitter.enable = true;
-      vim.treesitter.grammars = [
-        cfg.treesitter.package
-        cfg.treesitter.heexPackage
-        cfg.treesitter.eexPackage
-      ];
+      vim.treesitter.grammars = [cfg.treesitter.package];
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (n: {
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.elixir-lsp = servers.${cfg.lsp.server}.lspConfig;
     })
 
     (mkIf cfg.format.enable {
       vim.formatter.conform-nvim = {
         enable = true;
-        setupOpts = {
-          formatters_by_ft.elixir = cfg.format.type;
-          formatters =
-            mapListToAttrs (name: {
-              inherit name;
-              value = formats.${name};
-            })
-            cfg.format.type;
-        };
+        setupOpts.formatters_by_ft.elixir = [cfg.format.type];
+        setupOpts.formatters.${cfg.format.type} =
+          formats.${cfg.format.type}.config;
       };
     })
 
diff --git a/modules/plugins/languages/fsharp.nix b/modules/plugins/languages/fsharp.nix
index 19703022..6ed0ccab 100644
--- a/modules/plugins/languages/fsharp.nix
+++ b/modules/plugins/languages/fsharp.nix
@@ -6,55 +6,36 @@
 }: let
   inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
-  inherit (lib.types) enum;
+  inherit (lib.types) either listOf package str enum;
   inherit (lib.meta) getExe;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.generators) mkLuaInline;
-  inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
+  inherit (lib.lists) isList;
+  inherit (lib.nvim.types) mkGrammarOption;
+  inherit (lib.nvim.lua) expToLua;
 
-  defaultServer = ["fsautocomplete"];
+  defaultServer = "fsautocomplete";
   servers = {
     fsautocomplete = {
-      cmd = [(getExe pkgs.fsautocomplete) "--adaptive-lsp-server-enabled"];
-      filetypes = ["fsharp"];
-      root_dir = mkLuaInline ''
-        function(bufnr, on_dir)
-          on_dir(vim.fs.root(bufnr, function(name, path)
-            return name == ".git" or name:match("%.sln$") or name:match("%.fsproj$")
-          end))
-        end
+      package = pkgs.fsautocomplete;
+      internalFormatter = false;
+      lspConfig = ''
+        lspconfig.fsautocomplete.setup {
+          capabilities = capabilities;
+          on_attach = default_on_attach;
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else "{'${cfg.lsp.package}/bin/fsautocomplete'}"
+        },
+        }
       '';
-      init_options = {
-        AutomaticWorkspaceInit = true;
-      };
-      settings = {
-        FSharp = {
-          keywordsAutocomplete = true;
-          ExternalAutocomplete = false;
-          Linter = true;
-          UnionCaseStubGeneration = true;
-          UnionCaseStubGenerationBody = ''failwith "Not Implemented"'';
-          RecordStubGeneration = true;
-          RecordStubGenerationBody = ''failwith "Not Implemented"'';
-          InterfaceStubGeneration = true;
-          InterfaceStubGenerationObjectIdentifier = "this";
-          InterfaceStubGenerationMethodBody = ''failwith "Not Implemented"'';
-          UnusedOpensAnalyzer = true;
-          UnusedDeclarationsAnalyzer = true;
-          UseSdkScripts = true;
-          SimplifyNameAnalyzer = true;
-          ResolveNamespaces = true;
-          EnableReferenceCodeLens = true;
-        };
-      };
     };
   };
 
-  defaultFormat = ["fantomas"];
+  defaultFormat = "fantomas";
   formats = {
     fantomas = {
-      command = getExe pkgs.fantomas;
+      package = pkgs.fantomas;
     };
   };
 
@@ -71,20 +52,33 @@ in {
 
       lsp = {
         enable = mkEnableOption "F# LSP support" // {default = config.vim.lsp.enable;};
-        servers = mkOption {
-          type = deprecatedSingleOrListOf "vim.language.fsharp.lsp.servers" (enum (attrNames servers));
+        server = mkOption {
+          type = enum (attrNames servers);
           default = defaultServer;
           description = "F# LSP server to use";
         };
+
+        package = mkOption {
+          type = either package (listOf str);
+          default = servers.${cfg.lsp.server}.package;
+          example = ''[lib.getExe pkgs.fsautocomplete "--state-directory" "~/.cache/fsautocomplete"]'';
+          description = "F# LSP server package, or the command to run as a list of strings";
+        };
       };
       format = {
         enable = mkEnableOption "F# formatting" // {default = config.vim.languages.enableFormat;};
 
         type = mkOption {
-          type = deprecatedSingleOrListOf "vim.language.fsharp.format.type" (enum (attrNames formats));
+          type = enum (attrNames formats);
           default = defaultFormat;
           description = "F# formatter to use";
         };
+
+        package = mkOption {
+          type = package;
+          default = formats.${cfg.format.type}.package;
+          description = "F# formatter package";
+        };
       };
     };
   };
@@ -96,25 +90,16 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (name: {
-          inherit name;
-          value = servers.${name};
-        })
-        cfg.lsp.servers;
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.fsharp-lsp = servers.${cfg.lsp.server}.lspConfig;
     })
 
     (mkIf cfg.format.enable {
       vim.formatter.conform-nvim = {
         enable = true;
-        setupOpts = {
-          formatters_by_ft.fsharp = cfg.format.type;
-          formatters =
-            mapListToAttrs (name: {
-              inherit name;
-              value = formats.${name};
-            })
-            cfg.format.type;
+        setupOpts.formatters_by_ft.fsharp = [cfg.format.type];
+        setupOpts.formatters.${cfg.format.type} = {
+          command = getExe cfg.format.package;
         };
       };
     })
diff --git a/modules/plugins/languages/gleam.nix b/modules/plugins/languages/gleam.nix
index 349d9ac1..272ef51e 100644
--- a/modules/plugins/languages/gleam.nix
+++ b/modules/plugins/languages/gleam.nix
@@ -7,20 +7,28 @@
   inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.meta) getExe;
-  inherit (lib.types) enum;
-  inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
+  inherit (lib.lists) isList;
+  inherit (lib.types) enum either listOf package str;
+  inherit (lib.nvim.lua) expToLua;
+  inherit (lib.nvim.types) mkGrammarOption;
 
   cfg = config.vim.languages.gleam;
 
-  defaultServers = ["gleam"];
+  defaultServer = "gleam";
   servers = {
     gleam = {
-      enable = true;
-      cmd = [(getExe pkgs.gleam) "lsp"];
-      filetypes = ["gleam"];
-      root_markers = ["gleam.toml" ".git"];
+      package = pkgs.gleam;
+      lspConfig = ''
+        lspconfig.gleam.setup{
+          capabilities = capabilities,
+          on_attach = default_on_attach,
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''{"${cfg.lsp.package}/bin/gleam", "lsp"}''
+        }
+        }
+      '';
     };
   };
 in {
@@ -34,11 +42,18 @@ in {
 
     lsp = {
       enable = mkEnableOption "Gleam LSP support" // {default = config.vim.lsp.enable;};
-      servers = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.gleam.lsp.servers" (enum (attrNames servers));
-        default = defaultServers;
+
+      server = mkOption {
+        type = enum (attrNames servers);
+        default = defaultServer;
         description = "Gleam LSP server to use";
       };
+
+      package = mkOption {
+        type = either package (listOf str);
+        default = servers.${cfg.lsp.server}.package;
+        description = "Gleam LSP server package, or the command to run as a list of strings";
+      };
     };
   };
 
@@ -49,12 +64,8 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (n: {
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.gleam-lsp = servers.${cfg.lsp.server}.lspConfig;
     })
   ]);
 }
diff --git a/modules/plugins/languages/go.nix b/modules/plugins/languages/go.nix
index c51077f9..bab0ff4a 100644
--- a/modules/plugins/languages/go.nix
+++ b/modules/plugins/languages/go.nix
@@ -8,67 +8,45 @@
   inherit (lib.options) mkEnableOption mkOption literalMD;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.meta) getExe;
-  inherit (lib.generators) mkLuaInline;
-  inherit (lib.types) bool enum package;
-  inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
+  inherit (lib.lists) isList;
+  inherit (lib.types) bool enum either listOf package str;
+  inherit (lib.nvim.types) mkGrammarOption;
+  inherit (lib.nvim.lua) expToLua;
   inherit (lib.nvim.dag) entryAfter;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
 
   cfg = config.vim.languages.go;
 
-  defaultServers = ["gopls"];
+  defaultServer = "gopls";
   servers = {
     gopls = {
-      cmd = [(getExe pkgs.gopls)];
-      filetypes = ["go" "gomod" "gowork" "gotmpl"];
-      root_dir = mkLuaInline ''
-        function(bufnr, on_dir)
-          local fname = vim.api.nvim_buf_get_name(bufnr)
-
-          local function get_root(fname)
-            if _G.nvf_gopls_mod_cache and fname:sub(1, #_G.nvf_gopls_mod_cache) == _G.nvf_gopls_mod_cache then
-              local clients = vim.lsp.get_clients { name = 'gopls' }
-              if #clients > 0 then
-                return clients[#clients].config.root_dir
-              end
-            end
-            return vim.fs.root(fname, 'go.work') or vim.fs.root(fname, 'go.mod') or vim.fs.root(fname, '.git')
-          end
-
-          -- see: https://github.com/neovim/nvim-lspconfig/issues/804
-          if _G.nvf_gopls_mod_cache then
-            on_dir(get_root(fname))
-            return
-          end
-          local cmd = { 'go', 'env', 'GOMODCACHE' }
-          local ok, err = pcall(vim.system, cmd, { text = true }, function(output)
-            if output.code == 0 then
-              if output.stdout then
-                _G.nvf_gopls_mod_cache = vim.trim(output.stdout)
-              end
-              on_dir(get_root(fname))
-            else
-              vim.schedule(function()
-                vim.notify(('[gopls] cmd failed with code %d: %s\n%s'):format(output.code, cmd, output.stderr))
-              end)
-            end
-          end)
-          if not ok then vim.notify(('[gopls] cmd failed: %s\n%s'):format(cmd, err)) end
-        end
+      package = pkgs.gopls;
+      lspConfig = ''
+        lspconfig.gopls.setup {
+          capabilities = capabilities;
+          on_attach = default_on_attach;
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''{"${cfg.lsp.package}/bin/gopls", "serve"}''
+        },
+        }
       '';
     };
   };
 
-  defaultFormat = ["gofmt"];
+  defaultFormat = "gofmt";
   formats = {
     gofmt = {
-      command = "${pkgs.go}/bin/gofmt";
+      package = pkgs.go;
+      config.command = "${cfg.format.package}/bin/gofmt";
     };
     gofumpt = {
-      command = getExe pkgs.gofumpt;
+      package = pkgs.gofumpt;
+      config.command = getExe cfg.format.package;
     };
     golines = {
-      command = "${pkgs.golines}/bin/golines";
+      package = pkgs.golines;
+      config.command = "${cfg.format.package}/bin/golines";
     };
   };
 
@@ -91,10 +69,17 @@ in {
     lsp = {
       enable = mkEnableOption "Go LSP support" // {default = config.vim.lsp.enable;};
 
-      servers = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.go.lsp.servers" (enum (attrNames servers));
-        default = defaultServers;
+      server = mkOption {
         description = "Go LSP server to use";
+        type = enum (attrNames servers);
+        default = defaultServer;
+      };
+
+      package = mkOption {
+        description = "Go LSP server package, or the command to run as a list of strings";
+        example = ''[lib.getExe pkgs.jdt-language-server " - data " " ~/.cache/jdtls/workspace "]'';
+        type = either package (listOf str);
+        default = servers.${cfg.lsp.server}.package;
       };
     };
 
@@ -110,9 +95,15 @@ in {
 
       type = mkOption {
         description = "Go formatter to use";
-        type = deprecatedSingleOrListOf "vim.language.go.format.type" (enum (attrNames formats));
+        type = enum (attrNames formats);
         default = defaultFormat;
       };
+
+      package = mkOption {
+        description = "Go formatter package";
+        type = package;
+        default = formats.${cfg.format.type}.package;
+      };
     };
 
     dap = {
@@ -143,26 +134,15 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (name: {
-          inherit name;
-          value = servers.${name};
-        })
-        cfg.lsp.servers;
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.go-lsp = servers.${cfg.lsp.server}.lspConfig;
     })
 
     (mkIf cfg.format.enable {
       vim.formatter.conform-nvim = {
         enable = true;
-        setupOpts = {
-          formatters_by_ft.go = cfg.format.type;
-          formatters =
-            mapListToAttrs (name: {
-              inherit name;
-              value = formats.${name};
-            })
-            cfg.format.type;
-        };
+        setupOpts.formatters_by_ft.go = [cfg.format.type];
+        setupOpts.formatters.${cfg.format.type} = formats.${cfg.format.type}.config;
       };
     })
 
diff --git a/modules/plugins/languages/haskell.nix b/modules/plugins/languages/haskell.nix
index ac18fe55..f50c9f09 100644
--- a/modules/plugins/languages/haskell.nix
+++ b/modules/plugins/languages/haskell.nix
@@ -4,64 +4,17 @@
   pkgs,
   ...
 }: let
-  inherit (builtins) isList attrNames;
-  inherit (lib.types) either package enum listOf str;
+  inherit (builtins) isList;
+  inherit (lib.types) either package listOf str;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.strings) optionalString;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.nvim.types) mkGrammarOption;
   inherit (lib.nvim.dag) entryAfter;
-  inherit (lib.nvim.lua) toLuaObject;
-  inherit (lib.meta) getExe';
-  inherit (lib.generators) mkLuaInline;
+  inherit (lib.nvim.lua) expToLua;
   inherit (pkgs) haskellPackages;
 
   cfg = config.vim.languages.haskell;
-
-  defaultServers = ["hls"];
-  servers = {
-    hls = {
-      enable = false;
-      cmd = [(getExe' pkgs.haskellPackages.haskell-language-server "haskell-language-server-wrapper") "--lsp"];
-      filetypes = ["haskell" "lhaskell"];
-      on_attach =
-        mkLuaInline
-        /*
-        lua
-        */
-        ''
-          function(client, bufnr)
-              local ht = require("haskell-tools")
-              local opts = { noremap = true, silent = true, buffer = bufnr }
-              vim.keymap.set('n', '<localleader>cl', vim.lsp.codelens.run, opts)
-              vim.keymap.set('n', '<localleader>hs', ht.hoogle.hoogle_signature, opts)
-              vim.keymap.set('n', '<localleader>ea', ht.lsp.buf_eval_all, opts)
-              vim.keymap.set('n', '<localleader>rr', ht.repl.toggle, opts)
-              vim.keymap.set('n', '<localleader>rf', function()
-                ht.repl.toggle(vim.api.nvim_buf_get_name(0))
-              end, opts)
-              vim.keymap.set('n', '<localleader>rq', ht.repl.quit, opts)
-            end
-        '';
-      root_dir =
-        mkLuaInline
-        /*
-        lua
-        */
-        ''
-          function(bufnr, on_dir)
-            local fname = vim.api.nvim_buf_get_name(bufnr)
-            on_dir(util.root_pattern('hie.yaml', 'stack.yaml', 'cabal.project', '*.cabal', 'package.yaml')(fname))
-          end
-        '';
-      settings = {
-        haskell = {
-          formattingProvider = "ormolu";
-          cabalFormattingProvider = "cabalfmt";
-        };
-      };
-    };
-  };
 in {
   options.vim.languages.haskell = {
     enable = mkEnableOption "Haskell support";
@@ -72,20 +25,21 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "Haskell LSP support" // {default = config.vim.lsp.enable;};
-      servers = mkOption {
-        type = listOf (enum (attrNames servers));
-        default = defaultServers;
-        description = "Haskell LSP server to use";
+      enable = mkEnableOption "LSP support for Haskell" // {default = config.vim.lsp.enable;};
+      package = mkOption {
+        description = "Haskell LSP package or command to run the Haskell LSP";
+        example = ''[ (lib.getExe pkgs.haskellPackages.haskell-language-server) "--debug" ]'';
+        default = haskellPackages.haskell-language-server;
+        type = either package (listOf str);
       };
     };
 
     dap = {
       enable = mkEnableOption "DAP support for Haskell" // {default = config.vim.languages.enableDAP;};
       package = mkOption {
+        description = "Haskell DAP package or command to run the Haskell DAP";
         default = haskellPackages.haskell-debug-adapter;
         type = either package (listOf str);
-        description = "Haskell DAP package or command to run the Haskell DAP";
       };
     };
   };
@@ -103,7 +57,7 @@ in {
         startPlugins = ["haskell-tools-nvim"];
         luaConfigRC.haskell-tools-nvim =
           entryAfter
-          ["lsp-servers"]
+          ["lsp-setup"]
           ''
             vim.g.haskell_tools = {
             ${optionalString cfg.lsp.enable ''
@@ -113,13 +67,31 @@ in {
                   enable = true,
                 },
               },
-              hls = ${toLuaObject servers.hls},
+              hls = {
+                cmd = ${
+                if isList cfg.lsp.package
+                then expToLua cfg.lsp.package
+                else ''{"${cfg.lsp.package}/bin/haskell-language-server-wrapper", "--lsp"}''
+              },
+                on_attach = function(client, bufnr, ht)
+                  default_on_attach(client, bufnr, ht)
+                  local opts = { noremap = true, silent = true, buffer = bufnr }
+                  vim.keymap.set('n', '<localleader>cl', vim.lsp.codelens.run, opts)
+                  vim.keymap.set('n', '<localleader>hs', ht.hoogle.hoogle_signature, opts)
+                  vim.keymap.set('n', '<localleader>ea', ht.lsp.buf_eval_all, opts)
+                  vim.keymap.set('n', '<localleader>rr', ht.repl.toggle, opts)
+                  vim.keymap.set('n', '<localleader>rf', function()
+                    ht.repl.toggle(vim.api.nvim_buf_get_name(0))
+                  end, opts)
+                  vim.keymap.set('n', '<localleader>rq', ht.repl.quit, opts)
+                end,
+              },
             ''}
             ${optionalString cfg.dap.enable ''
               dap = {
                 cmd = ${
                 if isList cfg.dap.package
-                then toLuaObject cfg.dap.package
+                then expToLua cfg.dap.package
                 else ''{"${cfg.dap.package}/bin/haskell-debug-adapter"}''
               },
               },
diff --git a/modules/plugins/languages/hcl.nix b/modules/plugins/languages/hcl.nix
index e32719b9..e702170c 100644
--- a/modules/plugins/languages/hcl.nix
+++ b/modules/plugins/languages/hcl.nix
@@ -8,26 +8,29 @@
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.meta) getExe;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.types) bool enum listOf;
-  inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
+  inherit (lib.types) package bool enum;
+  inherit (lib.nvim.types) mkGrammarOption;
 
   cfg = config.vim.languages.hcl;
 
-  defaultServers = ["terraform-ls"];
+  defaultServer = "terraform-ls";
   servers = {
     terraform-ls = {
-      enable = true;
-      cmd = [(getExe pkgs.terraform-ls) "serve"];
-      filetypes = ["terraform" "terraform-vars"];
-      root_markers = [".terraform" ".git"];
+      package = pkgs.terraform-ls;
+      lspConfig = ''
+        lspconfig.terraformls.setup {
+          capabilities = capabilities,
+          on_attach=default_on_attach,
+          cmd = {"${lib.getExe cfg.lsp.package}", "serve"},
+        }
+      '';
     };
   };
 
-  defaultFormat = ["hclfmt"];
+  defaultFormat = "hclfmt";
   formats = {
     hclfmt = {
-      command = getExe pkgs.hclfmt;
+      package = pkgs.hclfmt;
     };
   };
 in {
@@ -40,11 +43,12 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "HCL LSP support" // {default = config.vim.lsp.enable;};
-      servers = mkOption {
-        type = listOf (enum (attrNames servers));
-        default = defaultServers;
-        description = "HCL LSP server to use";
+      enable = mkEnableOption "HCL LSP support (terraform-ls)" // {default = config.vim.lsp.enable;};
+      # TODO: (maybe, is it better?) it would be cooler to use vscode-extensions.hashicorp.hcl probably, shouldn't be too hard
+      package = mkOption {
+        type = package;
+        default = servers.${defaultServer}.package;
+        description = "HCL language server package (terraform-ls)";
       };
     };
 
@@ -55,10 +59,15 @@ in {
         description = "Enable HCL formatting";
       };
       type = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.hcl.format.type" (enum (attrNames formats));
+        type = enum (attrNames formats);
         default = defaultFormat;
         description = "HCL formatter to use";
       };
+      package = mkOption {
+        type = package;
+        default = formats.${cfg.format.type}.package;
+        description = "HCL formatter package";
+      };
     };
   };
 
@@ -87,25 +96,18 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (n: {
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources = lib.optionalAttrs (! config.vim.languages.terraform.lsp.enable) {
+        terraform-ls = servers.${cfg.lsp.server}.lspConfig;
+      };
     })
 
     (mkIf cfg.format.enable {
       vim.formatter.conform-nvim = {
         enable = true;
-        setupOpts = {
-          formatters_by_ft.hcl = cfg.format.type;
-          formatters =
-            mapListToAttrs (name: {
-              inherit name;
-              value = formats.${name};
-            })
-            cfg.format.type;
+        setupOpts.formatters_by_ft.hcl = [cfg.format.type];
+        setupOpts.formatters.${cfg.format.type} = {
+          command = getExe cfg.format.package;
         };
       };
     })
diff --git a/modules/plugins/languages/helm.nix b/modules/plugins/languages/helm.nix
index 18b09722..ffe115c9 100644
--- a/modules/plugins/languages/helm.nix
+++ b/modules/plugins/languages/helm.nix
@@ -4,39 +4,44 @@
   lib,
   ...
 }: let
-  inherit (builtins) attrNames head;
+  inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
-  inherit (lib.modules) mkDefault mkIf mkMerge;
-  inherit (lib.meta) getExe;
-  inherit (lib.types) enum;
-  inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
+  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.lists) isList;
+  inherit (lib.types) enum either listOf package str;
+  inherit (lib.nvim.types) mkGrammarOption;
+  inherit (lib.nvim.lua) expToLua;
 
   cfg = config.vim.languages.helm;
   yamlCfg = config.vim.languages.yaml;
 
-  defaultServers = ["helm-ls"];
+  helmCmd =
+    if isList cfg.lsp.package
+    then cfg.lsp.package
+    else ["${cfg.lsp.package}/bin/helm_ls" "serve"];
+  yamlCmd =
+    if isList yamlCfg.lsp.package
+    then builtins.elemAt yamlCfg.lsp.package 0
+    else "${yamlCfg.lsp.package}/bin/yaml-language-server";
+
+  defaultServer = "helm-ls";
   servers = {
     helm-ls = {
-      enable = true;
-      cmd = [(getExe pkgs.helm-ls) "serve"];
-      filetypes = ["helm" "yaml.helm-values"];
-      root_markers = ["Chart.yaml"];
-      capabilities = {
-        didChangeWatchedFiles = {
-          dynamicRegistration = true;
-        };
-      };
-      settings = mkIf (yamlCfg.enable && yamlCfg.lsp.enable) {
-        helm-ls = {
-          yamlls = {
-            # Without this being enabled, the YAML language module will look broken in helmfiles
-            # if both modules are enabled at once.
-            enabled = mkDefault yamlCfg.lsp.enable;
-            path = head config.vim.lsp.servers.${head yamlCfg.lsp.servers}.cmd;
-          };
-        };
-      };
+      package = pkgs.helm-ls;
+      lspConfig = ''
+        lspconfig.helm_ls.setup {
+          capabilities = capabilities,
+          on_attach = default_on_attach,
+          cmd = ${expToLua helmCmd},
+          settings = {
+            ['helm-ls'] = {
+              yamlls = {
+                  path = "${yamlCmd}"
+              }
+            }
+          }
+        }
+      '';
     };
   };
 in {
@@ -50,10 +55,17 @@ in {
 
     lsp = {
       enable = mkEnableOption "Helm LSP support" // {default = config.vim.lsp.enable;};
-      servers = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.helm.lsp.servers" (enum (attrNames servers));
-        default = defaultServers;
+
+      server = mkOption {
         description = "Helm LSP server to use";
+        type = enum (attrNames servers);
+        default = defaultServer;
+      };
+
+      package = mkOption {
+        description = "Helm LSP server package";
+        type = either package (listOf str);
+        default = servers.${cfg.lsp.server}.package;
       };
     };
   };
@@ -65,12 +77,8 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (n: {
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.helm-lsp = servers.${cfg.lsp.server}.lspConfig;
     })
 
     {
diff --git a/modules/plugins/languages/html.nix b/modules/plugins/languages/html.nix
index 85918ad2..0bef2767 100644
--- a/modules/plugins/languages/html.nix
+++ b/modules/plugins/languages/html.nix
@@ -4,46 +4,14 @@
   lib,
   ...
 }: let
-  inherit (builtins) attrNames;
-  inherit (lib.meta) getExe;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.types) bool enum;
+  inherit (lib.types) bool;
   inherit (lib.lists) optional;
-  inherit (lib.nvim.types) mkGrammarOption diagnostics deprecatedSingleOrListOf;
+  inherit (lib.nvim.types) mkGrammarOption;
   inherit (lib.nvim.dag) entryAnywhere;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
 
   cfg = config.vim.languages.html;
-
-  defaultServers = ["superhtml"];
-  servers = {
-    superhtml = {
-      cmd = [(getExe pkgs.superhtml) "lsp"];
-      filetypes = ["html" "shtml" "htm"];
-      root_markers = ["index.html" ".git"];
-    };
-    emmet-ls = {
-      cmd = [(getExe pkgs.emmet-ls) "--stdio"];
-      filetypes = ["html" "shtml" "htm"];
-      root_markers = ["index.html" ".git"];
-    };
-  };
-
-  defaultFormat = ["superhtml"];
-  formats = {
-    superhtml = {
-      command = "${pkgs.superhtml}/bin/superhtml";
-      args = ["fmt" "-"];
-    };
-  };
-
-  defaultDiagnosticsProvider = ["htmlhint"];
-  diagnosticsProviders = {
-    htmlhint = {
-      config.cmd = getExe pkgs.htmlhint;
-    };
-  };
 in {
   options.vim.languages.html = {
     enable = mkEnableOption "HTML language support";
@@ -51,38 +19,9 @@ in {
       enable = mkEnableOption "HTML treesitter support" // {default = config.vim.languages.enableTreesitter;};
       package = mkGrammarOption pkgs "html";
       autotagHtml = mkOption {
+        description = "Enable autoclose/autorename of html tags (nvim-ts-autotag)";
         type = bool;
         default = true;
-        description = "Enable autoclose/autorename of html tags (nvim-ts-autotag)";
-      };
-    };
-
-    lsp = {
-      enable = mkEnableOption "HTML LSP support" // {default = config.vim.lsp.enable;};
-      servers = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.html.lsp.servers" (enum (attrNames servers));
-        default = defaultServers;
-        description = "HTML LSP server to use";
-      };
-    };
-
-    format = {
-      enable = mkEnableOption "HTML formatting" // {default = config.vim.languages.enableFormat;};
-
-      type = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.html.format.type" (enum (attrNames formats));
-        default = defaultFormat;
-        description = "HTML formatter to use";
-      };
-    };
-
-    extraDiagnostics = {
-      enable = mkEnableOption "extra HTML diagnostics" // {default = config.vim.languages.enableExtraDiagnostics;};
-
-      types = diagnostics {
-        langDesc = "HTML";
-        inherit diagnosticsProviders;
-        inherit defaultDiagnosticsProvider;
       };
     };
   };
@@ -102,40 +41,5 @@ in {
         '');
       };
     })
-
-    (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (n: {
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
-    })
-
-    (mkIf (cfg.format.enable && !cfg.lsp.enable) {
-      vim.formatter.conform-nvim = {
-        enable = true;
-        setupOpts = {
-          formatters_by_ft.html = cfg.format.type;
-          formatters =
-            mapListToAttrs (name: {
-              inherit name;
-              value = formats.${name};
-            })
-            cfg.format.type;
-        };
-      };
-    })
-
-    (mkIf cfg.extraDiagnostics.enable {
-      vim.diagnostics.nvim-lint = {
-        enable = true;
-        linters_by_ft.html = cfg.extraDiagnostics.types;
-        linters = mkMerge (map (name: {
-            ${name} = diagnosticsProviders.${name}.config;
-          })
-          cfg.extraDiagnostics.types);
-      };
-    })
   ]);
 }
diff --git a/modules/plugins/languages/java.nix b/modules/plugins/languages/java.nix
index 82fae184..2e26feea 100644
--- a/modules/plugins/languages/java.nix
+++ b/modules/plugins/languages/java.nix
@@ -7,59 +7,12 @@
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.meta) getExe;
-  inherit (builtins) attrNames;
-  inherit (lib.types) listOf enum;
+  inherit (lib.lists) isList;
+  inherit (lib.types) either listOf package str;
   inherit (lib.nvim.types) mkGrammarOption;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
-  inherit (lib.nvim.dag) entryBefore;
-  inherit (lib.generators) mkLuaInline;
+  inherit (lib.nvim.lua) expToLua;
 
   cfg = config.vim.languages.java;
-
-  defaultServers = ["jdtls"];
-  servers = {
-    jdtls = {
-      enable = true;
-      cmd =
-        mkLuaInline
-        /*
-        lua
-        */
-        ''
-          {
-            '${getExe pkgs.jdt-language-server}',
-            '-configuration',
-            get_jdtls_config_dir(),
-            '-data',
-            get_jdtls_workspace_dir(),
-            get_jdtls_jvm_args(),
-          }
-        '';
-      filetypes = ["java"];
-      root_markers = [
-        # Multi-module projects
-        ".git"
-        "build.gradle"
-        "build.gradle.kts"
-        # Single-module projects
-        "build.xml" # Ant
-        "pom.xml" # Maven
-        "settings.gradle" # Gradle
-        "settings.gradle.kts" # Gradle
-      ];
-      init_options = {
-        workspace = mkLuaInline "get_jdtls_workspace_dir()";
-        jvm_args = {};
-        os_config = mkLuaInline "nil";
-      };
-      handlers = {
-        "textDocument/codeAction" = mkLuaInline "jdtls_on_textdocument_codeaction";
-        "textDocument/rename" = mkLuaInline "jdtls_on_textdocument_rename";
-        "workspace/applyEdit" = mkLuaInline "jdtls_on_workspace_applyedit";
-        "language/status" = mkLuaInline "vim.schedule_wrap(jdtls_on_language_status)";
-      };
-    };
-  };
 in {
   options.vim.languages.java = {
     enable = mkEnableOption "Java language support";
@@ -70,107 +23,30 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "Java LSP support" // {default = config.vim.lsp.enable;};
-      servers = mkOption {
-        type = listOf (enum (attrNames servers));
-        default = defaultServers;
-        description = "Java LSP server to use";
+      enable = mkEnableOption "Java LSP support (java-language-server)" // {default = config.vim.lsp.enable;};
+      package = mkOption {
+        description = "java language server package, or the command to run as a list of strings";
+        example = ''[lib.getExe pkgs.jdt-language-server "-data" "~/.cache/jdtls/workspace"]'';
+        type = either package (listOf str);
+        default = pkgs.jdt-language-server;
       };
     };
   };
 
   config = mkIf cfg.enable (mkMerge [
     (mkIf cfg.lsp.enable {
-      vim.luaConfigRC.jdtls-util =
-        entryBefore ["lsp-servers"]
-        /*
-        lua
-        */
-        ''
-          local jdtls_handlers = require 'vim.lsp.handlers'
-
-          local jdtls_env = {
-            HOME = vim.uv.os_homedir(),
-            XDG_CACHE_HOME = os.getenv 'XDG_CACHE_HOME',
-            JDTLS_JVM_ARGS = os.getenv 'JDTLS_JVM_ARGS',
-          }
-
-          local function get_cache_dir()
-            return jdtls_env.XDG_CACHE_HOME and jdtls_env.XDG_CACHE_HOME or jdtls_env.HOME .. '/.cache'
-          end
-
-          local function get_jdtls_cache_dir()
-            return get_cache_dir() .. '/jdtls'
-          end
-
-          local function get_jdtls_config_dir()
-            return get_jdtls_cache_dir() .. '/config'
-          end
-
-          local function get_jdtls_workspace_dir()
-            return get_jdtls_cache_dir() .. '/workspace'
-          end
-
-          local function get_jdtls_jvm_args()
-            local args = {}
-            for a in string.gmatch((jdtls_env.JDTLS_JVM_ARGS or '''), '%S+') do
-              local arg = string.format('--jvm-arg=%s', a)
-              table.insert(args, arg)
-            end
-            return unpack(args)
-          end
-
-          -- TextDocument version is reported as 0, override with nil so that
-          -- the client doesn't think the document is newer and refuses to update
-          -- See: https://github.com/eclipse/eclipse.jdt.ls/issues/1695
-          local function jdtls_fix_zero_version(workspace_edit)
-            if workspace_edit and workspace_edit.documentChanges then
-              for _, change in pairs(workspace_edit.documentChanges) do
-                local text_document = change.textDocument
-                if text_document and text_document.version and text_document.version == 0 then
-                  text_document.version = nil
-                end
-              end
-            end
-            return workspace_edit
-          end
-
-          local function jdtls_on_textdocument_codeaction(err, actions, ctx)
-            for _, action in ipairs(actions) do
-              -- TODO: (steelsojka) Handle more than one edit?
-              if action.command == 'java.apply.workspaceEdit' then -- 'action' is Command in java format
-                action.edit = jdtls_fix_zero_version(action.edit or action.arguments[1])
-              elseif type(action.command) == 'table' and action.command.command == 'java.apply.workspaceEdit' then -- 'action' is CodeAction in java format
-                action.edit = jdtls_fix_zero_version(action.edit or action.command.arguments[1])
-              end
-            end
-
-            jdtls_handlers[ctx.method](err, actions, ctx)
-          end
-
-          local function jdtls_on_textdocument_rename(err, workspace_edit, ctx)
-            jdtls_handlers[ctx.method](err, jdtls_fix_zero_version(workspace_edit), ctx)
-          end
-
-          local function jdtls_on_workspace_applyedit(err, workspace_edit, ctx)
-            jdtls_handlers[ctx.method](err, jdtls_fix_zero_version(workspace_edit), ctx)
-          end
-
-          -- Non-standard notification that can be used to display progress
-          local function jdtls_on_language_status(_, result)
-            local command = vim.api.nvim_command
-            command 'echohl ModeMsg'
-            command(string.format('echo "%s"', result.message))
-            command 'echohl None'
-          end
-        '';
-
-      vim.lsp.servers =
-        mapListToAttrs (n: {
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.jdtls = ''
+        lspconfig.jdtls.setup {
+          capabilities = capabilities,
+          on_attach = default_on_attach,
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''{"${getExe cfg.lsp.package}", "-data", vim.fn.stdpath("cache").."/jdtls/workspace"}''
+        },
+        }
+      '';
     })
 
     (mkIf cfg.treesitter.enable {
diff --git a/modules/plugins/languages/json.nix b/modules/plugins/languages/json.nix
deleted file mode 100644
index c928d3c5..00000000
--- a/modules/plugins/languages/json.nix
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: let
-  inherit (builtins) attrNames;
-  inherit (lib.options) mkOption mkEnableOption;
-  inherit (lib.meta) getExe' getExe;
-  inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.types) enum;
-  inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
-
-  cfg = config.vim.languages.json;
-
-  defaultServers = ["jsonls"];
-  servers = {
-    jsonls = {
-      cmd = [(getExe' pkgs.vscode-langservers-extracted "vscode-json-language-server") "--stdio"];
-      filetypes = ["json" "jsonc"];
-      init_options = {provideFormatter = true;};
-      root_markers = [".git"];
-    };
-  };
-
-  defaultFormat = ["jsonfmt"];
-
-  formats = {
-    jsonfmt = {
-      command = getExe pkgs.jsonfmt;
-      args = ["-w" "-"];
-    };
-  };
-in {
-  options.vim.languages.json = {
-    enable = mkEnableOption "JSON language support";
-
-    treesitter = {
-      enable = mkEnableOption "JSON treesitter" // {default = config.vim.languages.enableTreesitter;};
-
-      package = mkGrammarOption pkgs "json";
-    };
-
-    lsp = {
-      enable = mkEnableOption "JSON LSP support" // {default = config.vim.lsp.enable;};
-
-      servers = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.json.lsp.servers" (enum (attrNames servers));
-        default = defaultServers;
-        description = "JSON LSP server to use";
-      };
-    };
-
-    format = {
-      enable = mkEnableOption "JSON formatting" // {default = config.vim.languages.enableFormat;};
-
-      type = mkOption {
-        description = "JSON formatter to use";
-        type = deprecatedSingleOrListOf "vim.language.json.format.type" (enum (attrNames formats));
-        default = defaultFormat;
-      };
-    };
-  };
-
-  config = mkIf cfg.enable (mkMerge [
-    (mkIf cfg.treesitter.enable {
-      vim.treesitter.enable = true;
-      vim.treesitter.grammars = [cfg.treesitter.package];
-    })
-
-    (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (name: {
-          inherit name;
-          value = servers.${name};
-        })
-        cfg.lsp.servers;
-    })
-
-    (mkIf cfg.format.enable {
-      vim.formatter.conform-nvim = {
-        enable = true;
-        setupOpts = {
-          formatters_by_ft.json = cfg.format.type;
-          formatters =
-            mapListToAttrs (name: {
-              inherit name;
-              value = formats.${name};
-            })
-            cfg.format.type;
-        };
-      };
-    })
-  ]);
-}
diff --git a/modules/plugins/languages/julia.nix b/modules/plugins/languages/julia.nix
index 971e9f03..8c48b070 100644
--- a/modules/plugins/languages/julia.nix
+++ b/modules/plugins/languages/julia.nix
@@ -4,82 +4,63 @@
   config,
   ...
 }: let
-  inherit (builtins) attrNames;
+  inherit (builtins) attrNames isList;
   inherit (lib.options) mkEnableOption mkOption;
-  inherit (lib.types) enum;
+  inherit (lib.types) either listOf package str enum bool nullOr;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.meta) getExe;
-  inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
-  inherit (lib.generators) mkLuaInline;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
-  inherit (lib.nvim.dag) entryBefore;
+  inherit (lib.strings) optionalString;
+  inherit (lib.nvim.types) mkGrammarOption;
+  inherit (lib.nvim.lua) expToLua;
 
-  defaultServers = ["julials"];
+  defaultServer = "julials";
   servers = {
     julials = {
-      enable = true;
-      cmd =
-        mkLuaInline
-        /*
-        lua
-        */
-        ''
-          {
-            '${getExe (pkgs.julia.withPackages ["LanguageServer"])}',
-            '--startup-file=no',
-            '--history-file=no',
-            '-e',
-            [[
-              # Load LanguageServer.jl: attempt to load from ~/.julia/environments/nvim-lspconfig
-              # with the regular load path as a fallback
-              ls_install_path = joinpath(
-                  get(DEPOT_PATH, 1, joinpath(homedir(), ".julia")),
-                  "environments", "nvim-lspconfig"
-              )
-              pushfirst!(LOAD_PATH, ls_install_path)
-              using LanguageServer
-              popfirst!(LOAD_PATH)
-              depot_path = get(ENV, "JULIA_DEPOT_PATH", "")
-              project_path = let
-                  dirname(something(
-                      ## 1. Finds an explicitly set project (JULIA_PROJECT)
-                      Base.load_path_expand((
-                          p = get(ENV, "JULIA_PROJECT", nothing);
-                          p === nothing ? nothing : isempty(p) ? nothing : p
-                      )),
-                      ## 2. Look for a Project.toml file in the current working directory,
-                      ##    or parent directories, with $HOME as an upper boundary
-                      Base.current_project(),
-                      ## 3. First entry in the load path
-                      get(Base.load_path(), 1, nothing),
-                      ## 4. Fallback to default global environment,
-                      ##    this is more or less unreachable
-                      Base.load_path_expand("@v#.#"),
-                  ))
-              end
-              @info "Running language server" VERSION pwd() project_path depot_path
-              server = LanguageServer.LanguageServerInstance(stdin, stdout, project_path, depot_path)
-              server.runlinter = true
-              run(server)
-            ]],
-          }
-        '';
-      filetypes = ["julia"];
-      root_markers = ["Project.toml" "JuliaProject.toml"];
-      on_attach =
-        mkLuaInline
-        /*
-        lua
-        */
-        ''
-          function(_, bufnr)
-              vim.api.nvim_buf_create_user_command(bufnr, 'LspJuliaActivateEnv', activate_julia_env, {
-                desc = 'Activate a Julia environment',
-                nargs = '?',
-                complete = 'file',
-              })
-          end
-        '';
+      package = pkgs.julia.withPackages ["LanguageServer"];
+      internalFormatter = true;
+      lspConfig = ''
+        lspconfig.julials.setup {
+          capabilities = capabilities,
+          on_attach = default_on_attach,
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''
+            {
+              "${optionalString (cfg.lsp.package != null) "${cfg.lsp.package}/bin/"}julia",
+              "--startup-file=no",
+              "--history-file=no",
+              "--eval",
+              [[
+                using LanguageServer
+
+                depot_path = get(ENV, "JULIA_DEPOT_PATH", "")
+                project_path = let
+                    dirname(something(
+                        ## 1. Finds an explicitly set project (JULIA_PROJECT)
+                        Base.load_path_expand((
+                            p = get(ENV, "JULIA_PROJECT", nothing);
+                            p === nothing ? nothing : isempty(p) ? nothing : p
+                        )),
+                        ## 2. Look for a Project.toml file in the current working directory,
+                        ##    or parent directories, with $HOME as an upper boundary
+                        Base.current_project(),
+                        ## 3. First entry in the load path
+                        get(Base.load_path(), 1, nothing),
+                        ## 4. Fallback to default global environment,
+                        ##    this is more or less unreachable
+                        Base.load_path_expand("@v#.#"),
+                    ))
+                end
+                @info "Running language server" VERSION pwd() project_path depot_path
+                server = LanguageServer.LanguageServerInstance(stdin, stdout, project_path, depot_path)
+                server.runlinter = true
+                run(server)
+              ]]
+            }
+          ''
+        }
+        }
+      '';
     };
   };
 
@@ -95,26 +76,38 @@ in {
       };
 
       lsp = {
-        enable = mkEnableOption "Julia LSP support" // {default = config.vim.lsp.enable;};
-        servers = mkOption {
-          type = deprecatedSingleOrListOf "vim.language.julia.lsp.servers" (enum (attrNames servers));
-          default = defaultServers;
+        enable = mkOption {
+          type = bool;
+          default = config.vim.lsp.enable;
           description = ''
-            Julia LSP Server to Use
+            Whether to enable Julia LSP support.
 
             ::: {.note}
             The entirety of Julia is bundled with nvf, if you enable this
             option, since there is no way to provide only the LSP server.
 
             If you want to avoid that, you have to change
-            {option}`vim.lsp.servers.julials.cmd` to use
-            the Julia binary in {env}`PATH`, and add the `LanguageServer`
-            package to Julia in your devshells.
-
-            Check the source file of this option for the full `cmd`.
+            [](#opt-vim.languages.julia.lsp.package) to use the Julia binary
+            in {env}`PATH` (set it to `null`), and add the `LanguageServer` package to
+            Julia in your devshells.
             :::
           '';
         };
+
+        server = mkOption {
+          type = enum (attrNames servers);
+          default = defaultServer;
+          description = "Julia LSP server to use";
+        };
+
+        package = mkOption {
+          description = ''
+            Julia LSP server package, `null` to use the Julia binary in {env}`PATH`, or
+            the command to run as a list of strings.
+          '';
+          type = nullOr (either package (listOf str));
+          default = servers.${cfg.lsp.server}.package;
+        };
       };
     };
   };
@@ -126,70 +119,8 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.luaConfigRC.julia-util =
-        entryBefore ["lsp-servers"]
-        /*
-        lua
-        */
-        ''
-          local function activate_julia_env(path)
-            assert(vim.fn.has 'nvim-0.10' == 1, 'requires Nvim 0.10 or newer')
-            local bufnr = vim.api.nvim_get_current_buf()
-            local julials_clients = vim.lsp.get_clients { bufnr = bufnr, name = 'julials' }
-            assert(
-              #julials_clients > 0,
-              'method julia/activateenvironment is not supported by any servers active on the current buffer'
-            )
-            local function _activate_env(environment)
-              if environment then
-                for _, julials_client in ipairs(julials_clients) do
-                  julials_client:notify('julia/activateenvironment', { envPath = environment })
-                end
-                vim.notify('Julia environment activated: \n`' .. environment .. '`', vim.log.levels.INFO)
-              end
-            end
-            if path then
-              path = vim.fs.normalize(vim.fn.fnamemodify(vim.fn.expand(path), ':p'))
-              local found_env = false
-              for _, project_file in ipairs(root_files) do
-                local file = vim.uv.fs_stat(vim.fs.joinpath(path, project_file))
-                if file and file.type then
-                  found_env = true
-                  break
-                end
-              end
-              if not found_env then
-                vim.notify('Path is not a julia environment: \n`' .. path .. '`', vim.log.levels.WARN)
-                return
-              end
-              _activate_env(path)
-            else
-              local depot_paths = vim.env.JULIA_DEPOT_PATH
-                  and vim.split(vim.env.JULIA_DEPOT_PATH, vim.fn.has 'win32' == 1 and ';' or ':')
-                or { vim.fn.expand '~/.julia' }
-              local environments = {}
-              vim.list_extend(environments, vim.fs.find(root_files, { type = 'file', upward = true, limit = math.huge }))
-              for _, depot_path in ipairs(depot_paths) do
-                local depot_env = vim.fs.joinpath(vim.fs.normalize(depot_path), 'environments')
-                vim.list_extend(
-                  environments,
-                  vim.fs.find(function(name, env_path)
-                    return vim.tbl_contains(root_files, name) and string.sub(env_path, #depot_env + 1):match '^/[^/]*$'
-                  end, { path = depot_env, type = 'file', limit = math.huge })
-                )
-              end
-              environments = vim.tbl_map(vim.fs.dirname, environments)
-              vim.ui.select(environments, { prompt = 'Select a Julia environment' }, _activate_env)
-            end
-          end
-        '';
-
-      vim.lsp.servers =
-        mapListToAttrs (n: {
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.julia-lsp = servers.${cfg.lsp.server}.lspConfig;
     })
   ]);
 }
diff --git a/modules/plugins/languages/just.nix b/modules/plugins/languages/just.nix
deleted file mode 100644
index 7645f255..00000000
--- a/modules/plugins/languages/just.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  inherit (builtins) attrNames;
-  inherit (lib.options) mkEnableOption mkOption;
-  inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.meta) getExe;
-  inherit (lib.types) enum listOf;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
-  inherit (lib.nvim.types) mkGrammarOption;
-
-  cfg = config.vim.languages.just;
-
-  defaultServers = ["just-lsp"];
-  servers = {
-    just-lsp = {
-      enable = true;
-      cmd = [(getExe pkgs.just-lsp)];
-      filetypes = ["just"];
-      root_markers = [".git" "justfile"];
-    };
-  };
-in {
-  options.vim.languages.just = {
-    enable = mkEnableOption "Just support";
-
-    treesitter = {
-      enable =
-        mkEnableOption "Just treesitter" // {default = config.vim.languages.enableTreesitter;};
-      package = mkGrammarOption pkgs "just";
-    };
-
-    lsp = {
-      enable =
-        mkEnableOption "Just LSP support" // {default = config.vim.lsp.enable;};
-      servers = mkOption {
-        type = listOf (enum (attrNames servers));
-        default = defaultServers;
-        description = "Just LSP server to use";
-      };
-    };
-  };
-
-  config = mkIf cfg.enable (mkMerge [
-    (mkIf cfg.treesitter.enable {
-      vim.treesitter = {
-        enable = true;
-        grammars = [cfg.treesitter.package];
-      };
-    })
-
-    (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (n: {
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
-    })
-  ]);
-}
diff --git a/modules/plugins/languages/kotlin.nix b/modules/plugins/languages/kotlin.nix
index f316c4cb..1118afdf 100644
--- a/modules/plugins/languages/kotlin.nix
+++ b/modules/plugins/languages/kotlin.nix
@@ -4,47 +4,16 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption mkOption literalExpression;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.meta) getExe' getExe;
-  inherit (builtins) attrNames;
-  inherit (lib.types) enum listOf;
+  inherit (lib.meta) getExe;
+  inherit (lib.types) either package listOf str;
   inherit (lib.nvim.types) mkGrammarOption diagnostics;
-  inherit (lib.generators) mkLuaInline;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
+  inherit (lib.lists) isList;
+  inherit (lib.nvim.lua) expToLua;
 
   cfg = config.vim.languages.kotlin;
 
-  defaultServers = ["kotlin-language-server"];
-  servers = {
-    kotlin-language-server = {
-      enable = true;
-      cmd = [(getExe' pkgs.kotlin-language-server "kotlin-language-server")];
-      filetypes = ["kotlin"];
-      root_markers = [
-        "settings.gradle" # Gradle (multi-project)
-        "settings.gradle.kts" # Gradle (multi-project)
-        "build.xml" # Ant
-        "pom.xml" # Maven
-        "build.gradle" # Gradle
-        "build.gradle.kts" # gradle
-      ];
-      init_options = {
-        storagePath = mkLuaInline "
-        vim.fs.root(vim.fn.expand '%:p:h',
-          {
-            'settings.gradle', -- Gradle (multi-project)
-            'settings.gradle.kts', -- Gradle (multi-project)
-            'build.xml', -- Ant
-            'pom.xml', -- Maven
-            'build.gradle', -- Gradle
-            'build.gradle.kts', -- Gradle
-          }
-        )";
-      };
-    };
-  };
-
   defaultDiagnosticsProvider = ["ktlint"];
   diagnosticsProviders = {
     ktlint = {
@@ -62,10 +31,22 @@ in {
 
     lsp = {
       enable = mkEnableOption "Kotlin LSP support" // {default = config.vim.lsp.enable;};
-      servers = mkOption {
-        type = listOf (enum (attrNames servers));
-        default = defaultServers;
-        description = "Kotlin LSP server to use";
+
+      package = mkOption {
+        description = "kotlin_language_server package with Kotlin runtime";
+        type = either package (listOf str);
+        example = literalExpression ''
+          pkgs.symlinkJoin {
+            name = "kotlin-language-server-wrapped";
+            paths = [pkgs.kotlin-language-server];
+            nativeBuildInputs = [pkgs.makeBinaryWrapper];
+            postBuild = '''
+              wrapProgram $out/bin/kotlin-language-server \
+                --prefix PATH : ''${pkgs.kotlin}/bin
+            ''';
+          };
+        '';
+        default = pkgs.kotlin-language-server;
       };
     };
 
@@ -97,12 +78,23 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (n: {
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.kotlin_language_server = ''
+        lspconfig.kotlin_language_server.setup {
+          capabilities = capabilities,
+          root_dir = lspconfig.util.root_pattern("main.kt", ".git"),
+          on_attach=default_on_attach,
+          init_options = {
+          -- speeds up the startup time for the LSP
+            storagePath = vim.fn.stdpath('state') .. '/kotlin',
+          },
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''{"${cfg.lsp.package}/bin/kotlin-language-server"}''
+        },
+        }
+      '';
     })
   ]);
 }
diff --git a/modules/plugins/languages/lua.nix b/modules/plugins/languages/lua.nix
index 276c9a6a..9f56cbea 100644
--- a/modules/plugins/languages/lua.nix
+++ b/modules/plugins/languages/lua.nix
@@ -8,36 +8,17 @@
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.meta) getExe;
-  inherit (lib.types) bool enum listOf;
-  inherit (lib.nvim.types) diagnostics mkGrammarOption deprecatedSingleOrListOf;
+  inherit (lib.lists) isList;
+  inherit (lib.types) bool either enum listOf package str;
+  inherit (lib.nvim.types) diagnostics mkGrammarOption;
+  inherit (lib.nvim.lua) expToLua;
   inherit (lib.nvim.dag) entryBefore;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
 
   cfg = config.vim.languages.lua;
-
-  defaultServers = ["lua-language-server"];
-  servers = {
-    lua-language-server = {
-      enable = true;
-      cmd = [(getExe pkgs.lua-language-server)];
-      filetypes = ["lua"];
-      root_markers = [
-        ".luarc.json"
-        ".luarc.jsonc"
-        ".luacheckrc"
-        ".stylua.toml"
-        "stylua.toml"
-        "selene.toml"
-        "selene.yml"
-        ".git"
-      ];
-    };
-  };
-
-  defaultFormat = ["stylua"];
+  defaultFormat = "stylua";
   formats = {
     stylua = {
-      command = getExe pkgs.stylua;
+      package = pkgs.stylua;
     };
   };
 
@@ -62,11 +43,12 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "Lua LSP support" // {default = config.vim.lsp.enable;};
-      servers = mkOption {
-        type = listOf (enum (attrNames servers));
-        default = defaultServers;
-        description = "Lua LSP server to use";
+      enable = mkEnableOption "Lua LSP support via LuaLS" // {default = config.vim.lsp.enable;};
+
+      package = mkOption {
+        description = "LuaLS package, or the command to run as a list of strings";
+        type = either package (listOf str);
+        default = pkgs.lua-language-server;
       };
 
       lazydev.enable = mkEnableOption "lazydev.nvim integration, useful for neovim plugin developers";
@@ -79,10 +61,16 @@ in {
         description = "Enable Lua formatting";
       };
       type = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.lua.format.type" (enum (attrNames formats));
+        type = enum (attrNames formats);
         default = defaultFormat;
         description = "Lua formatter to use";
       };
+
+      package = mkOption {
+        type = package;
+        default = formats.${cfg.format.type}.package;
+        description = "Lua formatter package";
+      };
     };
 
     extraDiagnostics = {
@@ -103,17 +91,23 @@ in {
 
     (mkIf cfg.enable (mkMerge [
       (mkIf cfg.lsp.enable {
-        vim.lsp.servers =
-          mapListToAttrs (n: {
-            name = n;
-            value = servers.${n};
-          })
-          cfg.lsp.servers;
+        vim.lsp.lspconfig.enable = true;
+        vim.lsp.lspconfig.sources.lua-lsp = ''
+          lspconfig.lua_ls.setup {
+            capabilities = capabilities;
+            on_attach = default_on_attach;
+            cmd = ${
+            if isList cfg.lsp.package
+            then expToLua cfg.lsp.package
+            else ''{"${getExe cfg.lsp.package}"}''
+          };
+          }
+        '';
       })
 
       (mkIf cfg.lsp.lazydev.enable {
         vim.startPlugins = ["lazydev-nvim"];
-        vim.pluginRC.lazydev = entryBefore ["lsp-servers"] ''
+        vim.pluginRC.lazydev = entryBefore ["lua-lsp"] ''
           require("lazydev").setup({
             enabled = function(root_dir)
               return not vim.uv.fs_stat(root_dir .. "/.luarc.json")
@@ -126,14 +120,9 @@ in {
       (mkIf cfg.format.enable {
         vim.formatter.conform-nvim = {
           enable = true;
-          setupOpts = {
-            formatters_by_ft.lua = cfg.format.type;
-            formatters =
-              mapListToAttrs (name: {
-                inherit name;
-                value = formats.${name};
-              })
-              cfg.format.type;
+          setupOpts.formatters_by_ft.lua = [cfg.format.type];
+          setupOpts.formatters.${cfg.format.type} = {
+            command = getExe cfg.format.package;
           };
         };
       })
diff --git a/modules/plugins/languages/markdown.nix b/modules/plugins/languages/markdown.nix
index 59615cec..23848835 100644
--- a/modules/plugins/languages/markdown.nix
+++ b/modules/plugins/languages/markdown.nix
@@ -8,42 +8,42 @@
   inherit (lib.meta) getExe;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.options) mkEnableOption mkOption;
-  inherit (lib.types) bool enum listOf str nullOr;
-  inherit (lib.nvim.lua) toLuaObject;
-  inherit (lib.nvim.types) diagnostics mkGrammarOption mkPluginSetupOption deprecatedSingleOrListOf;
+  inherit (lib.lists) isList;
+  inherit (lib.types) bool enum either package listOf str nullOr;
+  inherit (lib.nvim.lua) expToLua toLuaObject;
+  inherit (lib.nvim.types) diagnostics mkGrammarOption mkPluginSetupOption;
   inherit (lib.nvim.dag) entryAnywhere;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
-  inherit (lib.trivial) warn;
 
   cfg = config.vim.languages.markdown;
-  defaultServers = ["marksman"];
+  defaultServer = "marksman";
   servers = {
     marksman = {
-      enable = true;
-      cmd = [(getExe pkgs.marksman) "server"];
-      filetypes = ["markdown" "markdown.mdx"];
-      root_markers = [".marksman.toml" ".git"];
-    };
-
-    markdown-oxide = {
-      enable = true;
-      cmd = [(getExe pkgs.markdown-oxide)];
-      filetypes = ["markdown"];
-      root_markers = [".git" ".obsidian" ".moxide.toml"];
+      package = pkgs.marksman;
+      lspConfig = ''
+        lspconfig.marksman.setup{
+          capabilities = capabilities;
+          on_attach = default_on_attach;
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''{"${cfg.lsp.package}/bin/marksman", "server"}''
+        },
+        }
+      '';
     };
   };
 
-  defaultFormat = ["deno_fmt"];
+  defaultFormat = "deno_fmt";
   formats = {
     # for backwards compatibility
     denofmt = {
-      command = getExe pkgs.deno;
+      package = pkgs.deno;
     };
     deno_fmt = {
-      command = getExe pkgs.deno;
+      package = pkgs.deno;
     };
     prettierd = {
-      command = getExe pkgs.prettierd;
+      package = pkgs.prettierd;
     };
   };
   defaultDiagnosticsProvider = ["markdownlint-cli2"];
@@ -67,12 +67,19 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "Markdown LSP support" // {default = config.vim.lsp.enable;};
+      enable = mkEnableOption "Enable Markdown LSP support" // {default = config.vim.lsp.enable;};
 
-      servers = mkOption {
+      server = mkOption {
+        type = enum (attrNames servers);
+        default = defaultServer;
         description = "Markdown LSP server to use";
-        type = deprecatedSingleOrListOf "vim.language.markdown.lsp.servers" (enum (attrNames servers));
-        default = defaultServers;
+      };
+
+      package = mkOption {
+        type = either package (listOf str);
+        default = servers.${cfg.lsp.server}.package;
+        example = ''[lib.getExe pkgs.jdt-language-server " - data " " ~/.cache/jdtls/workspace "]'';
+        description = "Markdown LSP server package, or the command to run as a list of strings";
       };
     };
 
@@ -80,11 +87,17 @@ in {
       enable = mkEnableOption "Markdown formatting" // {default = config.vim.languages.enableFormat;};
 
       type = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.markdown.format.type" (enum (attrNames formats));
+        type = enum (attrNames formats);
         default = defaultFormat;
         description = "Markdown formatter to use. `denofmt` is deprecated and currently aliased to deno_fmt.";
       };
 
+      package = mkOption {
+        type = package;
+        default = formats.${cfg.format.type}.package;
+        description = "Markdown formatter package";
+      };
+
       extraFiletypes = mkOption {
         type = listOf str;
         default = [];
@@ -148,34 +161,20 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (n: {
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.markdown-lsp = servers.${cfg.lsp.server}.lspConfig;
     })
 
     (mkIf cfg.format.enable {
       vim.formatter.conform-nvim = {
         enable = true;
-        setupOpts = {
-          formatters_by_ft.markdown = cfg.format.type;
-          formatters = let
-            names = map (name:
-              if name == "denofmt"
-              then
-                warn ''
-                  vim.languages.markdown.format.type: "denofmt" is renamed to "deno_fmt".
-                '' "deno_fmt"
-              else name)
-            cfg.format.type;
-          in
-            mapListToAttrs (name: {
-              inherit name;
-              value = formats.${name};
-            })
-            names;
+        setupOpts.formatters_by_ft.markdown = [cfg.format.type];
+        setupOpts.formatters.${
+          if cfg.format.type == "denofmt"
+          then "deno_fmt"
+          else cfg.format.type
+        } = {
+          command = getExe cfg.format.package;
         };
       };
     })
diff --git a/modules/plugins/languages/nim.nix b/modules/plugins/languages/nim.nix
index faf71baa..6e5885e2 100644
--- a/modules/plugins/languages/nim.nix
+++ b/modules/plugins/languages/nim.nix
@@ -6,41 +6,41 @@
 }: let
   inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
-  inherit (lib.meta) getExe';
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.types) enum;
-  inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
-  inherit (lib.generators) mkLuaInline;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
+  inherit (lib.lists) isList;
+  inherit (lib.types) enum either listOf package str;
+  inherit (lib.nvim.types) mkGrammarOption;
+  inherit (lib.nvim.lua) expToLua;
 
   cfg = config.vim.languages.nim;
 
-  defaultServers = ["nimlsp"];
+  defaultServer = "nimlsp";
   servers = {
     nimlsp = {
-      enable = true;
-      cmd = [(getExe' pkgs.nimlsp "nimlsp")];
-      filetypes = ["nim"];
-      root_dir =
-        mkLuaInline
-        /*
-        lua
-        */
-        ''
-          function(bufnr, on_dir)
-              local fname = vim.api.nvim_buf_get_name(bufnr)
-              on_dir(
-                util.root_pattern '*.nimble'(fname) or vim.fs.dirname(vim.fs.find('.git', { path = fname, upward = true })[1])
-              )
-          end
-        '';
+      package = pkgs.nimlsp;
+      lspConfig = ''
+        lspconfig.nimls.setup{
+          capabilities = capabilities;
+          on_attach = default_on_attach;
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''
+            {"${cfg.lsp.package}/bin/nimlsp"}
+          ''
+        };
+        }
+      '';
     };
   };
 
-  defaultFormat = ["nimpretty"];
+  defaultFormat = "nimpretty";
   formats = {
     nimpretty = {
-      command = "${pkgs.nim}/bin/nimpretty";
+      package = pkgs.nim;
+      config = {
+        command = "${cfg.format.package}/bin/nimpretty";
+      };
     };
   };
 in {
@@ -54,20 +54,32 @@ in {
 
     lsp = {
       enable = mkEnableOption "Nim LSP support" // {default = config.vim.lsp.enable;};
-
-      servers = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.nim.lsp.servers" (enum (attrNames servers));
-        default = defaultServers;
+      server = mkOption {
         description = "Nim LSP server to use";
+        type = str;
+        default = defaultServer;
+      };
+
+      package = mkOption {
+        description = "Nim LSP server package, or the command to run as a list of strings";
+        example = ''[lib.getExe pkgs.nimlsp]'';
+        type = either package (listOf str);
+        default = servers.${cfg.lsp.server}.package;
       };
     };
 
     format = {
       enable = mkEnableOption "Nim formatting" // {default = config.vim.languages.enableFormat;};
       type = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.nim.format.type" (enum (attrNames formats));
-        default = defaultFormat;
         description = "Nim formatter to use";
+        type = enum (attrNames formats);
+        default = defaultFormat;
+      };
+
+      package = mkOption {
+        description = "Nim formatter package";
+        type = package;
+        default = formats.${cfg.format.type}.package;
       };
     };
   };
@@ -88,26 +100,15 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (n: {
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.nim-lsp = servers.${cfg.lsp.server}.lspConfig;
     })
 
     (mkIf cfg.format.enable {
       vim.formatter.conform-nvim = {
         enable = true;
-        setupOpts = {
-          formatters_by_ft.nim = cfg.format.type;
-          formatters =
-            mapListToAttrs (name: {
-              inherit name;
-              value = formats.${name};
-            })
-            cfg.format.type;
-        };
+        setupOpts.formatters_by_ft.nim = [cfg.format.type];
+        setupOpts.formatters.${cfg.format.type} = formats.${cfg.format.type}.config;
       };
     })
   ]);
diff --git a/modules/plugins/languages/nix.nix b/modules/plugins/languages/nix.nix
index f03806f9..7d126e15 100644
--- a/modules/plugins/languages/nix.nix
+++ b/modules/plugins/languages/nix.nix
@@ -9,37 +9,93 @@
   inherit (lib.meta) getExe;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.types) enum;
-  inherit (lib.nvim.types) mkGrammarOption diagnostics deprecatedSingleOrListOf;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
+  inherit (lib.lists) isList;
+  inherit (lib.strings) optionalString;
+  inherit (lib.types) anything attrsOf enum either listOf nullOr package str;
+  inherit (lib.nvim.types) mkGrammarOption diagnostics;
+  inherit (lib.nvim.lua) expToLua toLuaObject;
 
   cfg = config.vim.languages.nix;
 
-  defaultServers = ["nil"];
+  useFormat = "on_attach = default_on_attach";
+  noFormat = "on_attach = attach_keymaps";
+
+  defaultServer = "nil";
+  packageToCmd = package: defaultCmd:
+    if isList package
+    then expToLua package
+    else ''{"${package}/bin/${defaultCmd}"}'';
   servers = {
     nil = {
-      enable = true;
-      cmd = [(getExe pkgs.nil)];
-      filetypes = ["nix"];
-      root_markers = [".git" "flake.nix"];
+      package = pkgs.nil;
+      internalFormatter = true;
+      lspConfig = ''
+        lspconfig.nil_ls.setup{
+          capabilities = capabilities,
+        ${
+          if cfg.format.enable
+          then useFormat
+          else noFormat
+        },
+          cmd = ${packageToCmd cfg.lsp.package "nil"},
+        ${optionalString cfg.format.enable ''
+          settings = {
+            ["nil"] = {
+          ${optionalString (cfg.format.type == "alejandra")
+            ''
+              formatting = {
+                command = {"${cfg.format.package}/bin/alejandra", "--quiet"},
+              },
+            ''}
+          ${optionalString (cfg.format.type == "nixfmt")
+            ''
+              formatting = {
+                command = {"${cfg.format.package}/bin/nixfmt"},
+              },
+            ''}
+            },
+          },
+        ''}
+        }
+      '';
     };
 
-    nixd = {
-      enable = true;
-      cmd = [(getExe pkgs.nixd)];
-      filetypes = ["nix"];
-      root_markers = [".git" "flake.nix"];
+    nixd = let
+      settings.nixd = {
+        inherit (cfg.lsp) options;
+        formatting.command =
+          if !cfg.format.enable
+          then null
+          else if cfg.format.type == "alejandra"
+          then ["${cfg.format.package}/bin/alejandra" "--quiet"]
+          else ["${cfg.format.package}/bin/nixfmt"];
+      };
+    in {
+      package = pkgs.nixd;
+      internalFormatter = true;
+      lspConfig = ''
+        lspconfig.nixd.setup{
+          capabilities = capabilities,
+        ${
+          if cfg.format.enable
+          then useFormat
+          else noFormat
+        },
+          cmd = ${packageToCmd cfg.lsp.package "nixd"},
+          settings = ${toLuaObject settings},
+        }
+      '';
     };
   };
 
-  defaultFormat = ["alejandra"];
+  defaultFormat = "alejandra";
   formats = {
     alejandra = {
-      command = getExe pkgs.alejandra;
+      package = pkgs.alejandra;
     };
 
     nixfmt = {
-      command = getExe pkgs.nixfmt-rfc-style;
+      package = pkgs.nixfmt-rfc-style;
     };
   };
 
@@ -80,10 +136,23 @@ in {
 
     lsp = {
       enable = mkEnableOption "Nix LSP support" // {default = config.vim.lsp.enable;};
-      servers = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.nix.lsp.servers" (enum (attrNames servers));
-        default = defaultServers;
+      server = mkOption {
         description = "Nix LSP server to use";
+        type = enum (attrNames servers);
+        default = defaultServer;
+      };
+
+      package = mkOption {
+        description = "Nix LSP server package, or the command to run as a list of strings";
+        example = ''[lib.getExe pkgs.jdt-language-server "-data" "~/.cache/jdtls/workspace"]'';
+        type = either package (listOf str);
+        default = servers.${cfg.lsp.server}.package;
+      };
+
+      options = mkOption {
+        type = nullOr (attrsOf anything);
+        default = null;
+        description = "Options to pass to nixd LSP server";
       };
     };
 
@@ -92,9 +161,15 @@ in {
 
       type = mkOption {
         description = "Nix formatter to use";
-        type = deprecatedSingleOrListOf "vim.language.nix.format.type" (enum (attrNames formats));
+        type = enum (attrNames formats);
         default = defaultFormat;
       };
+
+      package = mkOption {
+        description = "Nix formatter package";
+        type = package;
+        default = formats.${cfg.format.type}.package;
+      };
     };
 
     extraDiagnostics = {
@@ -118,6 +193,13 @@ in {
             ${concatStringsSep ", " (attrNames formats)}
           '';
         }
+        {
+          assertion = cfg.lsp.server != "rnix";
+          message = ''
+            rnix-lsp has been archived upstream. Please use one of the following available language servers:
+            ${concatStringsSep ", " (attrNames servers)}
+          '';
+        }
       ];
     }
 
@@ -127,25 +209,16 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (n: {
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.nix-lsp = servers.${cfg.lsp.server}.lspConfig;
     })
 
-    (mkIf cfg.format.enable {
+    (mkIf (cfg.format.enable && (!cfg.lsp.enable || !servers.${cfg.lsp.server}.internalFormatter)) {
       vim.formatter.conform-nvim = {
         enable = true;
-        setupOpts = {
-          formatters_by_ft.nix = cfg.format.type;
-          formatters =
-            mapListToAttrs (name: {
-              inherit name;
-              value = formats.${name};
-            })
-            cfg.format.type;
+        setupOpts.formatters_by_ft.nix = [cfg.format.type];
+        setupOpts.formatters.${cfg.format.type} = {
+          command = getExe cfg.format.package;
         };
       };
     })
diff --git a/modules/plugins/languages/nu.nix b/modules/plugins/languages/nu.nix
index 7bbe1d78..bd007fc8 100644
--- a/modules/plugins/languages/nu.nix
+++ b/modules/plugins/languages/nu.nix
@@ -5,30 +5,27 @@
   ...
 }: let
   inherit (lib.options) mkEnableOption mkOption;
-  inherit (lib.types) enum;
+  inherit (lib.types) str either package listOf;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
-  inherit (lib.meta) getExe;
-  inherit (lib.generators) mkLuaInline;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
-  inherit (builtins) attrNames;
+  inherit (lib.nvim.lua) expToLua;
+  inherit (lib.nvim.types) mkGrammarOption;
+  inherit (builtins) isList;
 
-  defaultServers = ["nushell"];
+  defaultServer = "nushell";
   servers = {
     nushell = {
-      enable = true;
-      cmd = [(getExe pkgs.nushell) "--no-config-file" "--lsp"];
-      filetypes = ["nu"];
-      root_dir =
-        mkLuaInline
-        /*
-        lua
-        */
-        ''
-          function(bufnr, on_dir)
-            on_dir(vim.fs.root(bufnr, { '.git' }) or vim.fs.dirname(vim.api.nvim_buf_get_name(bufnr)))
-          end
-        '';
+      package = pkgs.nushell;
+      lspConfig = ''
+        lspconfig.nushell.setup{
+          capabilities = capabilities,
+          on_attach = default_on_attach,
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''{"${cfg.lsp.package}/bin/nu", "--no-config-file", "--lsp"}''
+        }
+        }
+      '';
     };
   };
 
@@ -44,12 +41,18 @@ in {
 
     lsp = {
       enable = mkEnableOption "Nu LSP support" // {default = config.vim.lsp.enable;};
-
-      servers = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.nu.lsp.servers" (enum (attrNames servers));
-        default = defaultServers;
+      server = mkOption {
+        type = str;
+        default = defaultServer;
         description = "Nu LSP server to use";
       };
+
+      package = mkOption {
+        type = either package (listOf str);
+        default = servers.${cfg.lsp.server}.package;
+        example = ''[(lib.getExe pkgs.nushell) "--lsp"]'';
+        description = "Nu LSP server package, or the command to run as a list of strings";
+      };
     };
   };
 
@@ -60,12 +63,8 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (n: {
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.nu-lsp = servers.${cfg.lsp.server}.lspConfig;
     })
   ]);
 }
diff --git a/modules/plugins/languages/ocaml.nix b/modules/plugins/languages/ocaml.nix
index 2ff5bfce..995ca04d 100644
--- a/modules/plugins/languages/ocaml.nix
+++ b/modules/plugins/languages/ocaml.nix
@@ -8,57 +8,35 @@
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.meta) getExe;
-  inherit (lib.types) enum;
-  inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
-  inherit (lib.generators) mkLuaInline;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
+  inherit (lib.lists) isList;
+  inherit (lib.types) either enum listOf package str;
+  inherit (lib.nvim.types) mkGrammarOption;
+  inherit (lib.nvim.lua) expToLua;
 
   cfg = config.vim.languages.ocaml;
 
-  defaultServers = ["ocaml-lsp"];
+  defaultServer = "ocaml-lsp";
   servers = {
     ocaml-lsp = {
-      enable = true;
-      cmd = [(getExe pkgs.ocamlPackages.ocaml-lsp)];
-      filetypes = ["ocaml" "menhir" "ocamlinterface" "ocamllex" "reason" "dune"];
-      root_dir =
-        mkLuaInline
-        /*
-        lua
-        */
-        ''
-          function(bufnr, on_dir)
-            local fname = vim.api.nvim_buf_get_name(bufnr)
-            on_dir(util.root_pattern('*.opam', 'esy.json', 'package.json', '.git', 'dune-project', 'dune-workspace')(fname))
-          end
-        '';
-      get_language_id =
-        mkLuaInline
-        /*
-        lua
-        */
-        ''
-          function(_, ftype)
-            local language_id_of = {
-              menhir = 'ocaml.menhir',
-              ocaml = 'ocaml',
-              ocamlinterface = 'ocaml.interface',
-              ocamllex = 'ocaml.ocamllex',
-              reason = 'reason',
-              dune = 'dune',
-            }
-
-            return language_id_of[ftype]
-
-          end
-        '';
+      package = pkgs.ocamlPackages.ocaml-lsp;
+      lspConfig = ''
+        lspconfig.ocamllsp.setup {
+          capabilities = capabilities,
+          on_attach = default_on_attach,
+            cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''{"${getExe cfg.lsp.package}"}''
+        };
+        }
+      '';
     };
   };
 
-  defaultFormat = ["ocamlformat"];
+  defaultFormat = "ocamlformat";
   formats = {
     ocamlformat = {
-      command = getExe pkgs.ocamlPackages.ocamlformat;
+      package = pkgs.ocamlPackages.ocamlformat;
     };
   };
 in {
@@ -71,33 +49,38 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "OCaml LSP support" // {default = config.vim.lsp.enable;};
-
-      servers = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.ocaml.lsp.servers" (enum (attrNames servers));
-        default = defaultServers;
-        description = "OCaml LSP server to use";
+      enable = mkEnableOption "OCaml LSP support (ocaml-lsp)" // {default = config.vim.lsp.enable;};
+      server = mkOption {
+        description = "OCaml LSP server to user";
+        type = enum (attrNames servers);
+        default = defaultServer;
+      };
+      package = mkOption {
+        description = "OCaml language server package, or the command to run as a list of strings";
+        type = either package (listOf str);
+        default = servers.${cfg.lsp.server}.package;
       };
     };
 
     format = {
       enable = mkEnableOption "OCaml formatting support (ocamlformat)" // {default = config.vim.languages.enableFormat;};
       type = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.ocaml.format.type" (enum (attrNames formats));
-        default = defaultFormat;
         description = "OCaml formatter to use";
+        type = enum (attrNames formats);
+        default = defaultFormat;
+      };
+      package = mkOption {
+        description = "OCaml formatter package";
+        type = package;
+        default = formats.${cfg.format.type}.package;
       };
     };
   };
 
   config = mkIf cfg.enable (mkMerge [
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (n: {
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.ocaml-lsp = servers.${cfg.lsp.server}.lspConfig;
     })
 
     (mkIf cfg.treesitter.enable {
@@ -108,14 +91,9 @@ in {
     (mkIf cfg.format.enable {
       vim.formatter.conform-nvim = {
         enable = true;
-        setupOpts = {
-          formatters_by_ft.ocaml = cfg.format.type;
-          formatters =
-            mapListToAttrs (name: {
-              inherit name;
-              value = formats.${name};
-            })
-            cfg.format.type;
+        setupOpts.formatters_by_ft.ocaml = [cfg.format.type];
+        setupOpts.formatters.${cfg.format.type} = {
+          command = getExe cfg.format.package;
         };
       };
     })
diff --git a/modules/plugins/languages/odin.nix b/modules/plugins/languages/odin.nix
index fa2254c5..6d20351c 100644
--- a/modules/plugins/languages/odin.nix
+++ b/modules/plugins/languages/odin.nix
@@ -7,28 +7,26 @@
   inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.types) enum;
-  inherit (lib.meta) getExe;
-  inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
-  inherit (lib.generators) mkLuaInline;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
+  inherit (lib.lists) isList;
+  inherit (lib.types) either listOf package str enum;
+  inherit (lib.nvim.lua) expToLua;
+  inherit (lib.nvim.types) mkGrammarOption;
 
-  defaultServers = ["ols"];
+  defaultServer = "ols";
   servers = {
     ols = {
-      enable = true;
-      cmd = [(getExe pkgs.ols)];
-      filetypes = ["odin"];
-      root_dir =
-        mkLuaInline
-        /*
-        lua
-        */
-        ''
-          function(bufnr, on_dir)
-            local fname = vim.api.nvim_buf_get_name(bufnr)
-            on_dir(util.root_pattern('ols.json', '.git', '*.odin')(fname))
-          end'';
+      package = pkgs.ols;
+      lspConfig = ''
+        lspconfig.ols.setup {
+          capabilities = capabilities,
+          on_attach = default_on_attach,
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else "{'${cfg.lsp.package}/bin/ols'}"
+        }
+        }
+      '';
     };
   };
 
@@ -45,11 +43,17 @@ in {
     lsp = {
       enable = mkEnableOption "Odin LSP support" // {default = config.vim.lsp.enable;};
 
-      servers = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.odin.lsp.servers" (enum (attrNames servers));
-        default = defaultServers;
+      server = mkOption {
+        type = enum (attrNames servers);
+        default = defaultServer;
         description = "Odin LSP server to use";
       };
+
+      package = mkOption {
+        description = "Ols package, or the command to run as a list of strings";
+        type = either package (listOf str);
+        default = pkgs.ols;
+      };
     };
   };
 
@@ -60,12 +64,8 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (n: {
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.odin-lsp = servers.${cfg.lsp.server}.lspConfig;
     })
   ]);
 }
diff --git a/modules/plugins/languages/php.nix b/modules/plugins/languages/php.nix
index 193c0a1f..61ff0425 100644
--- a/modules/plugins/languages/php.nix
+++ b/modules/plugins/languages/php.nix
@@ -8,60 +8,81 @@
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.meta) getExe;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.types) enum;
-  inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
-  inherit (lib.generators) mkLuaInline;
+  inherit (lib.lists) isList;
+  inherit (lib.types) enum either listOf package str;
+  inherit (lib.nvim.types) mkGrammarOption;
+  inherit (lib.nvim.lua) expToLua;
 
   cfg = config.vim.languages.php;
 
-  defaultServers = ["phpactor"];
+  defaultServer = "phpactor";
   servers = {
     phpactor = {
-      enable = true;
-      cmd = [(getExe pkgs.phpactor) "language-server"];
-      filetypes = ["php"];
-      root_markers = [".git" "composer.json" ".phpactor.json" ".phpactor.yml"];
-      workspace_required = true;
+      package = pkgs.phpactor;
+      lspConfig = ''
+        lspconfig.phpactor.setup{
+          capabilities = capabilities,
+          on_attach = default_on_attach,
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''
+            {
+              "${getExe cfg.lsp.package}",
+              "language-server"
+            },
+          ''
+        }
+        }
+      '';
     };
 
     phan = {
-      enable = true;
-      cmd = [
-        (getExe pkgs.php81Packages.phan)
-        "-m"
-        "json"
-        "--no-color"
-        "--no-progress-bar"
-        "-x"
-        "-u"
-        "-S"
-        "--language-server-on-stdin"
-        "--allow-polyfill-parser"
-      ];
-      filetypes = ["php"];
-      root_dir =
-        mkLuaInline
-        /*
-        lua
-        */
-        ''
-          function(bufnr, on_dir)
-            local fname = vim.api.nvim_buf_get_name(bufnr)
-            local cwd = assert(vim.uv.cwd())
-            local root = vim.fs.root(fname, { 'composer.json', '.git' })
-
-            -- prefer cwd if root is a descendant
-            on_dir(root and vim.fs.relpath(cwd, root) and cwd)
-          end
-        '';
+      package = pkgs.php81Packages.phan;
+      lspConfig = ''
+        lspconfig.phan.setup{
+          capabilities = capabilities,
+          on_attach = default_on_attach,
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''
+              {
+                "${getExe cfg.lsp.package}",
+                "-m",
+                "json",
+                "--no-color",
+                "--no-progress-bar",
+                "-x",
+                "-u",
+                "-S",
+                "--language-server-on-stdin",
+                "--allow-polyfill-parser"
+            },
+          ''
+        }
+        }
+      '';
     };
 
     intelephense = {
-      enable = true;
-      cmd = [(getExe pkgs.intelephense) "--stdio"];
-      filetypes = ["php"];
-      root_markers = ["composer.json" ".git"];
+      package = pkgs.intelephense;
+      lspConfig = ''
+        lspconfig.intelephense.setup{
+          capabilities = capabilities,
+          on_attach = default_on_attach,
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''
+            {
+              "${getExe cfg.lsp.package}",
+              "--stdio"
+            },
+          ''
+        }
+        }
+      '';
     };
   };
 in {
@@ -76,10 +97,17 @@ in {
     lsp = {
       enable = mkEnableOption "PHP LSP support" // {default = config.vim.lsp.enable;};
 
-      servers = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.php.lsp.servers" (enum (attrNames servers));
-        default = defaultServers;
+      server = mkOption {
         description = "PHP LSP server to use";
+        type = enum (attrNames servers);
+        default = defaultServer;
+      };
+
+      package = mkOption {
+        description = "PHP LSP server package, or the command to run as a list of strings";
+        example = ''[lib.getExe pkgs.jdt-language-server " - data " " ~/.cache/jdtls/workspace "]'';
+        type = either package (listOf str);
+        default = servers.${cfg.lsp.server}.package;
       };
     };
   };
@@ -89,14 +117,11 @@ in {
       vim.treesitter.enable = true;
       vim.treesitter.grammars = [cfg.treesitter.package];
     })
-
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (n: {
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
+      vim.lsp.lspconfig = {
+        enable = true;
+        sources.php-lsp = servers.${cfg.lsp.server}.lspConfig;
+      };
     })
   ]);
 }
diff --git a/modules/plugins/languages/python.nix b/modules/plugins/languages/python.nix
index b1cbe224..bec7ec8b 100644
--- a/modules/plugins/languages/python.nix
+++ b/modules/plugins/languages/python.nix
@@ -6,152 +6,88 @@
 }: let
   inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption literalExpression;
-  inherit (lib.lists) flatten;
-  inherit (lib.meta) getExe getExe';
+  inherit (lib.meta) getExe;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.types) enum package bool;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
-  inherit (lib.nvim.types) deprecatedSingleOrListOf;
-  inherit (lib.generators) mkLuaInline;
-  inherit (lib.nvim.dag) entryBefore;
-  inherit (lib.trivial) warn;
+  inherit (lib.lists) isList;
+  inherit (lib.types) enum either listOf package str bool;
+  inherit (lib.nvim.lua) expToLua;
 
   cfg = config.vim.languages.python;
 
-  defaultServers = ["basedpyright"];
+  defaultServer = "basedpyright";
   servers = {
     pyright = {
-      enable = true;
-      cmd = [(getExe' pkgs.pyright "pyright-langserver") "--stdio"];
-      filetypes = ["python"];
-      root_markers = [
-        "pyproject.toml"
-        "setup.py"
-        "setup.cfg"
-        "requirements.txt"
-        "Pipfile"
-        "pyrightconfig.json"
-        ".git"
-      ];
-      settings = {
-        python = {
-          analysis = {
-            autoSearchPaths = true;
-            useLibraryCodeForTypes = true;
-            diagnosticMode = "openFilesOnly";
-          };
-        };
-      };
-      on_attach = mkLuaInline ''
-        function(client, bufnr)
-          vim.api.nvim_buf_create_user_command(bufnr, 'LspPyrightOrganizeImports', function()
-            local params = {
-              command = 'pyright.organizeimports',
-              arguments = { vim.uri_from_bufnr(bufnr) },
-            }
-
-            -- Using client.request() directly because "pyright.organizeimports" is private
-            -- (not advertised via capabilities), which client:exec_cmd() refuses to call.
-            -- https://github.com/neovim/neovim/blob/c333d64663d3b6e0dd9aa440e433d346af4a3d81/runtime/lua/vim/lsp/client.lua#L1024-L1030
-            client.request('workspace/executeCommand', params, nil, bufnr)
-          end, {
-            desc = 'Organize Imports',
-          })
-          vim.api.nvim_buf_create_user_command(bufnr, 'LspPyrightSetPythonPath', set_python_path, {
-            desc = 'Reconfigure basedpyright with the provided python path',
-            nargs = 1,
-            complete = 'file',
-          })
-        end
+      package = pkgs.pyright;
+      lspConfig = ''
+        lspconfig.pyright.setup{
+          capabilities = capabilities;
+          on_attach = default_on_attach;
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''{"${cfg.lsp.package}/bin/pyright-langserver", "--stdio"}''
+        }
+        }
       '';
     };
 
     basedpyright = {
-      enable = true;
-      cmd = [(getExe' pkgs.basedpyright "basedpyright-langserver") "--stdio"];
-      filetypes = ["python"];
-      root_markers = [
-        "pyproject.toml"
-        "setup.py"
-        "setup.cfg"
-        "requirements.txt"
-        "Pipfile"
-        "pyrightconfig.json"
-        ".git"
-      ];
-      settings = {
-        basedpyright = {
-          analysis = {
-            autoSearchPaths = true;
-            useLibraryCodeForTypes = true;
-            diagnosticMode = "openFilesOnly";
-          };
-        };
-      };
-      on_attach = mkLuaInline ''
-        function(client, bufnr)
-          vim.api.nvim_buf_create_user_command(bufnr, 'LspPyrightOrganizeImports', function()
-            local params = {
-              command = 'basedpyright.organizeimports',
-              arguments = { vim.uri_from_bufnr(bufnr) },
-            }
-
-            -- Using client.request() directly because "basedpyright.organizeimports" is private
-            -- (not advertised via capabilities), which client:exec_cmd() refuses to call.
-            -- https://github.com/neovim/neovim/blob/c333d64663d3b6e0dd9aa440e433d346af4a3d81/runtime/lua/vim/lsp/client.lua#L1024-L1030
-            client.request('workspace/executeCommand', params, nil, bufnr)
-          end, {
-            desc = 'Organize Imports',
-          })
-
-          vim.api.nvim_buf_create_user_command(bufnr, 'LspPyrightSetPythonPath', set_python_path, {
-            desc = 'Reconfigure basedpyright with the provided python path',
-            nargs = 1,
-            complete = 'file',
-          })
-        end
+      package = pkgs.basedpyright;
+      lspConfig = ''
+        lspconfig.basedpyright.setup{
+          capabilities = capabilities;
+          on_attach = default_on_attach;
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''{"${cfg.lsp.package}/bin/basedpyright-langserver", "--stdio"}''
+        }
+        }
       '';
     };
 
     python-lsp-server = {
-      enable = true;
-      cmd = [(getExe pkgs.python3Packages.python-lsp-server)];
-      filetypes = ["python"];
-      root_markers = [
-        "pyproject.toml"
-        "setup.py"
-        "setup.cfg"
-        "requirements.txt"
-        "Pipfile"
-        ".git"
-      ];
+      package = pkgs.python3Packages.python-lsp-server;
+      lspConfig = ''
+        lspconfig.pylsp.setup{
+          capabilities = capabilities;
+          on_attach = default_on_attach;
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''{"${cfg.lsp.package}/bin/pylsp"}''
+        }
+        }
+      '';
     };
   };
 
-  defaultFormat = ["black"];
+  defaultFormat = "black";
   formats = {
     black = {
-      command = getExe pkgs.black;
+      package = pkgs.black;
     };
 
     isort = {
-      command = getExe pkgs.isort;
+      package = pkgs.isort;
     };
 
-    # dummy option for backwards compat
-    black-and-isort = {};
+    black-and-isort = {
+      package = pkgs.writeShellApplication {
+        name = "black";
+        runtimeInputs = [pkgs.black pkgs.isort];
+        text = ''
+          black --quiet - "$@" | isort --profile black -
+        '';
+      };
+    };
 
     ruff = {
-      command = getExe pkgs.ruff;
-      args = ["format" "-"];
-    };
-
-    ruff-check = {
       package = pkgs.writeShellApplication {
-        name = "ruff-check";
+        name = "ruff";
         runtimeInputs = [pkgs.ruff];
         text = ''
-          ruff check --fix --exit-zero -
+          ruff format -
         '';
       };
     };
@@ -235,10 +171,17 @@ in {
     lsp = {
       enable = mkEnableOption "Python LSP support" // {default = config.vim.lsp.enable;};
 
-      servers = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.python.lsp.servers" (enum (attrNames servers));
-        default = defaultServers;
+      server = mkOption {
         description = "Python LSP server to use";
+        type = enum (attrNames servers);
+        default = defaultServer;
+      };
+
+      package = mkOption {
+        description = "python LSP server package, or the command to run as a list of strings";
+        example = ''[lib.getExe pkgs.jdt-language-server "-data" "~/.cache/jdtls/workspace"]'';
+        type = either package (listOf str);
+        default = servers.${cfg.lsp.server}.package;
       };
     };
 
@@ -246,24 +189,30 @@ in {
       enable = mkEnableOption "Python formatting" // {default = config.vim.languages.enableFormat;};
 
       type = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.python.format.type" (enum (attrNames formats));
+        description = "Python formatter to use";
+        type = enum (attrNames formats);
         default = defaultFormat;
-        description = "Python formatters to use";
+      };
+
+      package = mkOption {
+        description = "Python formatter package";
+        type = package;
+        default = formats.${cfg.format.type}.package;
       };
     };
 
     # TODO this implementation is very bare bones, I don't know enough python to implement everything
     dap = {
       enable = mkOption {
+        description = "Enable Python Debug Adapter";
         type = bool;
         default = config.vim.languages.enableDAP;
-        description = "Enable Python Debug Adapter";
       };
 
       debugger = mkOption {
+        description = "Python debugger to use";
         type = enum (attrNames debuggers);
         default = defaultDebugger;
-        description = "Python debugger to use";
       };
 
       package = mkOption {
@@ -285,59 +234,26 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.luaConfigRC.python-util =
-        entryBefore ["lsp-servers"]
-        /*
-        lua
-        */
-        ''
-          local function set_python_path(server_name, command)
-            local path = command.args
-            local clients = vim.lsp.get_clients {
-              bufnr = vim.api.nvim_get_current_buf(),
-              name = server_name,
-            }
-            for _, client in ipairs(clients) do
-              if client.settings then
-                client.settings.python = vim.tbl_deep_extend('force', client.settings.python or {}, { pythonPath = path })
-              else
-                client.config.settings = vim.tbl_deep_extend('force', client.config.settings, { python = { pythonPath = path } })
-              end
-              client:notify('workspace/didChangeConfiguration', { settings = nil })
-            end
-          end
-        '';
-
-      vim.lsp.servers =
-        mapListToAttrs (n: {
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.python-lsp = servers.${cfg.lsp.server}.lspConfig;
     })
 
     (mkIf cfg.format.enable {
-      vim.formatter.conform-nvim = let
-        names = flatten (map (type:
-          if type == "black-and-isort"
-          then
-            warn ''
-              vim.languages.python.format.type: "black-and-isort" is deprecated,
-              use `["black" "isort"]` instead.
-            '' ["black" "isort"]
-          else type)
-        cfg.format.type);
-      in {
+      vim.formatter.conform-nvim = {
         enable = true;
-        setupOpts = {
-          formatters_by_ft.python = names;
-          formatters =
-            mapListToAttrs (name: {
-              inherit name;
-              value = formats.${name};
-            })
-            names;
-        };
+        # HACK: I'm planning to remove these soon so I just took the easiest way out
+        setupOpts.formatters_by_ft.python =
+          if cfg.format.type == "black-and-isort"
+          then ["black"]
+          else [cfg.format.type];
+        setupOpts.formatters =
+          if (cfg.format.type == "black-and-isort")
+          then {
+            black.command = "${cfg.format.package}/bin/black";
+          }
+          else {
+            ${cfg.format.type}.command = getExe cfg.format.package;
+          };
       };
     })
 
diff --git a/modules/plugins/languages/qml.nix b/modules/plugins/languages/qml.nix
deleted file mode 100644
index e8f40654..00000000
--- a/modules/plugins/languages/qml.nix
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: let
-  inherit (builtins) attrNames;
-  inherit (lib.meta) getExe';
-  inherit (lib.options) mkEnableOption mkOption;
-  inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.types) enum;
-  inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
-
-  cfg = config.vim.languages.qml;
-
-  qmlPackage = pkgs.kdePackages.qtdeclarative;
-
-  defaultServers = ["qmlls"];
-  servers = {
-    qmlls = {
-      cmd = [(getExe' qmlPackage "qmlls")];
-      filetypes = ["qml" "qmljs"];
-      rootmarkers = [".git"];
-    };
-  };
-
-  defaultFormat = ["qmlformat"];
-  formats = {
-    qmlformat = {
-      command = "${qmlPackage}/bin/qmlformat";
-      args = ["-i" "$FILENAME"];
-      stdin = false;
-    };
-  };
-in {
-  options.vim.languages.qml = {
-    enable = mkEnableOption "QML language support";
-    treesitter = {
-      enable = mkEnableOption "QML treesitter support" // {default = config.vim.languages.enableTreesitter;};
-      package = mkGrammarOption pkgs "qmljs";
-    };
-
-    lsp = {
-      enable = mkEnableOption "QML LSP support" // {default = config.vim.lsp.enable;};
-      servers = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.qml.lsp.servers" (enum (attrNames servers));
-        default = defaultServers;
-        description = "QML LSP server to use";
-      };
-    };
-
-    format = {
-      enable = mkEnableOption "QML formatting" // {default = config.vim.languages.enableFormat;};
-
-      type = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.qml.format.type" (enum (attrNames formats));
-        default = defaultFormat;
-        description = "QML formatter to use";
-      };
-    };
-  };
-
-  config = mkIf cfg.enable (mkMerge [
-    (mkIf cfg.treesitter.enable {
-      vim.treesitter = {
-        enable = true;
-        grammars = [cfg.treesitter.package];
-      };
-    })
-    (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (n: {
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
-    })
-
-    (mkIf (cfg.format.enable && !cfg.lsp.enable) {
-      vim.formatter.conform-nvim = {
-        enable = true;
-        setupOpts = {
-          formatters_by_ft.qml = cfg.format.type;
-          formatters =
-            mapListToAttrs (name: {
-              inherit name;
-              value = formats.${name};
-            })
-            cfg.format.type;
-        };
-      };
-    })
-  ]);
-}
diff --git a/modules/plugins/languages/r.nix b/modules/plugins/languages/r.nix
index d9f6e9f0..894c63f6 100644
--- a/modules/plugins/languages/r.nix
+++ b/modules/plugins/languages/r.nix
@@ -5,13 +5,12 @@
   ...
 }: let
   inherit (builtins) attrNames;
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption mkOption literalExpression;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.types) enum;
-  inherit (lib.meta) getExe;
-  inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
-  inherit (lib.generators) mkLuaInline;
+  inherit (lib.lists) isList;
+  inherit (lib.types) enum either listOf package str;
+  inherit (lib.nvim.lua) expToLua;
+  inherit (lib.nvim.types) mkGrammarOption;
 
   cfg = config.vim.languages.r;
 
@@ -19,44 +18,54 @@
     packages = [pkgs.rPackages.languageserver];
   };
 
-  defaultFormat = ["format_r"];
+  defaultFormat = "format_r";
   formats = {
     styler = {
-      command = let
-        pkg = pkgs.rWrapper.override {packages = [pkgs.rPackages.styler];};
-      in "${pkg}/bin/R";
+      package = pkgs.rWrapper.override {
+        packages = [pkgs.rPackages.styler];
+      };
+      config = {
+        command = "${cfg.format.package}/bin/R";
+      };
     };
 
     format_r = {
-      command = let
-        pkg = pkgs.rWrapper.override {
-          packages = [pkgs.rPackages.formatR];
-        };
-      in "${pkg}/bin/R";
-      stdin = true;
-      args = [
-        "--slave"
-        "--no-restore"
-        "--no-save"
-        "-s"
-        "-e"
-        ''formatR::tidy_source(source="stdin")''
-      ];
-      # TODO: range_args seem to be possible
-      # https://github.com/nvimtools/none-ls.nvim/blob/main/lua/null-ls/builtins/formatting/format_r.lua
+      package = pkgs.rWrapper.override {
+        packages = [pkgs.rPackages.formatR];
+      };
+      config = {
+        command = "${cfg.format.package}/bin/R";
+        stdin = true;
+        args = [
+          "--slave"
+          "--no-restore"
+          "--no-save"
+          "-s"
+          "-e"
+          ''formatR::tidy_source(source="stdin")''
+        ];
+        # TODO: range_args seem to be possible
+        # https://github.com/nvimtools/none-ls.nvim/blob/main/lua/null-ls/builtins/formatting/format_r.lua
+      };
     };
   };
 
-  defaultServers = ["r_language_server"];
+  defaultServer = "r_language_server";
   servers = {
     r_language_server = {
-      enable = true;
-      cmd = [(getExe r-with-languageserver) "--no-echo" "-e" "languageserver::run()"];
-      filetypes = ["r" "rmd" "quarto"];
-      root_dir = mkLuaInline ''
-        function(bufnr, on_dir)
-          on_dir(vim.fs.root(bufnr, '.git') or vim.uv.os_homedir())
-        end
+      package = pkgs.writeShellScriptBin "r_lsp" ''
+        ${r-with-languageserver}/bin/R --slave -e "languageserver::run()"
+      '';
+      lspConfig = ''
+        lspconfig.r_language_server.setup{
+          capabilities = capabilities;
+          on_attach = default_on_attach;
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''{"${lib.getExe cfg.lsp.package}"}''
+        }
+        }
       '';
     };
   };
@@ -72,10 +81,17 @@ in {
     lsp = {
       enable = mkEnableOption "R LSP support" // {default = config.vim.lsp.enable;};
 
-      servers = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.r.lsp.servers" (enum (attrNames servers));
-        default = defaultServers;
+      server = mkOption {
         description = "R LSP server to use";
+        type = enum (attrNames servers);
+        default = defaultServer;
+      };
+
+      package = mkOption {
+        description = "R LSP server package, or the command to run as a list of strings";
+        example = literalExpression "[ (lib.getExe pkgs.jdt-language-server) \"-data\" \"~/.cache/jdtls/workspace\" ]";
+        type = either package (listOf str);
+        default = servers.${cfg.lsp.server}.package;
       };
     };
 
@@ -83,10 +99,16 @@ in {
       enable = mkEnableOption "R formatting" // {default = config.vim.languages.enableFormat;};
 
       type = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.r.format.type" (enum (attrNames formats));
+        type = enum (attrNames formats);
         default = defaultFormat;
         description = "R formatter to use";
       };
+
+      package = mkOption {
+        type = package;
+        default = formats.${cfg.format.type}.package;
+        description = "R formatter package";
+      };
     };
   };
 
@@ -99,25 +121,14 @@ in {
     (mkIf cfg.format.enable {
       vim.formatter.conform-nvim = {
         enable = true;
-        setupOpts = {
-          formatters_by_ft.r = cfg.format.type;
-          formatters =
-            mapListToAttrs (name: {
-              inherit name;
-              value = formats.${name};
-            })
-            cfg.format.type;
-        };
+        setupOpts.formatters_by_ft.r = [cfg.format.type];
+        setupOpts.formatters.${cfg.format.type} = formats.${cfg.format.type}.config;
       };
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (n: {
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.r-lsp = servers.${cfg.lsp.server}.lspConfig;
     })
   ]);
 }
diff --git a/modules/plugins/languages/ruby.nix b/modules/plugins/languages/ruby.nix
index 14896f01..1f3ce82f 100644
--- a/modules/plugins/languages/ruby.nix
+++ b/modules/plugins/languages/ruby.nix
@@ -8,51 +8,55 @@
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.meta) getExe;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.nvim.types) mkGrammarOption diagnostics deprecatedSingleOrListOf;
-  inherit (lib.types) enum;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
+  inherit (lib.nvim.types) mkGrammarOption diagnostics;
+  inherit (lib.nvim.lua) expToLua;
+  inherit (lib.lists) isList;
+  inherit (lib.types) either listOf package str enum;
 
   cfg = config.vim.languages.ruby;
 
-  defaultServers = ["solargraph"];
+  defaultServer = "rubyserver";
   servers = {
-    ruby_lsp = {
-      enable = true;
-      cmd = [(getExe pkgs.ruby-lsp)];
-      filetypes = ["ruby" "eruby"];
-      root_markers = ["Gemfile" ".git"];
-      init_options = {
-        formatter = "auto";
-      };
+    rubyserver = {
+      package = pkgs.rubyPackages.solargraph;
+      lspConfig = ''
+        lspconfig.solargraph.setup {
+          capabilities = capabilities,
+          on_attach = attach_keymaps,
+          flags = {
+            debounce_text_changes = 150,
+          },
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''{ "${cfg.lsp.package}/bin/solargraph", "stdio" }''
+        }
+        }
+      '';
     };
-
-    solargraph = {
-      enable = true;
-      cmd = [(getExe pkgs.rubyPackages.solargraph) "stdio"];
-      filetypes = ["ruby"];
-      root_markers = ["Gemfile" ".git"];
-      settings = {
-        solargraph = {
-          diagnostics = true;
-        };
-      };
-
-      flags = {
-        debounce_text_changes = 150;
-      };
-
-      init_options = {
-        formatting = true;
-      };
+    rubylsp = {
+      package = pkgs.ruby-lsp;
+      lspConfig = ''
+        lspconfig.ruby_lsp.setup {
+          capabilities = capabilities,
+          on_attach = default_on_attach,
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''{ "${cfg.lsp.package}/bin/ruby-lsp" }''
+        }
+        }
+      '';
     };
   };
 
   # testing
 
-  defaultFormat = ["rubocop"];
+  defaultFormat = "rubocop";
   formats = {
     rubocop = {
-      command = getExe pkgs.rubyPackages.rubocop;
+      # TODO: is this right?
+      package = pkgs.rubyPackages.rubocop;
     };
   };
 
@@ -60,6 +64,7 @@
   diagnosticsProviders = {
     rubocop = {
       package = pkgs.rubyPackages.rubocop;
+      config.command = getExe cfg.format.package;
     };
   };
 in {
@@ -74,21 +79,33 @@ in {
     lsp = {
       enable = mkEnableOption "Ruby LSP support" // {default = config.vim.lsp.enable;};
 
-      servers = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.ruby.lsp.servers" (enum (attrNames servers));
-        default = defaultServers;
+      server = mkOption {
+        type = enum (attrNames servers);
+        default = defaultServer;
         description = "Ruby LSP server to use";
       };
+
+      package = mkOption {
+        type = either package (listOf str);
+        default = servers.${cfg.lsp.server}.package;
+        description = "Ruby LSP server package, or the command to run as a list of strings";
+      };
     };
 
     format = {
       enable = mkEnableOption "Ruby formatter support" // {default = config.vim.languages.enableFormat;};
 
       type = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.ruby.format.type" (enum (attrNames formats));
+        type = enum (attrNames formats);
         default = defaultFormat;
         description = "Ruby formatter to use";
       };
+
+      package = mkOption {
+        type = package;
+        default = formats.${cfg.format.type}.package;
+        description = "Ruby formatter package";
+      };
     };
 
     extraDiagnostics = {
@@ -111,25 +128,16 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (n: {
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.ruby-lsp = servers.${cfg.lsp.server}.lspConfig;
     })
 
     (mkIf cfg.format.enable {
       vim.formatter.conform-nvim = {
         enable = true;
-        setupOpts = {
-          formatters_by_ft.ruby = cfg.format.type;
-          formatters =
-            mapListToAttrs (name: {
-              inherit name;
-              value = formats.${name};
-            })
-            cfg.format.type;
+        setupOpts.formatters_by_ft.ruby = [cfg.format.type];
+        setupOpts.formatters.${cfg.format.type} = {
+          command = getExe cfg.format.package;
         };
       };
     })
diff --git a/modules/plugins/languages/rust.nix b/modules/plugins/languages/rust.nix
index fea75305..09c54ae6 100644
--- a/modules/plugins/languages/rust.nix
+++ b/modules/plugins/languages/rust.nix
@@ -4,24 +4,24 @@
   lib,
   ...
 }: let
+  inherit (builtins) attrNames;
   inherit (lib.meta) getExe;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.options) mkOption mkEnableOption literalMD;
   inherit (lib.strings) optionalString;
+  inherit (lib.trivial) boolToString;
   inherit (lib.lists) isList;
-  inherit (lib.attrsets) attrNames;
-  inherit (lib.types) bool package str listOf either enum int;
-  inherit (lib.nvim.lua) expToLua toLuaObject;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
-  inherit (lib.nvim.types) mkGrammarOption mkPluginSetupOption deprecatedSingleOrListOf;
+  inherit (lib.types) bool package str listOf either enum;
+  inherit (lib.nvim.types) mkGrammarOption;
+  inherit (lib.nvim.lua) expToLua;
   inherit (lib.nvim.dag) entryAfter entryAnywhere;
 
   cfg = config.vim.languages.rust;
 
-  defaultFormat = ["rustfmt"];
+  defaultFormat = "rustfmt";
   formats = {
     rustfmt = {
-      command = getExe pkgs.rustfmt;
+      package = pkgs.rustfmt;
     };
   };
 in {
@@ -33,6 +33,15 @@ in {
       package = mkGrammarOption pkgs "rust";
     };
 
+    crates = {
+      enable = mkEnableOption "crates-nvim, tools for managing dependencies";
+      codeActions = mkOption {
+        description = "Enable code actions through null-ls";
+        type = bool;
+        default = true;
+      };
+    };
+
     lsp = {
       enable = mkEnableOption "Rust LSP support (rust-analyzer with extra tools)" // {default = config.vim.lsp.enable;};
       package = mkOption {
@@ -70,9 +79,15 @@ in {
 
       type = mkOption {
         description = "Rust formatter to use";
-        type = deprecatedSingleOrListOf "vim.language.rust.format.type" (enum (attrNames formats));
+        type = enum (attrNames formats);
         default = defaultFormat;
       };
+
+      package = mkOption {
+        description = "Rust formatter package";
+        type = package;
+        default = formats.${cfg.format.type}.package;
+      };
     };
 
     dap = {
@@ -88,39 +103,25 @@ in {
         default = pkgs.lldb;
       };
     };
-
-    extensions = {
-      crates-nvim = {
-        enable = mkEnableOption "crates.io dependency management [crates-nvim]";
-
-        setupOpts = mkPluginSetupOption "crates-nvim" {
-          lsp = {
-            enabled = mkEnableOption "crates.nvim's in-process language server" // {default = cfg.extensions.crates-nvim.enable;};
-            actions = mkEnableOption "actions for crates-nvim's in-process language server" // {default = cfg.extensions.crates-nvim.enable;};
-            completion = mkEnableOption "completion for crates-nvim's in-process language server" // {default = cfg.extensions.crates-nvim.enable;};
-            hover = mkEnableOption "hover actions for crates-nvim's in-process language server" // {default = cfg.extensions.crates-nvim.enable;};
-          };
-          completion = {
-            crates = {
-              enabled = mkEnableOption "completion for crates-nvim's in-process language server" // {default = cfg.extensions.crates-nvim.enable;};
-              max_results = mkOption {
-                description = "The maximum number of search results to display";
-                type = int;
-                default = 8;
-              };
-              min_chars = mkOption {
-                description = "The minimum number of characters to type before completions begin appearing";
-                type = int;
-                default = 3;
-              };
-            };
-          };
-        };
-      };
-    };
   };
 
   config = mkIf cfg.enable (mkMerge [
+    (mkIf cfg.crates.enable {
+      vim = {
+        startPlugins = ["crates-nvim"];
+        lsp.null-ls.enable = mkIf cfg.crates.codeActions true;
+        autocomplete.nvim-cmp.sources = {crates = "[Crates]";};
+        pluginRC.rust-crates = entryAnywhere ''
+          require('crates').setup {
+            null_ls = {
+              enabled = ${boolToString cfg.crates.codeActions},
+              name = "crates.nvim",
+            }
+          }
+        '';
+      };
+    })
+
     (mkIf cfg.treesitter.enable {
       vim.treesitter.enable = true;
       vim.treesitter.grammars = [cfg.treesitter.package];
@@ -129,14 +130,9 @@ in {
     (mkIf cfg.format.enable {
       vim.formatter.conform-nvim = {
         enable = true;
-        setupOpts = {
-          formatters_by_ft.rust = cfg.format.type;
-          formatters =
-            mapListToAttrs (name: {
-              inherit name;
-              value = formats.${name};
-            })
-            cfg.format.type;
+        setupOpts.formatters_by_ft.rust = [cfg.format.type];
+        setupOpts.formatters.${cfg.format.type} = {
+          command = getExe cfg.format.package;
         };
       };
     })
@@ -144,6 +140,7 @@ in {
     (mkIf (cfg.lsp.enable || cfg.dap.enable) {
       vim = {
         startPlugins = ["rustaceanvim"];
+
         pluginRC.rustaceanvim = entryAfter ["lsp-setup"] ''
           vim.g.rustaceanvim = {
           ${optionalString cfg.lsp.enable ''
@@ -202,16 +199,5 @@ in {
         '';
       };
     })
-
-    (mkIf cfg.extensions.crates-nvim.enable {
-      vim = mkMerge [
-        {
-          startPlugins = ["crates-nvim"];
-          pluginRC.rust-crates = entryAnywhere ''
-            require("crates").setup(${toLuaObject cfg.extensions.crates-nvim.setupOpts})
-          '';
-        }
-      ];
-    })
   ]);
 }
diff --git a/modules/plugins/languages/sql.nix b/modules/plugins/languages/sql.nix
index e3e686ec..add46c15 100644
--- a/modules/plugins/languages/sql.nix
+++ b/modules/plugins/languages/sql.nix
@@ -8,36 +8,43 @@
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.meta) getExe;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.types) enum package str;
-  inherit (lib.nvim.types) diagnostics deprecatedSingleOrListOf;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
-  inherit (lib.generators) mkLuaInline;
+  inherit (lib.lists) isList;
+  inherit (lib.types) enum either listOf package str;
+  inherit (lib.nvim.lua) expToLua;
+  inherit (lib.nvim.types) diagnostics;
 
   cfg = config.vim.languages.sql;
   sqlfluffDefault = pkgs.sqlfluff;
 
-  defaultServers = ["sqls"];
+  defaultServer = "sqls";
   servers = {
     sqls = {
-      enable = true;
-      cmd = [(getExe pkgs.sqls)];
-      filetypes = ["sql" "mysql"];
-      root_markers = ["config.yml"];
-      settings = {};
-      on_attach = mkLuaInline ''
-        function(client, bufnr)
-          client.server_capabilities.execute_command = true
-          require'sqls'.setup{}
-        end
+      package = pkgs.sqls;
+      lspConfig = ''
+        lspconfig.sqls.setup {
+          on_attach = function(client)
+            client.server_capabilities.execute_command = true
+            on_attach_keymaps(client, bufnr)
+            require'sqls'.setup{}
+          end,
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''{ "${cfg.lsp.package}/bin/sqls", "-config", string.format("%s/config.yml", vim.fn.getcwd()) }''
+        }
+        }
       '';
     };
   };
 
-  defaultFormat = ["sqlfluff"];
+  defaultFormat = "sqlfluff";
   formats = {
     sqlfluff = {
-      command = getExe sqlfluffDefault;
-      append_args = ["--dialect=${cfg.dialect}"];
+      package = sqlfluffDefault;
+      config = {
+        command = getExe cfg.format.package;
+        append_args = ["--dialect=${cfg.dialect}"];
+      };
     };
   };
 
@@ -56,28 +63,35 @@ in {
     enable = mkEnableOption "SQL language support";
 
     dialect = mkOption {
+      description = "SQL dialect for sqlfluff (if used)";
       type = str;
       default = "ansi";
-      description = "SQL dialect for sqlfluff (if used)";
     };
 
     treesitter = {
       enable = mkEnableOption "SQL treesitter" // {default = config.vim.languages.enableTreesitter;};
 
       package = mkOption {
+        description = "SQL treesitter grammar to use";
         type = package;
         default = pkgs.vimPlugins.nvim-treesitter.builtGrammars.sql;
-        description = "SQL treesitter grammar to use";
       };
     };
 
     lsp = {
       enable = mkEnableOption "SQL LSP support" // {default = config.vim.lsp.enable;};
 
-      servers = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.sql.lsp.servers" (enum (attrNames servers));
-        default = defaultServers;
+      server = mkOption {
         description = "SQL LSP server to use";
+        type = enum (attrNames servers);
+        default = defaultServer;
+      };
+
+      package = mkOption {
+        description = "SQL LSP server package, or the command to run as a list of strings";
+        example = ''[lib.getExe pkgs.jdt-language-server "-data" "~/.cache/jdtls/workspace"]'';
+        type = either package (listOf str);
+        default = servers.${cfg.lsp.server}.package;
       };
     };
 
@@ -85,9 +99,15 @@ in {
       enable = mkEnableOption "SQL formatting" // {default = config.vim.languages.enableFormat;};
 
       type = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.sql.format.type" (enum (attrNames formats));
-        default = defaultFormat;
         description = "SQL formatter to use";
+        type = enum (attrNames formats);
+        default = defaultFormat;
+      };
+
+      package = mkOption {
+        description = "SQL formatter package";
+        type = package;
+        default = formats.${cfg.format.type}.package;
       };
     };
 
@@ -112,27 +132,18 @@ in {
       vim = {
         startPlugins = ["sqls-nvim"];
 
-        lsp.servers =
-          mapListToAttrs (n: {
-            name = n;
-            value = servers.${n};
-          })
-          cfg.lsp.servers;
+        lsp.lspconfig = {
+          enable = true;
+          sources.sql-lsp = servers.${cfg.lsp.server}.lspConfig;
+        };
       };
     })
 
     (mkIf cfg.format.enable {
       vim.formatter.conform-nvim = {
         enable = true;
-        setupOpts = {
-          formatters_by_ft.sql = cfg.format.type;
-          formatters =
-            mapListToAttrs (name: {
-              inherit name;
-              value = formats.${name};
-            })
-            cfg.format.type;
-        };
+        setupOpts.formatters_by_ft.sql = [cfg.format.type];
+        setupOpts.formatters.${cfg.format.type} = formats.${cfg.format.type}.config;
       };
     })
 
diff --git a/modules/plugins/languages/svelte.nix b/modules/plugins/languages/svelte.nix
index bfe793a0..4cc9ffe9 100644
--- a/modules/plugins/languages/svelte.nix
+++ b/modules/plugins/languages/svelte.nix
@@ -1,5 +1,4 @@
 {
-  self,
   config,
   pkgs,
   lib,
@@ -8,65 +7,41 @@
   inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.lists) isList;
   inherit (lib.meta) getExe;
-  inherit (lib.types) enum package coercedTo;
-  inherit (lib.nvim.types) mkGrammarOption diagnostics deprecatedSingleOrListOf;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
-  inherit (lib.generators) mkLuaInline;
+  inherit (lib.types) enum either listOf package str;
+  inherit (lib.nvim.lua) expToLua;
+  inherit (lib.nvim.types) mkGrammarOption diagnostics;
 
   cfg = config.vim.languages.svelte;
 
-  defaultServers = ["svelte"];
+  defaultServer = "svelte";
   servers = {
     svelte = {
-      enable = true;
-      cmd = [(getExe pkgs.svelte-language-server) "--stdio"];
-      filetypes = ["svelte"];
-      root_dir = mkLuaInline ''
-        function(bufnr, on_dir)
-          local root_files = { 'package.json', '.git' }
-          local fname = vim.api.nvim_buf_get_name(bufnr)
-          -- Svelte LSP only supports file:// schema. https://github.com/sveltejs/language-tools/issues/2777
-          if vim.uv.fs_stat(fname) ~= nil then
-            on_dir(vim.fs.dirname(vim.fs.find(root_files, { path = fname, upward = true })[1]))
-          end
-        end
-      '';
-      on_attach = mkLuaInline ''
-        function(client, bufnr)
-          vim.api.nvim_create_autocmd('BufWritePost', {
-            pattern = { '*.js', '*.ts' },
-            group = vim.api.nvim_create_augroup('svelte_js_ts_file_watch', {}),
-            callback = function(ctx)
-              -- internal API to sync changes that have not yet been saved to the file system
-              client:notify('$/onDidChangeTsOrJsFile', { uri = ctx.match })
-            end,
-          })
-
-          vim.api.nvim_buf_create_user_command(bufnr, 'LspMigrateToSvelte5', function()
-            client:exec_cmd({
-              command = 'migrate_to_svelte_5',
-              arguments = { vim.uri_from_bufnr(bufnr) },
-            })
-          end, { desc = 'Migrate Component to Svelte 5 Syntax' })
-        end
+      package = pkgs.svelte-language-server;
+      lspConfig = ''
+        lspconfig.svelte.setup {
+          capabilities = capabilities;
+          on_attach = attach_keymaps,
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''{"${cfg.lsp.package}/bin/svelteserver", "--stdio"}''
+        }
+        }
       '';
     };
   };
 
-  defaultFormat = ["prettier"];
-  formats = let
-    prettierPlugin = self.packages.${pkgs.stdenv.system}.prettier-plugin-svelte;
-    prettierPluginPath = "${prettierPlugin}/lib/node_modules/prettier-plugin-svelte/plugin.js";
-  in {
+  # TODO: specify packages
+  defaultFormat = "prettier";
+  formats = {
     prettier = {
-      command = getExe pkgs.nodePackages.prettier;
-      options.ft_parsers.svelte = "svelte";
-      prepend_args = ["--plugin=${prettierPluginPath}"];
+      package = pkgs.prettier;
     };
 
     biome = {
-      command = getExe pkgs.biome;
+      package = pkgs.biome;
     };
   };
 
@@ -90,15 +65,6 @@
       };
     };
   };
-
-  formatType =
-    deprecatedSingleOrListOf
-    "vim.languages.svelte.format.type"
-    (coercedTo (enum ["prettierd"]) (_:
-      lib.warn
-      "vim.languages.svelte.format.type: prettierd is deprecated, use prettier instead"
-      "prettier")
-    (enum (attrNames formats)));
 in {
   options.vim.languages.svelte = {
     enable = mkEnableOption "Svelte language support";
@@ -112,10 +78,17 @@ in {
     lsp = {
       enable = mkEnableOption "Svelte LSP support" // {default = config.vim.lsp.enable;};
 
-      servers = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.svelte.lsp.servers" (enum (attrNames servers));
-        default = defaultServers;
+      server = mkOption {
         description = "Svelte LSP server to use";
+        type = enum (attrNames servers);
+        default = defaultServer;
+      };
+
+      package = mkOption {
+        description = "Svelte LSP server package, or the command to run as a list of strings";
+        example = ''[lib.getExe pkgs.jdt-language-server "-data" "~/.cache/jdtls/workspace"]'';
+        type = either package (listOf str);
+        default = servers.${cfg.lsp.server}.package;
       };
     };
 
@@ -123,9 +96,15 @@ in {
       enable = mkEnableOption "Svelte formatting" // {default = config.vim.languages.enableFormat;};
 
       type = mkOption {
-        type = formatType;
-        default = defaultFormat;
         description = "Svelte formatter to use";
+        type = enum (attrNames formats);
+        default = defaultFormat;
+      };
+
+      package = mkOption {
+        description = "Svelte formatter package";
+        type = package;
+        default = formats.${cfg.format.type}.package;
       };
     };
 
@@ -147,25 +126,16 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (n: {
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.svelte-lsp = servers.${cfg.lsp.server}.lspConfig;
     })
 
     (mkIf cfg.format.enable {
       vim.formatter.conform-nvim = {
         enable = true;
-        setupOpts = {
-          formatters_by_ft.svelte = cfg.format.type;
-          formatters =
-            mapListToAttrs (name: {
-              inherit name;
-              value = formats.${name};
-            })
-            cfg.format.type;
+        setupOpts.formatters_by_ft.svelte = [cfg.format.type];
+        setupOpts.formatters.${cfg.format.type} = {
+          command = getExe cfg.format.package;
         };
       };
     })
diff --git a/modules/plugins/languages/tailwind.nix b/modules/plugins/languages/tailwind.nix
index 35449237..fbe707ba 100644
--- a/modules/plugins/languages/tailwind.nix
+++ b/modules/plugins/languages/tailwind.nix
@@ -7,142 +7,26 @@
   inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.meta) getExe;
-  inherit (lib.types) enum;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
-  inherit (lib.nvim.types) deprecatedSingleOrListOf;
-  inherit (lib.generators) mkLuaInline;
+  inherit (lib.lists) isList;
+  inherit (lib.types) enum either listOf package str;
+  inherit (lib.nvim.lua) expToLua;
 
   cfg = config.vim.languages.tailwind;
 
-  defaultServers = ["tailwindcss"];
+  defaultServer = "tailwindcss-language-server";
   servers = {
-    tailwindcss = {
-      enable = true;
-      cmd = [(getExe pkgs.tailwindcss-language-server) "--stdio"];
-      filetypes = [
-        # html
-        "aspnetcorerazor"
-        "astro"
-        "astro-markdown"
-        "blade"
-        "clojure"
-        "django-html"
-        "htmldjango"
-        "edge"
-        "eelixir"
-        "elixir"
-        "ejs"
-        "erb"
-        "eruby"
-        "gohtml"
-        "gohtmltmpl"
-        "haml"
-        "handlebars"
-        "hbs"
-        "html"
-        "htmlangular"
-        "html-eex"
-        "heex"
-        "jade"
-        "leaf"
-        "liquid"
-        "markdown"
-        "mdx"
-        "mustache"
-        "njk"
-        "nunjucks"
-        "php"
-        "razor"
-        "slim"
-        "twig"
-        # css
-        "css"
-        "less"
-        "postcss"
-        "sass"
-        "scss"
-        "stylus"
-        "sugarss"
-        # js
-        "javascript"
-        "javascriptreact"
-        "reason"
-        "rescript"
-        "typescript"
-        "typescriptreact"
-        # mixed
-        "vue"
-        "svelte"
-        "templ"
-      ];
-      settings = {
-        tailwindCSS = {
-          validate = true;
-          lint = {
-            cssConflict = "warning";
-            invalidApply = "error";
-            invalidScreen = "error";
-            invalidVariant = "error";
-            invalidConfigPath = "error";
-            invalidTailwindDirective = "error";
-            recommendedVariantOrder = "warning";
-          };
-          classAttributes = [
-            "class"
-            "className"
-            "class:list"
-            "classList"
-            "ngClass"
-          ];
-          includeLanguages = {
-            eelixir = "html-eex";
-            elixir = "phoenix-heex";
-            eruby = "erb";
-            heex = "phoenix-heex";
-            htmlangular = "html";
-            templ = "html";
-          };
-        };
-      };
-      before_init = mkLuaInline ''
-        function(_, config)
-          if not config.settings then
-            config.settings = {}
-          end
-          if not config.settings.editor then
-            config.settings.editor = {}
-          end
-          if not config.settings.editor.tabSize then
-            config.settings.editor.tabSize = vim.lsp.util.get_effective_tabstop()
-          end
-        end
-      '';
-      workspace_required = true;
-      root_dir = mkLuaInline ''
-        function(bufnr, on_dir)
-          local root_files = {
-            -- Generic
-            'tailwind.config.js',
-            'tailwind.config.cjs',
-            'tailwind.config.mjs',
-            'tailwind.config.ts',
-            'postcss.config.js',
-            'postcss.config.cjs',
-            'postcss.config.mjs',
-            'postcss.config.ts',
-            -- Django
-            'theme/static_src/tailwind.config.js',
-            'theme/static_src/tailwind.config.cjs',
-            'theme/static_src/tailwind.config.mjs',
-            'theme/static_src/tailwind.config.ts',
-            'theme/static_src/postcss.config.js',
-          }
-          local fname = vim.api.nvim_buf_get_name(bufnr)
-          root_files = util.insert_package_json(root_files, 'tailwindcss', fname)
-          root_files = util.root_markers_with_field(root_files, { 'mix.lock', 'Gemfile.lock' }, 'tailwind', fname)
-          on_dir(vim.fs.dirname(vim.fs.find(root_files, { path = fname, upward = true })[1]))
-        end
+    tailwindcss-language-server = {
+      package = pkgs.tailwindcss-language-server;
+      lspConfig = ''
+        lspconfig.tailwindcss.setup {
+          capabilities = capabilities;
+          on_attach = default_on_attach;
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''{"${cfg.lsp.package}/bin/tailwindcss-language-server", "--stdio"}''
+        }
+        }
       '';
     };
   };
@@ -153,22 +37,25 @@ in {
     lsp = {
       enable = mkEnableOption "Tailwindcss LSP support" // {default = config.vim.lsp.enable;};
 
-      servers = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.tailwind.lsp.servers" (enum (attrNames servers));
-        default = defaultServers;
+      server = mkOption {
         description = "Tailwindcss LSP server to use";
+        type = enum (attrNames servers);
+        default = defaultServer;
+      };
+
+      package = mkOption {
+        description = "Tailwindcss LSP server package, or the command to run as a list of strings";
+        example = ''[lib.getExe pkgs.jdt-language-server " - data " " ~/.cache/jdtls/workspace "]'';
+        type = either package (listOf str);
+        default = servers.${cfg.lsp.server}.package;
       };
     };
   };
 
   config = mkIf cfg.enable (mkMerge [
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (n: {
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.tailwindcss-lsp = servers.${cfg.lsp.server}.lspConfig;
     })
   ]);
 }
diff --git a/modules/plugins/languages/terraform.nix b/modules/plugins/languages/terraform.nix
index 5f3952df..095da072 100644
--- a/modules/plugins/languages/terraform.nix
+++ b/modules/plugins/languages/terraform.nix
@@ -4,25 +4,12 @@
   lib,
   ...
 }: let
-  inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.meta) getExe;
-  inherit (lib.types) enum listOf;
+  inherit (lib.types) package;
   inherit (lib.nvim.types) mkGrammarOption;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
 
   cfg = config.vim.languages.terraform;
-
-  defaultServers = ["terraformls"];
-  servers = {
-    terraformls = {
-      enable = true;
-      cmd = [(getExe pkgs.terraform-ls) "serve"];
-      filetypes = ["terraform" "terraform-vars"];
-      root_markers = [".terraform" ".git"];
-    };
-  };
 in {
   options.vim.languages.terraform = {
     enable = mkEnableOption "Terraform/HCL support";
@@ -35,10 +22,10 @@ in {
     lsp = {
       enable = mkEnableOption "Terraform LSP support (terraform-ls)" // {default = config.vim.lsp.enable;};
 
-      servers = mkOption {
-        type = listOf (enum (attrNames servers));
-        default = defaultServers;
-        description = "Terraform LSP server to use";
+      package = mkOption {
+        description = "terraform-ls package";
+        type = package;
+        default = pkgs.terraform-ls;
       };
     };
   };
@@ -49,12 +36,14 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (n: {
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.terraform-ls = ''
+        lspconfig.terraformls.setup {
+          capabilities = capabilities,
+          on_attach=default_on_attach,
+          cmd = {"${cfg.lsp.package}/bin/terraform-ls", "serve"},
+        }
+      '';
     })
   ]);
 }
diff --git a/modules/plugins/languages/ts.nix b/modules/plugins/languages/ts.nix
index e5dc8d13..6064da98 100644
--- a/modules/plugins/languages/ts.nix
+++ b/modules/plugins/languages/ts.nix
@@ -4,187 +4,86 @@
   lib,
   ...
 }: let
-  inherit (builtins) attrNames elem;
+  inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.lists) isList;
   inherit (lib.meta) getExe;
-  inherit (lib.types) enum package bool;
-  inherit (lib.generators) mkLuaInline;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
-  inherit (lib.nvim.lua) toLuaObject;
-  inherit (lib.nvim.types) mkGrammarOption diagnostics mkPluginSetupOption deprecatedSingleOrListOf;
-  inherit (lib.nvim.dag) entryAnywhere entryBefore;
+  inherit (lib.types) enum either listOf package str bool;
+  inherit (lib.nvim.lua) expToLua toLuaObject;
+  inherit (lib.nvim.types) mkGrammarOption diagnostics mkPluginSetupOption;
+  inherit (lib.nvim.dag) entryAnywhere;
 
   cfg = config.vim.languages.ts;
 
-  defaultServers = ["ts_ls"];
-  servers = let
+  defaultServer = "ts_ls";
+  servers = {
     ts_ls = {
-      cmd = [(getExe pkgs.typescript-language-server) "--stdio"];
-      init_options = {hostInfo = "neovim";};
-      filetypes = [
-        "javascript"
-        "javascriptreact"
-        "javascript.jsx"
-        "typescript"
-        "typescriptreact"
-        "typescript.tsx"
-      ];
-      root_markers = ["tsconfig.json" "jsconfig.json" "package.json" ".git"];
-      handlers = {
-        # handle rename request for certain code actions like extracting functions / types
-        "_typescript.rename" = mkLuaInline ''
-          function(_, result, ctx)
-            local client = assert(vim.lsp.get_client_by_id(ctx.client_id))
-            vim.lsp.util.show_document({
-              uri = result.textDocument.uri,
-              range = {
-                start = result.position,
-                ['end'] = result.position,
-              },
-            }, client.offset_encoding)
-            vim.lsp.buf.rename()
-            return vim.NIL
-          end
-        '';
-      };
-      on_attach = mkLuaInline ''
-        function(client, bufnr)
-          -- ts_ls provides `source.*` code actions that apply to the whole file. These only appear in
-          -- `vim.lsp.buf.code_action()` if specified in `context.only`.
-          vim.api.nvim_buf_create_user_command(0, 'LspTypescriptSourceAction', function()
-            local source_actions = vim.tbl_filter(function(action)
-              return vim.startswith(action, 'source.')
-            end, client.server_capabilities.codeActionProvider.codeActionKinds)
-
-            vim.lsp.buf.code_action({
-              context = {
-                only = source_actions,
-              },
-            })
-          end, {})
-        end
+      package = pkgs.typescript-language-server;
+      lspConfig = ''
+        lspconfig.ts_ls.setup {
+          capabilities = capabilities,
+          on_attach = function(client, bufnr)
+            attach_keymaps(client, bufnr);
+            client.server_capabilities.documentFormattingProvider = false;
+          end,
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''{"${cfg.lsp.package}/bin/typescript-language-server", "--stdio"}''
+        }
+        }
       '';
     };
-  in {
-    inherit ts_ls;
+
+    denols = {
+      package = pkgs.deno;
+      lspConfig = ''
+        vim.g.markdown_fenced_languages = { "ts=typescript" }
+        lspconfig.denols.setup {
+          capabilities = capabilities;
+          on_attach = attach_keymaps,
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''{"${cfg.lsp.package}/bin/deno", "lsp"}''
+        }
+        }
+      '';
+    };
+
     # Here for backwards compatibility. Still consider tsserver a valid
     # configuration in the enum, but assert if it's set to *properly*
     # redirect the user to the correct server.
-    tsserver = ts_ls;
-
-    denols = {
-      cmd = [(getExe pkgs.deno) "lsp"];
-      cmd_env = {NO_COLOR = true;};
-      filetypes = [
-        "javascript"
-        "javascriptreact"
-        "javascript.jsx"
-        "typescript"
-        "typescriptreact"
-        "typescript.tsx"
-      ];
-      root_markers = ["deno.json" "deno.jsonc" ".git"];
-      settings = {
-        deno = {
-          enable = true;
-          suggest = {
-            imports = {
-              hosts = {
-                "https://deno.land" = true;
-              };
-            };
-          };
-        };
-      };
-      handlers = {
-        "textDocument/definition" = mkLuaInline "nvf_denols_handler";
-        "textDocument/typeDefinition" = mkLuaInline "nvf_denols_handler";
-        "textDocument/references" = mkLuaInline "nvf_denols_handler";
-      };
-      on_attach = mkLuaInline ''
-        function(client, bufnr)
-          vim.api.nvim_buf_create_user_command(0, 'LspDenolsCache', function()
-            client:exec_cmd({
-              command = 'deno.cache',
-              arguments = { {}, vim.uri_from_bufnr(bufnr) },
-            }, { bufnr = bufnr }, function(err, _result, ctx)
-              if err then
-                local uri = ctx.params.arguments[2]
-                vim.api.nvim_err_writeln('cache command failed for ' .. vim.uri_to_fname(uri))
-              end
-            end)
-          end, {
-            desc = 'Cache a module and all of its dependencies.',
-          })
-        end
+    tsserver = {
+      package = pkgs.typescript-language-server;
+      lspConfig = ''
+        lspconfig.ts_ls.setup {
+          capabilities = capabilities;
+          on_attach = attach_keymaps,
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''{"${cfg.lsp.package}/bin/typescript-language-server", "--stdio"}''
+        }
+        }
       '';
     };
   };
 
-  denols_handlers = ''
-    local function nvf_denols_virtual_text_document_handler(uri, res, client)
-      if not res then
-        return nil
-      end
-
-      local lines = vim.split(res.result, '\n')
-      local bufnr = vim.uri_to_bufnr(uri)
-
-      local current_buf = vim.api.nvim_buf_get_lines(bufnr, 0, -1, false)
-      if #current_buf ~= 0 then
-        return nil
-      end
-
-      vim.api.nvim_buf_set_lines(bufnr, 0, -1, false, lines)
-      vim.api.nvim_set_option_value('readonly', true, { buf = bufnr })
-      vim.api.nvim_set_option_value('modified', false, { buf = bufnr })
-      vim.api.nvim_set_option_value('modifiable', false, { buf = bufnr })
-      vim.lsp.buf_attach_client(bufnr, client.id)
-    end
-
-    local function nvf_denols_virtual_text_document(uri, client)
-      local params = {
-        textDocument = {
-          uri = uri,
-        },
-      }
-      local result = client.request_sync('deno/virtualTextDocument', params)
-      nvf_denols_virtual_text_document_handler(uri, result, client)
-    end
-
-    local function nvf_denols_handler(err, result, ctx, config)
-      if not result or vim.tbl_isempty(result) then
-        return nil
-      end
-
-      local client = vim.lsp.get_client_by_id(ctx.client_id)
-      for _, res in pairs(result) do
-        local uri = res.uri or res.targetUri
-        if uri:match '^deno:' then
-          nvf_denols_virtual_text_document(uri, client)
-          res['uri'] = uri
-          res['targetUri'] = uri
-        end
-      end
-
-      vim.lsp.handlers[ctx.method](err, result, ctx, config)
-    end
-  '';
-
   # TODO: specify packages
-  defaultFormat = ["prettier"];
+  defaultFormat = "prettier";
   formats = {
     prettier = {
-      command = getExe pkgs.prettier;
+      package = pkgs.prettier;
     };
 
     prettierd = {
-      command = getExe pkgs.prettierd;
+      package = pkgs.prettierd;
     };
 
     biome = {
-      command = getExe pkgs.biome;
+      package = pkgs.biome;
     };
   };
 
@@ -216,18 +115,24 @@ in {
 
     treesitter = {
       enable = mkEnableOption "Typescript/Javascript treesitter" // {default = config.vim.languages.enableTreesitter;};
-      tsPackage = mkGrammarOption pkgs "typescript";
-      tsxPackage = mkGrammarOption pkgs "tsx";
+      tsPackage = mkGrammarOption pkgs "tsx";
       jsPackage = mkGrammarOption pkgs "javascript";
     };
 
     lsp = {
       enable = mkEnableOption "Typescript/Javascript LSP support" // {default = config.vim.lsp.enable;};
 
-      servers = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.ts.lsp.servers" (enum (attrNames servers));
-        default = defaultServers;
+      server = mkOption {
         description = "Typescript/Javascript LSP server to use";
+        type = enum (attrNames servers);
+        default = defaultServer;
+      };
+
+      package = mkOption {
+        description = "Typescript/Javascript LSP server package, or the command to run as a list of strings";
+        example = ''[lib.getExe pkgs.jdt-language-server "-data" "~/.cache/jdtls/workspace"]'';
+        type = either package (listOf str);
+        default = servers.${cfg.lsp.server}.package;
       };
     };
 
@@ -236,9 +141,15 @@ in {
 
       type = mkOption {
         description = "Typescript/Javascript formatter to use";
-        type = deprecatedSingleOrListOf "vim.language.ts.format.type" (enum (attrNames formats));
+        type = enum (attrNames formats);
         default = defaultFormat;
       };
+
+      package = mkOption {
+        description = "Typescript/Javascript formatter package";
+        type = package;
+        default = formats.${cfg.format.type}.package;
+      };
     };
 
     extraDiagnostics = {
@@ -275,43 +186,24 @@ in {
   config = mkIf cfg.enable (mkMerge [
     (mkIf cfg.treesitter.enable {
       vim.treesitter.enable = true;
-      vim.treesitter.grammars = [
-        cfg.treesitter.tsPackage
-        cfg.treesitter.tsxPackage
-        cfg.treesitter.jsPackage
-      ];
+      vim.treesitter.grammars = [cfg.treesitter.tsPackage cfg.treesitter.jsPackage];
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (name: {
-          inherit name;
-          value = servers.${name};
-        })
-        cfg.lsp.servers;
-    })
-
-    (mkIf (cfg.lsp.enable && elem "denols" cfg.lsp.servers) {
-      vim.globals.markdown_fenced_languages = ["ts=typescript"];
-      vim.luaConfigRC.denols_handlers = entryBefore ["lsp-servers"] denols_handlers;
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.ts-lsp = servers.${cfg.lsp.server}.lspConfig;
     })
 
     (mkIf cfg.format.enable {
       vim.formatter.conform-nvim = {
         enable = true;
         setupOpts = {
-          formatters_by_ft = {
-            typescript = cfg.format.type;
-            javascript = cfg.format.type;
-            # .tsx/.jsx files
-            typescriptreact = cfg.format.type;
+          formatters_by_ft.typescript = [cfg.format.type];
+          # .tsx files
+          formatters_by_ft.typescriptreact = [cfg.format.type];
+          formatters.${cfg.format.type} = {
+            command = getExe cfg.format.package;
           };
-          setupOpts.formatters =
-            mapListToAttrs (name: {
-              inherit name;
-              value = formats.${name};
-            })
-            cfg.format.type;
         };
       };
     })
@@ -342,7 +234,7 @@ in {
     {
       assertions = [
         {
-          assertion = cfg.lsp.enable -> !(elem "tsserver" cfg.lsp.servers);
+          assertion = cfg.lsp.enable -> cfg.lsp.server != "tsserver";
           message = ''
             As of a recent lspconfig update, the `tsserver` configuration has been renamed
             to `ts_ls` to match upstream behaviour of `lspconfig`, and the name `tsserver`
diff --git a/modules/plugins/languages/typst.nix b/modules/plugins/languages/typst.nix
index 10783b61..77f0e504 100644
--- a/modules/plugins/languages/typst.nix
+++ b/modules/plugins/languages/typst.nix
@@ -4,99 +4,64 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkOption mkEnableOption;
+  inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.types) nullOr enum attrsOf listOf package str bool int;
+  inherit (lib.lists) isList;
+  inherit (lib.types) nullOr enum either attrsOf listOf package str bool int;
   inherit (lib.attrsets) attrNames;
   inherit (lib.meta) getExe;
-  inherit (lib.nvim.types) mkGrammarOption mkPluginSetupOption deprecatedSingleOrListOf;
+  inherit (lib.nvim.binds) mkMappingOption mkKeymap;
+  inherit (lib.nvim.lua) expToLua toLuaObject;
+  inherit (lib.nvim.types) mkGrammarOption mkPluginSetupOption;
   inherit (lib.nvim.dag) entryAnywhere;
-  inherit (lib.nvim.lua) toLuaObject;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
-  inherit (lib.nvim.binds) mkKeymap mkMappingOption;
-  inherit (lib.generators) mkLuaInline;
 
   cfg = config.vim.languages.typst;
 
-  defaultServers = ["tinymist"];
+  defaultServer = "tinymist";
   servers = {
-    typst_lsp = {
-      enable = true;
-      cmd = [(getExe pkgs.typst-lsp)];
-      filetypes = ["typst"];
-      root_markers = [".git"];
-      on_attach = mkLuaInline ''
-        function(client, bufnr)
-          -- Disable semantic tokens as a workaround for a semantic token error when using non-english characters
-          client.server_capabilities.semanticTokensProvider = nil
-        end
+    typst-lsp = {
+      package = pkgs.typst-lsp;
+      lspConfig = ''
+        lspconfig.typst_lsp.setup {
+          capabilities = capabilities,
+          on_attach = function(client, bufnr)
+            -- Disable semantic tokens as a workaround for a semantic token error when using non-english characters
+            client.server_capabilities.semanticTokensProvider = nil
+          end,
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''{"${cfg.lsp.package}/bin/typst-lsp"}''
+        },
+        }
       '';
     };
 
     tinymist = {
-      enable = true;
-      cmd = [(getExe pkgs.tinymist)];
-      filetypes = ["typst"];
-      root_markers = [".git"];
-      on_attach = mkLuaInline ''
-        function(client, bufnr)
-          local function create_tinymist_command(command_name, client, bufnr)
-            local export_type = command_name:match 'tinymist%.export(%w+)'
-            local info_type = command_name:match 'tinymist%.(%w+)'
-            if info_type and info_type:match '^get' then
-              info_type = info_type:gsub('^get', 'Get')
-            end
-            local cmd_display = export_type or info_type
-            local function run_tinymist_command()
-              local arguments = { vim.api.nvim_buf_get_name(bufnr) }
-              local title_str = export_type and ('Export ' .. cmd_display) or cmd_display
-              local function handler(err, res)
-                if err then
-                  return vim.notify(err.code .. ': ' .. err.message, vim.log.levels.ERROR)
-                end
-                vim.notify(export_type and res or vim.inspect(res), vim.log.levels.INFO)
-              end
-              if vim.fn.has 'nvim-0.11' == 1 then
-                return client:exec_cmd({
-                  title = title_str,
-                  command = command_name,
-                  arguments = arguments,
-                }, { bufnr = bufnr }, handler)
-              else
-                return vim.notify('Tinymist commands require Neovim 0.11+', vim.log.levels.WARN)
-              end
-            end
-            local cmd_name = export_type and ('LspTinymistExport' .. cmd_display) or ('LspTinymist' .. cmd_display)
-            local cmd_desc = export_type and ('Export to ' .. cmd_display) or ('Get ' .. cmd_display)
-            return run_tinymist_command, cmd_name, cmd_desc
-          end
-
-          for _, command in ipairs {
-            'tinymist.exportSvg',
-            'tinymist.exportPng',
-            'tinymist.exportPdf',
-            'tinymist.exportMarkdown',
-            'tinymist.exportText',
-            'tinymist.exportQuery',
-            'tinymist.exportAnsiHighlight',
-            'tinymist.getServerInfo',
-            'tinymist.getDocumentTrace',
-            'tinymist.getWorkspaceLabels',
-            'tinymist.getDocumentMetrics',
-          } do
-            local cmd_func, cmd_name, cmd_desc = create_tinymist_command(command, client, bufnr)
-            vim.api.nvim_buf_create_user_command(bufnr, cmd_name, cmd_func, { nargs = 0, desc = cmd_desc })
-          end
-        end
+      package = pkgs.tinymist;
+      lspConfig = ''
+        lspconfig.tinymist.setup {
+          capabilities = capabilities,
+          single_file_support = true,
+          on_attach = function(client, bufnr)
+            -- Disable semantic tokens as a workaround for a semantic token error when using non-english characters
+            client.server_capabilities.semanticTokensProvider = nil
+          end,
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''{"${cfg.lsp.package}/bin/tinymist"}''
+        },
+        }
       '';
     };
   };
 
-  defaultFormat = ["typstyle"];
+  defaultFormat = "typstyle";
   formats = {
     # https://github.com/Enter-tainer/typstyle
     typstyle = {
-      command = getExe pkgs.typstyle;
+      package = pkgs.typstyle;
     };
   };
 in {
@@ -111,10 +76,17 @@ in {
     lsp = {
       enable = mkEnableOption "Typst LSP support (typst-lsp)" // {default = config.vim.lsp.enable;};
 
-      servers = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.typst.lsp.servers" (enum (attrNames servers));
-        default = defaultServers;
+      server = mkOption {
         description = "Typst LSP server to use";
+        type = enum (attrNames servers);
+        default = defaultServer;
+      };
+
+      package = mkOption {
+        description = "typst-lsp package, or the command to run as a list of strings";
+        example = ''[lib.getExe pkgs.jdt-language-server "-data" "~/.cache/jdtls/workspace"]'';
+        type = either package (listOf str);
+        default = servers.${cfg.lsp.server}.package;
       };
     };
 
@@ -122,9 +94,15 @@ in {
       enable = mkEnableOption "Typst document formatting" // {default = config.vim.languages.enableFormat;};
 
       type = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.typst.format.type" (enum (attrNames formats));
-        default = defaultFormat;
         description = "Typst formatter to use";
+        type = enum (attrNames formats);
+        default = defaultFormat;
+      };
+
+      package = mkOption {
+        description = "Typst formatter package";
+        type = package;
+        default = formats.${cfg.format.type}.package;
       };
     };
 
@@ -151,7 +129,7 @@ in {
           dependencies_bin = mkOption {
             type = attrsOf str;
             default = {
-              "tinymist" = getExe pkgs.tinymist;
+              "tinymist" = getExe servers.tinymist.package;
               "websocat" = getExe pkgs.websocat;
             };
 
@@ -232,25 +210,16 @@ in {
     (mkIf cfg.format.enable {
       vim.formatter.conform-nvim = {
         enable = true;
-        setupOpts = {
-          formatters_by_ft.typst = cfg.format.type;
-          formatters =
-            mapListToAttrs (name: {
-              inherit name;
-              value = formats.${name};
-            })
-            cfg.format.type;
+        setupOpts.formatters_by_ft.typst = [cfg.format.type];
+        setupOpts.formatters.${cfg.format.type} = {
+          command = getExe cfg.format.package;
         };
       };
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (n: {
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.typst-lsp = servers.${cfg.lsp.server}.lspConfig;
     })
 
     # Extensions
diff --git a/modules/plugins/languages/vala.nix b/modules/plugins/languages/vala.nix
index af58758d..220926d0 100644
--- a/modules/plugins/languages/vala.nix
+++ b/modules/plugins/languages/vala.nix
@@ -7,58 +7,36 @@
   inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.meta) getExe;
-  inherit (lib.types) enum;
-  inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
-  inherit (lib.generators) mkLuaInline;
+  inherit (lib.lists) isList;
+  inherit (lib.types) enum either listOf package str;
+  inherit (lib.nvim.types) mkGrammarOption;
+  inherit (lib.nvim.lua) expToLua;
 
   cfg = config.vim.languages.vala;
 
-  defaultServers = ["vala_ls"];
+  defaultServer = "vala_ls";
   servers = {
     vala_ls = {
-      enable = true;
-      cmd = [
-        (getExe (pkgs.symlinkJoin {
-          name = "vala-language-server-wrapper";
-          paths = [pkgs.vala-language-server];
-          meta.mainProgram = "vala-language-server-wrapper";
-          buildInputs = [pkgs.makeBinaryWrapper];
-          postBuild = ''
-            wrapProgram $out/bin/vala-language-server \
-              --prefix PATH : ${pkgs.uncrustify}/bin
-          '';
-        }))
-      ];
-      filetypes = ["vala" "genie"];
-      root_dir = mkLuaInline ''
-        function(bufnr, on_dir)
-          local meson_matcher = function(path)
-            local pattern = 'meson.build'
-            local f = vim.fn.glob(table.concat({ path, pattern }, '/'))
-            if f == ''' then
-              return nil
-            end
-            for line in io.lines(f) do
-              -- skip meson comments
-              if not line:match '^%s*#.*' then
-                local str = line:gsub('%s+', ''')
-                if str ~= ''' then
-                  if str:match '^project%(' then
-                    return path
-                  else
-                    break
-                  end
-                end
-              end
-            end
-          end
-
-          local fname = vim.api.nvim_buf_get_name(bufnr)
-          local root = vim.iter(vim.fs.parents(fname)):find(meson_matcher)
-          on_dir(root or vim.fs.dirname(vim.fs.find('.git', { path = fname, upward = true })[1]))
-        end
+      package = pkgs.symlinkJoin {
+        name = "vala-language-server-wrapper";
+        paths = [pkgs.vala-language-server];
+        buildInputs = [pkgs.makeBinaryWrapper];
+        postBuild = ''
+          wrapProgram $out/bin/vala-language-server \
+            --prefix PATH : ${pkgs.uncrustify}/bin
+        '';
+      };
+      internalFormatter = true;
+      lspConfig = ''
+        lspconfig.vala_ls.setup {
+          capabilities = capabilities;
+          on_attach = default_on_attach;
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''{"${cfg.lsp.package}/bin/vala-language-server"}''
+        },
+        }
       '';
     };
   };
@@ -73,10 +51,16 @@ in {
 
     lsp = {
       enable = mkEnableOption "Vala LSP support" // {default = config.vim.lsp.enable;};
-      servers = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.vala.lsp.servers" (enum (attrNames servers));
-        default = defaultServers;
+      server = mkOption {
         description = "Vala LSP server to use";
+        type = enum (attrNames servers);
+        default = defaultServer;
+      };
+
+      package = mkOption {
+        description = "Vala LSP server package, or the command to run as a list of strings";
+        type = either package (listOf str);
+        default = servers.${cfg.lsp.server}.package;
       };
     };
   };
@@ -88,12 +72,8 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (n: {
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.vala_ls = servers.${cfg.lsp.server}.lspConfig;
     })
   ]);
 }
diff --git a/modules/plugins/languages/wgsl.nix b/modules/plugins/languages/wgsl.nix
index f38cb124..44323092 100644
--- a/modules/plugins/languages/wgsl.nix
+++ b/modules/plugins/languages/wgsl.nix
@@ -5,23 +5,31 @@
   ...
 }: let
   inherit (builtins) attrNames;
+  inherit (lib.lists) isList;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
-  inherit (lib.options) mkEnableOption mkOption;
-  inherit (lib.types) enum;
-  inherit (lib.meta) getExe;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
+  inherit (lib.nvim.lua) expToLua;
+  inherit (lib.nvim.types) mkGrammarOption;
+  inherit (lib.options) literalExpression mkEnableOption mkOption;
+  inherit (lib.types) either enum listOf package str;
 
   cfg = config.vim.languages.wgsl;
 
-  defaultServers = ["wgsl-analyzer"];
+  defaultServer = "wgsl-analyzer";
   servers = {
     wgsl-analyzer = {
-      enable = true;
-      cmd = [(getExe pkgs.wgsl-analyzer)];
-      filetypes = ["wgsl"];
-      root_markers = [".git"];
-      settings = {};
+      package = pkgs.wgsl-analyzer;
+      internalFormatter = true;
+      lspConfig = ''
+        lspconfig.wgsl_analyzer.setup {
+          capabilities = capabilities,
+          on_attach = default_on_attach,
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else "{'${cfg.lsp.package}/bin/wgsl-analyzer'}"
+        }
+        }
+      '';
     };
   };
 in {
@@ -36,11 +44,18 @@ in {
     lsp = {
       enable = mkEnableOption "WGSL LSP support" // {default = config.vim.lsp.enable;};
 
-      servers = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.wgsl.lsp.servers" (enum (attrNames servers));
-        default = defaultServers;
+      server = mkOption {
+        type = enum (attrNames servers);
+        default = defaultServer;
         description = "WGSL LSP server to use";
       };
+
+      package = mkOption {
+        description = "wgsl-analyzer package, or the command to run as a list of strings";
+        example = literalExpression "[(lib.getExe pkgs.wgsl-analyzer)]";
+        type = either package (listOf str);
+        default = pkgs.wgsl-analyzer;
+      };
     };
   };
 
@@ -53,12 +68,12 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (n: {
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
+      vim = {
+        lsp.lspconfig = {
+          enable = true;
+          sources.wgsl_analyzer = servers.${cfg.lsp.server}.lspConfig;
+        };
+      };
     })
   ]);
 }
diff --git a/modules/plugins/languages/yaml.nix b/modules/plugins/languages/yaml.nix
index 2e57d8be..a75a921f 100644
--- a/modules/plugins/languages/yaml.nix
+++ b/modules/plugins/languages/yaml.nix
@@ -5,45 +5,43 @@
   ...
 }: let
   inherit (builtins) attrNames;
-  inherit (lib.generators) mkLuaInline;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.meta) getExe;
-  inherit (lib.types) enum;
-  inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
+  inherit (lib.lists) isList;
+  inherit (lib.types) enum either listOf package str;
+  inherit (lib.nvim.types) mkGrammarOption;
+  inherit (lib.nvim.lua) expToLua;
 
   cfg = config.vim.languages.yaml;
 
-  on_attach =
-    if config.vim.languages.helm.lsp.enable && config.vim.languages.helm.enable
-    then
-      mkLuaInline ''
-        function(client, bufnr)
-          local filetype = vim.bo[bufnr].filetype
-          if filetype == "helm" then
-            client.stop()
-          end
+  onAttach =
+    if config.vim.languages.helm.lsp.enable
+    then ''
+      on_attach = function(client, bufnr)
+        local filetype = vim.bo[bufnr].filetype
+        if filetype == "helm" then
+          client.stop()
         end
-      ''
-    else null;
+      end''
+    else "on_attach = default_on_attach";
 
-  defaultServers = ["yaml-language-server"];
+  defaultServer = "yaml-language-server";
   servers = {
     yaml-language-server = {
-      enable = true;
-      cmd = [(getExe pkgs.yaml-language-server) "--stdio"];
-      filetypes = ["yaml" "yaml.docker-compose" "yaml.gitlab" "yaml.helm-values"];
-      root_markers = [".git"];
-      inherit on_attach;
-      # -- https://github.com/redhat-developer/vscode-redhat-telemetry#how-to-disable-telemetry-reporting
-      settings = {
-        redhat = {
-          telemetry = {
-            enabled = false;
-          };
-        };
-      };
+      package = pkgs.yaml-language-server;
+      lspConfig = ''
+
+
+        lspconfig.yamlls.setup {
+          capabilities = capabilities,
+          ${onAttach},
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''{"${cfg.lsp.package}/bin/yaml-language-server", "--stdio"}''
+        },
+        }
+      '';
     };
   };
 in {
@@ -57,11 +55,18 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "Yaml LSP support" // {default = config.vim.lsp.enable;};
-      servers = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.yaml.lsp.servers" (enum (attrNames servers));
-        default = defaultServers;
-        description = "Yaml LSP server to use";
+      enable = mkEnableOption "YAML LSP support" // {default = config.vim.lsp.enable;};
+
+      server = mkOption {
+        type = enum (attrNames servers);
+        default = defaultServer;
+        description = "YAML LSP server to use";
+      };
+
+      package = mkOption {
+        type = either package (listOf str);
+        default = servers.${cfg.lsp.server}.package;
+        description = "YAML LSP server package";
       };
     };
   };
@@ -73,12 +78,8 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (n: {
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.yaml-lsp = servers.${cfg.lsp.server}.lspConfig;
     })
   ]);
 }
diff --git a/modules/plugins/languages/zig.nix b/modules/plugins/languages/zig.nix
index 57ce961e..89307eab 100644
--- a/modules/plugins/languages/zig.nix
+++ b/modules/plugins/languages/zig.nix
@@ -7,21 +7,29 @@
   inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge mkDefault;
-  inherit (lib.types) bool package enum;
-  inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
-  inherit (lib.meta) getExe;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
+  inherit (lib.lists) isList;
+  inherit (lib.types) bool either listOf package str enum;
+  inherit (lib.nvim.lua) expToLua;
+  inherit (lib.nvim.types) mkGrammarOption;
 
   cfg = config.vim.languages.zig;
 
-  defaultServers = ["zls"];
+  defaultServer = "zls";
   servers = {
     zls = {
-      enable = true;
-      cmd = [(getExe pkgs.zls)];
-      filetypes = ["zig" "zir"];
-      root_markers = ["zls.json" "build.zig" ".git"];
-      workspace_required = false;
+      package = pkgs.zls;
+      internalFormatter = true;
+      lspConfig = ''
+        lspconfig.zls.setup {
+          capabilities = capabilities,
+          on_attach = default_on_attach,
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else "{'${cfg.lsp.package}/bin/zls'}"
+        }
+        }
+      '';
     };
   };
 
@@ -66,11 +74,17 @@ in {
     lsp = {
       enable = mkEnableOption "Zig LSP support" // {default = config.vim.lsp.enable;};
 
-      servers = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.zig.lsp.servers" (enum (attrNames servers));
-        default = defaultServers;
+      server = mkOption {
+        type = enum (attrNames servers);
+        default = defaultServer;
         description = "Zig LSP server to use";
       };
+
+      package = mkOption {
+        description = "ZLS package, or the command to run as a list of strings";
+        type = either package (listOf str);
+        default = pkgs.zls;
+      };
     };
 
     dap = {
@@ -104,12 +118,10 @@ in {
 
     (mkIf cfg.lsp.enable {
       vim = {
-        lsp.servers =
-          mapListToAttrs (n: {
-            name = n;
-            value = servers.${n};
-          })
-          cfg.lsp.servers;
+        lsp.lspconfig = {
+          enable = true;
+          sources.zig-lsp = servers.${cfg.lsp.server}.lspConfig;
+        };
 
         # nvf handles autosaving already
         globals.zig_fmt_autosave = mkDefault 0;
diff --git a/modules/plugins/lsp/config.nix b/modules/plugins/lsp/config.nix
index 791b72b7..e7b67c8e 100644
--- a/modules/plugins/lsp/config.nix
+++ b/modules/plugins/lsp/config.nix
@@ -1,7 +1,7 @@
 {
   config,
   lib,
-  options,
+  pkgs,
   ...
 }: let
   inherit (lib.generators) mkLuaInline;
@@ -10,21 +10,20 @@
   inherit (lib.strings) optionalString;
   inherit (lib.trivial) boolToString;
   inherit (lib.nvim.binds) addDescriptionsToMappings;
-  inherit (lib.nvim.dag) entryBefore;
-  inherit (lib.nvim.lua) toLuaObject;
 
   cfg = config.vim.lsp;
   usingNvimCmp = config.vim.autocomplete.nvim-cmp.enable;
   usingBlinkCmp = config.vim.autocomplete.blink-cmp.enable;
+  self = import ./module.nix {inherit config lib pkgs;};
   conformCfg = config.vim.formatter.conform-nvim;
   conformFormatOnSave = conformCfg.enable && conformCfg.setupOpts.format_on_save != null;
 
   augroup = "nvf_lsp";
-  mappingDefinitions = options.vim.lsp.mappings;
+  mappingDefinitions = self.options.vim.lsp.mappings;
   mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
   mkBinding = binding: action:
     if binding.value != null
-    then "vim.keymap.set('n', ${toLuaObject binding.value}, ${action}, {buffer=bufnr, noremap=true, silent=true, desc=${toLuaObject binding.description}})"
+    then "vim.keymap.set('n', '${binding.value}', ${action}, {buffer=bufnr, noremap=true, silent=true, desc='${binding.description}'})"
     else "";
 in {
   config = mkIf cfg.enable {
@@ -36,26 +35,20 @@ in {
 
       augroups = [{name = augroup;}];
       autocmds =
-        [
-          {
-            group = augroup;
-            event = ["LspAttach"];
-            desc = "LSP on-attach add keybinds, enable inlay hints, and other plugin integrations";
-            callback = mkLuaInline ''
-              function(event)
-                local bufnr = event.buf
-                local client = vim.lsp.get_client_by_id(event.data.client_id)
-                default_on_attach(client, bufnr)
-
-                ${optionalString cfg.inlayHints.enable ''
-                if client and client.supports_method(vim.lsp.protocol.Methods.textDocument_inlayHint) then
-                  vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled({ bufnr = bufnr }), { bufnr = bufnr })
-                end
-              ''}
+        (optional cfg.inlayHints.enable {
+          group = augroup;
+          event = ["LspAttach"];
+          desc = "LSP on-attach enable inlay hints autocmd";
+          callback = mkLuaInline ''
+            function(event)
+              local bufnr = event.buf
+              local client = vim.lsp.get_client_by_id(event.data.client_id)
+              if client and client.supports_method(vim.lsp.protocol.Methods.textDocument_inlayHint) then
+                vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled({ bufnr = bufnr }), { bufnr = bufnr })
               end
-            '';
-          }
-        ]
+            end
+          '';
+        })
         ++ (optional (!conformFormatOnSave) {
           group = augroup;
           event = ["BufWritePre"];
@@ -94,7 +87,7 @@ in {
           '';
         });
 
-      pluginRC.lsp-setup = entryBefore ["autocmds"] ''
+      pluginRC.lsp-setup = ''
         vim.g.formatsave = ${boolToString cfg.formatOnSave};
 
         local attach_keymaps = function(client, bufnr)
diff --git a/modules/plugins/lsp/default.nix b/modules/plugins/lsp/default.nix
index ed20685d..eb694583 100644
--- a/modules/plugins/lsp/default.nix
+++ b/modules/plugins/lsp/default.nix
@@ -7,7 +7,6 @@
     ./lspconfig
     ./lspsaga
     ./null-ls
-    ./harper-ls
 
     # lsp plugins
     ./lspsaga
diff --git a/modules/plugins/lsp/harper-ls/config.nix b/modules/plugins/lsp/harper-ls/config.nix
deleted file mode 100644
index d6e27bfc..00000000
--- a/modules/plugins/lsp/harper-ls/config.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  inherit (lib.modules) mkIf;
-  inherit (lib.meta) getExe;
-
-  cfg = config.vim.lsp;
-in {
-  config = mkIf (cfg.enable && cfg.harper-ls.enable) {
-    vim.lsp.servers.harper-ls = {
-      root_markers = [".git"];
-      cmd = [(getExe pkgs.harper) "--stdio"];
-      settings = {harper-ls = cfg.harper-ls.settings;};
-    };
-  };
-}
diff --git a/modules/plugins/lsp/harper-ls/default.nix b/modules/plugins/lsp/harper-ls/default.nix
deleted file mode 100644
index 9b4b3ec7..00000000
--- a/modules/plugins/lsp/harper-ls/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  imports = [
-    ./harper-ls.nix
-    ./config.nix
-  ];
-}
diff --git a/modules/plugins/lsp/harper-ls/harper-ls.nix b/modules/plugins/lsp/harper-ls/harper-ls.nix
deleted file mode 100644
index 9fab45fe..00000000
--- a/modules/plugins/lsp/harper-ls/harper-ls.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{lib, ...}: let
-  inherit (lib.options) mkOption mkEnableOption;
-  inherit (lib.types) anything attrsOf;
-in {
-  options.vim.lsp.harper-ls = {
-    enable = mkEnableOption "Harper grammar checking LSP";
-    settings = mkOption {
-      type = attrsOf anything;
-      default = {};
-      example = {
-        userDictPath = "";
-        workspaceDictPath = "";
-        fileDictPath = "";
-        linters = {
-          BoringWords = true;
-          PossessiveNoun = true;
-          SentenceCapitalization = false;
-          SpellCheck = false;
-        };
-        codeActions = {
-          ForceStable = false;
-        };
-        markdown = {
-          IgnoreLinkTitle = false;
-        };
-        diagnosticSeverity = "hint";
-        isolateEnglish = false;
-        dialect = "American";
-        maxFileLength = 120000;
-        ignoredLintsPath = {};
-      };
-      description = "Settings to pass to harper-ls";
-    };
-  };
-}
diff --git a/modules/plugins/lsp/nvim-docs-view/config.nix b/modules/plugins/lsp/nvim-docs-view/config.nix
index 997e9a72..5c7ad2b7 100644
--- a/modules/plugins/lsp/nvim-docs-view/config.nix
+++ b/modules/plugins/lsp/nvim-docs-view/config.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  options,
   ...
 }: let
   inherit (lib.modules) mkIf mkMerge;
@@ -10,8 +9,9 @@
   inherit (lib.nvim.lua) toLuaObject;
 
   cfg = config.vim.lsp.nvim-docs-view;
+  self = import ./nvim-docs-view.nix {inherit lib;};
 
-  mappingDefinitions = options.vim.lsp.nvim-docs-view.mappings;
+  mappingDefinitions = self.options.vim.lsp.nvim-docs-view.mappings;
   mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
 in {
   config = mkIf cfg.enable {
diff --git a/modules/plugins/lsp/otter/config.nix b/modules/plugins/lsp/otter/config.nix
index f3dbe4d6..85f24c70 100644
--- a/modules/plugins/lsp/otter/config.nix
+++ b/modules/plugins/lsp/otter/config.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  options,
   ...
 }: let
   inherit (lib.modules) mkIf mkMerge;
@@ -11,7 +10,8 @@
 
   cfg = config.vim.lsp;
 
-  mappingDefinitions = options.vim.lsp.otter-nvim.mappings;
+  self = import ./otter.nix {inherit lib;};
+  mappingDefinitions = self.options.vim.lsp.otter-nvim.mappings;
   mappings = addDescriptionsToMappings cfg.otter-nvim.mappings mappingDefinitions;
 in {
   config = mkIf (cfg.enable && cfg.otter-nvim.enable) {
diff --git a/modules/plugins/minimap/codewindow/config.nix b/modules/plugins/minimap/codewindow/config.nix
index 8a62ee04..a853514a 100644
--- a/modules/plugins/minimap/codewindow/config.nix
+++ b/modules/plugins/minimap/codewindow/config.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  options,
   ...
 }: let
   inherit (lib.modules) mkIf mkMerge;
@@ -10,7 +9,9 @@
 
   cfg = config.vim.minimap.codewindow;
 
-  mappingDefinitions = options.vim.minimap.codewindow.mappings;
+  self = import ./codewindow.nix {inherit lib;};
+
+  mappingDefinitions = self.options.vim.minimap.codewindow.mappings;
   mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
 in {
   config = mkIf cfg.enable {
diff --git a/modules/plugins/notes/orgmode/orgmode.nix b/modules/plugins/notes/orgmode/orgmode.nix
index 103a1453..fe2c4be8 100644
--- a/modules/plugins/notes/orgmode/orgmode.nix
+++ b/modules/plugins/notes/orgmode/orgmode.nix
@@ -5,9 +5,9 @@
   ...
 }: let
   inherit (lib.modules) mkRenamedOptionModule;
-  inherit (lib.options) mkEnableOption mkOption mkPackageOption;
+  inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.types) str listOf;
-  inherit (lib.nvim.types) mkPluginSetupOption;
+  inherit (lib.nvim.types) mkGrammarOption mkPluginSetupOption;
 in {
   imports = [
     (mkRenamedOptionModule ["vim" "notes" "orgmode" "orgAgendaFiles"] ["vim" "notes" "orgmode" "setupOpts" "org_agenda_files"])
@@ -33,9 +33,7 @@ in {
 
     treesitter = {
       enable = mkEnableOption "Orgmode treesitter" // {default = config.vim.languages.enableTreesitter;};
-      orgPackage = mkPackageOption pkgs ["org-nvim treesitter"] {
-        default = ["tree-sitter-grammars" "tree-sitter-org-nvim"];
-      };
+      orgPackage = mkGrammarOption pkgs "org";
     };
   };
 }
diff --git a/modules/plugins/notes/todo-comments/config.nix b/modules/plugins/notes/todo-comments/config.nix
index 47fa3641..b03efce4 100644
--- a/modules/plugins/notes/todo-comments/config.nix
+++ b/modules/plugins/notes/todo-comments/config.nix
@@ -1,7 +1,7 @@
 {
+  pkgs,
   config,
   lib,
-  options,
   ...
 }: let
   inherit (lib.modules) mkMerge mkIf;
@@ -9,7 +9,8 @@
   inherit (lib.nvim.lua) toLuaObject;
 
   cfg = config.vim.notes.todo-comments;
-  inherit (options.vim.notes.todo-comments) mappings;
+  self = import ./todo-comments.nix {inherit pkgs lib;};
+  inherit (self.options.vim.notes.todo-comments) mappings;
 in {
   config = mkIf cfg.enable {
     vim = {
diff --git a/modules/plugins/statusline/lualine/supported_themes.nix b/modules/plugins/statusline/lualine/supported_themes.nix
index b7fe2de8..3528b24f 100644
--- a/modules/plugins/statusline/lualine/supported_themes.nix
+++ b/modules/plugins/statusline/lualine/supported_themes.nix
@@ -5,5 +5,4 @@
   "oxocarbon"
   "gruvbox"
   "nord"
-  "mellow"
 ]
diff --git a/modules/plugins/tabline/nvim-bufferline/config.nix b/modules/plugins/tabline/nvim-bufferline/config.nix
index 396e6886..250425d3 100644
--- a/modules/plugins/tabline/nvim-bufferline/config.nix
+++ b/modules/plugins/tabline/nvim-bufferline/config.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  options,
   ...
 }: let
   inherit (lib.modules) mkIf mkMerge;
@@ -10,8 +9,8 @@
   inherit (lib.nvim.lua) toLuaObject;
 
   cfg = config.vim.tabline.nvimBufferline;
-
-  inherit (options.vim.tabline.nvimBufferline) mappings;
+  self = import ./nvim-bufferline.nix {inherit config lib;};
+  inherit (self.options.vim.tabline.nvimBufferline) mappings;
 in {
   config = mkIf cfg.enable {
     vim = {
diff --git a/modules/plugins/theme/supported-themes.nix b/modules/plugins/theme/supported-themes.nix
index c2a5e1ca..6419ba14 100644
--- a/modules/plugins/theme/supported-themes.nix
+++ b/modules/plugins/theme/supported-themes.nix
@@ -315,13 +315,4 @@ in {
 
     styles = ["hard" "medium" "soft"];
   };
-
-  mellow = {
-    setup = {transparent ? false, ...}: ''
-      -- Mellow configuration
-      vim.g.mellow_transparent = ${boolToString transparent}
-
-      vim.cmd.colorscheme("mellow")
-    '';
-  };
 }
diff --git a/modules/plugins/treesitter/config.nix b/modules/plugins/treesitter/config.nix
index f7955110..14aba5e1 100644
--- a/modules/plugins/treesitter/config.nix
+++ b/modules/plugins/treesitter/config.nix
@@ -1,7 +1,7 @@
 {
   config,
+  pkgs,
   lib,
-  options,
   ...
 }: let
   inherit (lib.modules) mkIf mkMerge;
@@ -12,7 +12,8 @@
 
   cfg = config.vim.treesitter;
 
-  mappingDefinitions = options.vim.treesitter.mappings;
+  self = import ./treesitter.nix {inherit pkgs lib;};
+  mappingDefinitions = self.options.vim.treesitter.mappings;
   mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
 in {
   config = mkIf cfg.enable {
diff --git a/modules/plugins/treesitter/ts-context/context.nix b/modules/plugins/treesitter/ts-context/context.nix
index f6886f9c..d29ba68e 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
-          {option}`vim.treesitter.context.setupOpts.max_lines` is exceeded.
+          [](#opt-vim.treesitter.context.setupOpts.max_lines) is exceeded.
         '';
       };
 
diff --git a/modules/plugins/utility/default.nix b/modules/plugins/utility/default.nix
index 2e00e270..349fb47a 100644
--- a/modules/plugins/utility/default.nix
+++ b/modules/plugins/utility/default.nix
@@ -19,7 +19,6 @@
     ./oil-nvim
     ./outline
     ./preview
-    ./qmk-nvim
     ./sleuth
     ./smart-splits
     ./snacks-nvim
diff --git a/modules/plugins/utility/gestures/gesture-nvim/config.nix b/modules/plugins/utility/gestures/gesture-nvim/config.nix
index 6c40e3ea..9838c178 100644
--- a/modules/plugins/utility/gestures/gesture-nvim/config.nix
+++ b/modules/plugins/utility/gestures/gesture-nvim/config.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  options,
   ...
 }: let
   inherit (lib.modules) mkIf mkMerge;
@@ -10,7 +9,9 @@
 
   cfg = config.vim.gestures.gesture-nvim;
 
-  mappingDefinitions = options.vim.gestures.gesture-nvim.mappings;
+  self = import ./gesture-nvim.nix {inherit lib;};
+
+  mappingDefinitions = self.options.vim.gestures.gesture-nvim.mappings;
   mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
 in {
   config = mkIf cfg.enable {
diff --git a/modules/plugins/utility/motion/flash/config.nix b/modules/plugins/utility/motion/flash/config.nix
index 73c94ab3..83ddd0b9 100644
--- a/modules/plugins/utility/motion/flash/config.nix
+++ b/modules/plugins/utility/motion/flash/config.nix
@@ -14,7 +14,7 @@ in {
         "flash-nvim" = {
           package = "flash-nvim";
           setupModule = "flash";
-          inherit (cfg) setupOpts;
+          setupOpts = cfg.setupOpts;
 
           lazy = true;
 
diff --git a/modules/plugins/utility/motion/hop/config.nix b/modules/plugins/utility/motion/hop/config.nix
index 21292269..505b9ebb 100644
--- a/modules/plugins/utility/motion/hop/config.nix
+++ b/modules/plugins/utility/motion/hop/config.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  options,
   ...
 }: let
   inherit (lib.modules) mkIf;
@@ -10,11 +9,13 @@
 
   cfg = config.vim.utility.motion.hop;
 
-  mappingDefinitions = options.vim.utility.motion.hop.mappings;
+  self = import ./hop.nix {inherit lib;};
+
+  mappingDefinitions = self.options.vim.utility.motion.hop.mappings;
   mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
 in {
   config = mkIf cfg.enable {
-    vim.startPlugins = ["hop.nvim"];
+    vim.startPlugins = ["hop-nvim"];
 
     vim.maps.normal = mkSetBinding mappings.hop "<cmd> HopPattern<CR>";
 
diff --git a/modules/plugins/utility/oil-nvim/config.nix b/modules/plugins/utility/oil-nvim/config.nix
index 9344c305..dca4de60 100644
--- a/modules/plugins/utility/oil-nvim/config.nix
+++ b/modules/plugins/utility/oil-nvim/config.nix
@@ -3,38 +3,18 @@
   lib,
   ...
 }: let
-  inherit (lib.attrsets) optionalAttrs recursiveUpdate;
-  inherit (lib.lists) optionals;
   inherit (lib.modules) mkIf;
   inherit (lib.nvim.lua) toLuaObject;
-  inherit (lib.nvim.dag) entryAfter entryAnywhere;
+  inherit (lib.nvim.dag) entryAnywhere;
 
   cfg = config.vim.utility.oil-nvim;
 in {
   config = mkIf cfg.enable {
     vim = {
-      startPlugins = ["oil-nvim"] ++ (optionals cfg.gitStatus.enable ["oil-git-status.nvim"]);
-
-      pluginRC.oil-nvim = let
-        gitStatusDefaultOpts = {
-          # https://github.com/refractalize/oil-git-status.nvim?tab=readme-ov-file#configuration
-          win_options = {
-            signcolumn = "yes:2";
-          };
-        };
-
-        setupOpts =
-          recursiveUpdate
-          (optionalAttrs cfg.gitStatus.enable gitStatusDefaultOpts)
-          cfg.setupOpts;
-      in
-        entryAnywhere ''
-          require("oil").setup(${toLuaObject setupOpts});
-        '';
-
-      pluginRC.oil-git-status-nvim = mkIf cfg.gitStatus.enable (entryAfter ["oil-nvim"] ''
-        require("oil-git-status").setup(${toLuaObject cfg.gitStatus.setupOpts})
-      '');
+      startPlugins = ["oil-nvim"];
+      pluginRC.oil-nvim = entryAnywhere ''
+        require("oil").setup(${toLuaObject cfg.setupOpts});
+      '';
     };
   };
 }
diff --git a/modules/plugins/utility/oil-nvim/oil-nvim.nix b/modules/plugins/utility/oil-nvim/oil-nvim.nix
index 426188bc..557f3db6 100644
--- a/modules/plugins/utility/oil-nvim/oil-nvim.nix
+++ b/modules/plugins/utility/oil-nvim/oil-nvim.nix
@@ -8,13 +8,5 @@ in {
     '';
 
     setupOpts = mkPluginSetupOption "oil-nvim" {};
-
-    gitStatus = {
-      enable = mkEnableOption ''
-        Git status on [oil-nvim] directory listings
-      '';
-
-      setupOpts = mkPluginSetupOption "oil-git-status-nvim" {};
-    };
   };
 }
diff --git a/modules/plugins/utility/preview/glow/config.nix b/modules/plugins/utility/preview/glow/config.nix
index 7297df83..4529a534 100644
--- a/modules/plugins/utility/preview/glow/config.nix
+++ b/modules/plugins/utility/preview/glow/config.nix
@@ -2,7 +2,6 @@
   pkgs,
   config,
   lib,
-  options,
   ...
 }: let
   inherit (lib.modules) mkIf mkMerge;
@@ -10,7 +9,10 @@
   inherit (lib.nvim.dag) entryAnywhere;
 
   cfg = config.vim.utility.preview.glow;
-  inherit (options.vim.utility.preview.glow) mappings;
+  self = import ./glow.nix {
+    inherit lib config pkgs;
+  };
+  inherit (self.options.vim.utility.preview.glow) mappings;
 in {
   config = mkIf cfg.enable {
     vim.startPlugins = ["glow-nvim"];
diff --git a/modules/plugins/utility/qmk-nvim/config.nix b/modules/plugins/utility/qmk-nvim/config.nix
deleted file mode 100644
index c86a483a..00000000
--- a/modules/plugins/utility/qmk-nvim/config.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  inherit (lib.modules) mkIf;
-  inherit (lib.nvim.lua) toLuaObject;
-  inherit (lib.nvim.dag) entryAfter;
-
-  cfg = config.vim.utility.qmk-nvim;
-in {
-  config = mkIf cfg.enable {
-    vim = {
-      startPlugins = ["qmk-nvim"];
-
-      pluginRC.qmk-nvim = entryAfter ["nvim-notify"] ''
-        require('qmk').setup(${toLuaObject cfg.setupOpts})
-      '';
-    };
-
-    assertions = [
-      {
-        assertion = cfg.setupOpts.variant == "qmk" && cfg.setupOpts.comment_preview.position != "inside";
-        message = "comment_preview.position can only be set to inside when using the qmk layoyt";
-      }
-      {
-        assertion = cfg.setupOpts.name != null;
-        message = "qmk-nvim requires 'vim.utility.qmk.setupOpts.name' to be set.";
-      }
-      {
-        assertion = cfg.setupOpts.layout != null;
-        message = "qmk-nvim requires 'vim.utility.qmk.setupOpts.layout' to be set.";
-      }
-    ];
-  };
-}
diff --git a/modules/plugins/utility/qmk-nvim/default.nix b/modules/plugins/utility/qmk-nvim/default.nix
deleted file mode 100644
index 4162ff2e..00000000
--- a/modules/plugins/utility/qmk-nvim/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  imports = [
-    ./config.nix
-    ./qmk-nvim.nix
-  ];
-}
diff --git a/modules/plugins/utility/qmk-nvim/qmk-nvim.nix b/modules/plugins/utility/qmk-nvim/qmk-nvim.nix
deleted file mode 100644
index 2c541e64..00000000
--- a/modules/plugins/utility/qmk-nvim/qmk-nvim.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{lib, ...}: let
-  inherit (lib.options) mkOption mkEnableOption;
-  inherit (lib.types) attrsOf nullOr enum lines str;
-  inherit (lib.nvim.types) mkPluginSetupOption;
-in {
-  options.vim.utility.qmk-nvim = {
-    enable = mkEnableOption "QMK and ZMK keymaps in nvim";
-
-    setupOpts = mkPluginSetupOption "qmk.nvim" {
-      name = mkOption {
-        type = nullOr str;
-        default = null;
-        description = "The name of the layout";
-      };
-
-      layout = mkOption {
-        type = nullOr lines;
-        default = null;
-        description = ''
-          The keyboard key layout
-          see <https://github.com/codethread/qmk.nvim?tab=readme-ov-file#Layout> for more details
-        '';
-      };
-
-      variant = mkOption {
-        type = enum ["qmk" "zmk"];
-        default = "qmk";
-        description = "Chooses the expected hardware target";
-      };
-
-      comment_preview = {
-        position = mkOption {
-          type = enum ["top" "bottom" "inside" "none"];
-          default = "top";
-          description = "Controls the position of the preview";
-        };
-
-        keymap_overrides = mkOption {
-          type = attrsOf str;
-          default = {};
-          description = ''
-            Key codes to text replacements
-            see <https://github.com/codethread/qmk.nvim/blob/main/lua/qmk/config/key_map.lua> for more details
-          '';
-        };
-      };
-    };
-  };
-}
diff --git a/modules/plugins/utility/telescope/telescope.nix b/modules/plugins/utility/telescope/telescope.nix
index 3aa75ca6..70fc92c7 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 {option}`vim.extraPackages`.
+          make sure that the package is available in [](#opt-vim.extraPackages).
         '';
       };
 
diff --git a/modules/plugins/visuals/fidget-nvim/fidget.nix b/modules/plugins/visuals/fidget-nvim/fidget.nix
index f5bdf397..fa2ecb44 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 {option}`vim.visuals.fidget-nvim.setupOpts.notification.configs`.
+              in [](#opt-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/build/config.nix b/modules/wrapper/build/config.nix
index 68b2c00d..a1807388 100644
--- a/modules/wrapper/build/config.nix
+++ b/modules/wrapper/build/config.nix
@@ -22,7 +22,9 @@
       passthru.vimPlugin = false;
     };
 
-  # Build a Vim plugin with the given name and arguments.
+  # build a vim plugin with the given name and arguments
+  # if the plugin is nvim-treesitter, warn the user to use buildTreesitterPlug
+  # instead
   buildPlug = attrs: let
     pin = getPin attrs.pname;
   in
@@ -34,7 +36,6 @@
       // attrs
     );
 
-  # Build a given Treesitter grammar.
   buildTreesitterPlug = grammars: vimPlugins.nvim-treesitter.withPlugins (_: grammars);
 
   pluginBuilders = {
@@ -47,9 +48,6 @@
       doCheck = false;
     };
 
-    # Get plugins built from source from self.packages
-    # If adding a new plugin to be built from source, it must also be inherited
-    # here.
     inherit (inputs.self.packages.${pkgs.stdenv.system}) blink-cmp avante-nvim;
   };
 
@@ -73,38 +71,29 @@
   # Wrap the user's desired (unwrapped) Neovim package with arguments that'll be used to
   # generate a wrapped Neovim package.
   neovim-wrapped = inputs.mnw.lib.wrap {inherit pkgs;} {
-    appName = "nvf";
     neovim = config.vim.package;
-    initLua = config.vim.builtLuaConfigRC;
-    luaFiles = config.vim.extraLuaFiles;
-
-    # Plugin configurations
     plugins = {
       start = buildConfigPlugins config.vim.startPlugins;
       opt = buildConfigPlugins config.vim.optPlugins;
     };
-
-    # Providers for Neovim
+    appName = "nvf";
+    extraBinPath = config.vim.extraPackages;
+    initLua = config.vim.builtLuaConfigRC;
+    luaFiles = config.vim.extraLuaFiles;
     providers = {
-      ruby.enable = config.vim.withRuby;
-      nodeJs.enable = config.vim.withNodeJs;
       python3 = {
         enable = config.vim.withPython3;
         extraPackages = ps: map (flip builtins.getAttr ps) config.vim.python3Packages;
       };
+      ruby.enable = config.vim.withRuby;
+      nodeJs.enable = config.vim.withNodeJs;
     };
-
-    # Aliases to link `nvim` to
     aliases = lib.optional config.vim.viAlias "vi" ++ lib.optional config.vim.vimAlias "vim";
 
-    # Additional packages or Lua packages to be made available to Neovim
-    extraBinPath = config.vim.extraPackages;
     extraLuaPackages = ps: map (flip builtins.getAttr ps) config.vim.luaPackages;
   };
 
-  # A store path representing the built Lua configuration.
   dummyInit = pkgs.writeText "nvf-init.lua" config.vim.builtLuaConfigRC;
-
   # Additional helper scripts for printing and displaying nvf configuration
   # in your commandline.
   printConfig = pkgs.writers.writeDashBin "nvf-print-config" "cat ${dummyInit}";
@@ -117,23 +106,10 @@
     paths = [neovim-wrapped printConfig printConfigPath];
     postBuild = "echo Helpers added";
 
-    passthru = {
-      # Allow evaluating config.vim, i.e., config.vim from the packages' passthru
-      # attribute. For example, packages.x86_64-linux.neovim.passthru.neovimConfig
-      # will return the configuration in full.
-      neovimConfig = config.vim;
-
-      # Also expose the helper scripts in passthru.
-      nvfPrintConfig = printConfig;
-      nvfPrintConfigPath = printConfigPath;
-
-      # In systems where we only have a package and no module, this can be used
-      # to access the built init.lua
-      initLua = dummyInit;
-
-      mnwConfig = neovim-wrapped.passthru.config;
-      mnwConfigDir = neovim-wrapped.passthru.configDir;
-    };
+    # Allow evaluating config.vim, i.e., config.vim from the packages' passthru
+    # attribute. For example, packages.x86_64-linux.neovim.passthru.neovimConfig
+    # will return the configuration in full.
+    passthru.neovimConfig = config.vim;
 
     meta =
       neovim-wrapped.meta
diff --git a/modules/wrapper/environment/options.nix b/modules/wrapper/environment/options.nix
index 5b2f1f63..c401f506 100644
--- a/modules/wrapper/environment/options.nix
+++ b/modules/wrapper/environment/options.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkOption mkEnableOption literalMD literalExpression;
+  inherit (lib.options) mkOption mkEnableOption literalMD;
   inherit (lib.types) package bool str listOf attrsOf;
   inherit (lib.nvim.types) pluginsOpt extraPluginType;
 in {
@@ -11,7 +11,6 @@ in {
     package = mkOption {
       type = package;
       default = pkgs.neovim-unwrapped;
-      defaultText = literalExpression "pkgs.neovim-unwrapped";
       description = ''
         The neovim package to use for the wrapper. This
         corresponds to the package that will be wrapped
@@ -28,33 +27,36 @@ in {
     viAlias = mkOption {
       type = bool;
       default = true;
-      example = false;
       description = "Enable the `vi` alias for `nvim`";
     };
 
     vimAlias = mkOption {
       type = bool;
       default = true;
-      example = false;
       description = "Enable the `vim` alias for `nvim`";
     };
 
     startPlugins = pluginsOpt {
       default = ["plenary-nvim"];
-      example = literalExpression "[pkgs.vimPlugins.telescope-nvim]";
+      example = ''
+        [pkgs.vimPlugins.telescope-nvim]
+      '';
+
       description = ''
         List of plugins to load on startup. This is used
         internally to add plugins to Neovim's runtime.
 
         To add additional plugins to your configuration, consider
-        using the {option}`vim.extraPlugins`
+        using the [{option}`vim.extraPlugins`](#opt-vim.extraPlugins)
         option.
       '';
     };
 
     optPlugins = pluginsOpt {
       default = [];
-      example = literalExpression "[pkgs.vimPlugins.vim-ghost]";
+      example = ''
+        [pkgs.vimPlugins.vim-ghost]
+      '';
       description = ''
         List of plugins to optionally load on startup.
 
@@ -106,7 +108,7 @@ in {
       '';
     };
 
-    # This defaults to `true` in the wrapper
+    # this defaults to `true` in the wrapper
     # and since we pass this value to the wrapper
     # with an inherit, it should be `true` here as well
     withRuby =
@@ -118,14 +120,14 @@ in {
       };
 
     withNodeJs = mkEnableOption ''
-      NodeJS support in the Neovim wrapper
+      NodeJs support in the Neovim wrapper
     '';
 
     luaPackages = mkOption {
       type = listOf str;
       default = [];
       example = ''["magick" "serpent"]'';
-      description = "List of Lua packages to install";
+      description = "List of lua packages to install";
     };
 
     withPython3 = mkEnableOption ''
@@ -142,7 +144,7 @@ in {
     pluginOverrides = mkOption {
       type = attrsOf package;
       default = {};
-      example = literalExpression ''
+      example = ''
         {
           lazydev-nvim = pkgs.fetchFromGitHub {
             owner = "folke";
diff --git a/modules/wrapper/lazy/lazy.nix b/modules/wrapper/lazy/lazy.nix
index 7ff38b12..eb1f5cdf 100644
--- a/modules/wrapper/lazy/lazy.nix
+++ b/modules/wrapper/lazy/lazy.nix
@@ -1,7 +1,7 @@
 {lib, ...}: let
   inherit (lib.options) mkOption mkEnableOption;
   inherit (lib.types) enum listOf submodule nullOr str bool int attrsOf anything either oneOf lines;
-  inherit (lib.nvim.types) pluginType luaInline;
+  inherit (lib.nvim.types) pluginType;
   inherit (lib.nvim.config) mkBool;
 
   lznKeysSpec = submodule {
@@ -98,7 +98,7 @@
       # lz.n options
 
       enabled = mkOption {
-        type = nullOr (either bool luaInline);
+        type = nullOr (either bool str);
         default = null;
         description = "When false, or if the lua function returns false, this plugin will not be included in the spec";
       };
@@ -121,7 +121,7 @@
         description = ''
           Lua code to run after plugin is loaded. This will be wrapped in a function.
 
-          If {option}`vim.lazy.plugins._name_.setupModule` is provided, the setup will be ran before `after`.
+          If [](#opt-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 f1baaa17..c0bb6915 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
-        {option}`vim-additionalRuntimePaths`
+        [](#opt-vim.additionalRuntimePaths)
         to the `runtimepath` and enable the experimental Lua module loader
-        if {option}`vim.enableLuaLoader` is set to true.
+        if [](#opt-vim.enableLuaLoader) is set to true.
       '';
 
       example = literalExpression "\${builtins.readFile ./my-lua-config-pre.lua}";
diff --git a/npins/sources.json b/npins/sources.json
index 919ef20d..78b67216 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -708,21 +708,18 @@
       "url": "https://github.com/tzachar/highlight-undo.nvim/archive/ee32e12693d70e66f954d09a504a7371d110fc27.tar.gz",
       "hash": "09byybwyl61jxlfii9vsi4i21vy6ngm3mbypqlhsivn8wgg24kn9"
     },
-    "hop.nvim": {
-      "type": "GitRelease",
+    "hop-nvim": {
+      "type": "Git",
       "repository": {
         "type": "GitHub",
-        "owner": "smoka7",
+        "owner": "phaazon",
         "repo": "hop.nvim"
       },
-      "pre_releases": false,
-      "version_upper_bound": null,
-      "release_prefix": null,
+      "branch": "master",
       "submodules": false,
-      "version": "v2.7.2",
-      "revision": "08ddca799089ab96a6d1763db0b8adc5320bf050",
-      "url": "https://api.github.com/repos/smoka7/hop.nvim/tarball/v2.7.2",
-      "hash": "07mydcm3x7xc7x6wg5l6kcx8yrrv9bwy2p44y17ajyx37c5lmwwn"
+      "revision": "1a1eceafe54b5081eae4cb91c723abd1d450f34b",
+      "url": "https://github.com/phaazon/hop.nvim/archive/1a1eceafe54b5081eae4cb91c723abd1d450f34b.tar.gz",
+      "hash": "08h18cam2yr57qvfsnf1bra28vbl6013wlchnr5crb757xw8aysa"
     },
     "hunk-nvim": {
       "type": "GitRelease",
@@ -964,19 +961,6 @@
       "url": "https://github.com/OXY2DEV/markview.nvim/archive/de79a7626d54d7785436105ef72f37ee8fe8fa16.tar.gz",
       "hash": "032i6m9pld1zyhd7lq49dg4qh98w6vmmzqp2f46drhq0ds26hs4h"
     },
-    "mellow": {
-      "type": "Git",
-      "repository": {
-        "type": "GitHub",
-        "owner": "mellow-theme",
-        "repo": "mellow.nvim"
-      },
-      "branch": "main",
-      "submodules": false,
-      "revision": "5cd188489bcc7eb512f0a30581ad972070f8e5cd",
-      "url": "https://github.com/mellow-theme/mellow.nvim/archive/5cd188489bcc7eb512f0a30581ad972070f8e5cd.tar.gz",
-      "hash": "0hjfhwvvlc50rrxscg2lbkip7v5s13yaja0pckhhxfkbz17b5v83"
-    },
     "mind-nvim": {
       "type": "Git",
       "repository": {
@@ -2120,19 +2104,6 @@
       "url": "https://github.com/epwalsh/obsidian.nvim/archive/14e0427bef6c55da0d63f9a313fd9941be3a2479.tar.gz",
       "hash": "15ycmhn48ryaqzch6w3w6llq2qgmjx8xwkb9dn0075z60dybpflr"
     },
-    "oil-git-status.nvim": {
-      "type": "Git",
-      "repository": {
-        "type": "GitHub",
-        "owner": "refractalize",
-        "repo": "oil-git-status.nvim"
-      },
-      "branch": "main",
-      "submodules": false,
-      "revision": "4b5cf53842c17a09420919e655a6a559da3112d7",
-      "url": "https://github.com/refractalize/oil-git-status.nvim/archive/4b5cf53842c17a09420919e655a6a559da3112d7.tar.gz",
-      "hash": "1jzw6lkvi9xxzqy8xz056xlb45byr1arklh87zmyf0nj9plm2nsp"
-    },
     "oil-nvim": {
       "type": "Git",
       "repository": {
@@ -2250,38 +2221,6 @@
       "url": "https://github.com/tris203/precognition.nvim/archive/2aae2687207029b3611a0e19a289f9e1c7efbe16.tar.gz",
       "hash": "0b4yz5jvqd0li373067cs1n761vn9jxkhcvhsrvm9h1snqw1c6nk"
     },
-    "prettier-plugin-astro": {
-      "type": "GitRelease",
-      "repository": {
-        "type": "GitHub",
-        "owner": "withastro",
-        "repo": "prettier-plugin-astro"
-      },
-      "pre_releases": false,
-      "version_upper_bound": null,
-      "release_prefix": null,
-      "submodules": false,
-      "version": "v0.14.1",
-      "revision": "57234893ca374c8e401cce1f931180d314e13eac",
-      "url": "https://api.github.com/repos/withastro/prettier-plugin-astro/tarball/v0.14.1",
-      "hash": "14ffwxggcnyc947pdxgsgz1v2q76m5xmybfxg8kyla4l7phg6qsw"
-    },
-    "prettier-plugin-svelte": {
-      "type": "GitRelease",
-      "repository": {
-        "type": "GitHub",
-        "owner": "sveltejs",
-        "repo": "prettier-plugin-svelte"
-      },
-      "pre_releases": false,
-      "version_upper_bound": null,
-      "release_prefix": null,
-      "submodules": false,
-      "version": "v3.3.2",
-      "revision": "76c04ebfdff4306842e8ab0cd96b1c53c7041dde",
-      "url": "https://api.github.com/repos/sveltejs/prettier-plugin-svelte/tarball/v3.3.2",
-      "hash": "0g6h5lvhyms6nvk83vkd3yi8rvsz2v5g6cw03fqsv2nj45s6cf7r"
-    },
     "project-nvim": {
       "type": "Git",
       "repository": {
@@ -2308,19 +2247,6 @@
       "url": "https://github.com/kevinhwang91/promise-async/archive/119e8961014c9bfaf1487bf3c2a393d254f337e2.tar.gz",
       "hash": "0q4a0rmy09hka6zvydzjj2gcm2j5mlbrhbxfcdjj33ngpblkmqzm"
     },
-    "qmk-nvim": {
-      "type": "Git",
-      "repository": {
-        "type": "GitHub",
-        "owner": "codethread",
-        "repo": "qmk.nvim"
-      },
-      "branch": "main",
-      "submodules": false,
-      "revision": "3c804c1480991e4837514900b22b9358cfd64fa1",
-      "url": "https://github.com/codethread/qmk.nvim/archive/3c804c1480991e4837514900b22b9358cfd64fa1.tar.gz",
-      "hash": "03fsx6qsn8b36jp5m0fkdla6gkkzdv2j18y378y3cqpjclgq995a"
-    },
     "rainbow-delimiters-nvim": {
       "type": "Git",
       "repository": {