vim-plugins: add extra plugins

- isort
- splice
- a bunch of tpope's missing plugins

3 files changed, 116 insertions, 13 deletions

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 34699940f0c..b3dfed3d265 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -32,7 +32,7 @@ let
 # Documentation & usage see vim-utils.nix.
 # attribute names should be the same as used by vim-pi to make dependency
 # resolution work
-  self = rec {
+self = rec {
   # This is not a plugin, it provides bin/vim-open-buffer-with-plugins-derivations
   # which recreates this the following derivations based on ./vim-plugin-names
   pluginnames2nix = vimUtils.pluginnames2Nix {
@@ -454,17 +454,6 @@ let
 
   };
 
-  deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-nvim-2018-07-22";
-    src = fetchgit {
-      url = "https://github.com/Shougo/deoplete.nvim";
-      rev = "59fbd61d492b0a1728f34b8958d8e4dbce165c73";
-      sha256 = "06x46dhyy9bix0svl2c0jxxk7rs8ahzl18yq6hmfb1j45jlv5qiz";
-    };
-    dependencies = [];
-
-  };
-
   ultisnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "ultisnips-2018-04-30";
     src = fetchgit {
@@ -1051,6 +1040,20 @@ let
 
   };
 
+  vim-isort = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-isort-2017-03-12";
+    src = fetchgit {
+      url = "https://github.com/fisadev/vim-isort";
+      rev = "65bd9fecd5412c8c127de86f8dcf6cfe4dd70fda";
+      sha256 = "0d9r2p557czrqhn3z35jsrzp3iw6n0vjhxcgkk6l0y79ni3dar1m";
+    };
+    dependencies = [];
+    postPatch = ''
+      substituteInPlace ftplugin/python_vimisort.vim \
+          --replace 'import vim' 'import vim; import sys; sys.path.append("${pythonPackages.isort}/${python.sitePackages}")'
+    '';
+  };
+
   vim-colorschemes = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-colorschemes-2017-08-22";
     src = fetchgit {
@@ -2344,6 +2347,17 @@ let
 
   };
 
+  deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "deoplete-nvim-2018-07-22";
+    src = fetchgit {
+      url = "https://github.com/shougo/deoplete.nvim";
+      rev = "59fbd61d492b0a1728f34b8958d8e4dbce165c73";
+      sha256 = "06x46dhyy9bix0svl2c0jxxk7rs8ahzl18yq6hmfb1j45jlv5qiz";
+    };
+    dependencies = [];
+
+  };
+
   echodoc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "echodoc-vim-2018-03-26";
     src = fetchgit {
@@ -2484,6 +2498,17 @@ let
     '';
   };
 
+  fugitive-gitlab-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "fugitive-gitlab-vim-2018-07-04";
+    src = fetchgit {
+      url = "https://github.com/shumphrey/fugitive-gitlab.vim";
+      rev = "b8e7b6986c5d13f3e2de2163816af06f74a6f838";
+      sha256 = "1lvll9hjqsm79f0ls84d8b8s12043b9p5qa4i6iwf3v1qbq7kb8d";
+    };
+    dependencies = [];
+
+  };
+
   gundo-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "gundo-vim-2017-05-09";
     src = fetchgit {
@@ -2495,6 +2520,17 @@ let
 
   };
 
+  splice-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "splice-vim-2017-09-03";
+    src = fetchgit {
+      url = "https://github.com/sjl/splice.vim";
+      rev = "b31cb25eea8a92a037e9da9a98b2e6147294c37d";
+      sha256 = "0mqnrmkyms2z5lqy90cy076x3fr9xmd63962wd8n6n6mbin97ihx";
+    };
+    dependencies = [];
+
+  };
+
   last256 = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "last256-2017-06-11";
     src = fetchgit {
@@ -2660,6 +2696,17 @@ let
 
   };
 
+  vim-abolish = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-abolish-2017-03-10";
+    src = fetchgit {
+      url = "https://github.com/tpope/vim-abolish";
+      rev = "b6a8b49e2173ba5a1b34d00e68e0ed8addac3ebd";
+      sha256 = "0i9q3l7r5p8mk4in3c1j4x0jbln7ir9lg1cqjxci0chjjzfzc53m";
+    };
+    dependencies = [];
+
+  };
+
   vim-commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-commentary-2018-07-11";
     src = fetchgit {
@@ -2693,6 +2740,17 @@ let
 
   };
 
