From 292c2a02d67fc19327b4e1be2051e81679a3f521 Mon Sep 17 00:00:00 2001
From: PerchunPak <git@perchun.it>
Date: Wed, 3 Dec 2025 14:51:13 +0100
Subject: [PATCH] vimPlugins.vscode-diff-nvim: move to non-generated

The plugin requires a C library, which needs to be compiled. We should
move this to non-generated so hydra would build this plugin.
---
 .../editors/vim/plugins/generated.nix         | 13 -------
 .../vscode-diff-nvim/default.nix              | 38 +++++++++++++++++++
 .../editors/vim/plugins/overrides.nix         | 13 -------
 3 files changed, 38 insertions(+), 26 deletions(-)
 create mode 100644 pkgs/applications/editors/vim/plugins/non-generated/vscode-diff-nvim/default.nix

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index e414f69aed2c..e85cb6b94c3a 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -22312,19 +22312,6 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
-  vscode-diff-nvim = buildVimPlugin {
-    pname = "vscode-diff.nvim";
-    version = "2025-11-27";
-    src = fetchFromGitHub {
-      owner = "esmuellert";
-      repo = "vscode-diff.nvim";
-      rev = "9831250fb85beb27df984bd985961f1a2ca23f81";
-      sha256 = "0dl23y5a5yq3kd02w9xfx56nqk20xpjv0j97qr0yh346d27401l1";
-    };
-    meta.homepage = "https://github.com/esmuellert/vscode-diff.nvim/";
-    meta.hydraPlatforms = [ ];
-  };
-
   vscode-nvim = buildVimPlugin {
     pname = "vscode.nvim";
     version = "2025-08-06";
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/vscode-diff-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/vscode-diff-nvim/default.nix
new file mode 100644
index 000000000000..0cfedc682a49
--- /dev/null
+++ b/pkgs/applications/editors/vim/plugins/non-generated/vscode-diff-nvim/default.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  cmake,
+  fetchFromGitHub,
+  nix-update-script,
+  vimUtils,
+  vimPlugins,
+}:
+vimUtils.buildVimPlugin rec {
+  pname = "vscode-diff.nvim";
+  version = "1.6.2";
+
+  src = fetchFromGitHub {
+    owner = "esmuellert";
+    repo = "vscode-diff.nvim";
+    tag = "v${version}";
+    hash = "sha256-FyfVmxX40hAk1ch1PWtNi3FszAKfDk7XKEpnZfBw4I4=";
+  };
+
+  dependencies = [ vimPlugins.nui-nvim ];
+
+  nativeBuildInputs = [ cmake ];
+  dontUseCmakeConfigure = true;
+  buildPhase = ''
+    runHook preBuild
+    make
+    runHook postBuild
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "VSCode-style side-by-side diff rendering with two-tier highlighting (line + character level)";
+    homepage = "https://github.com/esmuellert/vscode-diff.nvim/";
+    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 477947f3bf35..72a524e91049 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -4091,19 +4091,6 @@ assertNoAdditions {
     ];
   };
 
-  vscode-diff-nvim = super.vscode-diff-nvim.overrideAttrs {
-    dependencies = [
-      self.nui-nvim
-    ];
-    nativeBuildInputs = [ cmake ];
-    dontUseCmakeConfigure = true;
-    buildPhase = ''
-      runHook preBuild
-      make
-      runHook postBuild
-    '';
-  };
-
   which-key-nvim = super.which-key-nvim.overrideAttrs {
     nvimSkipModules = [ "which-key.docs" ];
   };