From a36a063a04b7756592019345d5a72c8fff30148e Mon Sep 17 00:00:00 2001
From: Perchun Pak <git@perchun.it>
Date: Thu, 9 Apr 2026 13:22:41 +0200
Subject: [PATCH 01/11] vimPlugins.bitbake: move back to generated.nix

It was moved to non-generated, because "updater can't handle sub
directories". Added a `sourceRoot` override to `overrides.nix` and the
plugin builds.
---
 .../editors/vim/plugins/deprecated.json       |  4 ++++
 .../editors/vim/plugins/generated.nix         | 13 ++++++++++++
 .../non-generated/bitbake-vim/default.nix     | 21 -------------------
 .../editors/vim/plugins/overrides.nix         |  4 ++++
 .../editors/vim/plugins/vim-plugin-names      |  1 +
 5 files changed, 22 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/applications/editors/vim/plugins/non-generated/bitbake-vim/default.nix

diff --git a/pkgs/applications/editors/vim/plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json
index fa8c481f4917..4af18da693a7 100644
--- a/pkgs/applications/editors/vim/plugins/deprecated.json
+++ b/pkgs/applications/editors/vim/plugins/deprecated.json
@@ -83,6 +83,10 @@
         "date": "2026-02-04",
         "new": "bats-vim"
     },
+    "bitbake-vim": {
+        "date": "2026-04-09",
+        "new": "bitbake"
+    },
     "calendar": {
         "date": "2026-02-04",
         "new": "calendar-vim"
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 0bdd6a0d9575..5bb6cacfa5ae 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -1582,6 +1582,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  bitbake = buildVimPlugin {
+    pname = "bitbake";
+    version = "2.12.0-unstable-2026-04-08";
+    src = fetchFromGitHub {
+      owner = "openembedded";
+      repo = "bitbake";
+      rev = "5d722b5d65e4eef7befe6376983385421e993f86";
+      hash = "sha256-nOnNIXRUxsYNaEBhWuzCMTg37C9/S4ekxNbCpvBe+TU=";
+    };
+    meta.homepage = "https://github.com/openembedded/bitbake/";
+    meta.hydraPlatforms = [ ];
+  };
+
   blame-nvim = buildVimPlugin {
     pname = "blame.nvim";
     version = "0-unstable-2026-02-12";
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/bitbake-vim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/bitbake-vim/default.nix
deleted file mode 100644
index f43b0557c4d8..000000000000
--- a/pkgs/applications/editors/vim/plugins/non-generated/bitbake-vim/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  vimUtils,
-  fetchFromGitHub,
-}:
-vimUtils.buildVimPlugin rec {
-  pname = "bitbake-vim";
-  version = "2.10.4";
-
-  # The tags are very messy on the upstream repo. We prefer disabling automatic updates for this plugin.
-  # nixpkgs-update: no auto update
-  src = fetchFromGitHub {
-    owner = "openembedded";
-    repo = "bitbake";
-    tag = version;
-    hash = "sha256-gdxPnRhd4Hj1PWgCU5A/+639ndJXlkdArOBZt6eiZWA=";
-  };
-
-  sourceRoot = "source/contrib/vim";
-
-  meta.homepage = "https://github.com/openembedded/bitbake/";
-}
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index ac3f29e5730b..95a1c87e0d60 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -304,6 +304,10 @@ assertNoAdditions {
     ];
   };
 
+  bitbake = super.bitbake.overrideAttrs {
+    sourceRoot = "source/contrib/vim";
+  };
+
   blink-cmp-conventional-commits = super.blink-cmp-conventional-commits.overrideAttrs {
     dependencies = [ self.blink-cmp ];
   };
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index a8bb5fbf3787..da5c2c3d2f9a 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -120,6 +120,7 @@ https://github.com/rbgrouleff/bclose.vim/,,
 https://github.com/sontungexpt/better-diagnostic-virtual-text/,HEAD,
 https://github.com/max397574/better-escape.nvim/,,
 https://github.com/LunarVim/bigfile.nvim/,,
+https://github.com/openembedded/bitbake/,HEAD,
 https://github.com/FabijanZulj/blame.nvim/,HEAD,
 https://github.com/APZelos/blamer.nvim/,HEAD,
 https://github.com/Kaiser-Yang/blink-cmp-avante/,HEAD,

From 92c4fa3b95598fe9fea5046de730bbb7913518eb Mon Sep 17 00:00:00 2001
From: Perchun Pak <git@perchun.it>
Date: Thu, 9 Apr 2026 13:23:53 +0200
Subject: [PATCH 02/11] vimPlugins.clangd_extensions-nvim: move back to
 generated.nix

