diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 26b4e54659f68..44007ca4828f0 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -226,7 +226,7 @@
 /pkgs/applications/editors/neovim      @jonringer @teto
 
 # VimPlugins
-/pkgs/misc/vim-plugins         @jonringer @softinio
+/pkgs/applications/editors/vim/plugins         @jonringer
 
 # VsCode Extensions
 /pkgs/applications/editors/vscode/extensions   @jonringer
diff --git a/.github/labeler.yml b/.github/labeler.yml
index a3c1ed1b587f0..c5c10d3e4bc1c 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -142,7 +142,7 @@
 "6.topic: vim":
   - doc/languages-frameworks/vim.section.md
   - pkgs/applications/editors/vim/**/*
-  - pkgs/misc/vim-plugins/**/*
+  - pkgs/applications/editors/vim/plugins/**/*
   - nixos/modules/programs/neovim.nix
   - pkgs/applications/editors/neovim/**/*
 
diff --git a/doc/contributing/submitting-changes.chapter.md b/doc/contributing/submitting-changes.chapter.md
index d5b5f5a601752..109d051c016fa 100644
--- a/doc/contributing/submitting-changes.chapter.md
+++ b/doc/contributing/submitting-changes.chapter.md
@@ -98,7 +98,7 @@ We use jbidwatcher as an example for a discontinued project here.
 1. Create a new branch for your change, e.g. `git checkout -b jbidwatcher`
 1. Remove the actual package including its directory, e.g. `rm -rf pkgs/applications/misc/jbidwatcher`
 1. Remove the package from the list of all packages (`pkgs/top-level/all-packages.nix`).
