diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 63da7fbf9245..42de002d1eaf 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -1,39 +1,11 @@
-"github:godlygeek/csapprox"
-"github:chrisbra/CheckAttach"
-"github:lfilho/cosco.vim"
-"github:mattn/gist-vim"
-"github:Twinside/vim-hoogle"
-"github:altercation/vim-colors-solarized"
-"github:ervandew/supertab"
-"github:scrooloose/syntastic"
-"github:inkarkat/vim-SyntaxRange"
-"github:godlygeek/tabular"
-"github:majutsushi/tagbar"
-"github:scrooloose/nerdcommenter"
-"github:scrooloose/nerdtree"
-"github:SirVer/ultisnips"
-"github:vimoutliner/vimoutliner"
-"github:mattn/webapi-vim"
-"github:vim-scripts/YankRing.vim"
-"github:tyru/caw.vim"
-"github:Rip-Rip/clang_complete"
-"github:tpope/vim-commentary"
-"github:chrisbra/csv.vim"
-"github:JazzCore/ctrlp-cmatcher"
-"github:FelikZ/ctrlp-py-matcher"
-"github:amiorin/ctrlp-z"
-"github:neoclide/vim-easygit"
-"github:int3/vim-extradite"
-"github:tpope/vim-fugitive"
-"github:eagletmt/ghcmod-vim"
 "github:907th/vim-auto-save"
-"github:Chiel92/vim-autoformat"
-"github:LnL7/vim-nix"
-"github:Quramy/tsuquyomi"
-"github:Shougo/deoplete.nvim"
+"github:airblade/vim-gitgutter"
 "github:ajh17/Spacegray.vim"
 "github:albfan/nerdtree-git-plugin"
+"github:altercation/vim-colors-solarized"
 "github:alvan/vim-closetag"
+"github:amiorin/ctrlp-z"
+"github:andreshazard/vim-logreview"
 "github:andsild/peskcolor.vim.git"
 "github:andviro/flake8-vim"
 "github:ap/vim-css-color"
@@ -45,17 +17,26 @@
 "github:cespare/vim-toml"
 "github:chemzqm/denite-extra"
 "github:chemzqm/denite-git"
+"github:Chiel92/vim-autoformat"
 "github:chikatoike/concealedyank.vim"
+"github:chikatoike/sourcemap.vim"
+"github:chrisbra/CheckAttach"
+"github:chrisbra/csv.vim"
+"github:chrisgeo/sparkup"
 "github:christoomey/vim-sort-motion"
 "github:christoomey/vim-tmux-navigator"
 "github:ctjhoa/spacevim"
 "github:ctrlpvim/ctrlp.vim"
+"github:dag/vim2hs"
+"github:dannyob/quickfixstatus"
 "github:derekelkins/agda-vim"
 "github:derekwyatt/vim-scala"
+"github:dhruvasagar/vim-table-mode"
 "github:digitaltoad/vim-jade"
 "github:dleonard0/pony-vim-syntax"
 "github:dracula/vim"
 "github:drmingdrmer/xptemplate"
+"github:eagletmt/ghcmod-vim"
 "github:eagletmt/neco-ghc"
 "github:editorconfig/editorconfig-vim"
 "github:ehamberg/vim-cute-python.git"
@@ -66,24 +47,36 @@
 "github:embear/vim-localvimrc"
 "github:enomsg/vim-haskellConcealPlus"
 "github:ensime/ensime-vim"
+"github:ervandew/supertab"
 "github:esneider/YUNOcommit.vim"
 "github:fatih/vim-go"
+"github:FelikZ/ctrlp-py-matcher"
 "github:flazz/vim-colorschemes"
 "github:floobits/floobits-neovim"
 "github:frigoeu/psc-ide-vim"
+"github:garbas/vim-snipmate"
+"github:gmarik/vundle"
+"github:godlygeek/csapprox"
+"github:godlygeek/tabular"
 "github:google/vim-codefmt"
 "github:google/vim-jsonnet"
 "github:google/vim-maktaba"
 "github:gregsexton/gitv"
+"github:guns/xterm-color-table.vim"
 "github:heavenshell/vim-jsdoc"
 "github:hecal3/vim-leader-guide"
+"github:honza/vim-snippets"
 "github:idris-hackers/idris-vim"
+"github:inkarkat/vim-SyntaxRange"
+"github:int3/vim-extradite"
 "github:itchyny/calendar.vim"
 "github:itchyny/lightline.vim"
 "github:itchyny/thumbnail.vim"
+"github:itchyny/vim-cursorword"
 "github:itchyny/vim-gitbranch"
 "github:ivanov/vim-ipython"
 "github:janko-m/vim-test.git"