---
 .../editors/vim/plugins/generated.nix         | 12 +++++++++
 .../clangd_extensions-nvim/default.nix        | 26 -------------------
 .../editors/vim/plugins/vim-plugin-names      |  1 +
 3 files changed, 13 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/applications/editors/vim/plugins/non-generated/clangd_extensions-nvim/default.nix

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 5bb6cacfa5ae..fd14f2ec7804 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -2258,6 +2258,18 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  clangd_extensions-nvim = buildVimPlugin {
+    pname = "clangd_extensions.nvim";
+    version = "0-unstable-2026-01-12";
+    src = fetchgit {
+      url = "https://git.sr.ht/~p00f/clangd_extensions.nvim";
+      rev = "997d20e6bc83ea1a6223c08d2b9db76943abf56b";
+      hash = "sha256-5XES8qyl3tdMmsT+mkVcJ1sC5AKJDpHI/elsoB8XE/8=";
+    };
+    meta.homepage = "https://git.sr.ht/~p00f/clangd_extensions.nvim";
+    meta.hydraPlatforms = [ ];
+  };
+
   claude-code-nvim = buildVimPlugin {
     pname = "claude-code.nvim";
     version = "0.4.3-unstable-2026-02-04";
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/clangd_extensions-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/clangd_extensions-nvim/default.nix
deleted file mode 100644
index 5f998af8c27e..000000000000
--- a/pkgs/applications/editors/vim/plugins/non-generated/clangd_extensions-nvim/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  lib,
-  fetchFromSourcehut,
-  nix-update-script,
-  vimUtils,
-}:
-vimUtils.buildVimPlugin {
-  pname = "clangd_extensions.nvim";
-  version = "0-unstable-2025-01-27";
-
-  src = fetchFromSourcehut {
-    owner = "~p00f";
-    repo = "clangd_extensions.nvim";
-    rev = "db28f29be928d18cbfb86fbfb9f83f584f658feb";
-    hash = "sha256-XdA638W0Zb85v5uAUNpvUiiQXGKOM2xykD2ClLk8Qpo=";
-  };
-
-  passthru.updateScript = nix-update-script { };
-
-  meta = {
-    description = "Clangd's off-spec features for neovim's LSP client";
-    homepage = "https://git.sr.ht/~p00f/clangd_extensions.nvim";
-    license = lib.licenses.mit;
-    platforms = lib.platforms.all;
-  };
-}
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index da5c2c3d2f9a..3ae0bae855bb 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -172,6 +172,7 @@ https://github.com/declancm/cinnamon.nvim/,HEAD,
 https://github.com/projekt0n/circles.nvim/,,
 https://github.com/zootedb0t/citruszest.nvim/,,
 https://github.com/xavierd/clang_complete/,,
+https://git.sr.ht/~p00f/clangd_extensions.nvim,HEAD,
 https://github.com/greggh/claude-code.nvim/,HEAD,
 https://github.com/pittcat/claude-fzf-history.nvim/,HEAD,
 https://github.com/pittcat/claude-fzf.nvim/,HEAD,

From 07dcf163761c84c0724634f43aeb04f6cf5aa20d Mon Sep 17 00:00:00 2001
From: Perchun Pak <git@perchun.it>
Date: Thu, 9 Apr 2026 13:25:31 +0200
Subject: [PATCH 03/11] vimPlugins.cmp-async-path: move back to generated.nix

---
 .../editors/vim/plugins/generated.nix         | 12 +++++++
 .../non-generated/cmp-async-path/default.nix  | 31 -------------------
 .../editors/vim/plugins/overrides.nix         |  4 +++
 .../editors/vim/plugins/vim-plugin-names      |  1 +
 4 files changed, 17 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index fd14f2ec7804..4a85724bf730 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -2439,6 +2439,18 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  cmp-async-path = buildVimPlugin {
+    pname = "cmp-async-path";
+    version = "0-unstable-2026-01-28";
+    src = fetchgit {
+      url = "https://codeberg.org/FelipeLema/cmp-async-path/";
+      rev = "f8af3f726e07f2e9d37672eaa9102581aefce149";
+      hash = "sha256-ALMK7TnEB7/UZibVgOl4r6/gYsHCo6YAZcAR536VL4g=";
+    };
+    meta.homepage = "https://codeberg.org/FelipeLema/cmp-async-path/";
+    meta.hydraPlatforms = [ ];
+  };
+
   cmp-beancount = buildVimPlugin {
     pname = "cmp-beancount";
     version = "0-unstable-2025-11-26";
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix
deleted file mode 100644
index 29ffe4e42c07..000000000000
--- a/pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  lib,
-  vimUtils,
-  fetchFromCodeberg,
-  nix-update-script,
-  vimPlugins,
-}:
-vimUtils.buildVimPlugin {
-  pname = "cmp-async-path";
-  version = "0-unstable-2026-01-28";
-
-  src = fetchFromCodeberg {
-    owner = "FelipeLema";
-    repo = "cmp-async-path";
-    rev = "f8af3f726e07f2e9d37672eaa9102581aefce149";
-    hash = "sha256-ALMK7TnEB7/UZibVgOl4r6/gYsHCo6YAZcAR536VL4g=";
-  };
-
-  checkInputs = [ vimPlugins.nvim-cmp ];
-
-  passthru.updateScript = nix-update-script {
-    extraArgs = [ "--version=branch" ];
-  };
-
-  meta = {
-    description = "Nvim-cmp source for filesystem paths with async processing";
-    homepage = "https://codeberg.org/FelipeLema/cmp-async-path/";
-    license = lib.licenses.mit;
-    platforms = lib.platforms.all;
-  };
-}
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 95a1c87e0d60..f3585b278533 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -510,6 +510,10 @@ assertNoAdditions {
     ];
   };
 
