From d4b4506b77aab1a3a370cf75cf6fe517d813b208 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 18 Mar 2025 18:08:04 -0500
Subject: [PATCH] vimPlugins: fix override sorting

---
 .../editors/vim/plugins/overrides.nix         | 490 +++++++++---------
 1 file changed, 244 insertions(+), 246 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index c81e450df2e78..4222d63f1e853 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -6,7 +6,6 @@
   buildVimPlugin,
   callPackage,
   fetchFromGitHub,
-  fetchFromSourcehut,
   fetchpatch,
   fetchurl,
   neovimUtils,
@@ -158,14 +157,6 @@ in
   #######################
   # Regular overrides
 
-  aerial-nvim = super.aerial-nvim.overrideAttrs {
-    # optional dependencies
-    nvimSkipModule = [
-      "lualine.components.aerial"
-      "telescope._extensions.aerial"
-    ];
-  };
-
   advanced-git-search-nvim = super.advanced-git-search-nvim.overrideAttrs {
     dependencies = with self; [
       telescope-nvim
@@ -176,6 +167,14 @@ in
     ];
   };
 
+  aerial-nvim = super.aerial-nvim.overrideAttrs {
+    # optional dependencies
+    nvimSkipModule = [
+      "lualine.components.aerial"
+      "telescope._extensions.aerial"
+    ];
+  };
+
   agitator-nvim = super.agitator-nvim.overrideAttrs {
     dependencies = with self; [
       telescope-nvim
@@ -183,6 +182,16 @@ in
     ];
   };
 
+  aider-nvim = super.aider-nvim.overrideAttrs {
+    patches = [
+      (replaceVars ./patches/aider-nvim/bin.patch { aider = lib.getExe' aider-chat "aider"; })
+    ];
+  };
+
+  animation-nvim = super.animation-nvim.overrideAttrs {
+    dependencies = [ self.middleclass ];
+  };
+
   astrocore = super.astrocore.overrideAttrs {
     dependencies = [ self.lazy-nvim ];
   };
@@ -200,10 +209,6 @@ in
     ];
   };
 
-  animation-nvim = super.animation-nvim.overrideAttrs {
-    dependencies = [ self.middleclass ];
-  };
-
   autosave-nvim = super.autosave-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
   };
@@ -296,6 +301,10 @@ in
     dependencies = [ self.plenary-nvim ];
   };
 
+  blink-cmp-git = super.blink-cmp-git.overrideAttrs {
+    dependencies = [ self.plenary-nvim ];
+  };
+
   blink-emoji-nvim = super.blink-emoji-nvim.overrideAttrs {
     dependencies = [ self.blink-cmp ];
   };
@@ -304,10 +313,6 @@ in
     dependencies = [ self.blink-cmp ];
   };
 
-  blink-cmp-git = super.blink-cmp-git.overrideAttrs {
-    dependencies = [ self.plenary-nvim ];
-  };
-
   blink-pairs = callPackage ./non-generated/blink-pairs { };
 
   bluloco-nvim = super.bluloco-nvim.overrideAttrs {
@@ -578,16 +583,16 @@ in
     dependencies = [ self.vim-lsp ];
   };
 
