From 46ba379d08a7d783ad3c5b2ce115aae0e4527abd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?=
 <jalil.salame@gmail.com>
Date: Mon, 21 Apr 2025 18:54:53 +0200
Subject: [PATCH] refactor(nvim): pull in vim plugins properly

This way should be faster to evaluate and more correct as we follow the
way done in nixpkgs.
---
 modules/nixvim/extraPlugins/default.nix | 11 -----------
 modules/nixvim/standalone.nix           |  9 +++++++--
 2 files changed, 7 insertions(+), 13 deletions(-)
 delete mode 100644 modules/nixvim/extraPlugins/default.nix

diff --git a/modules/nixvim/extraPlugins/default.nix b/modules/nixvim/extraPlugins/default.nix
deleted file mode 100644
index 87e972c..0000000
--- a/modules/nixvim/extraPlugins/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ pkgs }:
-let
-  overlay = pkgs.callPackage ./generated.nix {
-    inherit (pkgs.vimUtils) buildVimPlugin buildNeovimPlugin;
-  };
-  plugins = overlay pkgs pkgs;
-in
-{
-  inherit overlay;
-  inherit (plugins) nvim-silicon;
-}
diff --git a/modules/nixvim/standalone.nix b/modules/nixvim/standalone.nix
index 8f4f63f..f66d239 100644
--- a/modules/nixvim/standalone.nix
+++ b/modules/nixvim/standalone.nix
@@ -7,7 +7,12 @@
 let
   cfg = config.jhome.nvim;
   plugins = pkgs.vimPlugins;
-  extraPlugins = import ./extraPlugins { inherit pkgs; };
+  jExtraVimPlugins = pkgs.vimPlugins.extend (
+    pkgs.callPackage ./extraPlugins/generated.nix {
+      inherit (pkgs.vimUtils) buildVimPlugin;
+      inherit (pkgs.neovimUtils) buildNeovimPlugin;
+    }
+  );
 in
 {
   imports = [
@@ -78,7 +83,7 @@ in
     }
     # Big packages that are kinda unnecessary
     (lib.mkIf (!cfg.reduceSize) {
-      extraPlugins = [ extraPlugins.nvim-silicon ];
+      extraPlugins = [ jExtraVimPlugins.nvim-silicon ];
       extraPackages = [ pkgs.silicon ];
       extraConfigLua =
         # lua