+  cmp-async-path = super.cmp-async-path.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
+  };
+
   cmp-beancount = super.cmp-beancount.overrideAttrs {
     checkInputs = [ self.nvim-cmp ];
   };
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 3ae0bae855bb..89fe2f079d2d 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -186,6 +186,7 @@ https://github.com/Civitasv/cmake-tools.nvim/,,
 https://github.com/winston0410/cmd-parser.nvim/,,
 https://github.com/vim-scripts/cmdalias.vim/,HEAD,
 https://github.com/tzachar/cmp-ai/,HEAD,
+https://codeberg.org/FelipeLema/cmp-async-path/,HEAD,
 https://github.com/crispgm/cmp-beancount/,HEAD,
 https://github.com/hrsh7th/cmp-buffer/,,
 https://github.com/hrsh7th/cmp-calc/,,

From 849ce4126e0fd38812179528fab59191a9181004 Mon Sep 17 00:00:00 2001
From: Perchun Pak <git@perchun.it>
Date: Thu, 9 Apr 2026 14:43:37 +0200
Subject: [PATCH 04/11] vimPlugins.gitlab-vim: move back to generated.nix

---
 .../editors/vim/plugins/generated.nix         | 12 ++++++++
 .../non-generated/gitlab-vim/default.nix      | 29 -------------------
 .../editors/vim/plugins/vim-plugin-names      |  1 +
 3 files changed, 13 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/applications/editors/vim/plugins/non-generated/gitlab-vim/default.nix

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 4a85724bf730..da2fdca96a9d 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -6058,6 +6058,18 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  gitlab-vim = buildVimPlugin {
+    pname = "gitlab.vim";
+    version = "1.1.0-unstable-2026-03-17";
+    src = fetchgit {
+      url = "https://gitlab.com/gitlab-org/editor-extensions/gitlab.vim";
+      rev = "cb750761acf8dc17f4f1051d1b4ade6c0aaeb432";
+      hash = "sha256-rhYz3Z1Dcffvo8E3390gOBcqfFclWJ19wTKwp6L/874=";
+    };
+    meta.homepage = "https://gitlab.com/gitlab-org/editor-extensions/gitlab.vim";
+    meta.hydraPlatforms = [ ];
+  };
+
   gitlineage-nvim = buildVimPlugin {
     pname = "gitlineage.nvim";
     version = "0-unstable-2026-02-14";
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/gitlab-vim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/gitlab-vim/default.nix
deleted file mode 100644
index 824190179389..000000000000
--- a/pkgs/applications/editors/vim/plugins/non-generated/gitlab-vim/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  lib,
-  vimUtils,
-  fetchFromGitLab,
-  nix-update-script,
-}:
-let
-  version = "0.1.1";
-in
-vimUtils.buildVimPlugin {
-  pname = "gitlab.vim";
-  inherit version;
-
-  src = fetchFromGitLab {
-    owner = "gitlab-org/editor-extensions";
-    repo = "gitlab.vim";
-    rev = "v${version}";
-    hash = "sha256-W/FV+i/QJYX6A8uyxAQN4ov1kMd9UFCghFmSQp1kbnM=";
-  };
-
-  passthru.updateScript = nix-update-script { };
-
-  meta = {
-    description = "Integrate GitLab Duo with Neovim";
-    homepage = "https://gitlab.com/gitlab-org/editor-extensions/gitlab.vim";
-    license = lib.licenses.mit;
-    platforms = lib.platforms.all;
-  };
-}
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 89fe2f079d2d..55a332a74e42 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -464,6 +464,7 @@ https://github.com/polarmutex/git-worktree.nvim/,HEAD,
 https://github.com/projekt0n/github-nvim-theme/,HEAD,
 https://github.com/wintermute-cell/gitignore.nvim/,HEAD,
 https://github.com/vim-scripts/gitignore.vim/,,
+https://gitlab.com/gitlab-org/editor-extensions/gitlab.vim,HEAD,
 https://github.com/LionyxML/gitlineage.nvim/,HEAD,
 https://github.com/ruifm/gitlinker.nvim/,,
 https://github.com/trevorhauter/gitportal.nvim/,,

From 368d82f6e9433956ad2f086397ed631d60980b69 Mon Sep 17 00:00:00 2001
From: Perchun Pak <git@perchun.it>
Date: Thu, 9 Apr 2026 14:44:03 +0200
Subject: [PATCH 05/11] vimPlugins.hare-vim: move back to generated.nix