-  cmp-vimwiki-tags = super.cmp-vimwiki-tags.overrideAttrs {
+  cmp-vimtex = super.cmp-vimtex.overrideAttrs {
     checkInputs = [ self.nvim-cmp ];
-    dependencies = [ self.vimwiki ];
   };
 
-  cmp-vsnip = super.cmp-vsnip.overrideAttrs {
+  cmp-vimwiki-tags = super.cmp-vimwiki-tags.overrideAttrs {
     checkInputs = [ self.nvim-cmp ];
+    dependencies = [ self.vimwiki ];
   };
 
-  cmp-vimtex = super.cmp-vimtex.overrideAttrs {
+  cmp-vsnip = super.cmp-vsnip.overrideAttrs {
     checkInputs = [ self.nvim-cmp ];
   };
 
@@ -946,19 +951,23 @@ in
     dependencies = [ self.ddc-vim ];
   };
 
-  ddc-source-lsp = super.ddc-source-lsp.overrideAttrs {
+  ddc-filter-sorter_rank = super.ddc-filter-sorter_rank.overrideAttrs {
     dependencies = [ self.ddc-vim ];
   };
 
-  ddc-vim = super.ddc-vim.overrideAttrs {
-    dependencies = [ self.denops-vim ];
+  ddc-fuzzy = super.ddc-fuzzy.overrideAttrs {
+    dependencies = [ self.ddc-vim ];
   };
 
-  ddc-filter-sorter_rank = super.ddc-filter-sorter_rank.overrideAttrs {
+  ddc-source-around = super.ddc-source-around.overrideAttrs {
     dependencies = [ self.ddc-vim ];
   };
 
-  ddc-ui-native = super.ddc-ui-native.overrideAttrs {
+  ddc-source-file = super.ddc-source-file.overrideAttrs {
+    dependencies = [ self.ddc-vim ];
+  };
+
+  ddc-source-lsp = super.ddc-source-lsp.overrideAttrs {
     dependencies = [ self.ddc-vim ];
   };
 
@@ -969,16 +978,12 @@ in
     ];
   };
 
-  ddc-source-around = super.ddc-source-around.overrideAttrs {
-    dependencies = [ self.ddc-vim ];
-  };
-
-  ddc-source-file = super.ddc-source-file.overrideAttrs {
+  ddc-ui-native = super.ddc-ui-native.overrideAttrs {
     dependencies = [ self.ddc-vim ];
   };
 
-  ddc-fuzzy = super.ddc-fuzzy.overrideAttrs {
-    dependencies = [ self.ddc-vim ];
+  ddc-vim = super.ddc-vim.overrideAttrs {
+    dependencies = [ self.denops-vim ];
   };
 
   defx-nvim = super.defx-nvim.overrideAttrs {
@@ -1196,18 +1201,6 @@ in
       '';
     });
 
-  fuzzy-nvim = super.fuzzy-nvim.overrideAttrs {
-    checkInputs = with self; [
-      # Optional sorters
-      telescope-zf-native-nvim
-    ];
-    dependencies = [ self.telescope-fzf-native-nvim ];
-    nvimSkipModule = [
-      # TODO: package fzy-lua-native
-      "fuzzy_nvim.fzy_matcher"
-    ];
-  };
-
   fugit2-nvim = super.fugit2-nvim.overrideAttrs {
     # Requires web-devicons but mini.icons can mock them up
     checkInputs = [
@@ -1226,6 +1219,18 @@ in
     '';
   };
 
+  fuzzy-nvim = super.fuzzy-nvim.overrideAttrs {
+    checkInputs = with self; [
+      # Optional sorters
+      telescope-zf-native-nvim
+    ];
+    dependencies = [ self.telescope-fzf-native-nvim ];
+    nvimSkipModule = [
+      # TODO: package fzy-lua-native
+      "fuzzy_nvim.fzy_matcher"
+    ];
+  };
+
   fzf-checkout-vim = super.fzf-checkout-vim.overrideAttrs {
     # The plugin has a makefile which tries to run tests in a docker container.
     # This prevents it.
@@ -1288,6 +1293,18 @@ in
     dependencies = [ self.plenary-nvim ];
   };
 
+  git-conflict-nvim = super.git-conflict-nvim.overrideAttrs {
+    # TODO: Remove after next fixed version
+    # https://github.com/akinsho/git-conflict.nvim/issues/103
+    version = "2.1.0";
+    src = fetchFromGitHub {
+      owner = "akinsho";
+      repo = "git-conflict.nvim";
+      tag = "v2.1.0";
+      hash = "sha256-1t0kKxTGLuOvuRkoLgkoqMZpF+oKo8+gMsTdgPsSb+8=";
+    };
+  };
+
   git-worktree-nvim = super.git-worktree-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
   };
@@ -1363,14 +1380,14 @@ in
     ];
   };
 
-  haskell-snippets-nvim = super.haskell-snippets-nvim.overrideAttrs {
-    dependencies = [ self.luasnip ];
-  };
-
   haskell-scope-highlighting-nvim = super.haskell-scope-highlighting-nvim.overrideAttrs {
     dependencies = [ self.nvim-treesitter ];
   };
 
+  haskell-snippets-nvim = super.haskell-snippets-nvim.overrideAttrs {
+    dependencies = [ self.luasnip ];
+  };
+
   haskell-tools-nvim = neovimUtils.buildNeovimPlugin {
     luaAttr = luaPackages.haskell-tools-nvim;
     nvimSkipModule = [
@@ -1533,13 +1550,6 @@ in
     ];
   };
 
-  lean-nvim = super.lean-nvim.overrideAttrs {
-    dependencies = with self; [
-      nvim-lspconfig
-      plenary-nvim
-    ];
-  };
-
   LeaderF = super.LeaderF.overrideAttrs {
     nativeBuildInputs = [ python3.pkgs.setuptools ];
     buildInputs = [ python3 ];
@@ -1553,6 +1563,13 @@ in
     stripDebugList = [ "autoload/leaderf/python" ];
   };
 
+  lean-nvim = super.lean-nvim.overrideAttrs {
+    dependencies = with self; [
+      nvim-lspconfig
+      plenary-nvim
+    ];
+  };
+
   leap-ast-nvim = super.leap-ast-nvim.overrideAttrs {
     dependencies = with self; [
       leap-nvim
@@ -1663,12 +1680,6 @@ in
     dependencies = [ self.nvim-lspconfig ];
   };
 
-  lsp_extensions-nvim = super.lsp_extensions-nvim.overrideAttrs {
-    dependencies = [ self.plenary-nvim ];
-  };
-
-  lsp_lines-nvim = callPackage ./non-generated/lsp_lines-nvim { };
-
   lspecho-nvim = super.lspecho-nvim.overrideAttrs {
     meta.license = lib.licenses.mit;
   };
@@ -1678,6 +1689,12 @@ in
     nvimRequireCheck = "lspsaga";
   };
 
+  lsp_extensions-nvim = super.lsp_extensions-nvim.overrideAttrs {
+    dependencies = [ self.plenary-nvim ];
+  };
+
+  lsp_lines-nvim = callPackage ./non-generated/lsp_lines-nvim { };
+
   ltex_extra-nvim = super.ltex_extra-nvim.overrideAttrs {
     # Other modules require setup call first
     nvimRequireCheck = "ltex_extra";
@@ -1806,18 +1823,6 @@ in
     '';
   };
 
-  git-conflict-nvim = super.git-conflict-nvim.overrideAttrs {
-    # TODO: Remove after next fixed version
-    # https://github.com/akinsho/git-conflict.nvim/issues/103
-    version = "2.1.0";
-    src = fetchFromGitHub {
-      owner = "akinsho";
-      repo = "git-conflict.nvim";
-      tag = "v2.1.0";
-      hash = "sha256-1t0kKxTGLuOvuRkoLgkoqMZpF+oKo8+gMsTdgPsSb+8=";
-    };
-  };
-
   minimap-vim = super.minimap-vim.overrideAttrs {
     preFixup = ''
       substituteInPlace $out/plugin/minimap.vim \
@@ -2229,11 +2234,11 @@ in
     dependencies = [ self.plenary-nvim ];
   };
 
-  notmuch-vim = notmuch.vim;
-
   NotebookNavigator-nvim = super.NotebookNavigator-nvim.overrideAttrs {
   };
 
+  notmuch-vim = notmuch.vim;
+
   nterm-nvim = super.nterm-nvim.overrideAttrs {
     dependencies = [ self.aniseed ];
   };
@@ -2296,12 +2301,6 @@ in
     dependencies = [ self.plenary-nvim ];
   };
 
-  nvim-dap-cortex-debug = super.nvim-dap-cortex-debug.overrideAttrs {
-    dependencies = [ self.nvim-dap ];
-  };
-
-  nvim-dbee = callPackage ./non-generated/nvim-dbee { };
-
   nvim-coverage = super.nvim-coverage.overrideAttrs {
     dependencies = with self; [
       neotest
@@ -2313,6 +2312,10 @@ in
     ];
   };
 
+  nvim-dap-cortex-debug = super.nvim-dap-cortex-debug.overrideAttrs {
+    dependencies = [ self.nvim-dap ];
+  };
+
   nvim-dap-lldb = super.nvim-dap-lldb.overrideAttrs {
     dependencies = [ self.nvim-dap ];
   };
@@ -2342,16 +2345,18 @@ in
     dependencies = [ self.nvim-dap ];
   };
 
+  nvim-dbee = callPackage ./non-generated/nvim-dbee { };
+
+  nvim-FeMaco-lua = super.nvim-FeMaco-lua.overrideAttrs {
+    dependencies = [ self.nvim-treesitter ];
+  };
+
   nvim-fzf-commands = super.nvim-fzf-commands.overrideAttrs {
     dependencies = [ self.nvim-fzf ];
     # Requires global variable setup nvim_fzf_directory
     nvimSkipModule = "fzf-commands.rg";
   };
 
-  nvim-FeMaco-lua = super.nvim-FeMaco-lua.overrideAttrs {
-    dependencies = [ self.nvim-treesitter ];
-  };
-
   nvim-genghis = super.nvim-genghis.overrideAttrs {
     dependencies = [ self.dressing-nvim ];
 
@@ -2428,6 +2433,9 @@ in
       nvim-navic
     ];
   };
