From e373b1a746317dc089e3dc16e06d5994746cfa78 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mcoudron@hotmail.com>
Date: Wed, 11 May 2022 23:17:54 +0200
Subject: [PATCH 1/3] vimPlugins.diffview-nvim: add plenary as dependency

---
 .../editors/vim/plugins/generated.nix             |  2 +-
 .../editors/vim/plugins/overrides.nix             | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 4e35fd632b1f..3f04e59e81da 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -2143,7 +2143,7 @@ final: prev:
     meta.homepage = "https://github.com/nvim-lua/diagnostic-nvim/";
   };
 
-  diffview-nvim = buildVimPluginFrom2Nix {
+  diffview-nvim = buildNeovimPluginFrom2Nix {
     pname = "diffview.nvim";
     version = "2022-05-09";
     src = fetchFromGitHub {
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 494d42a4c46f..df5d30d18db5 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -230,6 +230,13 @@ self: super: {
     };
   });
 
+  diffview-nvim = super.diffview-nvim.overrideAttrs (oa: {
+    dependencies = with self; [ plenary-nvim ];
+
+    doInstallCheck = true;
+    nvimRequireCheck = "diffview";
+  });
+
   direnv-vim = super.direnv-vim.overrideAttrs (oa: {
     preFixup = oa.preFixup or "" + ''
       substituteInPlace $out/autoload/direnv.vim \
@@ -316,6 +323,10 @@ self: super: {
     configurePhase = "cd plugins/nvim";
   });
 
+  gitlinker-nvim = super.gitlinker-nvim.overrideAttrs (old: {
+    dependencies = with self; [ plenary-nvim ];
+  });
+
   gitsigns-nvim = super.gitsigns-nvim.overrideAttrs (old: {
     dependencies = with self; [ plenary-nvim ];
   });
@@ -526,6 +537,10 @@ self: super: {
       });
   });
 
+  octo-nvim = super.octo-nvim.overrideAttrs (old: {
+    dependencies = with self; [ telescope-nvim plenary-nvim ];
+  });
+
   onehalf = super.onehalf.overrideAttrs (old: {
     configurePhase = "cd vim";
   });

From a2d4d474c21a9543192e9c9eb56e67885e73a137 Mon Sep 17 00:00:00 2001
From: "\"Matthieu Coudron\"" <"mcoudron@hotmail.com">
Date: Wed, 11 May 2022 10:51:35 +0200
Subject: [PATCH 2/3] vimPlugins.nvim-biscuits: init at 2021-11-12

---
 pkgs/applications/editors/vim/plugins/generated.nix  | 12 ++++++++++++
 .../editors/vim/plugins/vim-plugin-names             |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 3f04e59e81da..4fec127eda6f 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -4666,6 +4666,18 @@ final: prev:
     meta.homepage = "https://github.com/RRethy/nvim-base16/";
   };
 
+  nvim-biscuits = buildVimPluginFrom2Nix {
+    pname = "nvim-biscuits";
+    version = "2021-11-12";
+    src = fetchFromGitHub {
+      owner = "code-biscuits";
+      repo = "nvim-biscuits";
+      rev = "15a0cb1273bd36d5a734210cdc3406fb4bcfb733";
+      sha256 = "15incx76ps8k4bra3s6ml66ckjhzjgbc7q2njs61yzfg46vdbhsd";
+    };
+    meta.homepage = "https://github.com/code-biscuits/nvim-biscuits/";
+  };
+
   nvim-bqf = buildVimPluginFrom2Nix {
     pname = "nvim-bqf";
     version = "2022-04-30";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index e3806c71a2f6..1e2b24db37f5 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -393,6 +393,7 @@ https://github.com/catppuccin/nvim/,,catppuccin-nvim
 https://github.com/nathanmsmith/nvim-ale-diagnostic/,,
 https://github.com/windwp/nvim-autopairs/,,
 https://github.com/RRethy/nvim-base16/,,
+https://github.com/code-biscuits/nvim-biscuits/,HEAD,
 https://github.com/kevinhwang91/nvim-bqf/,,
 https://github.com/ojroques/nvim-bufdel/,,
 https://github.com/roxma/nvim-cm-racer/,,

From d7bfa0dcc49491c7683a84e7edbf24b1c3bddcc6 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mcoudron@hotmail.com>
Date: Mon, 16 May 2022 11:13:18 +0200
Subject: [PATCH 3/3] vim/update.py: mark some plugins as neovim ones

so that they use buildNeovimFrom2Nix

I want to avoid adding a more complex heuristic for now or adding a
column to vim-plugin-names.
---
 pkgs/applications/editors/vim/plugins/update.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/vim/plugins/update.py b/pkgs/applications/editors/vim/plugins/update.py
index 1214e36372a6..f63bd867f368 100755
--- a/pkgs/applications/editors/vim/plugins/update.py
+++ b/pkgs/applications/editors/vim/plugins/update.py
@@ -116,7 +116,13 @@ class VimEditor(pluginupdate.Editor):
 def main():
 
     global luaPlugins
-    luaPlugins = run_nix_expr(GET_PLUGINS_LUA)
+
+    # whitelist
+    luaPlugins = run_nix_expr(GET_PLUGINS_LUA) + [
+        "diffview-nvim",
+        "marks-nvim",
+        "nvim-biscuits"
+    ]
 
     editor = VimEditor("vim", ROOT, GET_PLUGINS)
     parser = editor.create_parser()