---
 .../editors/vim/plugins/generated.nix         | 12 +++++++++
 .../non-generated/hare-vim/default.nix        | 26 -------------------
 .../editors/vim/plugins/vim-plugin-names      |  1 +
 3 files changed, 13 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/applications/editors/vim/plugins/non-generated/hare-vim/default.nix

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index da2fdca96a9d..3ab0580cfae9 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -6500,6 +6500,18 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  hare-vim = buildVimPlugin {
+    pname = "hare.vim";
+    version = "0-unstable-2026-02-05";
+    src = fetchgit {
+      url = "https://git.sr.ht/~sircmpwn/hare.vim";
+      rev = "cbc1195ce25b853788d3006c34ff6be0aba6483d";
+      hash = "sha256-zueMmX8rHXMpnv6ukrcFcTIWVOoYrBC/0Tn2+5fTRlU=";
+    };
+    meta.homepage = "https://git.sr.ht/~sircmpwn/hare.vim";
+    meta.hydraPlatforms = [ ];
+  };
+
   harpoon = buildVimPlugin {
     pname = "harpoon";
     version = "0-unstable-2024-08-29";
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/hare-vim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/hare-vim/default.nix
deleted file mode 100644
index 7180615ced27..000000000000
--- a/pkgs/applications/editors/vim/plugins/non-generated/hare-vim/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  lib,
-  vimUtils,
-  fetchFromSourcehut,
-  nix-update-script,
-}:
-vimUtils.buildVimPlugin {
-  pname = "hare.vim";
-  version = "0-unstable-2025-04-24";
-
-  src = fetchFromSourcehut {
-    owner = "~sircmpwn";
-    repo = "hare.vim";
-    rev = "41b8b615f46a39d807a9a069039aac79c925c389";
-    hash = "sha256-GPFoQI6tipcLzkvjaeufmMrNnQM46lPas9D1SwzjKF4=";
-  };
-
-  passthru.updateScript = nix-update-script { };
-
-  meta = {
-    description = "Hare programming in Vim";
-    homepage = "https://git.sr.ht/~sircmpwn/hare.vim";
-    license = lib.licenses.vim;
-    platforms = lib.platforms.all;
-  };
-}
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 55a332a74e42..4a2f0436e5de 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -498,6 +498,7 @@ https://github.com/junegunn/gv.vim/,,
 https://github.com/chrishrb/gx.nvim/,HEAD,
 https://github.com/TheSnakeWitcher/hardhat.nvim/,HEAD,
 https://github.com/m4xshen/hardtime.nvim/,HEAD,
+https://git.sr.ht/~sircmpwn/hare.vim,HEAD,
 https://github.com/ThePrimeagen/harpoon/,master,
 https://github.com/ThePrimeagen/harpoon/,harpoon2,harpoon2
 https://github.com/kiyoon/haskell-scope-highlighting.nvim/,HEAD,

From c2486fd3d7ccb6b43c1e23cdce6375f47f1f3266 Mon Sep 17 00:00:00 2001
From: Perchun Pak <git@perchun.it>
Date: Thu, 9 Apr 2026 14:45:34 +0200
Subject: [PATCH 06/11] vimPlugins.jsonfly-nvim: move back to generated.nix

---
 .../editors/vim/plugins/generated.nix         | 12 +++++++++
 .../non-generated/jsonfly-nvim/default.nix    | 27 -------------------
 .../editors/vim/plugins/overrides.nix         |  8 ++++++
 .../editors/vim/plugins/vim-plugin-names      |  1 +
 4 files changed, 21 insertions(+), 27 deletions(-)
 delete mode 100644 pkgs/applications/editors/vim/plugins/non-generated/jsonfly-nvim/default.nix

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 3ab0580cfae9..b6318b3ee7b8 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -7398,6 +7398,18 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  jsonfly-nvim = buildVimPlugin {
+    pname = "jsonfly.nvim";
+    version = "0-unstable-2025-11-02";
+    src = fetchgit {
+      url = "https://git.myzel394.app/Myzel394/jsonfly.nvim";
+      rev = "3d58635cb195a5435743e7882c6ac7cff710204f";
+      hash = "sha256-bTh/6zmYQ+XqBsccKo8i149nU5bBfFv+8UKMayHIoo4=";
+    };
+    meta.homepage = "https://git.myzel394.app/Myzel394/jsonfly.nvim";
+    meta.hydraPlatforms = [ ];
+  };
+
   jule-nvim = buildVimPlugin {
     pname = "jule.nvim";
     version = "0-unstable-2025-12-26";
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/jsonfly-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/jsonfly-nvim/default.nix
deleted file mode 100644
index 22d445b55ded..000000000000
--- a/pkgs/applications/editors/vim/plugins/non-generated/jsonfly-nvim/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  lib,
-  fetchFromGitea,
-  vimUtils,
-  nix-update-script,
-}:
-vimUtils.buildVimPlugin {
-  pname = "jsonfly.nvim";
-  version = "0-unstable-2025-06-07";
-
-  src = fetchFromGitea {
-    domain = "git.myzel394.app";
-    owner = "Myzel394";
-    repo = "jsonfly.nvim";
-    rev = "db4394d856059d99d82ea2c75d033721e9dcb1fc";
-    hash = "sha256-PmYm+vZ0XONoHUo08haBozbXRpN+/LAlr6Fyg7anTNw=";
-  };
-
-  passthru.updateScript = nix-update-script { };
-
-  meta = {
-    description = "Search blazingly fast for JSON / XML / YAML keys via Telescope";
-    homepage = "https://git.myzel394.app/Myzel394/jsonfly.nvim";
-    platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ myzel394 ];
-  };
-}
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index f3585b278533..a70b5a657271 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1568,6 +1568,14 @@ assertNoAdditions {
     '';
   };
 