+  nvim-navic = super.nvim-navic.overrideAttrs {
+    dependencies = [ self.nvim-lspconfig ];
+  };
 
   nvim-neoclip-lua = super.nvim-neoclip-lua.overrideAttrs {
     nvimSkipModule = [
@@ -2442,6 +2450,11 @@ in
     checkInputs = [ self.nvim-web-devicons ];
   };
 
+  nvim-notify = super.nvim-notify.overrideAttrs {
+    # Optional fzf integration
+    nvimSkipModule = "notify.integrations.fzf";
+  };
+
   nvim-nu = super.nvim-nu.overrideAttrs {
     dependencies = with self; [
       nvim-treesitter
@@ -2449,19 +2462,6 @@ in
     ];
   };
 
-  vim-mediawiki-editor = super.vim-mediawiki-editor.overrideAttrs {
-    passthru.python3Dependencies = [ python3.pkgs.mwclient ];
-  };
-
-  nvim-navic = super.nvim-navic.overrideAttrs {
-    dependencies = [ self.nvim-lspconfig ];
-  };
-
-  nvim-notify = super.nvim-notify.overrideAttrs {
-    # Optional fzf integration
-    nvimSkipModule = "notify.integrations.fzf";
-  };
-
   nvim-paredit = super.nvim-paredit.overrideAttrs {
     dependencies = with self; [ nvim-treesitter ];
   };
@@ -2497,6 +2497,29 @@ in
     vimCommandCheck = "TealBuild";
   };
 
