From 4edf3f4d64320dac228f080ca49e8c535f615a7d Mon Sep 17 00:00:00 2001
From: Dmitriy Pleshevskiy <dmitriy@ideascup.me>
Date: Sat, 19 Nov 2022 19:52:39 +0300
Subject: [PATCH] add nix2lua to passthru

---
 default.nix | 15 +++++++++++----
 flake.nix   | 12 +++++++-----
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/default.nix b/default.nix
index 3846a93..5f1c942 100644
--- a/default.nix
+++ b/default.nix
@@ -12,14 +12,17 @@
 , tree-sitter
 , neovimPlugins
 , lib
-, toLua
+, nix2lua
 , substituteAll
 , ...
 }:
 
 let
   inherit (builtins) catAttrs isFunction readFile;
-  myLib = import ./lib.nix { inherit lib; } // { inherit substituteAll toLua; };
+  myLib = import ./lib.nix { inherit lib; } // {
+    inherit substituteAll;
+    inherit (nix2lua.lib) toLua;
+  };
 
   pluginParams = neovimPlugins // {
     inherit plugins;
@@ -52,7 +55,7 @@ let
   pluginConfigs = catAttrs "luaConfig" pluginsSettings;
   allConfigs = basicConfigs ++ pluginConfigs;
 in
-wrapNeovim neovim-unwrapped {
+(wrapNeovim neovim-unwrapped {
   inherit viAlias;
   inherit vimAlias;
 
@@ -65,4 +68,8 @@ wrapNeovim neovim-unwrapped {
 
     packages.myVimPackages = { start = allPlugins; };
   };
-}
+}).overrideAttrs (oldAttrs: {
+  passthru = oldAttrs.passthru // {
+    nix2lua = nix2lua.lib;
+  };
+})
diff --git a/flake.nix b/flake.nix
index 8eecdc6..8d1100c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -216,13 +216,15 @@
 
           neovimPlugins = (listToAttrs (map buildPluginValuePair inputPlugins));
         in
-        { inherit neovimPlugins; };
+        {
+          inherit neovimPlugins;
+          inherit nix2lua;
+        };
     in
     {
-      lib = nix2lua.lib;
       overlays = {
         default = final: prev: {
-          myneovim = prev.callPackage self (mkNvimPlugins prev // nix2lua.lib);
+          myneovim = prev.callPackage self (mkNvimPlugins prev);
         };
       };
     } //
@@ -230,14 +232,14 @@
       let
         pkgs = import nixpkgs { inherit system; };
 
-        minimalNeovim = pkgs.callPackage self (mkNvimPlugins pkgs // nix2lua.lib);
+        minimalNeovim = pkgs.callPackage self (mkNvimPlugins pkgs);
 
         recommendedNeovim = (minimalNeovim.override {
           enableDevIcons = true;
           enableTabby = true;
           grammarFileTypes = [ "nix" "lua" ];
 
-          plugins = with nix2lua.lib; {
+          plugins = with minimalNeovim.nix2lua; {
             nvimTree.settings = {
               open_on_setup = true;
               renderer = {