From db2eef5af63a8ba16608819d79441c371b53392b Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sun, 23 Mar 2025 21:10:55 -0500
Subject: [PATCH] vimplugins.coc-*: move into cocPlugins

coc is breaking out packages into top-level, but I don't know if we
really need separate folders for each of these. Can just create another
set to merge in.
---
 .../editors/vim/plugins/cocPlugins.nix        | 36 +++++++++++++++++++
 .../editors/vim/plugins/default.nix           |  5 +++
 .../editors/vim/plugins/overrides.nix         | 32 -----------------
 3 files changed, 41 insertions(+), 32 deletions(-)
 create mode 100644 pkgs/applications/editors/vim/plugins/cocPlugins.nix

diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
new file mode 100644
index 000000000000..508f0452724b
--- /dev/null
+++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
@@ -0,0 +1,36 @@
+{
+  buildVimPlugin,
+  coc-clangd,
+  coc-css,
+  coc-diagnostic,
+  coc-pyright,
+  coc-toml,
+}:
+final: prev: {
+  coc-clangd = buildVimPlugin {
+    inherit (coc-clangd) pname version meta;
+    src = "${coc-clangd}/lib/node_modules/coc-clangd";
+  };
+
+  coc-css = buildVimPlugin {
+    inherit (coc-css) pname version meta;
+    src = "${coc-css}/lib/node_modules/coc-css";
+  };
+
+  coc-diagnostic = buildVimPlugin {
+    inherit (coc-diagnostic) pname version meta;
+    src = "${coc-diagnostic}/lib/node_modules/coc-diagnostic";
+  };
+
+  coc-pyright = buildVimPlugin {
+    pname = "coc-pyright";
+    inherit (coc-pyright) version meta;
+    src = "${coc-pyright}/lib/node_modules/coc-pyright";
+  };
+
+  coc-toml = buildVimPlugin {
+    pname = "coc-toml";
+    inherit (coc-toml) version meta;
+    src = "${coc-toml}/lib/node_modules/coc-toml";
+  };
+}
diff --git a/pkgs/applications/editors/vim/plugins/default.nix b/pkgs/applications/editors/vim/plugins/default.nix
index d04632599e22..89bd49f36cc0 100644
--- a/pkgs/applications/editors/vim/plugins/default.nix
+++ b/pkgs/applications/editors/vim/plugins/default.nix
@@ -19,6 +19,10 @@ let
 
   initialPackages = self: { };
 
+  cocPlugins = callPackage ./cocPlugins.nix {
+    inherit buildVimPlugin;
+  };
+
   luaPackagePlugins = callPackage ./luaPackagePlugins.nix {
     inherit (neovimUtils) buildNeovimPlugin;
   };
@@ -53,6 +57,7 @@ let
 in
 lib.pipe initialPackages [
   (extends plugins)
+  (extends cocPlugins)
   (extends luaPackagePlugins)
   (extends nodePackagePlugins)
   (extends nonGeneratedPlugins)
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index b29f7da51709..5a5a60e95d24 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -16,11 +16,6 @@
   mkYarnModules,
   python3,
   # Misc dependencies
-  coc-clangd,
-  coc-css,
-  coc-diagnostic,
-  coc-pyright,
-  coc-toml,
   code-minimap,
   dasht,
   deno,
@@ -611,33 +606,6 @@ in
     ];
   };
 
-  coc-clangd = buildVimPlugin {
-    inherit (coc-clangd) pname version meta;
-    src = "${coc-clangd}/lib/node_modules/coc-clangd";
-  };
-
-  coc-css = buildVimPlugin {
-    inherit (coc-css) pname version meta;
-    src = "${coc-css}/lib/node_modules/coc-css";
-  };
-
-  coc-diagnostic = buildVimPlugin {
-    inherit (coc-diagnostic) pname version meta;
-    src = "${coc-diagnostic}/lib/node_modules/coc-diagnostic";
-  };
-
-  coc-pyright = buildVimPlugin {
-    pname = "coc-pyright";
-    inherit (coc-pyright) version meta;
-    src = "${coc-pyright}/lib/node_modules/coc-pyright";
-  };
-
-  coc-toml = buildVimPlugin {
-    pname = "coc-toml";
-    inherit (coc-toml) version meta;
-    src = "${coc-toml}/lib/node_modules/coc-toml";
-  };
-
   codecompanion-nvim = super.codecompanion-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
     nvimSkipModule = [