From ce0b361bcaa9ead8db0f3df6b2ff8d9c27a2bd4d Mon Sep 17 00:00:00 2001
From: Gerg-L <88247690+Gerg-L@users.noreply.github.com>
Date: Sat, 13 Jul 2024 22:04:10 +0000
Subject: [PATCH] flake.lock: update neovim-wrapper (#336)

* flake.lock: update neovim-wrapper

* modules/default: half size of plugins
---
 flake.lock          |  6 +++---
 modules/default.nix | 43 ++++++++++++++++++++++++++++++-------------
 2 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/flake.lock b/flake.lock
index 83f39f9..a1acf49 100644
--- a/flake.lock
+++ b/flake.lock
@@ -95,11 +95,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720539383,
-        "narHash": "sha256-HF4+pQJwgw62lLpWo5TiXFb8ui0FpZcb2TkSh9qXju8=",
+        "lastModified": 1720906640,
+        "narHash": "sha256-hQ++e9r03DPy9UByZ3aSweRn74EUx3HuoBTaUzYdE0E=",
         "owner": "Gerg-L",
         "repo": "neovim-wrapper",
-        "rev": "a2b26accc1c414bc0ef0132ab167e2973dc26e68",
+        "rev": "be1a9ec41230708ac72cabb1c5f4492f4f01f6d1",
         "type": "github"
       },
       "original": {
diff --git a/modules/default.nix b/modules/default.nix
index 529c805..a500175 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -33,13 +33,27 @@ inputs: {
   # build a vim plugin with the given name and arguments
   # if the plugin is nvim-treesitter, warn the user to use buildTreesitterPlug
   # instead
-  buildPlug = {pname, ...} @ args:
-    assert assertMsg (pname != "nvim-treesitter") "Use buildTreesitterPlug for building nvim-treesitter.";
-      buildVimPlugin (args
-        // {
-          version = "master";
-          src = getAttr ("plugin-" + pname) inputs;
-        });
+  buildPlug = {pname, ...} @ attrs: let
+    src = getAttr ("plugin-" + pname) inputs;
+  in
+    pkgs.runCommand pname {
+      inherit src;
+      version = src.shortRev or src.shortDirtyRev or "dirty";
+    }
+    // attrs
+    ''
+      mkdir -p $out
+      cp -r . $out
+    '';
+
+  noBuildPlug = {pname, ...} @ attrs: let
+    input = getAttr ("plugin-" + pname) inputs;
+  in
+    {
+      version = input.shortRev or input.shortDirtyRev or "dirty";
+      outPath = getAttr ("plugin-" + pname) inputs;
+    }
+    // attrs;
 
   buildTreesitterPlug = grammars: vimPlugins.nvim-treesitter.withPlugins (_: grammars);
 
@@ -53,11 +67,14 @@ inputs: {
           then (buildTreesitterPlug vimOptions.treesitter.grammars)
           else if (plug == "flutter-tools-patched")
           then
-            (buildPlug {
-              pname = "flutter-tools";
-              patches = [../patches/flutter-tools.patch];
-            })
-          else (buildPlug {pname = plug;})
+            (
+              buildPlug
+              {
+                pname = "flutter-tools";
+                patches = [../patches/flutter-tools.patch];
+              }
+            )
+          else noBuildPlug {pname = plug;}
         )
       else plug
     ))
@@ -84,7 +101,7 @@ inputs: {
   neovim-wrapped = inputs.neovim-wrapper.legacyPackages.${pkgs.stdenv.system}.neovimWrapper {
     neovim = vimOptions.package;
     plugins = concatLists [builtStartPlugins builtOptPlugins];
-    wrapperArgs = ["--set" "NVIM_APPNAME" "nvf"];
+    appName = "nvf";
     initViml = vimOptions.builtConfigRC;
     extraBinPath = vimOptions.extraPackages;