+  nvim-test = super.nvim-test.overrideAttrs {
+    dependencies = with self; [
+      nvim-treesitter
+      nvim-treesitter-parsers.c_sharp
+      nvim-treesitter-parsers.go
+      nvim-treesitter-parsers.haskell
+      nvim-treesitter-parsers.javascript
+      nvim-treesitter-parsers.python
+      nvim-treesitter-parsers.ruby
+      nvim-treesitter-parsers.rust
+      nvim-treesitter-parsers.typescript
+      nvim-treesitter-parsers.zig
+    ];
+    nvimSkipModule = [
+      # Optional toggleterm integration
+      "nvim-test.terms.toggleterm"
+      # Broken runners
+      "nvim-test.runners.zig"
+      "nvim-test.runners.hspec"
+      "nvim-test.runners.stack"
+    ];
+  };
+
   nvim-tree-lua = super.nvim-tree-lua.overrideAttrs {
     nvimSkipModule = [
       # Meta can't be required
@@ -2548,29 +2571,6 @@ in
     dependencies = [ self.nvim-treesitter ];
   };
 
-  nvim-test = super.nvim-test.overrideAttrs {
-    dependencies = with self; [
-      nvim-treesitter
-      nvim-treesitter-parsers.c_sharp
-      nvim-treesitter-parsers.go
-      nvim-treesitter-parsers.haskell
-      nvim-treesitter-parsers.javascript
-      nvim-treesitter-parsers.python
-      nvim-treesitter-parsers.ruby
-      nvim-treesitter-parsers.rust
-      nvim-treesitter-parsers.typescript
-      nvim-treesitter-parsers.zig
-    ];
-    nvimSkipModule = [
-      # Optional toggleterm integration
-      "nvim-test.terms.toggleterm"
-      # Broken runners
-      "nvim-test.runners.zig"
-      "nvim-test.runners.hspec"
-      "nvim-test.runners.stack"
-    ];
-  };
-
   nvim-ufo = super.nvim-ufo.overrideAttrs {
     dependencies = [ self.promise-async ];
   };
@@ -2590,6 +2590,10 @@ in
     dependencies = [ self.nvzone-volt ];
   };
 