+  jsonfly-nvim = super.jsonfly-nvim.overrideAttrs (old: {
+    meta = old.meta // {
+      maintainers = old.meta.maintainers or [ ] ++ [
+        lib.maintainers.myzel394
+      ];
+    };
+  });
+
   jupytext-nvim = super.jupytext-nvim.overrideAttrs {
     passthru.python3Dependencies = ps: [ ps.jupytext ];
   };
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 4a2f0436e5de..f1b3a4e50be0 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -567,6 +567,7 @@ https://github.com/HiPhish/jinja.vim/,HEAD,
 https://github.com/NicolasGB/jj.nvim/,HEAD,
 https://github.com/vito-c/jq.vim/,,
 https://github.com/neoclide/jsonc.vim/,,
+https://git.myzel394.app/Myzel394/jsonfly.nvim,HEAD,
 https://github.com/julelang/jule.nvim/,HEAD,
 https://github.com/julelang/jule.nvim/,HEAD,
 https://github.com/JuliaEditorSupport/julia-vim/,,

From e4e2323de667fb061f801321e09a2be48e5b45c2 Mon Sep 17 00:00:00 2001
From: Perchun Pak <git@perchun.it>
Date: Thu, 9 Apr 2026 14:46:12 +0200
Subject: [PATCH 07/11] vimPlugins.lsp_lines-nvim: move back to generated.nix

---
 .../editors/vim/plugins/generated.nix         | 12 ++++++++
 .../non-generated/lsp_lines-nvim/default.nix  | 29 -------------------
 .../editors/vim/plugins/vim-plugin-names      |  1 +
 3 files changed, 13 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/applications/editors/vim/plugins/non-generated/lsp_lines-nvim/default.nix

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index b6318b3ee7b8..c5d825e3f9f8 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -8346,6 +8346,18 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  lsp_lines-nvim = buildVimPlugin {
+    pname = "lsp_lines.nvim";
+    version = "3.0.0-unstable-2024-12-21";
+    src = fetchgit {
+      url = "https://git.sr.ht/~whynothugo/lsp_lines.nvim";
+      rev = "a92c755f182b89ea91bd8a6a2227208026f27b4d";
+      hash = "sha256-jHiIZemneQACTDYZXBJqX2/PRTBoxq403ILvt1Ej1ZM=";
+    };
+    meta.homepage = "https://git.sr.ht/~whynothugo/lsp_lines.nvim";
+    meta.hydraPlatforms = [ ];
+  };
+
   lsp_signature-nvim = buildVimPlugin {
     pname = "lsp_signature.nvim";
     version = "0.3.1-unstable-2026-04-07";
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/lsp_lines-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/lsp_lines-nvim/default.nix
deleted file mode 100644
index 72d9495af2d2..000000000000
--- a/pkgs/applications/editors/vim/plugins/non-generated/lsp_lines-nvim/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  lib,
-  vimUtils,
-  fetchFromSourcehut,
-  nix-update-script,
-}:
-let
-  version = "3.0.0";
-in
-vimUtils.buildVimPlugin {
-  pname = "lsp_lines.nvim";
-  inherit version;
-
-  src = fetchFromSourcehut {
-    owner = "~whynothugo";
-    repo = "lsp_lines.nvim";
-    rev = "v${version}";
-    hash = "sha256-QsvmPOer7JgO7Y+N/iaNJD7Kmy69gnlV4CeyaQesNvA=";
-  };
-
-  passthru.updateScript = nix-update-script { };
-
-  meta = {
-    description = "Neovim diagnostics using virtual lines";
-    homepage = "https://git.sr.ht/~whynothugo/lsp_lines.nvim";
-    license = lib.licenses.mit;
-    platforms = lib.platforms.all;
-  };
-}
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index f1b3a4e50be0..d3a1e41f0d58 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -641,6 +641,7 @@ https://github.com/ahmedkhalf/lsp-rooter.nvim/,,
 https://github.com/nvim-lua/lsp-status.nvim/,,
 https://github.com/VonHeikemen/lsp-zero.nvim/,v3.x,
 https://github.com/nvim-lua/lsp_extensions.nvim/,,
+https://git.sr.ht/~whynothugo/lsp_lines.nvim,HEAD,
 https://github.com/ray-x/lsp_signature.nvim/,,
 https://github.com/lspcontainers/lspcontainers.nvim/,,
 https://github.com/deathbeam/lspecho.nvim/,HEAD,

From a3b6dd2685c874f1328e49194d38fa348297e180 Mon Sep 17 00:00:00 2001
From: Perchun Pak <git@perchun.it>
Date: Thu, 9 Apr 2026 14:47:02 +0200
Subject: [PATCH 08/11] vimPlugins.nvim-julia-autotest: move back to
 generated.nix

