From 7b2b40513cb1a9e0271e7fe4e2771e80e127728f Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc@jakobi.dev>
Date: Tue, 16 Jun 2026 22:12:03 +0200
Subject: [PATCH] vimPlugins.kulala-nvim: replace with lua package

---
 .../editors/vim/plugins/generated.nix         | 14 ---------
 .../editors/vim/plugins/luaPackagePlugins.nix |  1 +
 .../editors/vim/plugins/overrides.nix         |  4 ---
 .../kulala-nvim/do-not-install-grammar.patch  | 15 ----------
 .../use-packaged-tree-sitter-parser.patch     | 29 -------------------
 .../editors/vim/plugins/vim-plugin-names      |  1 -
 6 files changed, 1 insertion(+), 63 deletions(-)
 delete mode 100644 pkgs/applications/editors/vim/plugins/patches/kulala-nvim/do-not-install-grammar.patch
 delete mode 100644 pkgs/applications/editors/vim/plugins/patches/kulala-nvim/use-packaged-tree-sitter-parser.patch

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 85489fefd586..dc433b28353a 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -8458,20 +8458,6 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
-  kulala-nvim = buildVimPlugin {
-    pname = "kulala.nvim";
-    version = "6.11.1";
-    src = fetchFromGitHub {
-      owner = "mistweaverco";
-      repo = "kulala.nvim";
-      tag = "v6.11.1";
-      hash = "sha256-w3psD4EYntFeX7otMPXN3altJf3UPjcaS2XLlqSnH4k=";
-    };
-    meta.homepage = "https://github.com/mistweaverco/kulala.nvim/";
-    meta.license = getLicenseFromSpdxId "MIT";
-    meta.hydraPlatforms = [ ];
-  };
-
   lackluster-nvim = buildVimPlugin {
     pname = "lackluster.nvim";
     version = "0-unstable-2025-10-06";
diff --git a/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix b/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix
index b8c8dccb4960..5bac2daba0b2 100644
--- a/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix
@@ -15,6 +15,7 @@ let
     "grug-far-nvim"
     "haskell-tools-nvim"
     "image-nvim"
+    "kulala-nvim"
     "lsp-progress-nvim"
     "lualine-nvim"
     "luasnip"
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 03edb8dac52b..63cf04e188fa 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -2020,10 +2020,6 @@ assertNoAdditions {
       );
     in
     {
-      patches = (old.patches or [ ]) ++ [
-        ./patches/kulala-nvim/use-packaged-tree-sitter-parser.patch
-      ];
-
       dependencies = [ kulala-http-grammar ];
 
       postPatch = ''
diff --git a/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/do-not-install-grammar.patch b/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/do-not-install-grammar.patch
deleted file mode 100644
index 00a76f9c0492..000000000000
--- a/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/do-not-install-grammar.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/lua/kulala/config/init.lua b/lua/kulala/config/init.lua
-index 7298f95..d781a12 100644
---- a/lua/kulala/config/init.lua
-+++ b/lua/kulala/config/init.lua
-@@ -122,6 +122,10 @@ local function setup_treesitter_master()
- end
- 
- local function set_kulala_parser()
-+  assert(vim.treesitter.language.add("kulala_http"))
-+  vim.treesitter.language.register("kulala_http", { "http", "rest" })
-+  do return end
-+
-   local parsers = vim.F.npcall(require, "nvim-treesitter.parsers")
- 
-   if not parsers then
diff --git a/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/use-packaged-tree-sitter-parser.patch b/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/use-packaged-tree-sitter-parser.patch
deleted file mode 100644
index d7bd71b2c4c6..000000000000
--- a/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/use-packaged-tree-sitter-parser.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/lua/kulala/config/parser.lua b/lua/kulala/config/parser.lua
-index 5f37046..c60c474 100644
---- a/lua/kulala/config/parser.lua
-+++ b/lua/kulala/config/parser.lua
-@@ -37,7 +37,6 @@ local function sync_queries()
- end
- 
- local function load_parser()
--  if not Fs.file_exists(parser_target_path) then return false end
-   return vim.treesitter.language.add(parser_name) == true
- end
- 
-@@ -48,7 +47,3 @@ M.register_parser = function()
--  -- kulala_http/*.scm live under tree-sitter-kulala-http/queries/
--  vim.opt.rtp:prepend(parser_source_path)
--  ensure_site_rtp()
--  sync_queries()
-   vim.treesitter.language.register(parser_name, filetypes)
-   vim.treesitter.language.register("markdown", "kulala_ui")
-   local backend = require("kulala.backend")
-@@ -94,7 +92,7 @@ local function has_kulala_parser()
- end
- 
- M.is_up_to_date = function()
--  return has_kulala_parser() and is_parser_ver_current()
-+  return load_parser()
- end
- 
- M.setup = function()
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 97bcfcc72948..1ca54bd8537c 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -602,7 +602,6 @@ https://github.com/frabjous/knap/,,
 https://github.com/oskarnurm/koda.nvim/,,
 https://github.com/b3nj5m1n/kommentary/,,
 https://github.com/udalov/kotlin-vim/,,
-https://github.com/mistweaverco/kulala.nvim/,,
 https://github.com/slugbyte/lackluster.nvim/,,
 https://github.com/qnighy/lalrpop.vim/,,
 https://github.com/Wansmer/langmapper.nvim/,,