From 09463c08b7bcaeddd23dfa93d3c65d09cffd125f Mon Sep 17 00:00:00 2001
From: Barrett Ruth <br.barrettruth@gmail.com>
Date: Sat, 28 Mar 2026 18:40:16 -0400
Subject: [PATCH] ci: add neovim and busted to CI shell

Problem: the CI flake shell lacked `neovim`, so `vimdoc-language-server`
could not resolve builtin Neovim help tags like `|:checkhealth|`.
Also missing `busted`/`nlua` lua packages.

Solution: add `pkgs.neovim` to the `ci` shell and `busted`/`nlua` via
`luajit.withPackages` to both shells, matching the pattern used in
canola.nvim. Revert the vimdoc workaround from the previous commit.
---
 doc/forge.nvim.txt |  2 +-
 flake.nix          | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/doc/forge.nvim.txt b/doc/forge.nvim.txt
index c55d23e..e49a8de 100644
--- a/doc/forge.nvim.txt
+++ b/doc/forge.nvim.txt
@@ -20,7 +20,7 @@ Requirements: ~
 - vim-fugitive (optional, for split review)
 - diffs.nvim (optional, for review mode)
 
-Run `:checkhealth forge` to verify CLIs and dependencies.
+Run |:checkhealth| forge to verify CLIs and dependencies.
 
 ==============================================================================
 CONFIGURATION                                                   *forge-config*
diff --git a/flake.nix b/flake.nix
index e11545a..6a16865 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,22 +24,21 @@
       devShells = forEachSystem (
         pkgs:
         let
-          vimdoc-ls = vimdoc-language-server.packages.${pkgs.system}.default;
           commonPackages = [
             pkgs.prettier
             pkgs.stylua
             pkgs.selene
             pkgs.lua-language-server
-            vimdoc-ls
+            vimdoc-language-server.packages.${pkgs.system}.default
+            (pkgs.luajit.withPackages (ps: [
+              ps.busted
+              ps.nlua
+            ]))
           ];
         in
         {
-          default = pkgs.mkShell {
-            packages = commonPackages;
-          };
-          ci = pkgs.mkShell {
-            packages = commonPackages;
-          };
+          default = pkgs.mkShell { packages = commonPackages; };
+          ci = pkgs.mkShell { packages = commonPackages ++ [ pkgs.neovim ]; };
         }
       );
     };