From 8ce2a73fc27d1b021d92db90b9f200d4238bc01c Mon Sep 17 00:00:00 2001
From: PerchunPak <git@perchun.it>
Date: Tue, 6 Jan 2026 16:49:26 +0100
Subject: [PATCH 1/2] vimPlugins.guihua-lua: init at 0.1-unstable-2025-11-12

Co-Authored-By: Austin Horstman <khaneliman12@gmail.com>
---
 .../editors/vim/plugins/generated.nix         | 13 +++++++++++++
 .../editors/vim/plugins/overrides.nix         | 19 +++++++++++++++++++
 .../editors/vim/plugins/vim-plugin-names      |  1 +
 3 files changed, 33 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 397830a50101..b5221c3af134 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -6218,6 +6218,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  guihua-lua = buildVimPlugin {
+    pname = "guihua.lua";
+    version = "0.1-unstable-2025-11-12";
+    src = fetchFromGitHub {
+      owner = "ray-x";
+      repo = "guihua.lua";
+      rev = "ef44ba40f12e56c1c9fa45967f2b4d142e4b97a0";
+      hash = "sha256-9iFqh12orsGnQniDloO+aXoBYuTqOW4pGHi3LBB2m4Q=";
+    };
+    meta.homepage = "https://github.com/ray-x/guihua.lua/";
+    meta.hydraPlatforms = [ ];
+  };
+
   gundo-vim = buildVimPlugin {
     pname = "gundo.vim";
     version = "2.6.2-unstable-2021-02-21";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index d0f9b915046f..b9dfc24a7b10 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1399,6 +1399,25 @@ assertNoAdditions {
     dependencies = [ self.guard-nvim ];
   };
 
+  guihua-lua = super.guihua-lua.overrideAttrs {
+    dependencies = [ self.nvim-treesitter ];
+
+    buildPhase = ''
+      runHook preBuild
+
+      pushd lua/fzy
+      make
+      popd
+
+      runHook postBuild
+    '';
+
+    nvimSkipModules = [
+      # lua module '.init' not found
+      "fzy.fzy-lua-native"
+    ];
+  };
+
   gx-nvim = super.gx-nvim.overrideAttrs {
     patches = lib.optionals stdenv.hostPlatform.isLinux [
       (replaceVars ./patches/gx-nvim/fix-paths.patch {
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 4deab3bb7e3b..b62906d7d331 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -476,6 +476,7 @@ https://github.com/ellisonleao/gruvbox.nvim/,,
 https://github.com/nvimdev/guard-collection/,HEAD,
 https://github.com/nvimdev/guard.nvim/,HEAD,
 https://github.com/nmac427/guess-indent.nvim/,HEAD,
+https://github.com/ray-x/guihua.lua/,HEAD,
 https://github.com/sjl/gundo.vim/,,
 https://github.com/junegunn/gv.vim/,,
 https://github.com/chrishrb/gx.nvim/,HEAD,

From b07fb014ea5b2aa396427b184f3b4d5d769f4149 Mon Sep 17 00:00:00 2001
From: PerchunPak <git@perchun.it>
Date: Tue, 6 Jan 2026 16:50:37 +0100
Subject: [PATCH 2/2] vimPlugins.go-nvim: add guihua-lua to dependencies

It is requeried if user wants nvim-treesitter main.
---
 pkgs/applications/editors/vim/plugins/overrides.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index b9dfc24a7b10..7b163b8b7cde 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1365,10 +1365,13 @@ assertNoAdditions {
   };
 
   go-nvim = super.go-nvim.overrideAttrs {
+    dependencies = with self; [
+      nvim-treesitter
+      guihua-lua
+    ];
     checkInputs = with self; [
       luasnip
       null-ls-nvim
-      nvim-treesitter
     ];
     nvimSkipModules = [
       "init"