+  vim-flagship = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-flagship-2018-07-24";
+    src = fetchgit {
+      url = "https://github.com/tpope/vim-flagship";
+      rev = "5e70829913900eb3a37dd6c055ac660c33fa6bff";
+      sha256 = "1v2kaisydi1vjfy66bwq2whllbickr3ppp9wqxjqv2qhfsnqny8f";
+    };
+    dependencies = [];
+
+  };
+
   vim-fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-fugitive-2018-07-25";
     src = fetchgit {
@@ -2715,6 +2773,17 @@ let
 
   };
 
+  vim-projectionist = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-projectionist-2018-07-24";
+    src = fetchgit {
+      url = "https://github.com/tpope/vim-projectionist";
+      rev = "873e492b4bb92834beb186028fbf6d4e5edfca5a";
+      sha256 = "0np7vm97y5ga8gz6qma15awcmgxi41hljp50bgy49sz62z8h0psz";
+    };
+    dependencies = [];
+
+  };
+
   vim-repeat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-repeat-2018-07-02";
     src = fetchgit {
@@ -2737,6 +2806,17 @@ let
 
   };
 
+  vim-scriptease = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-scriptease-2018-07-18";
+    src = fetchgit {
+      url = "https://github.com/tpope/vim-scriptease";
+      rev = "baea08bb5fff63cd2adf6e46429cad1f75bc7300";
+      sha256 = "01xfnda5paywfsb6ziq00zcgia7ls0v2924i1mcnvnqg4md890x4";
+    };
+    dependencies = [];
+
+  };
+
   vim-sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-sensible-2018-07-16";
     src = fetchgit {
@@ -2781,6 +2861,17 @@ let
 
   };
 
+  vim-tbone = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-tbone-2018-06-27";
+    src = fetchgit {
+      url = "https://github.com/tpope/vim-tbone";
+      rev = "8bc7348f658c32bea57365aa6acf3a7dde12e737";
+      sha256 = "17s2b66xxkvv17pzf3xrw6ba7y9awpd2k2d21v0pag924c5hi6d4";
+    };
+    dependencies = [];
+
+  };
+
   vim-vinegar = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-vinegar-2018-06-20";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 9e7f70925a2..4d0e85e153c 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -52,6 +52,7 @@
 "github:esneider/YUNOcommit.vim"
 "github:fatih/vim-go"
 "github:FelikZ/ctrlp-py-matcher"
+"github:fisadev/vim-isort"
 "github:flazz/vim-colorschemes"
 "github:floobits/floobits-neovim"
 "github:frigoeu/psc-ide-vim"
@@ -194,7 +195,7 @@
 "github:sheerun/vim-polyglot"
 "github:shougo/context_filetype.vim"
 "github:shougo/denite.nvim"
-"github:Shougo/deoplete.nvim"
+"github:shougo/deoplete.nvim"
 "github:shougo/echodoc.vim"
 "github:shougo/neco-syntax"
 "github:shougo/neco-vim"
@@ -207,8 +208,10 @@
 "github:shougo/tabpagebuffer.vim"
 "github:shougo/unite.vim"
 "github:shougo/vimproc.vim"
+"github:shumphrey/fugitive-gitlab.vim"
 "github:SirVer/ultisnips"
 "github:sjl/gundo.vim"
+"github:sjl/splice.vim"
 "github:sk1418/last256"
 "github:slashmili/alchemist.vim"
 "github:t9md/vim-smalls"
@@ -224,17 +227,22 @@
 "github:tomasr/molokai"
 "github:tomlion/vim-solidity"
 "github:tomtom/tlib_vim"
+"github:tpope/vim-abolish"
 "github:tpope/vim-commentary"
 "github:tpope/vim-dispatch"
 "github:tpope/vim-eunuch"
+"github:tpope/vim-flagship"
 "github:tpope/vim-fugitive"
 "github:tpope/vim-pathogen"
+"github:tpope/vim-projectionist"
 "github:tpope/vim-repeat"
 "github:tpope/vim-rhubarb"
+"github:tpope/vim-scriptease"
 "github:tpope/vim-sensible"
 "github:tpope/vim-sleuth"
 "github:tpope/vim-speeddating"
 "github:tpope/vim-surround"
+"github:tpope/vim-tbone"
 "github:tpope/vim-vinegar"
 "github:travitch/hasksyn"
 "github:twinside/vim-haskellconceal"
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-isort b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-isort
new file mode 100644
index 00000000000..febd2185bac
--- /dev/null
+++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-isort
@@ -0,0 +1,4 @@
+    postPatch = ''
+      substituteInPlace ftplugin/python_vimisort.vim \
+          --replace 'import vim' 'import vim; import sys; sys.path.append("${pythonPackages.isort}/${python.sitePackages}")'
+    '';