---
 .../editors/vim/plugins/generated.nix         | 12 ++++++++
 .../nvim-julia-autotest/default.nix           | 28 -------------------
 .../editors/vim/plugins/vim-plugin-names      |  1 +
 3 files changed, 13 insertions(+), 28 deletions(-)
 delete mode 100644 pkgs/applications/editors/vim/plugins/non-generated/nvim-julia-autotest/default.nix

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index c5d825e3f9f8..8ea24bcace40 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -11725,6 +11725,18 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  nvim-julia-autotest = buildVimPlugin {
+    pname = "nvim-julia-autotest";
+    version = "0-unstable-2022-10-31";
+    src = fetchgit {
+      url = "https://gitlab.com/usmcamp0811/nvim-julia-autotest";
+      rev = "b74e2f9c961e604cb56cc23f87188348bfa0f33f";
+      hash = "sha256-IaNsbBe5q7PB9Q/N/Z9nEnP6jlkQ6+xlkC0TCFnJpkk=";
+    };
+    meta.homepage = "https://gitlab.com/usmcamp0811/nvim-julia-autotest";
+    meta.hydraPlatforms = [ ];
+  };
+
   nvim-jump = buildVimPlugin {
     pname = "nvim-jump";
     version = "0-unstable-2026-04-08";
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/nvim-julia-autotest/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/nvim-julia-autotest/default.nix
deleted file mode 100644
index 032705f8359b..000000000000
--- a/pkgs/applications/editors/vim/plugins/non-generated/nvim-julia-autotest/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  lib,
-  vimUtils,
-  fetchFromGitLab,
-  nix-update-script,
-}:
-vimUtils.buildVimPlugin {
-  pname = "nvim-julia-autotest";
-  version = "0-unstable-2022-10-31";
-
-  src = fetchFromGitLab {
-    owner = "usmcamp0811";
-    repo = "nvim-julia-autotest";
-    rev = "b74e2f9c961e604cb56cc23f87188348bfa0f33f";
-    hash = "sha256-IaNsbBe5q7PB9Q/N/Z9nEnP6jlkQ6+xlkC0TCFnJpkk=";
-  };
-
-  passthru.updateScript = nix-update-script {
-    extraArgs = [ "--version=branch" ];
-  };
-
-  meta = {
-    description = "Automatically run Julia tests when you save runtest.jl file";
-    homepage = "https://gitlab.com/usmcamp0811/nvim-julia-autotest";
-    license = lib.licenses.gpl3;
-    platforms = lib.platforms.all;
-  };
-}
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index d3a1e41f0d58..047366ed2de2 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -901,6 +901,7 @@ https://github.com/nvim-java/nvim-java-refactor/,HEAD,
 https://github.com/nvim-java/nvim-java-test/,HEAD,
 https://codeberg.org/mfussenegger/nvim-jdtls/,,
 https://github.com/gennaro-tedesco/nvim-jqx/,,
+https://gitlab.com/usmcamp0811/nvim-julia-autotest,HEAD,
 https://github.com/yorickpeterse/nvim-jump/,HEAD,
 https://github.com/anasinnyk/nvim-k8s-crd/,HEAD,
 https://github.com/ethanholz/nvim-lastplace/,HEAD,

From 18e85dca8b49bbcc55565cb763f7f6b5a82d61d3 Mon Sep 17 00:00:00 2001
From: Perchun Pak <git@perchun.it>
Date: Thu, 9 Apr 2026 14:48:14 +0200
Subject: [PATCH 09/11] vimPlugins.rainbow-delimiters-nvim: move back to
 generated.nix

---
 .../editors/vim/plugins/generated.nix         | 12 +++++++
 .../rainbow-delimiters-nvim/default.nix       | 33 -------------------
 .../editors/vim/plugins/overrides.nix         |  9 +++++
 .../editors/vim/plugins/vim-plugin-names      |  1 +
 4 files changed, 22 insertions(+), 33 deletions(-)
 delete mode 100644 pkgs/applications/editors/vim/plugins/non-generated/rainbow-delimiters-nvim/default.nix

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 8ea24bcace40..48bfe3bb0132 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -13910,6 +13910,18 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  rainbow-delimiters-nvim = buildVimPlugin {
+    pname = "rainbow-delimiters.nvim";
+    version = "0.12.0-unstable-2026-04-06";
+    src = fetchgit {
+      url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim";
+      rev = "aab6caaffd79b8def22ec4320a5344f7c42f58d2";
+      hash = "sha256-aQM0Ay5GZZwcTnZ2PV4iucyBmoik98EAeIPIIJSxuYk=";
+    };
+    meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim";
+    meta.hydraPlatforms = [ ];
+  };
+
   rainbow_csv = buildVimPlugin {
     pname = "rainbow_csv";
     version = "4.3.0-unstable-2024-07-05";
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/rainbow-delimiters-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/rainbow-delimiters-nvim/default.nix
deleted file mode 100644
index 436518afa33c..000000000000
--- a/pkgs/applications/editors/vim/plugins/non-generated/rainbow-delimiters-nvim/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  lib,
-  vimUtils,
-  fetchFromGitLab,
-  nix-update-script,
-}:
-vimUtils.buildVimPlugin rec {
-  pname = "rainbow-delimiters.nvim";
-  version = "0.12.0";
-
-  src = fetchFromGitLab {
-    owner = "HiPhish";
-    repo = "rainbow-delimiters.nvim";
-    tag = "v${version}";
-    hash = "sha256-q4cBvF8d5h+BM1LTm5aq02OBVmwSUb9rC1smHlxbRzg=";
-  };
-
-  nvimSkipModules = [
-    # rainbow-delimiters.types.lua
-    "rainbow-delimiters.types"
-    # Test that requires an unpackaged dependency
-    "rainbow-delimiters._test.highlight"
-  ];
-
-  passthru.updateScript = nix-update-script { };
-
-  meta = {
-    description = "Rainbow delimiters for Neovim with Tree-sitter";
-    homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim";
-    license = lib.licenses.gpl3;
-    platforms = lib.platforms.all;
-  };
-}
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index a70b5a657271..bb02ee75cad2 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -3179,6 +3179,15 @@ assertNoAdditions {
     ];
   };
 