+  nvzone-typr = super.nvzone-typr.overrideAttrs {
+    dependencies = [ self.nvzone-volt ];
+  };
+
   obsidian-nvim = super.obsidian-nvim.overrideAttrs {
     checkInputs = with self; [
       # Optional pickers
@@ -2615,10 +2619,6 @@ in
     dependencies = [ self.plenary-nvim ];
   };
 
-  onehalf = super.onehalf.overrideAttrs {
-    configurePhase = "cd vim";
-  };
-
   omni-vim = super.omni-vim.overrideAttrs {
     # Optional lightline integration
     nvimSkipModule = "omni-lightline";
@@ -2634,6 +2634,10 @@ in
     ];
   };
 
+  onehalf = super.onehalf.overrideAttrs {
+    configurePhase = "cd vim";
+  };
+
   one-nvim = super.one-nvim.overrideAttrs {
     # E5108: /lua/one-nvim.lua:14: Unknown option 't_Co'
     # https://github.com/Th3Whit3Wolf/one-nvim/issues/23
@@ -2785,6 +2789,17 @@ in
     ];
   };
 
+  quarto-nvim = super.quarto-nvim.overrideAttrs {
+    checkInputs = [
+      # Optional runner
+      self.iron-nvim
+    ];
+    dependencies = with self; [
+      nvim-lspconfig
+      otter-nvim
+    ];
+  };
+
   quicker-nvim = super.quicker-nvim.overrideAttrs {
   };
 
@@ -2802,12 +2817,6 @@ in
     '';
   };
 
-  aider-nvim = super.aider-nvim.overrideAttrs {
-    patches = [
-      (replaceVars ./patches/aider-nvim/bin.patch { aider = lib.getExe' aider-chat "aider"; })
-    ];
-  };
-
   refactoring-nvim = super.refactoring-nvim.overrideAttrs {
     dependencies = with self; [
       nvim-treesitter
@@ -2855,6 +2864,21 @@ in
     ];
   };
 
+  rocks-nvim =
+    (neovimUtils.buildNeovimPlugin {
+      luaAttr = luaPackages.rocks-nvim;
+    }).overrideAttrs
+      (oa: {
+        passthru = oa.passthru // {
+          initLua = ''
+            vim.g.rocks_nvim = {
+              luarocks_binary = "${neovim-unwrapped.lua.pkgs.luarocks_bootstrap}/bin/luarocks"
+              }
+          '';
+        };
+
+      });
+
   rustaceanvim = neovimUtils.buildNeovimPlugin {
     checkInputs = [
       # Optional integration
@@ -3090,16 +3114,16 @@ in
     meta.maintainers = with lib.maintainers; [ callumio ];
   };
 
-  taskwarrior3 = buildVimPlugin {
-    inherit (taskwarrior3) version pname;
-    src = "${taskwarrior3.src}/scripts/vim";
-  };
-
   taskwarrior2 = buildVimPlugin {
     inherit (taskwarrior2) version pname;
     src = "${taskwarrior2.src}/scripts/vim";
   };
 
+  taskwarrior3 = buildVimPlugin {
+    inherit (taskwarrior3) version pname;
+    src = "${taskwarrior3.src}/scripts/vim";
+  };
+
   telekasten-nvim = super.telekasten-nvim.overrideAttrs {
     dependencies = with self; [
       plenary-nvim
@@ -3284,17 +3308,6 @@ in
     dependencies = with self; [ telescope-nvim ];
   };
 
-  quarto-nvim = super.quarto-nvim.overrideAttrs {
-    checkInputs = [
-      # Optional runner
-      self.iron-nvim
-    ];
-    dependencies = with self; [
-      nvim-lspconfig
-      otter-nvim
-    ];
-  };
-
   telescope-zoxide = super.telescope-zoxide.overrideAttrs {
     dependencies = with self; [ telescope-nvim ];
 
@@ -3344,6 +3357,11 @@ in
     dependencies = [ self.plenary-nvim ];
   };
 
+  trouble-nvim = super.trouble-nvim.overrideAttrs {
+    # Meta file
+    nvimSkipModule = "trouble.docs";
+  };
+
   tsc-nvim = super.tsc-nvim.overrideAttrs {
     patches = [ ./patches/tsc.nvim/fix-path.patch ];
 
@@ -3355,11 +3373,6 @@ in
     nvimSkipModule = "tsc.better-messages-test";
   };
 
-  trouble-nvim = super.trouble-nvim.overrideAttrs {
-    # Meta file
-    nvimSkipModule = "trouble.docs";
-  };
-
   tssorter-nvim = super.tssorter-nvim.overrideAttrs {
     dependencies = [ self.nvim-treesitter ];
   };
@@ -3400,8 +3413,13 @@ in
     ];
   };
 
-  nvzone-typr = super.nvzone-typr.overrideAttrs {
-    dependencies = [ self.nvzone-volt ];
+  typst-preview-nvim = super.typst-preview-nvim.overrideAttrs {
+    postPatch = ''
+      substituteInPlace lua/typst-preview/config.lua \
+       --replace-fail "['tinymist'] = nil," "tinymist = '${lib.getExe tinymist}'," \
+       --replace-fail "['websocat'] = nil," "websocat = '${lib.getExe websocat}',"
+    '';
+
   };
 
   unicode-vim =
@@ -3439,6 +3457,22 @@ in
     };
   };
 