+"github:JazzCore/ctrlp-cmatcher"
 "github:jceb/vim-hier"
 "github:jceb/vim-orgmode"
 "github:jeetsukumaran/vim-buffergator"
@@ -95,136 +88,34 @@
 "github:jonbri/vim-colorstepper"
 "github:joonty/vim-xdebug"
 "github:junegunn/fzf.vim"
+"github:junegunn/goyo.vim"
 "github:junegunn/limelight.vim"
+"github:junegunn/vim-easy-align"
+"github:junegunn/vim-github-dashboard"
 "github:junegunn/vim-peekaboo"
 "github:justincampbell/vim-eighties"
+"github:KabbAmine/zeavim.vim"
 "github:kana/vim-niceblock"
 "github:kana/vim-operator-replace"
 "github:kana/vim-operator-user"
+"github:kana/vim-tabpagecd"
+"github:kchmck/vim-coffee-script"
+"github:kien/rainbow_parentheses.vim"
+"github:kshenoy/vim-signature"
+"github:lambdalisue/vim-gista"
 "github:latex-box-team/latex-box"
 "github:leafgarland/typescript-vim"
 "github:lepture/vim-jinja"
 "github:lervag/vimtex"
+"github:lfilho/cosco.vim"
+"github:LnL7/vim-nix"
 "github:lokaltog/vim-easymotion"
 "github:ludovicchabant/vim-lawrencium"
 "github:luochen1990/rainbow"
 "github:lyokha/vim-xkbswitch"
 "github:machakann/vim-highlightedyank"
-"github:martinda/Jenkinsfile-vim-syntax"
-"github:megaannum/forms"
-"github:megaannum/self"
-"github:mfukar/robotframework-vim"
-"github:mhinz/vim-grepper.git"
-"github:mhinz/vim-startify"
-"github:michaeljsmith/vim-indent-object"
-"github:mileszs/ack.vim"
-"github:mindriot101/vim-yapf"
-"github:mkasa/lushtags"
-"github:mpickering/hlint-refactor-vim"
-"github:nathanaelkane/vim-indent-guides"
-"github:nbouscal/vim-stylish-haskell"
-"github:neovimhaskell/haskell-vim"
-"github:nixprime/cpsm"
-"github:osyo-manga/shabadou.vim"
-"github:osyo-manga/vim-textobj-multiblock"
-"github:osyo-manga/vim-watchdogs"
-"github:plasticboy/vim-markdown"
-"github:python-mode/python-mode"
-"github:racer-rust/vim-racer"
-"github:raichoo/purescript-vim"
-"github:reedes/vim-wordy"
-"github:rhysd/committia.vim.git"
-"github:rhysd/vim-grammarous"
-"github:rhysd/vim-operator-surround"
-"github:rodjek/vim-puppet"
-"github:roxma/nvim-cm-racer"
-"github:roxma/nvim-completion-manager"
-"github:rust-lang/rust.vim"
-"github:ryanoasis/vim-devicons"
-"github:sbdchd/neoformat"
-"github:sebastianmarkow/deoplete-rust"
-"github:sheerun/vim-polyglot"
-"github:shougo/context_filetype.vim"
-"github:shougo/denite.nvim"
-"github:shougo/echodoc.vim"
-"github:shougo/neco-syntax"
-"github:shougo/neco-vim"
-"github:shougo/neocomplete.vim"
-"github:shougo/neoinclude.vim"
-"github:shougo/neomru.vim"
-"github:shougo/neosnippet-snippets"
-"github:shougo/neosnippet.vim"
-"github:shougo/neoyank.vim.git"
-"github:shougo/tabpagebuffer.vim"
-"github:shougo/unite.vim"
-"github:shougo/vimproc.vim"
-"github:shougo/vimshell.vim"
-"github:sjl/gundo.vim"
-"github:slashmili/alchemist.vim"
-"github:t9md/vim-smalls"
-"github:takac/vim-hardtime"
-"github:terryma/vim-expand-region"
-"github:tex/vimpreviewpandoc"
-"github:thinca/vim-quickrun"
-"github:thinca/vim-themis"
-"github:tomasr/molokai"
-"github:tomlion/vim-solidity"
-"github:tpope/vim-dispatch"
-"github:tpope/vim-eunuch"
-"github:tpope/vim-repeat"
-"github:tpope/vim-rhubarb"
-"github:tpope/vim-speeddating"
-"github:travitch/hasksyn"
-"github:twinside/vim-haskellconceal"
-"github:tyru/open-browser.vim"
-"github:valloric/youcompleteme"
-"github:vim-airline/vim-airline-themes"
-"github:vim-pandoc/vim-pandoc"
-"github:vim-pandoc/vim-pandoc-after"
-"github:vim-pandoc/vim-pandoc-syntax"
-"github:vim-scripts/Colour-Sampler-Pack"
-"github:vim-scripts/Improved-AnsiEsc"
-"github:vim-scripts/Rename"
-"github:vim-scripts/ReplaceWithRegister"
-"github:vim-scripts/a.vim"
-"github:vim-scripts/align"
-"github:vim-scripts/argtextobj.vim"
-"github:vim-scripts/changeColorScheme.vim"
-"github:vim-scripts/mayansmoke.git"
-"github:vim-scripts/random.vim"
-"github:vim-scripts/tabmerge"
-"github:vim-scripts/wombat256.vim"
-"github:w0rp/ale"
-"github:wakatime/vim-wakatime"
-"github:wellle/targets.vim"
-"github:will133/vim-dirdiff"
-"github:wincent/command-t"
-"github:xolox/vim-easytags"
-"github:xolox/vim-misc"
-"github:zah/nim.vim"
-"github:zchee/deoplete-go"
-"github:zchee/deoplete-jedi"
-"github:zig-lang/zig.vim"
-"github:junegunn/goyo.vim"
-"github:morhetz/gruvbox"
-"github:vim-scripts/matchit.zip"
-"github:ujihisa/neco-look"
-"github:tpope/vim-pathogen"
-"github:thinca/vim-prettyprint"
-"github:dannyob/quickfixstatus"
-"github:kien/rainbow_parentheses.vim"
-"github:Rykka/riv.vim"
-"github:tpope/vim-sensible"
-"github:tpope/vim-sleuth"
-"github:garbas/vim-snipmate"
-"github:chikatoike/sourcemap.vim"
-"github:chrisgeo/sparkup"
-"github:tpope/vim-surround"
-"github:dhruvasagar/vim-table-mode"
-"github:kana/vim-tabpagecd"
-"github:vim-scripts/taglist.vim"
-"github:tomtom/tlib_vim"
-"github:mbbill/undotree"
+"github:majutsushi/tagbar"
+"github:maksimr/vim-jsbeautify"
 "github:MarcWeber/vim-addon-actions"
 "github:MarcWeber/vim-addon-async"
 "github:MarcWeber/vim-addon-background-cmd"
