From cfe8e54c1b77b9c3bc8941b2ab7b0b65ed126260 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 30 Aug 2025 14:35:45 -0500
Subject: [PATCH] vimPlugins.fzfWrapper: move to non-generated

Looks like it was missed in `overrides.nix` when it should be in
non-generated.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/applications/editors/vim/plugins/aliases.nix  |  1 +
 .../plugins/non-generated/fzf-wrapper/default.nix  | 14 ++++++++++++++
 .../applications/editors/vim/plugins/overrides.nix | 13 +------------
 3 files changed, 16 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/applications/editors/vim/plugins/non-generated/fzf-wrapper/default.nix

diff --git a/pkgs/applications/editors/vim/plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix
index 1adb63ed5d23..0f4054d498e7 100644
--- a/pkgs/applications/editors/vim/plugins/aliases.nix
+++ b/pkgs/applications/editors/vim/plugins/aliases.nix
@@ -75,6 +75,7 @@ mapAliases (
     feline-nvim = throw "feline.nvim has been removed: upstream deleted repository. Consider using lualine"; # Added 2025-02-09
     fugitive = vim-fugitive;
     floating-nvim = throw "floating.nvim has been removed: abandoned by upstream. Use popup-nvim or nui-nvim"; # Added 2024-11-26
+    fzfWrapper = fzf-wrapper;
     ghc-mod-vim = ghcmod-vim;
     ghcmod = ghcmod-vim;
     gleam-vim = throw "gleam.vim has been removed: its code was merged into vim."; # Added 2025-06-10
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/fzf-wrapper/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/fzf-wrapper/default.nix
new file mode 100644
index 000000000000..c22afcf7e9ae
--- /dev/null
+++ b/pkgs/applications/editors/vim/plugins/non-generated/fzf-wrapper/default.nix
@@ -0,0 +1,14 @@
+{
+  vimUtils,
+  fzf,
+}:
+# Mainly used as a dependency for fzf-vim. Wraps the fzf program as a vim
+# plugin, since part of the fzf vim plugin is included in the main fzf
+# program.
+vimUtils.buildVimPlugin {
+  inherit (fzf) src version;
+  pname = "fzf";
+  postInstall = ''
+    ln -s ${fzf}/bin/fzf $target/bin/fzf
+  '';
+}
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index e0aeef5ca345..3ac1f9d4f6b8 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1320,18 +1320,7 @@ in
   };
 
   fzf-vim = super.fzf-vim.overrideAttrs {
-    dependencies = [ self.fzfWrapper ];
-  };
-
-  # Mainly used as a dependency for fzf-vim. Wraps the fzf program as a vim
-  # plugin, since part of the fzf vim plugin is included in the main fzf
-  # program.
-  fzfWrapper = buildVimPlugin {
-    inherit (fzf) src version;
-    pname = "fzf";
-    postInstall = ''
-      ln -s ${fzf}/bin/fzf $target/bin/fzf
-    '';
+    dependencies = [ self.fzf-wrapper ];
   };
 
   gen-nvim = super.gen-nvim.overrideAttrs {