+  vimacs = super.vimacs.overrideAttrs {
+    buildPhase = ''
+      substituteInPlace bin/vim \
+        --replace-fail '/usr/bin/vim' 'vim' \
+        --replace-fail '/usr/bin/gvim' 'gvim'
+      # remove unnecessary duplicated bin wrapper script
+      rm -r plugin/vimacs
+    '';
+    meta = with lib; {
+      description = "Vim-Improved eMACS: Emacs emulation plugin for Vim";
+      homepage = "http://algorithm.com.au/code/vimacs";
+      license = licenses.gpl2Plus;
+      maintainers = with lib.maintainers; [ millerjason ];
+    };
+  };
+
   vimade = super.vimade.overrideAttrs {
     checkInputs = with self; [
       # Optional providers
@@ -3448,6 +3482,51 @@ in
     ];
   };
 
+  # The GitHub repository returns 404, which breaks the update script
+  VimCompletesMe = buildVimPlugin {
+    pname = "VimCompletesMe";
+    version = "2022-02-18";
+    src = fetchFromGitHub {
+      owner = "ackyshake";
+      repo = "VimCompletesMe";
+      rev = "9adf692d7ae6424038458a89d4a411f0a27d1388";
+      sha256 = "1sndgb3291dyifaa8adri2mb8cgbinbar3nw1fnf67k9ahwycaz0";
+    };
+    meta.homepage = "https://github.com/ackyshake/VimCompletesMe/";
+  };
+
+  vim2nix = buildVimPlugin {
+    pname = "vim2nix";
+    version = "1.0";
+    src = ./vim2nix;
+    dependencies = [ self.vim-addon-manager ];
+  };
+
+  vimsence = super.vimsence.overrideAttrs {
+    meta = with lib; {
+      description = "Discord rich presence for Vim";
+      homepage = "https://github.com/hugolgst/vimsence";
+      maintainers = with lib.maintainers; [ hugolgst ];
+    };
+  };
+
+  vimproc-vim = super.vimproc-vim.overrideAttrs {
+    buildInputs = [ which ];
+
+    # TODO: revisit
+    buildPhase = ''
+      substituteInPlace autoload/vimproc.vim \
+        --replace-fail vimproc_mac.so vimproc_unix.so \
+        --replace-fail vimproc_linux64.so vimproc_unix.so \
+        --replace-fail vimproc_linux32.so vimproc_unix.so
+      make -f make_unix.mak
+    '';
+  };
+
+  vimshell-vim = super.vimshell-vim.overrideAttrs {
+    dependencies = [ self.vimproc-vim ];
+  };
+
   vim-addon-actions = super.vim-addon-actions.overrideAttrs {
     dependencies = with self; [
       vim-addon-mw-utils
@@ -3678,6 +3757,10 @@ in
     nvimSkipModule = "treesitter-matchup.third-party.query";
   };
 
+  vim-mediawiki-editor = super.vim-mediawiki-editor.overrideAttrs {
+    passthru.python3Dependencies = [ python3.pkgs.mwclient ];
+  };
+
   vim-metamath = super.vim-metamath.overrideAttrs {
     preInstall = "cd vim";
   };
@@ -3743,6 +3826,12 @@ in
     nvimSkipModule = "tpipeline.main";
   };
 