@@ -244,30 +135,139 @@
 "github:MarcWeber/vim-addon-syntax-checker"
 "github:MarcWeber/vim-addon-toggle-buffer"
 "github:MarcWeber/vim-addon-xdebug"
-"github:vim-airline/vim-airline"
-"github:kchmck/vim-coffee-script"
-"github:itchyny/vim-cursorword"
-"github:junegunn/vim-easy-align"
-"github:thinca/vim-ft-diff_fold"
-"github:lambdalisue/vim-gista"
-"github:airblade/vim-gitgutter"
-"github:junegunn/vim-github-dashboard"
-"github:noc7c9/vim-iced-coffee-script"
-"github:pangloss/vim-javascript"
-"github:maksimr/vim-jsbeautify"
-"github:xuhdev/vim-latex-live-preview"
-"github:andreshazard/vim-logreview"
-"github:terryma/vim-multiple-cursors"
-"github:reedes/vim-pencil"
-"github:vim-ruby/vim-ruby"
-"github:thinca/vim-scouter"
-"github:kshenoy/vim-signature"
+"github:martinda/Jenkinsfile-vim-syntax"
+"github:mattn/gist-vim"
+"github:mattn/webapi-vim"
+"github:mbbill/undotree"
+"github:megaannum/forms"
+"github:megaannum/self"
+"github:mfukar/robotframework-vim"
+"github:mhinz/vim-grepper.git"
 "github:mhinz/vim-signify"
-"github:honza/vim-snippets"
+"github:mhinz/vim-startify"
+"github:michaeljsmith/vim-indent-object"
+"github:mileszs/ack.vim"
+"github:mindriot101/vim-yapf"
+"github:mkasa/lushtags"
+"github:morhetz/gruvbox"
+"github:mpickering/hlint-refactor-vim"
+"github:nathanaelkane/vim-indent-guides"
+"github:nbouscal/vim-stylish-haskell"
+"github:neoclide/vim-easygit"
+"github:neovimhaskell/haskell-vim"
+"github:nixprime/cpsm"
+"github:noc7c9/vim-iced-coffee-script"
+"github:osyo-manga/shabadou.vim"
+"github:osyo-manga/vim-textobj-multiblock"
+"github:osyo-manga/vim-watchdogs"
+"github:pangloss/vim-javascript"
+"github:plasticboy/vim-markdown"
+"github:python-mode/python-mode"
+"github:Quramy/tsuquyomi"
+"github:racer-rust/vim-racer"
+"github:raichoo/purescript-vim"
+"github:reedes/vim-pencil"
+"github:reedes/vim-wordy"
+"github:rhysd/committia.vim.git"
+"github:rhysd/vim-grammarous"
+"github:rhysd/vim-operator-surround"
+"github:Rip-Rip/clang_complete"
+"github:rodjek/vim-puppet"
+"github:roxma/nvim-cm-racer"
+"github:roxma/nvim-completion-manager"
+"github:rust-lang/rust.vim"
 "github:ryanoasis/vim-devicons"
