From eb6ae3e6bbe8ce40a99e242b62744e475ad4f8b1 Mon Sep 17 00:00:00 2001
From: traxys <quentin@familleboyer.net>
Date: Mon, 11 Mar 2024 13:02:41 +0100
Subject: [PATCH] Avoid non derivations for neovim packages

---
 flake.nix | 43 ++++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/flake.nix b/flake.nix
index 3240e2b..36c289e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -364,27 +364,32 @@
 
           nixvim' = inputs.nixvim.legacyPackages."${system}";
           neovimNightly = inputs.neovim-flake.packages."${system}".neovim;
-        in
-          callPackage ({pkgs}: let
-            neovimPkgs = (pkgs.extend neovimPlugins).extend (final: prev: {
-              vimPlugins = prev.vimPlugins.extend (final': prev': {
-                nvim-treesitter = prev'.nvim-treesitter.overrideAttrs (
-                  prev.callPackage ./neovim/nvim-treesitter/override.nix {} final' prev'
-                );
+        in {
+          inherit
+            (callPackage ({pkgs}: let
+              neovimPkgs = (pkgs.extend neovimPlugins).extend (final: prev: {
+                vimPlugins = prev.vimPlugins.extend (final': prev': {
+                  nvim-treesitter = prev'.nvim-treesitter.overrideAttrs (
+                    prev.callPackage ./neovim/nvim-treesitter/override.nix {} final' prev'
+                  );
+                });
               });
-            });
-          in {
-            neovimTraxys = nixvim'.makeNixvimWithModule {
-              module = {
-                imports = [./neovim];
-                package = neovimNightly;
+            in {
+              neovimTraxys = nixvim'.makeNixvimWithModule {
+                module = {
+                  imports = [./neovim];
+                  package = neovimNightly;
+                };
+                pkgs = neovimPkgs;
               };
-              pkgs = neovimPkgs;
-            };
-            update-nvim-treesitter = neovimPkgs.callPackage ./neovim/nvim-treesitter {
-              upstream = neovimNightly;
-            };
-          }) {}
+              update-nvim-treesitter = neovimPkgs.callPackage ./neovim/nvim-treesitter {
+                upstream = neovimNightly;
+              };
+            }) {})
+            neovimTraxys
+            update-nvim-treesitter
+            ;
+        }
       );
 
     extraInfo = import ./extra_info.nix;