-1. Add an alias for the package name in `pkgs/top-level/aliases.nix` (There is also `pkgs/misc/vim-plugins/aliases.nix`. Package sets typically do not have aliases, so we can't add them there.)
+1. Add an alias for the package name in `pkgs/top-level/aliases.nix` (There is also `pkgs/applications/editors/vim/plugins/aliases.nix`. Package sets typically do not have aliases, so we can't add them there.)
 
     For example in this case:
 
diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md
index 4ffd6736e238a..a615d585b151c 100644
--- a/doc/languages-frameworks/vim.section.md
+++ b/doc/languages-frameworks/vim.section.md
@@ -309,9 +309,9 @@ Sample output2:
 
 ## Adding new plugins to nixpkgs {#adding-new-plugins-to-nixpkgs}
 
-Nix expressions for Vim plugins are stored in [pkgs/misc/vim-plugins](https://github.com/NixOS/nixpkgs/tree/master/pkgs/misc/vim-plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`./update.py`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/misc/vim-plugins/update.py). This creates a [generated.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/misc/vim-plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](https://github.com/NixOS/nixpkgs/blob/master/pkgs/misc/vim-plugins/vim-plugin-names). Plugins are listed in alphabetical order in `vim-plugin-names` using the format `[github username]/[repository]@[gitref]`. For example https://github.com/scrooloose/nerdtree becomes `scrooloose/nerdtree`.
+Nix expressions for Vim plugins are stored in [pkgs/applications/editors/vim/plugins](https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/editors/vim/plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`./update.py`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/update.py). This creates a [generated.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/vim-plugin-names). Plugins are listed in alphabetical order in `vim-plugin-names` using the format `[github username]/[repository]@[gitref]`. For example https://github.com/scrooloose/nerdtree becomes `scrooloose/nerdtree`.
 
-Some plugins require overrides in order to function properly. Overrides are placed in [overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/misc/vim-plugins/overrides.nix). Overrides are most often required when a plugin requires some dependencies, or extra steps are required during the build process. For example `deoplete-fish` requires both `deoplete-nvim` and `vim-fish`, and so the following override was added:
+Some plugins require overrides in order to function properly. Overrides are placed in [overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/overrides.nix). Overrides are most often required when a plugin requires some dependencies, or extra steps are required during the build process. For example `deoplete-fish` requires both `deoplete-nvim` and `vim-fish`, and so the following override was added:
 
 ```nix
 deoplete-fish = super.deoplete-fish.overrideAttrs(old: {
@@ -330,13 +330,13 @@ Finally, there are some plugins that are also packaged in nodePackages because t
 Run the update script with a GitHub API token that has at least `public_repo` access. Running the script without the token is likely to result in rate-limiting (429 errors). For steps on creating an API token, please refer to [GitHub's token documentation](https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/creating-a-personal-access-token).
 
 ```sh
-GITHUB_API_TOKEN=my_token ./pkgs/misc/vim-plugins/update.py
+GITHUB_API_TOKEN=my_token ./pkgs/applications/editors/vim/plugins/update.py
 ```
 
 Alternatively, set the number of processes to a lower count to avoid rate-limiting.
 
 ```sh
-./pkgs/misc/vim-plugins/update.py --proc 1
+./pkgs/applications/editors/vim/plugins/update.py --proc 1
 ```
 
 ## Important repositories {#important-repositories}
diff --git a/maintainers/scripts/pluginupdate.py b/maintainers/scripts/pluginupdate.py
index 0fad92481bba2..877e664403203 100644
--- a/maintainers/scripts/pluginupdate.py
+++ b/maintainers/scripts/pluginupdate.py
@@ -1,4 +1,4 @@
-# Used by pkgs/misc/vim-plugins/update.py and pkgs/applications/editors/kakoune/plugins/update.py
+# Used by pkgs/applications/editors/vim/plugins/update.py and pkgs/applications/editors/kakoune/plugins/update.py
 
 # format:
 # $ nix run nixpkgs.python3Packages.black -c black update.py
diff --git a/pkgs/misc/vim-plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix
similarity index 100%
rename from pkgs/misc/vim-plugins/aliases.nix
rename to pkgs/applications/editors/vim/plugins/aliases.nix
diff --git a/pkgs/misc/vim-plugins/build-vim-plugin.nix b/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix
similarity index 100%
rename from pkgs/misc/vim-plugins/build-vim-plugin.nix
rename to pkgs/applications/editors/vim/plugins/build-vim-plugin.nix
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/applications/editors/vim/plugins/default.nix
similarity index 100%
rename from pkgs/misc/vim-plugins/default.nix
rename to pkgs/applications/editors/vim/plugins/default.nix
diff --git a/pkgs/misc/vim-plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json
similarity index 100%
rename from pkgs/misc/vim-plugins/deprecated.json
rename to pkgs/applications/editors/vim/plugins/deprecated.json
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
similarity index 98%
rename from pkgs/misc/vim-plugins/generated.nix
rename to pkgs/applications/editors/vim/plugins/generated.nix
index b6869ba872c91..065fed63c14a1 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -1,4 +1,4 @@
-# This file has been generated by ./pkgs/misc/vim-plugins/update.py. Do not edit!
+# This file has been generated by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit!
 { lib, buildVimPluginFrom2Nix, fetchFromGitHub, fetchgit }:
 
 final: prev:
@@ -41,12 +41,12 @@ final: prev:
 
   aerial-nvim = buildVimPluginFrom2Nix {
     pname = "aerial.nvim";
-    version = "2022-02-21";
+    version = "2022-02-22";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "aerial.nvim";
-      rev = "f4dab432cb3afe0b737f85d823fcd74655727aae";
-      sha256 = "0i1qmfnlcwa3d75s4b07yn62737fz87w3jgsjpf5ijmkyxf29d1k";
+      rev = "37802e72263f1592575ec1133969890b703e70a7";
+      sha256 = "085ln5pv5yk9kxhnvizyy2rm67nlhkmw4m92pg3yakjhx8cxmh1w";
     };
     meta.homepage = "https://github.com/stevearc/aerial.nvim/";
   };
@@ -461,12 +461,12 @@ final: prev:
 
   bufferline-nvim = buildVimPluginFrom2Nix {
     pname = "bufferline.nvim";
-    version = "2022-02-15";
+    version = "2022-02-24";
     src = fetchFromGitHub {
       owner = "akinsho";
       repo = "bufferline.nvim";
-      rev = "e97a404bd7449ecebab243c796c1016c98397fc0";
-      sha256 = "1cfqcbxvig271zppq0mydj616dgbdy5ryvycc64q5gyq1lfmhnsl";
+      rev = "871495d9e2dbe3314a421fd2d5e46f47de7ee537";
+      sha256 = "1xw13g6l16i6k32f3mdzmihz0m0n9y586ykiynjwkil69wxpjd1l";
     };
     meta.homepage = "https://github.com/akinsho/bufferline.nvim/";
   };
@@ -533,12 +533,12 @@ final: prev:
 
   chadtree = buildVimPluginFrom2Nix {
     pname = "chadtree";
-    version = "2022-02-22";
+    version = "2022-02-24";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "chadtree";
-      rev = "45177b39245b6aa4efda9f5051aadaad6f953fd5";
-      sha256 = "0hgmkfrwwplzw6bsvvd9549rr3326k4bviix8w4ir133qw8av5j5";
+      rev = "169134de0d3919837a436cceb806ce8e29a239ea";
+      sha256 = "1qfg5k406qdxv534c3xbrhpjhigsxkgj9yqm0sx45z5l6f4cmih6";
     };
     meta.homepage = "https://github.com/ms-jpq/chadtree/";
   };
@@ -641,12 +641,12 @@ final: prev:
 
   cmd-parser-nvim = buildVimPluginFrom2Nix {
     pname = "cmd-parser.nvim";
-    version = "2021-05-30";
+    version = "2022-02-23";
     src = fetchFromGitHub {
       owner = "winston0410";
       repo = "cmd-parser.nvim";
-      rev = "70813af493398217cb1df10950ae8b99c58422db";
-      sha256 = "0rfa8cpykarcal8qcfp1dax1kgcbq7bv1ld6r1ia08n9vnqi5vm6";
+      rev = "6363b8bddef968c3ec51a38172af44f675f01ef3";
+      sha256 = "11vi9fwgbcvrb8jnicsnwmggayn0586glfdknlkg43smz2cay3f1";
     };
     meta.homepage = "https://github.com/winston0410/cmd-parser.nvim/";
   };
@@ -965,12 +965,12 @@ final: prev:
 
   coc-nvim = buildVimPluginFrom2Nix {
     pname = "coc.nvim";
-    version = "2022-02-19";
+    version = "2022-02-24";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc.nvim";
-      rev = "33ddba0d8db509378b59d05939da20d8a8d23df7";
-      sha256 = "0vqdv9yscjp7m9p61qwb0jgrdxkj9c5fbw3ccy5z158lnfa4j5hk";
+      rev = "1bdaaefc15baea37f4de1f8bedb5b3dd7c0efd32";
+      sha256 = "1vjwgbw9r4jd41nkxmkn3yxdmds1alf9gf96kv0jdxjdxryy23dc";
     };
     meta.homepage = "https://github.com/neoclide/coc.nvim/";
   };
@@ -989,12 +989,12 @@ final: prev:
 
   colorbuddy-nvim = buildVimPluginFrom2Nix {
     pname = "colorbuddy.nvim";
-    version = "2021-12-01";
+    version = "2022-02-22";
     src = fetchFromGitHub {
       owner = "tjdevries";
       repo = "colorbuddy.nvim";
-      rev = "c678edd8113274574f9d9ef440773d1123e1431d";
-      sha256 = "095347cz5idcb09l4sl236agzi89lyr9r40nix2c8vk5pbskvp8f";
+      rev = "e0f5fafb4ee06cb29a915f8128282fc1f99b128f";
+      sha256 = "1lfb6ynhjyxzsm6id720f07cc1f52g38mzfc1i0hi4mysjnrkfh3";
     };
     meta.homepage = "https://github.com/tjdevries/colorbuddy.nvim/";
   };
@@ -1230,24 +1230,24 @@ final: prev:
 
   coq_nvim = buildVimPluginFrom2Nix {
     pname = "coq_nvim";
-    version = "2022-02-22";
+    version = "2022-02-24";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "coq_nvim";
-      rev = "baad617cc9d9598c563d0571d44ef226d4888ee7";
-      sha256 = "0a7yfmqrsbq4x5k0vvjlvw89n3k3hwsbz72cgcazid7a1ngxwh37";
+      rev = "6e2e12b2485a03a5f5a62319c6ae638b32a203d8";
+      sha256 = "08bwgn1vvsr96p7ifzc6qxhjdldfgxcqjha7jljrpbqjwj9cfdij";
     };
     meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
   };
 
   Coqtail = buildVimPluginFrom2Nix {
     pname = "Coqtail";
-    version = "2022-02-21";
+    version = "2022-02-22";
     src = fetchFromGitHub {
       owner = "whonore";
       repo = "Coqtail";
-      rev = "877cd4b9b023d728d196d7841ceec47d2060c467";
-      sha256 = "0qr8zvscwms6w0w4pfzdx319nykiacgj7qvgzk9ip5jfwnnlrxwr";
+      rev = "3526cb195cb381cef5d4fc25c532f00942562874";
+      sha256 = "0jxbdcjkmfwi05g1xdibr0i24hq23ihslmhpbj4yy0hj1x7afdk2";
     };
     meta.homepage = "https://github.com/whonore/Coqtail/";
   };
@@ -1832,12 +1832,12 @@ final: prev:
 
   edge = buildVimPluginFrom2Nix {
     pname = "edge";
-    version = "2022-02-20";
+    version = "2022-02-24";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "edge";
-      rev = "205cbbdd1181c3d164a84568449904fd1fe270a5";
-      sha256 = "1rjwdl4wiv49cr0wrm9ivy21r5cwif5p6ci2yhbsa048bg1gimpc";
+      rev = "032c406c7f63874c459234beedf8452d2fa38ee4";
+      sha256 = "1qjv2zs07svnw5whs2lsznxpbffr03i95n8q6xipqndzya7g23ym";
     };
     meta.homepage = "https://github.com/sainnhe/edge/";
   };
@@ -2267,12 +2267,12 @@ final: prev:
 
   gentoo-syntax = buildVimPluginFrom2Nix {
     pname = "gentoo-syntax";
-    version = "2022-02-21";
+    version = "2022-02-23";
     src = fetchFromGitHub {
       owner = "gentoo";
       repo = "gentoo-syntax";
-      rev = "e5a55b7fa046e3b23b7f7e5e2224fa9dc74c1052";
-      sha256 = "1l83d2yj8qd1vgc5iqswqim43akf31pm6apgi4y9fsg22lb742ip";
+      rev = "cf5f268f8b19262515105739bdcc112cd2a6cdbc";
+      sha256 = "1pbvr1yirn17fxw8zlzp8j5brj0n2sdm3ampjryirdxknli93685";
     };
     meta.homepage = "https://github.com/gentoo/gentoo-syntax/";
   };
@@ -3228,12 +3228,12 @@ final: prev:
 
   lightspeed-nvim = buildVimPluginFrom2Nix {
     pname = "lightspeed.nvim";
-    version = "2022-02-18";
+    version = "2022-02-24";
     src = fetchFromGitHub {
       owner = "ggandor";
       repo = "lightspeed.nvim";
-      rev = "4d8359a30b26ee5316d0e7c79af08b10cb17a57b";
-      sha256 = "0j5qn12qmahdbyavp85yd633pap0rds4xnn37v2jhkipm0ag81wg";
+      rev = "8fd73360e89a219b5701339c08a469f5703cf163";
+      sha256 = "0y43p3sv99rsbks9r67zjm7wp3j7xpdx6ql5n18371ys8wyyddpd";
     };
     meta.homepage = "https://github.com/ggandor/lightspeed.nvim/";
   };
@@ -3300,12 +3300,12 @@ final: prev:
 
   litee-filetree-nvim = buildVimPluginFrom2Nix {
     pname = "litee-filetree.nvim";
-    version = "2022-02-16";
+    version = "2022-02-24";
     src = fetchFromGitHub {
       owner = "ldelossa";
       repo = "litee-filetree.nvim";
-      rev = "a736dd5a177cc36d31b702a6b6d2ffb767e84c80";
-      sha256 = "0vhq6an7p6abhm6w9px627ymyq3r3ybsnik14k5x7pfwd5bg4c69";
+      rev = "f044fa4b465a102375d8d977e10e6427ec81ff63";
+      sha256 = "0blsnmdcyfm5phcwb6lh0ngynlj3i35nvlyvspr63v1vfxjms4x9";
     };
     meta.homepage = "https://github.com/ldelossa/litee-filetree.nvim/";
   };
@@ -3324,12 +3324,12 @@ final: prev:
 
   litee-nvim = buildVimPluginFrom2Nix {
     pname = "litee.nvim";
-    version = "2022-02-17";
+    version = "2022-02-24";
     src = fetchFromGitHub {
       owner = "ldelossa";
       repo = "litee.nvim";
-      rev = "dd231b288ae0bac7fe140aa78b474a094cc69e57";
-      sha256 = "1l5hq8jj5jdyd6jbxzmdj8wqgnx4y9mrv4zbjwhs7y67rmp7alqr";
+      rev = "7745d713e067b5faa44cffba85278ac820c3fe2c";
+      sha256 = "1y8lxrzvcs55chggrbg3h0vpg2ll5fschcp78ivb3cdq9cbs8jfh";
     };
     meta.homepage = "https://github.com/ldelossa/litee.nvim/";
   };
@@ -3467,12 +3467,12 @@ final: prev:
 
   luasnip = buildVimPluginFrom2Nix {
     pname = "luasnip";
-    version = "2022-02-19";
+    version = "2022-02-24";
     src = fetchFromGitHub {
       owner = "l3mon4d3";
       repo = "luasnip";
-      rev = "8f2480d7a8c23c164429f2e4b487f28fc9a72d4b";
-      sha256 = "0z0ksqc3rkb2vypdm6mkb6iq5g56fw4mxwfz5v4gqzlmfjc790vc";
+      rev = "e357328c02d1661ffa7ab0aba0d80b6770ca1c31";
+      sha256 = "0w1fwzcv4ngpwa7dkq6vi9fxg7dski7sqv2k432h1ll6ibph8yid";
     };
     meta.homepage = "https://github.com/l3mon4d3/luasnip/";
   };
@@ -3647,12 +3647,12 @@ final: prev:
 
   mkdx = buildVimPluginFrom2Nix {
     pname = "mkdx";
-    version = "2022-02-21";
+    version = "2022-02-23";
     src = fetchFromGitHub {
       owner = "SidOfc";
       repo = "mkdx";
-      rev = "973ab6ea0bf79021e2992cdf91627f18c4b74b5d";
-      sha256 = "0dkfyiv2932r8lqsipq4r9yfq3yi8s42q03iw14njnr68cvnqfn3";
+      rev = "ca5b89e28cecc7993f769fc35b0ae794fd73af06";
+      sha256 = "0b9j55gjk641rnkbl8b4vmfb8pkz7jml15yf3y65lzb09fchx2dv";
     };
     meta.homepage = "https://github.com/SidOfc/mkdx/";
   };
@@ -4043,12 +4043,12 @@ final: prev:
 
   neorg = buildVimPluginFrom2Nix {
     pname = "neorg";
-    version = "2022-02-13";
+    version = "2022-02-22";
     src = fetchFromGitHub {
       owner = "nvim-neorg";
       repo = "neorg";
-      rev = "d6d64466f060ff9db87976ca4dfc92dda473a81c";
-      sha256 = "0si8pq0scmpvarlssdpllfnbv3r1121dj5c6n88cy2g52f42zldi";
+      rev = "25dcc8d87cea1fc18280f4f1149c7dfc5b4a10bf";
+      sha256 = "0x5lhr18fw1zqf68r1hmnk0zh2wivdcqk7rpr5x41vq02hqy0ia2";
     };
     meta.homepage = "https://github.com/nvim-neorg/neorg/";
   };
@@ -4163,12 +4163,12 @@ final: prev:
 
   nerdcommenter = buildVimPluginFrom2Nix {
     pname = "nerdcommenter";
-    version = "2022-02-12";
+    version = "2022-02-24";
     src = fetchFromGitHub {
       owner = "preservim";
       repo = "nerdcommenter";
-      rev = "ec002e8f5de441d07cf5cd3ac44f41edc5f939d9";
-      sha256 = "1z7xdgqbcpld1742rw52sc0d128b5wsx2607hwm0y0nrzajd57xb";
+      rev = "f8671f783baeb0739f556d9b6c440ae1767340d6";
+      sha256 = "1j0fxxprxw12b70isnfqixnvz2xd657rr1jphjz8277yfqpdnh2i";
     };
     meta.homepage = "https://github.com/preservim/nerdcommenter/";
   };
@@ -4235,12 +4235,12 @@ final: prev:
 
   nightfox-nvim = buildVimPluginFrom2Nix {
     pname = "nightfox.nvim";
-    version = "2022-02-18";
+    version = "2022-02-22";
     src = fetchFromGitHub {
       owner = "EdenEast";
       repo = "nightfox.nvim";
-      rev = "57ef9b52e015530090d9b9c49558197ae413cc19";
-      sha256 = "16inv9r7vxwhw9blhd9sy2grf8ghpcpbw2lwd5wq39ij7vwwy2n3";
+      rev = "6b6cf94c588c9aba2f0bf65c175f54ddceb3aa85";
+      sha256 = "09maybpfclp3kj9diq98y8izwvgwn7h7phmj439c1ppjn8phgy04";
     };
     meta.homepage = "https://github.com/EdenEast/nightfox.nvim/";
   };
@@ -4355,12 +4355,12 @@ final: prev:
 
   null-ls-nvim = buildVimPluginFrom2Nix {
     pname = "null-ls.nvim";
-    version = "2022-02-21";
+    version = "2022-02-24";
     src = fetchFromGitHub {
       owner = "jose-elias-alvarez";
       repo = "null-ls.nvim";
-      rev = "ae1edec262c11964d45188b56af19135c5e38c89";
-      sha256 = "1bnw1hhm8xbs55dk99nl1sc86zvagfn5kb05vlczhngv7xrx2jpv";
+      rev = "ee6134db8f55ed2ef965fbc2d036de3f87a140d9";
+      sha256 = "04dsmih3hmby3sa9w9n6cw2lzz69jmm6yd6nx70fg07730sg364x";
     };
     meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
   };
@@ -4559,12 +4559,12 @@ final: prev:
 
   nvim-dap-ui = buildVimPluginFrom2Nix {
     pname = "nvim-dap-ui";
-    version = "2022-02-22";
+    version = "2022-02-24";
     src = fetchFromGitHub {
       owner = "rcarriga";
       repo = "nvim-dap-ui";
-      rev = "5dfbd6ebfbbfd4866f7eafe723f2fdfa0440733f";
-      sha256 = "02ss2mxi5dqa44r06iv69r5c5dp9g0cxg1dk3an1nnsh78wpibjs";
+      rev = "22e94f2303c8d8d72b541799d7733c5ded0733c5";
+      sha256 = "1761vih6pi2gs3z7bh5515nmr4hkbif82q33gghsvgzjri6a0c3q";
     };
     meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/";
   };
@@ -4655,12 +4655,12 @@ final: prev:
 
   nvim-hlslens = buildVimPluginFrom2Nix {
     pname = "nvim-hlslens";
-    version = "2022-02-15";
+    version = "2022-02-23";
     src = fetchFromGitHub {
       owner = "kevinhwang91";
       repo = "nvim-hlslens";
-      rev = "805b61cc7841a9ef700430095ed56cda34fb8619";
-      sha256 = "0i8nvdvf5l2966ihprwvh4py37ljlqrrclhwflzhdr7pmyy79k98";
+      rev = "2a883d68b93570a66baca5984e416d4c4d079c3f";
+      sha256 = "19i442k58jl0rrnxbbmxg0w0nghi1x3vpxy0id7bb10bg5aafwjm";
     };
     meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/";
   };
@@ -4703,48 +4703,48 @@ final: prev:
 
   nvim-lightbulb = buildVimPluginFrom2Nix {
     pname = "nvim-lightbulb";
-    version = "2021-11-13";
+    version = "2022-02-24";
     src = fetchFromGitHub {
       owner = "kosayoda";
       repo = "nvim-lightbulb";
-      rev = "cd5267d2d708e908dbd668c7de74e1325eb1e1da";
-      sha256 = "1ans2kzg750d4a83hk5p9x5h51m9ywxgk6bxrcj1pwnpkhl5h75z";
+      rev = "29ca81408119ba809d1f922edc941868af97ee86";
+      sha256 = "04c5wqh42648wzrnwcgwdmwwwqvwk5qn3ncrfjl0827xnpc8049g";
     };
     meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/";
   };
 
   nvim-lint = buildVimPluginFrom2Nix {
     pname = "nvim-lint";
-    version = "2022-02-14";
+    version = "2022-02-23";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-lint";
-      rev = "da931f58a59ff0a441b9e8c0679f91790fe61870";
-      sha256 = "13rbvf91xqhjwp4f4gp7gjgqsrbhdasb4k4swhf2f9zcqd51knz5";
+      rev = "f3215fa06782829a9705031fab2ec1f6ad514fd8";
+      sha256 = "05vsi9vgd2y6y8yv5mjc2lv4z1bdh7h4lq1cx4l2hy9p9z59kdzj";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-lint/";
   };
 
   nvim-lsp-ts-utils = buildVimPluginFrom2Nix {
     pname = "nvim-lsp-ts-utils";
-    version = "2022-02-11";
+    version = "2022-02-24";
     src = fetchFromGitHub {
       owner = "jose-elias-alvarez";
       repo = "nvim-lsp-ts-utils";
-      rev = "85e62e572ee63a2877267d023795488c33c0fd6f";
-      sha256 = "1c017n0di9zb1lcqqr9pjc4z8n3d2s55qlqzn8m9rrww9mjqqhnl";
+      rev = "f769dc92a364f428f9a48726e4c7a0ebfdbf6f66";
+      sha256 = "0nl81px6lj0sz0vrpvc4hhd6ccn4am9hd8kxcqzhdz0m37zzp8cr";
     };
     meta.homepage = "https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/";
   };
 
   nvim-lspconfig = buildVimPluginFrom2Nix {
     pname = "nvim-lspconfig";
-    version = "2022-02-21";
+    version = "2022-02-24";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "ec7119b166b16e681f663fcbf16b7139b38172ae";
-      sha256 = "115d4n8i9cjafsl0nkrljcswn5qd0ny1cw7w1mw67sjddp79cqq7";
+      rev = "470569379d708e6c8f33f082497e0374067c6fee";
+      sha256 = "1rp9ymbss8jjm1k20q9vp3ayd7lv2cbdiz5ylhx9p1v1glqimigw";
     };
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
   };
@@ -4775,12 +4775,12 @@ final: prev:
 
   nvim-neoclip-lua = buildVimPluginFrom2Nix {
     pname = "nvim-neoclip.lua";
-    version = "2022-02-20";
+    version = "2022-02-22";
     src = fetchFromGitHub {
       owner = "AckslD";
       repo = "nvim-neoclip.lua";
-      rev = "8213c2c59c99fdaccb3ea5fe9fed2a532fd3fdf8";
-      sha256 = "1hi1yjdaxjsawgci230cnxa5anniq2s6ijxy7z2ibsyfn1jcpb0b";
+      rev = "d859891e4bff9729ad6e63bd4aebc51946de8786";
+      sha256 = "17dbvr1y7hzrv04c89b4nmgmgg0qccrkz6qsh7vsava0lvjs4zm5";
     };
     meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/";
   };
@@ -4875,20 +4875,20 @@ final: prev:
     src = fetchFromGitHub {
       owner = "kyazdani42";
       repo = "nvim-tree.lua";
-      rev = "3486c48225265792842545e90dc041e5a214686d";
-      sha256 = "0bhp85j5446riacblingmd6z316hdh92lpp0p2kd4sckfw6ih8ja";
+      rev = "48e76bc0317de95ac154ae3a26193bf8881340a1";
+      sha256 = "06z7c5kcyxdcx7wi5yaw1d1mv3wah5y0kkjn7z5py9x82snk4rwm";
     };
     meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
   };
 
   nvim-treesitter = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter";
-    version = "2022-02-22";
+    version = "2022-02-24";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "3533721282669e945b62b3ae9c53d4c5ffe16c76";
-      sha256 = "0mlckwhammzh93kililzipynqzw4r09r2xk77yygka54y8vv9kjm";
+      rev = "fb7a56548b89670e2147beb15e5bd2487fffc800";
+      sha256 = "1ada3hzhya4qcqri63plbvvd7xf6gc7k9rr7v5z53lxj1l4s48v2";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
   };
@@ -4931,24 +4931,24 @@ final: prev:
 
   nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter-textobjects";
-    version = "2022-02-07";
+    version = "2022-02-23";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter-textobjects";
-      rev = "fea609aa58b3390a09e8df0e96902fd4b094d8b7";
-      sha256 = "0221ax71334ghsr8xznp9jk2iv9r0bin47ch8r7hsfh4r0wgc5w7";
+      rev = "e23fc8ac796b722dd30f40467d59581d4854c692";
+      sha256 = "15fa27dbyrmbsiysmy3rm3ih9jnxrlvvzlf966jcm29ph225zxmn";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
   };
 
   nvim-ts-autotag = buildVimPluginFrom2Nix {
     pname = "nvim-ts-autotag";
-    version = "2022-02-09";
+    version = "2022-02-24";
     src = fetchFromGitHub {
       owner = "windwp";
       repo = "nvim-ts-autotag";
-      rev = "5149f0c6557fa4a492d82895a564f4cd4a9c7715";
-      sha256 = "0zyx4qkm6gq2lw75f2b1k974dv3bz12gd4f6j76dr805b8kq6l5m";
+      rev = "178e40a213eeea4810cad440b6be56ceeb6af434";
+      sha256 = "00zlgc7bnryw3ys1ihsf2pyf7f9wzlgmqrkp8bs99nv5qji6bym4";
     };
     meta.homepage = "https://github.com/windwp/nvim-ts-autotag/";
   };
@@ -4967,12 +4967,12 @@ final: prev:
 
   nvim-ts-rainbow = buildVimPluginFrom2Nix {
     pname = "nvim-ts-rainbow";
-    version = "2022-02-09";
+    version = "2022-02-24";
     src = fetchFromGitHub {
       owner = "p00f";
       repo = "nvim-ts-rainbow";
-      rev = "c6c26c4def0e9cd82f371ba677d6fc9baa0038af";
-      sha256 = "0q0awc93l6cafbvb3wghrmvsn0qqg8hgkhfy5r86bvr0prwbvxga";
+      rev = "35bef9212441ef3f4b69c8ead0fbde123357bb4d";
+      sha256 = "0dnr3dilcsyfrgwv497aypvn6jk5rzwdqjs09gn5fwfg354nhsbk";
     };
     meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";
   };
@@ -5111,12 +5111,12 @@ final: prev:
 
   onedarkpro-nvim = buildVimPluginFrom2Nix {
     pname = "onedarkpro.nvim";
-    version = "2022-02-16";
+    version = "2022-02-24";
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "onedarkpro.nvim";
-      rev = "7bfdf32cae7bf83f2209f25a180d9f0bc5330919";
-      sha256 = "1877bv4cy1gignpdvhp8xfqgmh4yg04ak7amf9h1q4wg29hna15a";
+      rev = "fda3b36be8613f6ba303082fed7a7e20fdf52205";
+      sha256 = "14i3lqz1l9k8ai9lskrgz511srvf2wwfjd8zlbkmx55ws085ifca";
     };
     meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
   };
@@ -5605,12 +5605,12 @@ final: prev:
 
   refactoring-nvim = buildVimPluginFrom2Nix {
     pname = "refactoring.nvim";
-    version = "2022-02-18";
+    version = "2022-02-24";
     src = fetchFromGitHub {
       owner = "theprimeagen";
       repo = "refactoring.nvim";
-      rev = "7ebc76da62638a852a5a287a00ff94af32fe28da";
-      sha256 = "0gs5qb5s2ilqs2nskd9llgjd5zqcyx3yacyh56xwxr65yjvnpjg8";
+      rev = "85e3474449967d2ee4377fbb9633f21093a80187";
+      sha256 = "05scspf4jxhgbrfnnm363mb8g633rn83zmlxmwsqs1zzvpzgjxvp";
     };
     meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";
   };
@@ -5797,12 +5797,12 @@ final: prev:
 
   SchemaStore-nvim = buildVimPluginFrom2Nix {
     pname = "SchemaStore.nvim";
-    version = "2022-02-18";
+    version = "2022-02-24";
     src = fetchFromGitHub {
       owner = "b0o";
       repo = "SchemaStore.nvim";
-      rev = "45761cc7f76abc543e614e2fafa1ea146f4313bb";
-      sha256 = "14d7pfrr57i1b8kjg6bn3v6z7pa7vqrpa0gi4y0wqjmwiyl22zvm";
+      rev = "90f1123c0d63f41627dca0c5258a4193274edba0";
+      sha256 = "0f3jgj1bwvxzmvqf7nbbbwyav5wxmr9kyjw4j4fq7n3mrcapdjj0";
     };
     meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
   };
@@ -6036,6 +6036,18 @@ final: prev:
     meta.homepage = "https://github.com/chikatoike/sourcemap.vim/";
   };
 
+  space-vim = buildVimPluginFrom2Nix {
+    pname = "space-vim";
+    version = "2022-02-15";
+    src = fetchFromGitHub {
+      owner = "liuchengxu";
+      repo = "space-vim";
+      rev = "637390b17a8cd7d154a0d90a5c07612f1538a28e";
+      sha256 = "0f43mspfnch1ifqa9rgvc64dmk0hz3cirz8iicpszmdr0fphq3xs";
+    };
+    meta.homepage = "https://github.com/liuchengxu/space-vim/";
+  };
+
   SpaceCamp = buildVimPluginFrom2Nix {
     pname = "SpaceCamp";
     version = "2021-04-07";
@@ -6072,6 +6084,18 @@ final: prev:
     meta.homepage = "https://github.com/ctjhoa/spacevim/";
   };
 
+  SpaceVim = buildVimPluginFrom2Nix {
+    pname = "SpaceVim";
+    version = "2022-02-20";
+    src = fetchFromGitHub {
+      owner = "SpaceVim";
+      repo = "SpaceVim";
+      rev = "6975374b3be303b820c61c2fa33a43fe157265ec";
+      sha256 = "1lqsk7cpf9nb7h3wnmv4df6047iyck0p662m3gqy57xrhl33j33n";
+    };
+    meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
+  };
+
   sparkup = buildVimPluginFrom2Nix {
     pname = "sparkup";
     version = "2012-06-11";
@@ -6243,12 +6267,12 @@ final: prev:
 
   surround-nvim = buildVimPluginFrom2Nix {
     pname = "surround.nvim";
-    version = "2022-02-15";
+    version = "2022-02-22";
     src = fetchFromGitHub {
       owner = "ur4ltz";
       repo = "surround.nvim";
-      rev = "01756d3f31aeb2307cca5b73f9fa74a0802e5bc3";
-      sha256 = "0adxynnlbybj04vxflvrqhcc7z8y3m7myimdm9xyz8vi18qkfk5p";
+      rev = "633068182cf894480341b992445f0f0d2883721d";
+      sha256 = "0mqg4vki23rs0rj6zyfkd1ki9wndjifp0lmnnw99x3i1qc0ba47i";
     };
     meta.homepage = "https://github.com/ur4ltz/surround.nvim/";
   };
@@ -6654,12 +6678,12 @@ final: prev:
 
   telescope-nvim = buildVimPluginFrom2Nix {
     pname = "telescope.nvim";
-    version = "2022-02-15";
+    version = "2022-02-23";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope.nvim";
-      rev = "df0b35c8bc0944164828ccba8ea17941423c6725";
-      sha256 = "0ryx507ynil4y8y989df06d2j6dci5ywdjr4nb7kgwrfj2hn4cv9";
+      rev = "567ec85b157f1606b500a0f755181f284810a28e";
+      sha256 = "1pzdn12zg9g3y03grw2xha2h5qia6bbi8058n3z5g2ail58hnw2n";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
   };
@@ -6810,14 +6834,14 @@ final: prev:
 
   todo-nvim = buildVimPluginFrom2Nix {
     pname = "todo.nvim";
-    version = "2022-02-19";
+    version = "2022-02-23";
     src = fetchFromGitHub {
       owner = "AmeerTaweel";
       repo = "todo.nvim";
-      rev = "b252b4116812352161acfa73cdce6a15ffbde2eb";
-      sha256 = "+m3jy0ue0rAzRQ4hJDFPVVjNaOGNImkZjhIqI/AGTeY=";
+      rev = "6bd31dfd64b2730b33aad89423a1055c22fe276a";
+      sha256 = "1887d1bjzixrdinr857cqq4x84760scik04r9mz9zmwdf8nfgh6b";
     };
-    meta.homepage = "https://github.com/AmeerTaweel/todo.nvim";
+    meta.homepage = "https://github.com/AmeerTaweel/todo.nvim/";
   };
 
   todo-txt-vim = buildVimPluginFrom2Nix {
@@ -7711,12 +7735,12 @@ final: prev:
 
   vim-clap = buildVimPluginFrom2Nix {
     pname = "vim-clap";
-    version = "2022-02-22";
+    version = "2022-02-24";
     src = fetchFromGitHub {
       owner = "liuchengxu";
       repo = "vim-clap";
-      rev = "c22b4eaf296f8779ca8e6ccfa0a1497c4b5831ff";
-      sha256 = "13x7ykvh9qfdcik2x3yjz49xwww48b3cm1qq1qripnf2b19an3z6";
+      rev = "73fe68b6bfbd9201fb0facf2a13cb819f79b3d82";
+      sha256 = "0zs9rg21p0aws6shzvqi5khc3kipqh4yvcx5jpf8f3xcdlv13mrk";
     };
     meta.homepage = "https://github.com/liuchengxu/vim-clap/";
   };
@@ -8611,12 +8635,12 @@ final: prev:
 
   vim-gitgutter = buildVimPluginFrom2Nix {
     pname = "vim-gitgutter";
-    version = "2022-02-19";
+    version = "2022-02-23";
     src = fetchFromGitHub {
       owner = "airblade";
       repo = "vim-gitgutter";
-      rev = "e433d5ddc1e37cb07d646d58b832a88ee848988d";
-      sha256 = "1li873x55q0ia2098ciwn5ayq23si9zqqildz8qxa5xdwv318j8z";
+      rev = "18d12985ea6cb7ede59755ff4fd0a9fa1e6bf835";
+      sha256 = "1gs7vaf9pyd8ji0vc9iafd46g4iqy8rpa2jif0k56wxzcrjw4r22";
     };
     meta.homepage = "https://github.com/airblade/vim-gitgutter/";
   };
@@ -11087,12 +11111,12 @@ final: prev:
 
   vim-toml = buildVimPluginFrom2Nix {
     pname = "vim-toml";
-    version = "2021-12-06";
+    version = "2022-02-23";
     src = fetchFromGitHub {
       owner = "cespare";
       repo = "vim-toml";
-      rev = "2c8983cc391287e5e26e015c3ab9c38de9f9b759";
-      sha256 = "1mxn2z3p3lnk3ibwxhqb3dih25qalpqfwy0rx7i393vpjbkn79py";
+      rev = "89bcca8a3aeab360f6dfe5ce70999fc928669411";
+      sha256 = "0lw45cchgmank2w0y864qwhzw5cjbggk1p46vgjgs7cn1jsdhvr0";
     };
     meta.homepage = "https://github.com/cespare/vim-toml/";
   };
@@ -11603,12 +11627,12 @@ final: prev:
 
   vimspector = buildVimPluginFrom2Nix {
     pname = "vimspector";
-    version = "2022-02-19";
+    version = "2022-02-24";
     src = fetchFromGitHub {
       owner = "puremourning";
       repo = "vimspector";
-      rev = "d6641959336d0f0303c94cbea131b160f9dcabe3";
-      sha256 = "0r2sr4kissqvi5d63girgxp6swbkj0czfaf5nbq2c4gjnpkr6clx";
+      rev = "d044dea0c2669c740052a47900e6e16f64444b63";
+      sha256 = "1sv1r4pcz1fx99qi566nncs116vw3wsny344lcnsh0r6b2sc0bz0";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/puremourning/vimspector/";
diff --git a/pkgs/misc/vim-plugins/markdown-preview-nvim/fix-node-paths.patch b/pkgs/applications/editors/vim/plugins/markdown-preview-nvim/fix-node-paths.patch
similarity index 100%
rename from pkgs/misc/vim-plugins/markdown-preview-nvim/fix-node-paths.patch
rename to pkgs/applications/editors/vim/plugins/markdown-preview-nvim/fix-node-paths.patch
diff --git a/pkgs/misc/vim-plugins/markdown-preview-nvim/package.json b/pkgs/applications/editors/vim/plugins/markdown-preview-nvim/package.json
similarity index 100%
rename from pkgs/misc/vim-plugins/markdown-preview-nvim/package.json
rename to pkgs/applications/editors/vim/plugins/markdown-preview-nvim/package.json
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
similarity index 99%
rename from pkgs/misc/vim-plugins/overrides.nix
rename to pkgs/applications/editors/vim/plugins/overrides.nix
index da04fee9c95f6..059622495731b 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -414,7 +414,7 @@ self: super: {
 
   markdown-preview-nvim = super.markdown-preview-nvim.overrideAttrs (old: let
     # We only need its dependencies `node-modules`.
-    nodeDep = nodePackages."markdown-preview-nvim-../../misc/vim-plugins/markdown-preview-nvim".overrideAttrs (old: {
+    nodeDep = nodePackages."markdown-preview-nvim-../../applications/editors/vim/plugins/markdown-preview-nvim".overrideAttrs (old: {
       dontNpmInstall = true;
     });
   in {
diff --git a/pkgs/misc/vim-plugins/patches/fruzzy/get_version.patch b/pkgs/applications/editors/vim/plugins/patches/fruzzy/get_version.patch
similarity index 100%
rename from pkgs/misc/vim-plugins/patches/fruzzy/get_version.patch
rename to pkgs/applications/editors/vim/plugins/patches/fruzzy/get_version.patch
diff --git a/pkgs/misc/vim-plugins/patches/lens-vim/remove_duplicate_g_lens_animate.patch b/pkgs/applications/editors/vim/plugins/patches/lens-vim/remove_duplicate_g_lens_animate.patch
similarity index 100%
rename from pkgs/misc/vim-plugins/patches/lens-vim/remove_duplicate_g_lens_animate.patch
rename to pkgs/applications/editors/vim/plugins/patches/lens-vim/remove_duplicate_g_lens_animate.patch
diff --git a/pkgs/misc/vim-plugins/patches/sniprun/fix-paths.patch b/pkgs/applications/editors/vim/plugins/patches/sniprun/fix-paths.patch
similarity index 100%
rename from pkgs/misc/vim-plugins/patches/sniprun/fix-paths.patch
rename to pkgs/applications/editors/vim/plugins/patches/sniprun/fix-paths.patch
diff --git a/pkgs/misc/vim-plugins/patches/vim-grammarous/set_default_languagetool.patch b/pkgs/applications/editors/vim/plugins/patches/vim-grammarous/set_default_languagetool.patch
similarity index 100%
rename from pkgs/misc/vim-plugins/patches/vim-grammarous/set_default_languagetool.patch
rename to pkgs/applications/editors/vim/plugins/patches/vim-grammarous/set_default_languagetool.patch
diff --git a/pkgs/misc/vim-plugins/readme.md b/pkgs/applications/editors/vim/plugins/readme.md
similarity index 100%
rename from pkgs/misc/vim-plugins/readme.md
rename to pkgs/applications/editors/vim/plugins/readme.md
diff --git a/pkgs/misc/vim-plugins/update-shell.nix b/pkgs/applications/editors/vim/plugins/update-shell.nix
similarity index 60%
rename from pkgs/misc/vim-plugins/update-shell.nix
rename to pkgs/applications/editors/vim/plugins/update-shell.nix
index e1b727c49e046..52a9e741af21e 100644
--- a/pkgs/misc/vim-plugins/update-shell.nix
+++ b/pkgs/applications/editors/vim/plugins/update-shell.nix
@@ -1,5 +1,6 @@
-{ pkgs ? import ../../.. { } }:
+{ pkgs ? import ../../../../.. { } }:
 
+# Ideally, pkgs points to default.nix file of Nixpkgs official tree
 with pkgs;
 let
   pyEnv = python3.withPackages (ps: [ ps.GitPython ]);
diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/applications/editors/vim/plugins/update.py
similarity index 87%
rename from pkgs/misc/vim-plugins/update.py
rename to pkgs/applications/editors/vim/plugins/update.py
index d9adc66674827..ad1c38cb375fa 100755
--- a/pkgs/misc/vim-plugins/update.py
+++ b/pkgs/applications/editors/vim/plugins/update.py
@@ -13,6 +13,9 @@
 # refer to:
 #
 # https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks/vim.section.md#updating-plugins-in-nixpkgs-updating-plugins-in-nixpkgs
+#
+# (or the equivalent file /doc/languages-frameworks/vim.section.md from Nixpkgs master tree).
+#
 
 import inspect
 import os
@@ -27,7 +30,8 @@
 
 # Import plugin update library from maintainers/scripts/pluginupdate.py
 ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))))
-sys.path.insert(0, os.path.join(ROOT.parent.parent.parent, "maintainers", "scripts"))
+# Ideally, ROOT.(parent^5) points to root of Nixpkgs official tree
+sys.path.insert(0, os.path.join(ROOT.parent.parent.parent.parent.parent, "maintainers", "scripts"))
 import pluginupdate
 
 GET_PLUGINS = f"""(with import <localpkgs> {{}};
@@ -47,7 +51,7 @@
 in lib.filterAttrs (n: v: v != null) checksums)"""
 
 HEADER = (
-    "# This file has been generated by ./pkgs/misc/vim-plugins/update.py. Do not edit!"
+    "# This file has been generated by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit!"
 )
 
 
diff --git a/pkgs/misc/vim-plugins/vim-gen-doc-hook.sh b/pkgs/applications/editors/vim/plugins/vim-gen-doc-hook.sh
similarity index 100%
rename from pkgs/misc/vim-plugins/vim-gen-doc-hook.sh
rename to pkgs/applications/editors/vim/plugins/vim-gen-doc-hook.sh
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
similarity index 99%
rename from pkgs/misc/vim-plugins/vim-plugin-names
rename to pkgs/applications/editors/vim/plugins/vim-plugin-names
index 45b25f5f4d0c6..8687e27fb97c4 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -420,6 +420,7 @@ lighttiger2505/deoplete-vim-lsp
 lilydjwg/colorizer
 lilydjwg/fcitx.vim@fcitx5
 liuchengxu/graphviz.vim
+liuchengxu/space-vim
 liuchengxu/vim-clap
 liuchengxu/vim-which-key
 liuchengxu/vista.vim
@@ -772,6 +773,7 @@ sodapopcan/vim-twiggy
 solarnz/arcanist.vim
 sonph/onehalf
 sotte/presenting.vim
+SpaceVim/SpaceVim
 srcery-colors/srcery-vim
 steelsojka/completion-buffers
 steelsojka/pears.nvim
diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/applications/editors/vim/plugins/vim-utils.nix
similarity index 99%
rename from pkgs/misc/vim-plugins/vim-utils.nix
rename to pkgs/applications/editors/vim/plugins/vim-utils.nix
index 128b969c35753..4183b6214351a 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/applications/editors/vim/plugins/vim-utils.nix
@@ -82,7 +82,8 @@ See vimHelpTags sample code below.
 
 CONTRIBUTING AND CUSTOMIZING
 ============================
-The example file pkgs/misc/vim-plugins/default.nix provides both:
+The example file pkgs/applications/editors/vim/plugins/default.nix provides
+both:
 * manually mantained plugins
 * plugins created by VAM's nix#ExportPluginsForNix implementation
 
diff --git a/pkgs/misc/vim-plugins/vim2nix/README.txt b/pkgs/applications/editors/vim/plugins/vim2nix/README.txt
similarity index 100%
rename from pkgs/misc/vim-plugins/vim2nix/README.txt
rename to pkgs/applications/editors/vim/plugins/vim2nix/README.txt
diff --git a/pkgs/misc/vim-plugins/vim2nix/addon-info.json b/pkgs/applications/editors/vim/plugins/vim2nix/addon-info.json
similarity index 100%
rename from pkgs/misc/vim-plugins/vim2nix/addon-info.json
rename to pkgs/applications/editors/vim/plugins/vim2nix/addon-info.json
diff --git a/pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim b/pkgs/applications/editors/vim/plugins/vim2nix/autoload/nix.vim
similarity index 100%
rename from pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim
rename to pkgs/applications/editors/vim/plugins/vim2nix/autoload/nix.vim
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 9fa420975af1e..2803431089313 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -198,7 +198,7 @@
 , "markdownlint-cli"
 , "markdownlint-cli2"
 , "markdown-link-check"
-, {"markdown-preview-nvim": "../../misc/vim-plugins/markdown-preview-nvim"}
+, {"markdown-preview-nvim": "../../applications/editors/vim/plugins/markdown-preview-nvim"}
 , "mastodon-bot"
 , "mathjax"
 , "meat"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 3adfd4becd37d..54fa82135c549 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -107807,11 +107807,11 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  "markdown-preview-nvim-../../misc/vim-plugins/markdown-preview-nvim" = nodeEnv.buildNodePackage {
+  "markdown-preview-nvim-../../applications/editors/vim/plugins/markdown-preview-nvim" = nodeEnv.buildNodePackage {
     name = "markdown-preview-vim";
     packageName = "markdown-preview-vim";
     version = "0.0.1";
-    src = ../../misc/vim-plugins/markdown-preview-nvim;
+    src = ../../applications/editors/vim/plugins/markdown-preview-nvim;
     dependencies = [
       sources."accepts-1.3.8"
       sources."after-0.8.2"
diff --git a/pkgs/tools/nix/statix/default.nix b/pkgs/tools/nix/statix/default.nix
index 0f3a1c10e3557..d25f51ae5aa26 100644
--- a/pkgs/tools/nix/statix/default.nix
+++ b/pkgs/tools/nix/statix/default.nix
@@ -2,7 +2,8 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "statix";
-  # also update version of the vim plugin in pkgs/misc/vim-plugins/overrides.nix
+  # also update version of the vim plugin in
+  # pkgs/applications/editors/vim/plugins/overrides.nix
   # the version can be found in flake.nix of the source code
   version = "0.5.4";
 
diff --git a/pkgs/tools/text/rosie/default.nix b/pkgs/tools/text/rosie/default.nix
index 4f70f972b683b..a4edf55f7504f 100644
--- a/pkgs/tools/text/rosie/default.nix
+++ b/pkgs/tools/text/rosie/default.nix
@@ -1,5 +1,5 @@
-{ stdenv
-, lib
+{ lib
+, stdenv
 , fetchgit
 , libbsd
 , readline
@@ -8,6 +8,7 @@
 stdenv.mkDerivation rec {
   pname = "rosie";
   version = "unstable-2020-01-11";
+
   src = fetchgit {
     url = "https://gitlab.com/rosie-pattern-language/rosie";
     rev = "670e9027563609ba2ea31e14e2621a1302742795";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1656f63391885..f360f8f31b5aa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -33999,12 +33999,11 @@ with pkgs;
 
   viewnior = callPackage ../applications/graphics/viewnior { };
 
-
-  vimUtils = callPackage ../misc/vim-plugins/vim-utils.nix {
+  vimUtils = callPackage ../applications/editors/vim/plugins/vim-utils.nix {
     inherit (lua51Packages) hasLuaModule;
   };
 
-  vimPlugins = recurseIntoAttrs (callPackage ../misc/vim-plugins {
+  vimPlugins = recurseIntoAttrs (callPackage ../applications/editors/vim/plugins {
     llvmPackages = llvmPackages_6;
     luaPackages = lua51Packages;
   });