+  vim-ultest = super.vim-ultest.overrideAttrs {
+    # NOTE: vim-ultest is no longer maintained.
+    # If using Neovim, you can switch to using neotest (https://github.com/nvim-neotest/neotest) instead.
+    nvimSkipModule = "ultest";
+  };
+
   vim-unimpaired = super.vim-unimpaired.overrideAttrs {
     dependencies = [ self.vim-repeat ];
   };
@@ -3773,73 +3862,6 @@ in
     '';
   };
 
-  vim2nix = buildVimPlugin {
-    pname = "vim2nix";
-    version = "1.0";
-    src = ./vim2nix;
-    dependencies = [ self.vim-addon-manager ];
-  };
-
-  vimacs = super.vimacs.overrideAttrs {
-    buildPhase = ''
-      substituteInPlace bin/vim \
-        --replace-fail '/usr/bin/vim' 'vim' \
-        --replace-fail '/usr/bin/gvim' 'gvim'
-      # remove unnecessary duplicated bin wrapper script
-      rm -r plugin/vimacs
-    '';
-    meta = with lib; {
-      description = "Vim-Improved eMACS: Emacs emulation plugin for Vim";
-      homepage = "http://algorithm.com.au/code/vimacs";
-      license = licenses.gpl2Plus;
-      maintainers = with lib.maintainers; [ millerjason ];
-    };
-  };
-
-  # The GitHub repository returns 404, which breaks the update script
-  VimCompletesMe = buildVimPlugin {
-    pname = "VimCompletesMe";
-    version = "2022-02-18";
-    src = fetchFromGitHub {
-      owner = "ackyshake";
-      repo = "VimCompletesMe";
-      rev = "9adf692d7ae6424038458a89d4a411f0a27d1388";
-      sha256 = "1sndgb3291dyifaa8adri2mb8cgbinbar3nw1fnf67k9ahwycaz0";
-    };
-    meta.homepage = "https://github.com/ackyshake/VimCompletesMe/";
-  };
-
-  vimsence = super.vimsence.overrideAttrs {
-    meta = with lib; {
-      description = "Discord rich presence for Vim";
-      homepage = "https://github.com/hugolgst/vimsence";
-      maintainers = with lib.maintainers; [ hugolgst ];
-    };
-  };
-
-  vimproc-vim = super.vimproc-vim.overrideAttrs {
-    buildInputs = [ which ];
-
-    # TODO: revisit
-    buildPhase = ''
-      substituteInPlace autoload/vimproc.vim \
-        --replace-fail vimproc_mac.so vimproc_unix.so \
-        --replace-fail vimproc_linux64.so vimproc_unix.so \
-        --replace-fail vimproc_linux32.so vimproc_unix.so
-      make -f make_unix.mak
-    '';
-  };
-
-  vimshell-vim = super.vimshell-vim.overrideAttrs {
-    dependencies = [ self.vimproc-vim ];
-  };
-
-  vim-ultest = super.vim-ultest.overrideAttrs {
-    # NOTE: vim-ultest is no longer maintained.
-    # If using Neovim, you can switch to using neotest (https://github.com/nvim-neotest/neotest) instead.
-    nvimSkipModule = "ultest";
-  };
-
   vim-zettel = super.vim-zettel.overrideAttrs {
     dependencies = with self; [
       vimwiki
@@ -3987,28 +4009,4 @@ in
         --replace-fail "'zoxide_executable', 'zoxide'" "'zoxide_executable', '${zoxide}/bin/zoxide'"
     '';
   };
-
-  typst-preview-nvim = super.typst-preview-nvim.overrideAttrs {
-    postPatch = ''
-      substituteInPlace lua/typst-preview/config.lua \
-       --replace-fail "['tinymist'] = nil," "tinymist = '${lib.getExe tinymist}'," \
-       --replace-fail "['websocat'] = nil," "websocat = '${lib.getExe websocat}',"
-    '';
-
-  };
-
-  rocks-nvim =
-    (neovimUtils.buildNeovimPlugin {
-      luaAttr = luaPackages.rocks-nvim;
-    }).overrideAttrs
-      (oa: {
-        passthru = oa.passthru // {
-          initLua = ''
-            vim.g.rocks_nvim = {
-              luarocks_binary = "${neovim-unwrapped.lua.pkgs.luarocks_bootstrap}/bin/luarocks"
-              }
-          '';
-        };
-
-      });
 }