+  rainbow-delimiters-nvim = super.rainbow-delimiters-nvim.overrideAttrs {
+    nvimSkipModules = [
+      # rainbow-delimiters.types.lua
+      "rainbow-delimiters.types"
+      # Test that requires an unpackaged dependency
+      "rainbow-delimiters._test.highlight"
+    ];
+  };
+
   range-highlight-nvim = super.range-highlight-nvim.overrideAttrs {
     dependencies = [ self.cmd-parser-nvim ];
   };
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 047366ed2de2..173fa9445e4a 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -1069,6 +1069,7 @@ https://github.com/stefandtw/quickfix-reflector.vim/,,
 https://github.com/dannyob/quickfixstatus/,,
 https://github.com/jbyuki/quickmath.nvim/,HEAD,
 https://github.com/luochen1990/rainbow/,,
+https://gitlab.com/HiPhish/rainbow-delimiters.nvim,HEAD,
 https://github.com/mechatroner/rainbow_csv/,HEAD,
 https://github.com/kien/rainbow_parentheses.vim/,,
 https://github.com/vim-scripts/random.vim/,,

From 653e37788f360fa76bdbe87e65650a0e60c6db68 Mon Sep 17 00:00:00 2001
From: Perchun Pak <git@perchun.it>
Date: Thu, 9 Apr 2026 14:49:02 +0200
Subject: [PATCH 10/11] vimPlugins.sonarlint-nvim: move back to generated.nix

---
 .../editors/vim/plugins/generated.nix         | 12 ++++++++
 .../non-generated/sonarlint-nvim/default.nix  | 28 -------------------
 .../editors/vim/plugins/overrides.nix         |  8 ++++++
 .../editors/vim/plugins/vim-plugin-names      |  1 +
 4 files changed, 21 insertions(+), 28 deletions(-)
 delete mode 100644 pkgs/applications/editors/vim/plugins/non-generated/sonarlint-nvim/default.nix

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 48bfe3bb0132..e76b26804d18 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -14821,6 +14821,18 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  sonarlint-nvim = buildVimPlugin {
+    pname = "sonarlint.nvim";
+    version = "0-unstable-2026-01-19";
+    src = fetchgit {
+      url = "https://gitlab.com/schrieveslaach/sonarlint.nvim";
+      rev = "acd09b78969ddc965a7ddf59abb9d9eec5ecd94f";
+      hash = "sha256-71emILbp291AZmh9Rc0S92mbkcZ88zjCvPTaumEM7Qg=";
+    };
+    meta.homepage = "https://gitlab.com/schrieveslaach/sonarlint.nvim";
+    meta.hydraPlatforms = [ ];
+  };
+
   sonarqube-nvim = buildVimPlugin {
     pname = "sonarqube.nvim";
     version = "0-unstable-2025-06-24";
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/sonarlint-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/sonarlint-nvim/default.nix
deleted file mode 100644
index b38fd053f059..000000000000
--- a/pkgs/applications/editors/vim/plugins/non-generated/sonarlint-nvim/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  lib,
-  vimUtils,
-  fetchFromGitLab,
-  nix-update-script,
-}:
-vimUtils.buildVimPlugin {
-  pname = "sonarlint.nvim";
-  version = "0-unstable-2026-01-19";
-
-  src = fetchFromGitLab {
-    owner = "schrieveslaach";
-    repo = "sonarlint.nvim";
-    rev = "acd09b78969ddc965a7ddf59abb9d9eec5ecd94f";
-    hash = "sha256-71emILbp291AZmh9Rc0S92mbkcZ88zjCvPTaumEM7Qg=";
-  };
-
-  passthru.updateScript = nix-update-script {
-    extraArgs = [ "--version=branch" ];
-  };
-
-  meta = {
-    homepage = "https://gitlab.com/schrieveslaach/sonarlint.nvim";
-    description = "Extensions for the built-in Language Server Protocol support in Neovim for sonarlint-language-server";
-    license = lib.licenses.gpl3;
-    maintainers = [ lib.maintainers.sinics ];
-  };
-}
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index bb02ee75cad2..552ef22b39de 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -3387,6 +3387,14 @@ assertNoAdditions {
     ];
   };
 