-"github:dag/vim2hs"
-"github:vimwiki/vimwiki"
+"github:ryanoasis/vim-devicons"
+"github:Rykka/riv.vim"
+"github:sbdchd/neoformat"
+"github:scrooloose/nerdcommenter"
+"github:scrooloose/nerdtree"
+"github:scrooloose/syntastic"
+"github:sebastianmarkow/deoplete-rust"
+"github:sheerun/vim-polyglot"
+"github:shougo/context_filetype.vim"
+"github:shougo/denite.nvim"
+"github:Shougo/deoplete.nvim"
+"github:shougo/echodoc.vim"
+"github:shougo/neco-syntax"
+"github:shougo/neco-vim"
+"github:shougo/neocomplete.vim"
+"github:shougo/neoinclude.vim"
+"github:shougo/neomru.vim"
+"github:shougo/neosnippet-snippets"
+"github:shougo/neosnippet.vim"
+"github:shougo/neoyank.vim.git"
+"github:shougo/tabpagebuffer.vim"
+"github:shougo/unite.vim"
+"github:shougo/vimproc.vim"
+"github:shougo/vimshell.vim"
+"github:SirVer/ultisnips"
+"github:sjl/gundo.vim"
+"github:slashmili/alchemist.vim"
+"github:t9md/vim-smalls"
+"github:takac/vim-hardtime"
+"github:terryma/vim-expand-region"
+"github:terryma/vim-multiple-cursors"
+"github:tex/vimpreviewpandoc"
+"github:thinca/vim-ft-diff_fold"
+"github:thinca/vim-prettyprint"
+"github:thinca/vim-quickrun"
+"github:thinca/vim-scouter"
+"github:thinca/vim-themis"
+"github:tomasr/molokai"
+"github:tomlion/vim-solidity"
+"github:tomtom/tlib_vim"
+"github:tpope/vim-commentary"
+"github:tpope/vim-dispatch"
+"github:tpope/vim-eunuch"
+"github:tpope/vim-fugitive"
+"github:tpope/vim-pathogen"
+"github:tpope/vim-repeat"
+"github:tpope/vim-rhubarb"
+"github:tpope/vim-sensible"
+"github:tpope/vim-sleuth"
+"github:tpope/vim-speeddating"
+"github:tpope/vim-surround"
 "github:tpope/vim-vinegar"
-"github:gmarik/vundle"
-"github:guns/xterm-color-table.vim"
-"github:KabbAmine/zeavim.vim"
+"github:travitch/hasksyn"
+"github:twinside/vim-haskellconceal"
+"github:Twinside/vim-hoogle"
+"github:tyru/caw.vim"
+"github:tyru/open-browser.vim"
+"github:ujihisa/neco-look"
+"github:valloric/youcompleteme"
+"github:vim-airline/vim-airline"
+"github:vim-airline/vim-airline-themes"
+"github:vimoutliner/vimoutliner"
+"github:vim-pandoc/vim-pandoc"
+"github:vim-pandoc/vim-pandoc-after"
+"github:vim-pandoc/vim-pandoc-syntax"
+"github:vim-ruby/vim-ruby"
+"github:vim-scripts/align"
+"github:vim-scripts/argtextobj.vim"
+"github:vim-scripts/a.vim"
+"github:vim-scripts/changeColorScheme.vim"
+"github:vim-scripts/Colour-Sampler-Pack"
+"github:vim-scripts/Improved-AnsiEsc"
+"github:vim-scripts/matchit.zip"
+"github:vim-scripts/mayansmoke.git"
+"github:vim-scripts/random.vim"
+"github:vim-scripts/Rename"
+"github:vim-scripts/ReplaceWithRegister"
+"github:vim-scripts/tabmerge"
+"github:vim-scripts/taglist.vim"
+"github:vim-scripts/wombat256.vim"
+"github:vim-scripts/YankRing.vim"
+"github:vimwiki/vimwiki"
+"github:w0rp/ale"
+"github:wakatime/vim-wakatime"
+"github:wellle/targets.vim"
+"github:will133/vim-dirdiff"
+"github:wincent/command-t"
+"github:xolox/vim-easytags"
+"github:xolox/vim-misc"
+"github:xuhdev/vim-latex-live-preview"
+"github:zah/nim.vim"
+"github:zchee/deoplete-go"
+"github:zchee/deoplete-jedi"
+"github:zig-lang/zig.vim"