Merge remote-tracking branch 'upstream/master' into vim-plugins

pkgs/misc/vim-plugins/overrides.nix

@@ -33,6 +33,9 @@ self: super: {
     dependencies = with super; [ vim-addon-manager ];
   };
 
+  # Mainly used as a dependency for fzf-vim. Wraps the fzf program as a vim
+  # plugin, since part of the fzf vim plugin is included in the main fzf
+  # program.
   fzfWrapper = buildVimPluginFrom2Nix {
     pname = "fzf";
     version = fzf.version;
@@ -225,6 +228,10 @@ self: super: {
     dependencies = with super; [ ultisnips ];
   });
 
+  fzf-vim = super.fzf-vim.overrideAttrs(old: {
+    dependencies = [ self.fzfWrapper ];
+  });
+
   sved = let
     # we put the script in its own derivation to benefit the magic of wrapGAppsHook
     svedbackend = stdenv.mkDerivation {

pkgs/misc/vim-plugins/readme.md

@@ -0,0 +1 @@
+Instructions for adding Vim plugins to `nixpkgs` can be found [here](/doc/languages-frameworks/vim.section.md).

pkgs/misc/vim-plugins/vim-plugin-names

@@ -47,6 +47,7 @@ ctrlpvim/ctrlp.vim
 dag/vim2hs
 dag/vim-fish
 dannyob/quickfixstatus
+darfink/starsearch.vim
 dart-lang/dart-vim-plugin
 davidhalter/jedi-vim
 deoplete-plugins/deoplete-jedi
@@ -98,6 +99,7 @@ heavenshell/vim-jsdoc
 hecal3/vim-leader-guide
 HerringtonDarkholme/yats.vim
 honza/vim-snippets
+hotwatermorning/auto-git-diff
 hsanson/vim-android
 ianks/vim-tsx
 icymind/NeoSolarized
@@ -118,6 +120,7 @@ jceb/vim-hier
 jceb/vim-orgmode
 jeetsukumaran/vim-buffergator
 jeffkreeftmeijer/neovim-sensible
+jelera/vim-javascript-syntax
 jgdavey/tslime.vim
 jhradilek/vim-docbk
 jiangmiao/auto-pairs
@@ -125,6 +128,7 @@ jistr/vim-nerdtree-tabs
 jlanzarotta/bufexplorer
 jnurmine/zenburn
 jonbri/vim-colorstepper
+jonsmithers/vim-html-template-literals
 joonty/vim-xdebug
 josa42/coc-go
 jpalardy/vim-slime
@@ -156,11 +160,13 @@ KeitaNakamura/neodark.vim
 keith/swift.vim
 kien/rainbow_parentheses.vim
 konfekt/fastfold
+kristijanhusak/vim-hybrid-material
 kshenoy/vim-signature
 lambdalisue/vim-gista
 lambdalisue/vim-pager
 latex-box-team/latex-box
 leafgarland/typescript-vim
+leanprover/lean.vim
 ledger/vim-ledger
 lepture/vim-jinja
 lervag/vimtex
@@ -171,6 +177,7 @@ LucHermitte/lh-vim-lib
 ludovicchabant/vim-gutentags
 ludovicchabant/vim-lawrencium
 lukaszkorecki/workflowish
+lumiliet/vim-twig
 luochen1990/rainbow
 lyokha/vim-xkbswitch
 machakann/vim-highlightedyank
@@ -195,6 +202,7 @@ MarcWeber/vim-addon-sql
 MarcWeber/vim-addon-syntax-checker
 MarcWeber/vim-addon-toggle-buffer
 MarcWeber/vim-addon-xdebug
+MaxMEllon/vim-jsx-pretty
 markonm/traces.vim
 martinda/Jenkinsfile-vim-syntax
 mattn/emmet-vim
@@ -214,6 +222,7 @@ mhinz/vim-startify
 michaeljsmith/vim-indent-object
 mileszs/ack.vim
 mindriot101/vim-yapf
+mk12/vim-lean
 mkasa/lushtags
 mopp/sky-color-clock.vim
 morhetz/gruvbox
@@ -314,6 +323,7 @@ roxma/nvim-yarp
 rust-lang/rust.vim
 ryanoasis/vim-devicons
 Rykka/riv.vim
+samoshkin/vim-mergetool
 sbdchd/neoformat
 scrooloose/nerdcommenter
 scrooloose/nerdtree
@@ -345,6 +355,7 @@ sjl/splice.vim
 sk1418/last256
 slashmili/alchemist.vim
 sonph/onehalf
+stefandtw/quickfix-reflector.vim
 t9md/vim-choosewin
 t9md/vim-smalls
 takac/vim-hardtime
@@ -360,6 +371,7 @@ thinca/vim-themis
 thinca/vim-visualstar
 thosakwe/vim-flutter
 tikhomirov/vim-glsl
+tmux-plugins/vim-tmux
 tomasr/molokai
 tomlion/vim-solidity
 tommcdo/vim-lion
@@ -413,6 +425,7 @@ vim-scripts/changeColorScheme.vim
 vim-scripts/Colour-Sampler-Pack
 vim-scripts/DoxygenToolkit.vim
 vim-scripts/emodeline
+vim-scripts/gitignore.vim
 vim-scripts/Improved-AnsiEsc
 vim-scripts/jdaddy.vim
 vim-scripts/matchit.zip

pkgs/misc/vim-plugins/vim-utils.nix

@@ -188,7 +188,8 @@ let
     vam ? null,
     pathogen ? null,
     plug ? null,
-    customRC ? ""
+    customRC ? "",
+    beforePlugins ? "",
   }:
 
     let
@@ -291,7 +292,7 @@ let
 
         " tell vam about which plugins to load when:
         let l = []
-        ${lib.concatMapStrings (p: "call add(l, ${toNix p})\n") vam.pluginDictionaries}
+        ${lib.concatMapStrings (p: "call add(l, {'name': '${p.pname}'})\n") plugins}
         call vam#Scripts(l, {})
       '');
 
@@ -341,6 +342,8 @@ let
   " minimal setup, generated by NIX
   set nocompatible
 
+  ${beforePlugins}
+
   ${vamImpl}
   ${pathogenImpl}
   ${plugImpl}