+  sonarlint-nvim = super.sonarlint-nvim.overrideAttrs (old: {
+    meta = old.meta // {
+      maintainers = old.meta.maintainers or [ ] ++ [
+        lib.maintainers.sinics
+      ];
+    };
+  });
+
   spaceman-nvim = super.spaceman-nvim.overrideAttrs {
     # Optional telescope integration
     nvimSkipModules = "spaceman.adapters.telescope";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 173fa9445e4a..a2ccfc26801e 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -1139,6 +1139,7 @@ https://github.com/leath-dub/snipe.nvim/,HEAD,
 https://github.com/norcalli/snippets.nvim/,,
 https://github.com/craftzdog/solarized-osaka.nvim/,HEAD,
 https://github.com/shaunsingh/solarized.nvim/,HEAD,
+https://gitlab.com/schrieveslaach/sonarlint.nvim,HEAD,
 https://github.com/iamkarasik/sonarqube.nvim/,HEAD,
 https://github.com/sainnhe/sonokai/,,
 https://github.com/sQVe/sort.nvim/,HEAD,

From 64b82af6119db9ed74eba32709425bcd6b6d2e51 Mon Sep 17 00:00:00 2001
From: Perchun Pak <git@perchun.it>
Date: Thu, 9 Apr 2026 14:51:04 +0200
Subject: [PATCH 11/11] vimPlugins.vim-stationeers-ic10-syntax: move back to
 generated.nix

---
 .../editors/vim/plugins/generated.nix         | 12 ++++++++
 .../vim-stationeers-ic10-syntax/default.nix   | 28 -------------------
 .../editors/vim/plugins/vim-plugin-names      |  1 +
 3 files changed, 13 insertions(+), 28 deletions(-)
 delete mode 100644 pkgs/applications/editors/vim/plugins/non-generated/vim-stationeers-ic10-syntax/default.nix

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index e76b26804d18..efdc02b3c36d 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -21943,6 +21943,18 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  vim-stationeers-ic10-syntax = buildVimPlugin {
+    pname = "vim-stationeers-ic10-syntax";
+    version = "0-unstable-2025-11-02";
+    src = fetchgit {
+      url = "https://gitlab.com/LittleMorph/vim-ic10";
+      rev = "74446a16078ef4f3d2088136b32af939fb6bc2a4";
+      hash = "sha256-YCxrSB7eRQ54iZhpcsAR930Uccj+2ZyogpYGKbcSlys=";
+    };
+    meta.homepage = "https://gitlab.com/LittleMorph/vim-ic10";
+    meta.hydraPlatforms = [ ];
+  };
+
   vim-strip-trailing-whitespace = buildVimPlugin {
     pname = "vim-strip-trailing-whitespace";
     version = "1.0-unstable-2022-02-01";
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/vim-stationeers-ic10-syntax/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/vim-stationeers-ic10-syntax/default.nix
deleted file mode 100644
index 8d628bdd7767..000000000000
--- a/pkgs/applications/editors/vim/plugins/non-generated/vim-stationeers-ic10-syntax/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  lib,
-  vimUtils,
-  fetchFromGitLab,
-  nix-update-script,
-}:
-vimUtils.buildVimPlugin {
-  pname = "vim-ic10";
-  version = "0-unstable-2025-11-02";
-
-  src = fetchFromGitLab {
-    owner = "LittleMorph";
-    repo = "vim-ic10";
-    rev = "74446a16078ef4f3d2088136b32af939fb6bc2a4";
-    hash = "sha256-YCxrSB7eRQ54iZhpcsAR930Uccj+2ZyogpYGKbcSlys=";
-  };
-
-  passthru.updateScript = nix-update-script {
-    extraArgs = [ "--version=branch" ];
-  };
-
-  meta = {
-    description = "Stationeers IC10 syntax highlighting for Vim";
-    homepage = "https://gitlab.com/LittleMorph/vim-ic10";
-    license = lib.licenses.mit;
-    platforms = lib.platforms.all;
-  };
-}
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index a2ccfc26801e..5f811437506d 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -1686,6 +1686,7 @@ https://github.com/kbenzie/vim-spirv/,,
 https://github.com/yorokobi/vim-splunk/,HEAD,
 https://github.com/mhinz/vim-startify/,,
 https://github.com/dstein64/vim-startuptime/,,
+https://gitlab.com/LittleMorph/vim-ic10,HEAD,vim-stationeers-ic10-syntax
 https://github.com/axelf4/vim-strip-trailing-whitespace/,,
 https://github.com/nbouscal/vim-stylish-haskell/,,
 https://github.com/alx741/vim-stylishask/,,