From 9096a92a4d736751c3eca95aa66da67015e73565 Mon Sep 17 00:00:00 2001
From: Anders Sildnes <andsild@posteo.net>
Date: Thu, 25 Jan 2018 12:44:15 +0100
Subject: [PATCH 01/35] vim-plugins/peskcolor.vim.git init

---
 pkgs/misc/vim-plugins/default.nix      | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index c772f4173ce3..729e3b15888a 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -107,6 +107,7 @@ rec {
   webapi-vim          = WebAPI;
   wombat256           = wombat256-vim; # backwards compat, added 2015-7-8
   yankring            = YankRing;
+  peskcolor = peskcolor-vim-git;
 
   # do not auto-update this one, as the name clashes with vim-snippets
   vim-docbk-snippets = buildVimPluginFrom2Nix {
@@ -553,6 +554,17 @@ rec {
 
   };
 
+  peskcolor-vim-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "peskcolor-vim-git-2016-06-11";
+    src = fetchgit {
+      url = "https://github.com/andsild/peskcolor.vim.git";
+      rev = "cba4fc739bbebacd503158f6509d9c226651f363";
+      sha256 = "15hw3casr5y3ckgcn6aq8vhk6g2hym41w51nvgf34hbj9fx1nvkq";
+    };
+    dependencies = [];
+
+  };
+
   flake8-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "flake8-vim-2017-02-17";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 661917c955be..795e2b43f791 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -239,3 +239,4 @@
 "vundle"
 "xterm-color-table"
 "zeavim"
+"github:andsild/peskcolor.vim.git"

From 89763446e9f4d40cb7699b38a60defcdb984b1aa Mon Sep 17 00:00:00 2001
From: Anders Sildnes <andsild@posteo.net>
Date: Thu, 25 Jan 2018 12:49:50 +0100
Subject: [PATCH 02/35] vim-plugins/vim-bazel: init

---
 pkgs/misc/vim-plugins/default.nix      | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 729e3b15888a..be9396ea4ec5 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -598,6 +598,17 @@ rec {
 
   };
 
+  vim-bazel = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-bazel-2018-01-10";
+    src = fetchgit {
+      url = "https://github.com/bazelbuild/vim-bazel";
+      rev = "ecafb17d5d1d3756e5ac0bd9f4812a450b8c91a3";
+      sha256 = "0ixhx9ssfygjy2v2ss02w28rcjxnvhj0caffj32cv3snwnpcz6fy";
+    };
+    dependencies = ["maktaba"];
+
+  };
+
   clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "clighter8-2017-11-30";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 795e2b43f791..9960a41e2b0b 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -240,3 +240,4 @@
 "xterm-color-table"
 "zeavim"
 "github:andsild/peskcolor.vim.git"
+"github:bazelbuild/vim-bazel"

From 3bc1af57c7d23c7e8dcd73c393ed93c4394df351 Mon Sep 17 00:00:00 2001
From: Anders Sildnes <andsild@posteo.net>
Date: Thu, 25 Jan 2018 12:50:40 +0100
Subject: [PATCH 03/35] vim-plugins/vim-grepper: init

---
 pkgs/misc/vim-plugins/default.nix      | 18 +++++++++++++++---
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index be9396ea4ec5..98db9b6187d2 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -107,6 +107,7 @@ rec {
   webapi-vim          = WebAPI;
   wombat256           = wombat256-vim; # backwards compat, added 2015-7-8
   yankring            = YankRing;
+  vim-grepper = vim-grepper-git;
   peskcolor = peskcolor-vim-git;
 
   # do not auto-update this one, as the name clashes with vim-snippets
@@ -1320,12 +1321,23 @@ rec {
 
   };
 
+  vim-grepper-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-grepper-git-2018-01-16";
+    src = fetchgit {
+      url = "https://github.com/mhinz/vim-grepper.git";
+      rev = "4fd6260c56ffa0642095143f802d1cbfceb7437d";
+      sha256 = "11rhj6m85hxd4kf8yms4mab8553dcgl0yxm9r7nhdqpz6mljsir9";
+    };
+    dependencies = [];
+
+  };
+
   vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-startify-2017-12-06";
+    name = "vim-startify-2017-12-20";
     src = fetchgit {
       url = "https://github.com/mhinz/vim-startify";
-      rev = "c905a0c9598c72cb4311ca88f3eb664d05e4d66b";
-      sha256 = "1zdqr2lg1cf7dix6yvx7hmxcb698hb2zdimiqv2kgpdqlc40agcy";
+      rev = "5e476d8e00da70bc33c54a174fd8cb18ed991868";
+      sha256 = "07k7ddjqc2jisk0sh9k8w6r5xhh47cbzbxdnbkjz7bdskkwsdsay";
     };
     dependencies = [];
 
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 9960a41e2b0b..efef9b61ec8f 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -239,5 +239,6 @@
 "vundle"
 "xterm-color-table"
 "zeavim"
+"github:mhinz/vim-grepper.git"
 "github:andsild/peskcolor.vim.git"
 "github:bazelbuild/vim-bazel"

From f90e3bae4ebd40575b053d7d4c9f9fef66dbfd0d Mon Sep 17 00:00:00 2001
From: Anders Sildnes <andsild@posteo.net>
Date: Thu, 25 Jan 2018 12:52:32 +0100
Subject: [PATCH 04/35] vim-plugins/vim-toml: init

---
 pkgs/misc/vim-plugins/default.nix      | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 98db9b6187d2..aa7ffc5a7c38 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -657,6 +657,17 @@ rec {
 
   };
 
+  vim-toml = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-toml-2017-12-10";
+    src = fetchgit {
+      url = "https://github.com/cespare/vim-toml";
+      rev = "b531aac0d45aaa373070c4cc30d7ead91960f5a7";
+      sha256 = "14g3zvyfvhilr5ka3jhja4jxjn99957sk6hlv13yfkg349f57dvg";
+    };
+    dependencies = [];
+
+  };
+
   vim-sort-motion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-sort-motion-2017-10-03";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index efef9b61ec8f..1fc25863753a 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -239,6 +239,7 @@
 "vundle"
 "xterm-color-table"
 "zeavim"
+"github:cespare/vim-toml"
 "github:mhinz/vim-grepper.git"
 "github:andsild/peskcolor.vim.git"
 "github:bazelbuild/vim-bazel"

From 6b4c5326327dc6330b2d38b4aac6b295ad7be8b5 Mon Sep 17 00:00:00 2001
From: Anders Sildnes <andsild@posteo.net>
Date: Thu, 25 Jan 2018 12:53:02 +0100
Subject: [PATCH 05/35] vim-plugins/vim-operator-surround: init

---
 pkgs/misc/vim-plugins/default.nix      | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index aa7ffc5a7c38..e3c68032215b 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1553,6 +1553,17 @@ rec {
     ];
   };
 
+  vim-operator-surround = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-operator-surround-2017-12-23";
+    src = fetchgit {
+      url = "https://github.com/rhysd/vim-operator-surround";
+      rev = "001c0da077b5b38a723151b19760d220e02363db";
+      sha256 = "0c6w6id57faw6sjf5wvw9qp2a4i7xj65q0c4hjs0spgzycv2wpkh";
+    };
+    dependencies = [];
+
+  };
+
   vim-puppet = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-puppet-2017-08-25";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 1fc25863753a..553421dba72c 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -239,6 +239,7 @@
 "vundle"
 "xterm-color-table"
 "zeavim"
+"github:rhysd/vim-operator-surround"
 "github:cespare/vim-toml"
 "github:mhinz/vim-grepper.git"
 "github:andsild/peskcolor.vim.git"

From 140ddbd1c57124443fb8109e8d4114b2057d7c01 Mon Sep 17 00:00:00 2001
From: Anders Sildnes <andsild@posteo.net>
Date: Thu, 25 Jan 2018 12:53:32 +0100
Subject: [PATCH 06/35] vim-plugins/mayansmoke: init

---
 pkgs/misc/vim-plugins/default.nix      | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index e3c68032215b..0f192045c1ca 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -109,6 +109,7 @@ rec {
   yankring            = YankRing;
   vim-grepper = vim-grepper-git;
   peskcolor = peskcolor-vim-git;
+  mayansmoke = mayansmoke-git;
 
   # do not auto-update this one, as the name clashes with vim-snippets
   vim-docbk-snippets = buildVimPluginFrom2Nix {
@@ -2037,6 +2038,17 @@ rec {
 
   };
 
+  mayansmoke-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "mayansmoke-git-2010-10-17";
+    src = fetchgit {
+      url = "https://github.com/vim-scripts/mayansmoke.git";
+      rev = "168883af7aec05f139af251f47eadd5dfb802c9d";
+      sha256 = "1xxcky7i6sx7f1q8xka4gd2xg78w6sqjvqrdwgrdzv93fhf82rpd";
+    };
+    dependencies = [];
+
+  };
+
   random-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "random-vim-2010-10-17";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 553421dba72c..35c891a162a2 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -243,4 +243,5 @@
 "github:cespare/vim-toml"
 "github:mhinz/vim-grepper.git"
 "github:andsild/peskcolor.vim.git"
+"github:vim-scripts/mayansmoke.git"
 "github:bazelbuild/vim-bazel"

From d12a748955d6dd5d2644bb778d4e2f33e90ddeb2 Mon Sep 17 00:00:00 2001
From: Anders Sildnes <andsild@posteo.net>
Date: Thu, 25 Jan 2018 12:54:22 +0100
Subject: [PATCH 07/35] vim-plugins/denite-extra: init

---
 pkgs/misc/vim-plugins/default.nix      | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 0f192045c1ca..1f68b4a10908 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -669,6 +669,17 @@ rec {
 
   };
 
+  denite-extra = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "denite-extra-2017-11-03";
+    src = fetchgit {
+      url = "https://github.com/chemzqm/denite-extra";
+      rev = "2cea3e857b51fcde425339adeec12854e6cecbb6";
+      sha256 = "1qa0ajs6vix0vvm1z7rhxq9bfx4aggq97gxghrxpvsc059c7w9wv";
+    };
+    dependencies = [];
+
+  };
+
   vim-sort-motion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-sort-motion-2017-10-03";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 35c891a162a2..3e756cc90f93 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -244,4 +244,5 @@
 "github:mhinz/vim-grepper.git"
 "github:andsild/peskcolor.vim.git"
 "github:vim-scripts/mayansmoke.git"
+"github:chemzqm/denite-extra"
 "github:bazelbuild/vim-bazel"

From edeeae7b5c066449954f6e94425b949899536d95 Mon Sep 17 00:00:00 2001
From: Anders Sildnes <andsild@posteo.net>
Date: Thu, 25 Jan 2018 12:56:12 +0100
Subject: [PATCH 08/35] vim-plugins/denite-git: init

---
 pkgs/misc/vim-plugins/default.nix      | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 1f68b4a10908..9f87d83aaa8a 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -680,6 +680,17 @@ rec {
 
   };
 
+  denite-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "denite-git-2017-11-02";
+    src = fetchgit {
+      url = "https://github.com/chemzqm/denite-git";
+      rev = "d40026c9b2c0e53ecdd3883d26260f19c74c7dfe";
+      sha256 = "0c9602pj67hqfkyvanz5gw1s6vlf8q7s9r55g4dws5aakvjbqc0g";
+    };
+    dependencies = [];
+
+  };
+
   vim-sort-motion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-sort-motion-2017-10-03";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 3e756cc90f93..d48267921dd8 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -244,5 +244,6 @@
 "github:mhinz/vim-grepper.git"
 "github:andsild/peskcolor.vim.git"
 "github:vim-scripts/mayansmoke.git"
+"github:chemzqm/denite-git"
 "github:chemzqm/denite-extra"
 "github:bazelbuild/vim-bazel"

From e55ffc0c3e4e373bf73d9c72d613b2cd12849f3d Mon Sep 17 00:00:00 2001
From: Anders Sildnes <andsild@posteo.net>
Date: Thu, 25 Jan 2018 12:56:58 +0100
Subject: [PATCH 09/35] vim-plugins/concealedyank: init

---
 pkgs/misc/vim-plugins/default.nix      | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 9f87d83aaa8a..c34b99a18e9a 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -107,6 +107,7 @@ rec {
   webapi-vim          = WebAPI;
   wombat256           = wombat256-vim; # backwards compat, added 2015-7-8
   yankring            = YankRing;
+  concealedyank = concealedyank-vim;
   vim-grepper = vim-grepper-git;
   peskcolor = peskcolor-vim-git;
   mayansmoke = mayansmoke-git;
@@ -691,6 +692,17 @@ rec {
 
   };
 
+  concealedyank-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "concealedyank-vim-2013-03-24";
+    src = fetchgit {
+      url = "https://github.com/chikatoike/concealedyank.vim";
+      rev = "e7e65a395e0e6a266f3a808bc07441aa7d03ebbd";
+      sha256 = "0z7i8dmwfjh6mcrmgrxv3j86ic867617fas9mv4gqsrhhvrrkzsb";
+    };
+    dependencies = [];
+
+  };
+
   vim-sort-motion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-sort-motion-2017-10-03";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index d48267921dd8..4c31e9961e9f 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -240,6 +240,7 @@
 "xterm-color-table"
 "zeavim"
 "github:rhysd/vim-operator-surround"
+"github:chikatoike/concealedyank.vim"
 "github:cespare/vim-toml"
 "github:mhinz/vim-grepper.git"
 "github:andsild/peskcolor.vim.git"

From 40f8ccbb3cd0442a4e9a3c80c604358b7b4a0fb4 Mon Sep 17 00:00:00 2001
From: Anders Sildnes <andsild@posteo.net>
Date: Thu, 25 Jan 2018 12:57:29 +0100
Subject: [PATCH 10/35] vim-plugins/cute-python: init

---
 pkgs/misc/vim-plugins/default.nix      | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index c34b99a18e9a..6c80ed7e3cd0 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -108,6 +108,7 @@ rec {
   wombat256           = wombat256-vim; # backwards compat, added 2015-7-8
   yankring            = YankRing;
   concealedyank = concealedyank-vim;
+  cute-python = vim-cute-python-git;
   vim-grepper = vim-grepper-git;
   peskcolor = peskcolor-vim-git;
   mayansmoke = mayansmoke-git;
@@ -835,6 +836,17 @@ rec {
 
   };
 
+  vim-cute-python-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-cute-python-git-2016-04-04";
+    src = fetchgit {
+      url = "https://github.com/ehamberg/vim-cute-python.git";
+      rev = "d7a6163f794500447242df2bedbe20bd751b92da";
+      sha256 = "1jrfd6z84cdzn3yxdfp0xfxygscq7s8kbzxk37hf9cf5pl9ln0qf";
+    };
+    dependencies = [];
+
+  };
+
   acp = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "acp-2013-02-05";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 4c31e9961e9f..08731537d24a 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -242,6 +242,7 @@
 "github:rhysd/vim-operator-surround"
 "github:chikatoike/concealedyank.vim"
 "github:cespare/vim-toml"
+"github:ehamberg/vim-cute-python.git"
 "github:mhinz/vim-grepper.git"
 "github:andsild/peskcolor.vim.git"
 "github:vim-scripts/mayansmoke.git"

From b39683a4df71a8cbeb319bad52b0774f624990e4 Mon Sep 17 00:00:00 2001
From: Anders Sildnes <andsild@posteo.net>
Date: Thu, 25 Jan 2018 13:28:32 +0100
Subject: [PATCH 11/35] vim-plugins/vim-json: init

---
 pkgs/misc/vim-plugins/default.nix      | 17 ++++++++++++++---
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 6c80ed7e3cd0..bb005ffa1e24 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -880,12 +880,23 @@ rec {
 
   };
 
+  vim-json = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-json-2018-01-10";
+    src = fetchgit {
+      url = "https://github.com/elzr/vim-json";
+      rev = "3727f089410e23ae113be6222e8a08dd2613ecf2";
+      sha256 = "1c19pqrys45pzflj5jyrm4q6hcvs977lv6qsfvbnk7nm4skxrqp1";
+    };
+    dependencies = [];
+
+  };
+
   vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-localvimrc-2017-07-06";
+    name = "vim-localvimrc-2018-01-04";
     src = fetchgit {
       url = "https://github.com/embear/vim-localvimrc";
-      rev = "48c01c214ea0312e8045aaa1a28b30850e98a194";
-      sha256 = "158ajdg3n8j0cxk2ry8rmnpfvnzmznhl573v8ddw6xni58b7bg4d";
+      rev = "b915ce29c619fb367ed41d4c95d57eaaaed31b39";
+      sha256 = "13bc3davmw2pms663yniiha8bayzy1m08xjhyrnlqqb2dz77m5gy";
     };
     dependencies = [];
 
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 08731537d24a..f33cb8f8951a 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -239,6 +239,7 @@
 "vundle"
 "xterm-color-table"
 "zeavim"
+"github:elzr/vim-json"
 "github:rhysd/vim-operator-surround"
 "github:chikatoike/concealedyank.vim"
 "github:cespare/vim-toml"

From 4b036bb0191a5c826ea53814f038741ec70b5373 Mon Sep 17 00:00:00 2001
From: Anders Sildnes <andsild@posteo.net>
Date: Thu, 25 Jan 2018 14:12:16 +0100
Subject: [PATCH 12/35] vim-plugins/vim-gitbranch: init

---
 pkgs/misc/vim-plugins/default.nix      | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index bb005ffa1e24..723fa190c277 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1067,6 +1067,17 @@ rec {
 
   };
 
+  vim-gitbranch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-gitbranch-2017-05-28";
+    src = fetchgit {
+      url = "https://github.com/itchyny/vim-gitbranch";
+      rev = "8118dc1cdd387bd609852be4bf350360ce881193";
+      sha256 = "01gvd96mnzfc5s0951zzq122birg5svnximkldgb9kv5bmsnmh3j";
+    };
+    dependencies = [];
+
+  };
+
   vim-ipython = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-ipython-2015-06-23";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index f33cb8f8951a..0de98a32947b 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -250,3 +250,4 @@
 "github:chemzqm/denite-git"
 "github:chemzqm/denite-extra"
 "github:bazelbuild/vim-bazel"
+"github:itchyny/vim-gitbranch"

From cee0a1c1a1527da7f9e59f5015db3c448249417c Mon Sep 17 00:00:00 2001
From: Anders Sildnes <andsild@posteo.net>
Date: Thu, 25 Jan 2018 14:27:18 +0100
Subject: [PATCH 13/35] vim-plugins/vim-test: init

---
 pkgs/misc/vim-plugins/default.nix      | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 723fa190c277..e895a3f47d36 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -110,6 +110,7 @@ rec {
   concealedyank = concealedyank-vim;
   cute-python = vim-cute-python-git;
   vim-grepper = vim-grepper-git;
+  vim-test = vim-test-git;
   peskcolor = peskcolor-vim-git;
   mayansmoke = mayansmoke-git;
 
@@ -1089,6 +1090,17 @@ rec {
 
   };
 
+  vim-test-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-test-git-2018-01-16";
+    src = fetchgit {
+      url = "https://github.com/janko-m/vim-test.git";
+      rev = "731ad6942f9449d2ed22f6d9ccc8d1ce613b1f19";
+      sha256 = "14xwsc23zmkfl6ydvqiqf7l0gn5nxqdm62rvgiky5j5ii9iqj3hr";
+    };
+    dependencies = [];
+
+  };
+
   vim-hier = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-hier-2011-08-27";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 0de98a32947b..39b23919c636 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -245,6 +245,7 @@
 "github:cespare/vim-toml"
 "github:ehamberg/vim-cute-python.git"
 "github:mhinz/vim-grepper.git"
+"github:janko-m/vim-test.git"
 "github:andsild/peskcolor.vim.git"
 "github:vim-scripts/mayansmoke.git"
 "github:chemzqm/denite-git"

From d718644baf32e1aa26ab3736303204b5ba3ff55a Mon Sep 17 00:00:00 2001
From: Anders Sildnes <andsild@posteo.net>
Date: Thu, 25 Jan 2018 14:34:32 +0100
Subject: [PATCH 14/35] vim-plugins/vim-textobj-multiblock: init

---
 pkgs/misc/vim-plugins/default.nix      | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index e895a3f47d36..9b40d02aacae 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1559,6 +1559,17 @@ rec {
 
   };
 
+  vim-textobj-multiblock = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-textobj-multiblock-2014-06-02";
+    src = fetchgit {
+      url = "https://github.com/osyo-manga/vim-textobj-multiblock";
+      rev = "670a5ba57d73fcd793f480e262617c6eb0103355";
+      sha256 = "1s71hdr73cl8yg9mrdflvzrdccpiv7qrlainai7gqw30r1hfhfzf";
+    };
+    dependencies = [];
+
+  };
+
   vim-watchdogs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-watchdogs-2017-12-03";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 39b23919c636..084868d8229c 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -242,6 +242,7 @@
 "github:elzr/vim-json"
 "github:rhysd/vim-operator-surround"
 "github:chikatoike/concealedyank.vim"
+"github:osyo-manga/vim-textobj-multiblock"
 "github:cespare/vim-toml"
 "github:ehamberg/vim-cute-python.git"
 "github:mhinz/vim-grepper.git"

From e77a83b8087e9bd8b3ce8bfb91eb45f4bbc7c71f Mon Sep 17 00:00:00 2001
From: Anders Sildnes <andsild@posteo.net>
Date: Thu, 25 Jan 2018 14:36:14 +0100
Subject: [PATCH 15/35] vim-plugins/vim-niceblock: init

---
 pkgs/misc/vim-plugins/default.nix      | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 9b40d02aacae..16db44f8ebc4 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1266,6 +1266,17 @@ rec {
 
   };
 
+  vim-niceblock = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-niceblock-2015-08-22";
+    src = fetchgit {
+      url = "https://github.com/kana/vim-niceblock";
+      rev = "03c59f648fcadd415fc91d7b100cf48bd0a55fac";
+      sha256 = "05p3xr61v3infi07r9ahr30190kamgdjxkjjlawbqnrn8pv9fws4";
+    };
+    dependencies = [];
+
+  };
+
   latex-box = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "latex-box-2015-06-01";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 084868d8229c..22cf5b2e31db 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -240,6 +240,7 @@
 "xterm-color-table"
 "zeavim"
 "github:elzr/vim-json"
+"github:kana/vim-niceblock"
 "github:rhysd/vim-operator-surround"
 "github:chikatoike/concealedyank.vim"
 "github:osyo-manga/vim-textobj-multiblock"

From 5fa0183d00945a25bd78431efb2c5e26ffe885a4 Mon Sep 17 00:00:00 2001
From: Anders Sildnes <andsild@posteo.net>
Date: Thu, 25 Jan 2018 14:36:58 +0100
Subject: [PATCH 16/35] vim-plugins/vim-operator-replace: init

---
 pkgs/misc/vim-plugins/default.nix      | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 16db44f8ebc4..b35a6633b40c 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1277,6 +1277,17 @@ rec {
 
   };
 
+  vim-operator-replace = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-operator-replace-2015-02-25";
+    src = fetchgit {
+      url = "https://github.com/kana/vim-operator-replace";
+      rev = "1345a556a321a092716e149d4765a5e17c0e9f0f";
+      sha256 = "07cibp61zwbzpjfxqdc77fzrgnz8jhimmdhhyjr0lvgrjgvsnv6q";
+    };
+    dependencies = [];
+
+  };
+
   latex-box = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "latex-box-2015-06-01";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 22cf5b2e31db..b26047dc4f75 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -241,6 +241,7 @@
 "zeavim"
 "github:elzr/vim-json"
 "github:kana/vim-niceblock"
+"github:kana/vim-operator-replace"
 "github:rhysd/vim-operator-surround"
 "github:chikatoike/concealedyank.vim"
 "github:osyo-manga/vim-textobj-multiblock"

From 4d5acac34b4ee104d9ec3ae1d5c76b8693e315e4 Mon Sep 17 00:00:00 2001
From: Anders Sildnes <andsild@posteo.net>
Date: Thu, 25 Jan 2018 14:37:50 +0100
Subject: [PATCH 17/35] vim-plugins/vim-operator-user: init

---
 pkgs/misc/vim-plugins/default.nix      | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index b35a6633b40c..9751b5887343 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1288,6 +1288,17 @@ rec {
 
   };
 
+  vim-operator-user = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-operator-user-2015-02-17";
+    src = fetchgit {
+      url = "https://github.com/kana/vim-operator-user";
+      rev = "c3dfd41c1ed516b4b901c97562e644de62c367aa";
+      sha256 = "16y2fyrmwg4vkcl85i8xg8s6m39ca2jvgi9qm36b3vzbnkcifafb";
+    };
+    dependencies = [];
+
+  };
+
   latex-box = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "latex-box-2015-06-01";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index b26047dc4f75..421c388b1143 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -240,6 +240,7 @@
 "xterm-color-table"
 "zeavim"
 "github:elzr/vim-json"
+"github:kana/vim-operator-user"
 "github:kana/vim-niceblock"
 "github:kana/vim-operator-replace"
 "github:rhysd/vim-operator-surround"

From 7ee75b8cf4049580accaa348ac62b19c6801ed76 Mon Sep 17 00:00:00 2001
From: Anders Sildnes <andsild@posteo.net>
Date: Thu, 25 Jan 2018 14:44:50 +0100
Subject: [PATCH 18/35] vim-plugins/vim-wordy: init

---
 pkgs/misc/vim-plugins/default.nix      | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 9751b5887343..09a3da91995f 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1658,6 +1658,17 @@ rec {
 
   };
 
+  vim-wordy = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-wordy-2016-11-07";
+    src = fetchgit {
+      url = "https://github.com/reedes/vim-wordy";
+      rev = "bd37684a041fce85c34bb56c41c5a12c04a376ca";
+      sha256 = "0lv3ff1yfqdz2vj6lwaygslds1ccidbb09f4x1cdwlawxdgh3w2v";
+    };
+    dependencies = [];
+
+  };
+
   vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-grammarous-2017-08-25";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 421c388b1143..a62a837ebe09 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -255,4 +255,5 @@
 "github:chemzqm/denite-git"
 "github:chemzqm/denite-extra"
 "github:bazelbuild/vim-bazel"
+"github:reedes/vim-wordy"
 "github:itchyny/vim-gitbranch"

From 5f93dc591819744ffaf505c9cca7455511518b79 Mon Sep 17 00:00:00 2001
From: Anders Sildnes <andsild@posteo.net>
Date: Thu, 25 Jan 2018 14:45:53 +0100
Subject: [PATCH 19/35] vim-plugins/committia: init

---
 pkgs/misc/vim-plugins/default.nix      | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 09a3da91995f..1fa6cebdd933 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -110,6 +110,7 @@ rec {
   concealedyank = concealedyank-vim;
   cute-python = vim-cute-python-git;
   vim-grepper = vim-grepper-git;
+  committia = committia-vim-git;
   vim-test = vim-test-git;
   peskcolor = peskcolor-vim-git;
   mayansmoke = mayansmoke-git;
@@ -1669,6 +1670,17 @@ rec {
 
   };
 
+  committia-vim-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "committia-vim-git-2017-12-04";
+    src = fetchgit {
+      url = "https://github.com/rhysd/committia.vim.git";
+      rev = "51aec02e5ab07c89fa5d5445cfe3a8e0098bec27";
+      sha256 = "08nqncgnmbvhnn850s6hhp6p6scqg2iiwrl9air952yh9pl91h84";
+    };
+    dependencies = [];
+
+  };
+
   vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-grammarous-2017-08-25";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index a62a837ebe09..0984a00f9086 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -248,6 +248,7 @@
 "github:osyo-manga/vim-textobj-multiblock"
 "github:cespare/vim-toml"
 "github:ehamberg/vim-cute-python.git"
+"github:rhysd/committia.vim.git"
 "github:mhinz/vim-grepper.git"
 "github:janko-m/vim-test.git"
 "github:andsild/peskcolor.vim.git"

From 355062b3a92ce1266d5f8b817c66beea8db0fca0 Mon Sep 17 00:00:00 2001
From: Anders Sildnes <andsild@posteo.net>
Date: Thu, 25 Jan 2018 14:50:18 +0100
Subject: [PATCH 20/35] vim-plugins/context-filetype: init

---
 pkgs/misc/vim-plugins/default.nix      | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 1fa6cebdd933..104fb34e1d55 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -107,6 +107,7 @@ rec {
   webapi-vim          = WebAPI;
   wombat256           = wombat256-vim; # backwards compat, added 2015-7-8
   yankring            = YankRing;
+  context-filetype = context_filetype-vim;
   concealedyank = concealedyank-vim;
   cute-python = vim-cute-python-git;
   vim-grepper = vim-grepper-git;
@@ -1800,6 +1801,17 @@ rec {
 
   };
 
+  context_filetype-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "context_filetype-vim-2017-11-15";
+    src = fetchgit {
+      url = "https://github.com/shougo/context_filetype.vim";
+      rev = "6856503cd938d018c2d42277ee6ca896fd63f5a2";
+      sha256 = "1s4nimpvc5ps602h8xb231nvmk9jbzs981an5kxr3idmmk44j5ms";
+    };
+    dependencies = [];
+
+  };
+
   neco-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "neco-vim-2017-10-01";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 0984a00f9086..ec25f7e5d062 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -239,6 +239,7 @@
 "vundle"
 "xterm-color-table"
 "zeavim"
+"github:shougo/context_filetype.vim"
 "github:elzr/vim-json"
 "github:kana/vim-operator-user"
 "github:kana/vim-niceblock"

From 7e8f2864999d95af4283c1d0559c0dda4f30bebe Mon Sep 17 00:00:00 2001
From: Anders Sildnes <andsild@posteo.net>
Date: Thu, 25 Jan 2018 14:50:58 +0100
Subject: [PATCH 21/35] vim-plugins/denite: init

---
 pkgs/misc/vim-plugins/default.nix      | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 104fb34e1d55..8e5885365ab5 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -63,6 +63,7 @@ rec {
   command_T           = command-t; # backwards compat, added 2014-10-18
   css_color_5056      = vim-css-color;
   ctrlp               = ctrlp-vim;
+  denite              = denite-nvim;
   easy-align          = vim-easy-align;
   easymotion          = vim-easymotion;
   eighties            = vim-eighties;
@@ -1812,6 +1813,17 @@ rec {
 
   };
 
+  denite-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "denite-nvim-2018-01-16";
+    src = fetchgit {
+      url = "https://github.com/shougo/denite.nvim";
+      rev = "0d48d8d498d410a5ea4403648d528e7267d87461";
+      sha256 = "1npag0da8s3jv4jm8waqvsdfg0gnqhkc07r3m17zp2r2bh3b9bjc";
+    };
+    dependencies = [];
+
+  };
+
   neco-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "neco-vim-2017-10-01";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index ec25f7e5d062..dae5f59781c3 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -239,6 +239,7 @@
 "vundle"
 "xterm-color-table"
 "zeavim"
+"github:shougo/denite.nvim"
 "github:shougo/context_filetype.vim"
 "github:elzr/vim-json"
 "github:kana/vim-operator-user"

From 555306364ef388c2cc7ebd51f6aa026887951d8a Mon Sep 17 00:00:00 2001
From: Anders Sildnes <andsild@posteo.net>
Date: Thu, 25 Jan 2018 14:52:18 +0100
Subject: [PATCH 22/35] vim-plugins/echodoc: init

---
 pkgs/misc/vim-plugins/default.nix      | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 8e5885365ab5..bf64c9325484 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -108,6 +108,7 @@ rec {
   webapi-vim          = WebAPI;
   wombat256           = wombat256-vim; # backwards compat, added 2015-7-8
   yankring            = YankRing;
+  echodoc = echodoc-vim;
   context-filetype = context_filetype-vim;
   concealedyank = concealedyank-vim;
   cute-python = vim-cute-python-git;
@@ -1824,6 +1825,17 @@ rec {
 
   };
 
+  echodoc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "echodoc-vim-2018-01-12";
+    src = fetchgit {
+      url = "https://github.com/shougo/echodoc.vim";
+      rev = "410ead5a9fa4400b51771cba3b7599722c9e65b1";
+      sha256 = "01czpvn5rs37x0ml8bc5vwyhklm6fk3wl339smc3jvyr1w73rrf5";
+    };
+    dependencies = [];
+
+  };
+
   neco-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "neco-vim-2017-10-01";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index dae5f59781c3..a0684b221c66 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -240,6 +240,7 @@
 "xterm-color-table"
 "zeavim"
 "github:shougo/denite.nvim"
+"github:shougo/echodoc.vim"
 "github:shougo/context_filetype.vim"
 "github:elzr/vim-json"
 "github:kana/vim-operator-user"

From 7e7c89d7df34ef247e671caae676cdb031044f26 Mon Sep 17 00:00:00 2001
From: Anders Sildnes <andsild@posteo.net>
Date: Thu, 25 Jan 2018 14:52:47 +0100
Subject: [PATCH 23/35] vim-plugins/necosyntax: init

---
 pkgs/misc/vim-plugins/default.nix      | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index bf64c9325484..22a119f6cfa0 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1836,6 +1836,17 @@ rec {
 
   };
 
+  neco-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "neco-syntax-2017-10-01";
+    src = fetchgit {
+      url = "https://github.com/shougo/neco-syntax";
+      rev = "98cba4a98a4f44dcff80216d0b4aa6f41c2ce3e3";
+      sha256 = "1cjcbgx3h00g91ifgw30q5n97x4nprsr4kwirydws79fcs4vkgip";
+    };
+    dependencies = [];
+
+  };
+
   neco-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "neco-vim-2017-10-01";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index a0684b221c66..4fa78b02adf5 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -252,6 +252,7 @@
 "github:cespare/vim-toml"
 "github:ehamberg/vim-cute-python.git"
 "github:rhysd/committia.vim.git"
+"github:shougo/neco-syntax"
 "github:mhinz/vim-grepper.git"
 "github:janko-m/vim-test.git"
 "github:andsild/peskcolor.vim.git"

From b1a60ba86bf4775a9107b793c56e57170625af5b Mon Sep 17 00:00:00 2001
From: Anders Sildnes <andsild@posteo.net>
Date: Thu, 25 Jan 2018 14:53:18 +0100
Subject: [PATCH 24/35] vim-plugins/neoinclude: init

---
 pkgs/misc/vim-plugins/default.nix      | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 22a119f6cfa0..d060522f4bfe 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -113,6 +113,7 @@ rec {
   concealedyank = concealedyank-vim;
   cute-python = vim-cute-python-git;
   vim-grepper = vim-grepper-git;
+  neoinclude = neoinclude-vim;
   committia = committia-vim-git;
   vim-test = vim-test-git;
   peskcolor = peskcolor-vim-git;
@@ -1869,6 +1870,17 @@ rec {
 
   };
 
+  neoinclude-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "neoinclude-vim-2017-10-01";
+    src = fetchgit {
+      url = "https://github.com/shougo/neoinclude.vim";
+      rev = "b5956ac824fdd60d6eacaa597c8d329252972d8b";
+      sha256 = "07x7hxqhklcr5y8zkw9939cwx7rpiicjlc65bn526fkmhcc2hng6";
+    };
+    dependencies = [];
+
+  };
+
   neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "neosnippet-snippets-2017-09-26";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 4fa78b02adf5..3cb924e7e727 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -251,6 +251,7 @@
 "github:osyo-manga/vim-textobj-multiblock"
 "github:cespare/vim-toml"
 "github:ehamberg/vim-cute-python.git"
+"github:shougo/neoinclude.vim"
 "github:rhysd/committia.vim.git"
 "github:shougo/neco-syntax"
 "github:mhinz/vim-grepper.git"

From fffe2f83845a426766bd7de8cff2c502e7f428bd Mon Sep 17 00:00:00 2001
From: Anders Sildnes <andsild@posteo.net>
Date: Thu, 25 Jan 2018 14:53:39 +0100
Subject: [PATCH 25/35] vim-plugins/neomru: init

---
 pkgs/misc/vim-plugins/default.nix      | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index d060522f4bfe..9724306265d4 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -108,6 +108,7 @@ rec {
   webapi-vim          = WebAPI;
   wombat256           = wombat256-vim; # backwards compat, added 2015-7-8
   yankring            = YankRing;
+  neomru = neomru-vim;
   echodoc = echodoc-vim;
   context-filetype = context_filetype-vim;
   concealedyank = concealedyank-vim;
@@ -1881,6 +1882,17 @@ rec {
 
   };
 
+  neomru-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "neomru-vim-2017-10-01";
+    src = fetchgit {
+      url = "https://github.com/shougo/neomru.vim";
+      rev = "97540f54fa20b94daf306f0c1f3cce983bbf7a1d";
+      sha256 = "15d5hmh5v3hnjnfb5736n45rh5nyq41vqjp1cz4ls2rxmmfi3xa7";
+    };
+    dependencies = [];
+
+  };
+
   neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "neosnippet-snippets-2017-09-26";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 3cb924e7e727..4f5bc851ce1b 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -240,6 +240,7 @@
 "xterm-color-table"
 "zeavim"
 "github:shougo/denite.nvim"
+"github:shougo/neomru.vim"
 "github:shougo/echodoc.vim"
 "github:shougo/context_filetype.vim"
 "github:elzr/vim-json"

From dea716d801eb9c2b290aa52d0e0c892719b27aef Mon Sep 17 00:00:00 2001
From: Anders Sildnes <andsild@posteo.net>
Date: Thu, 25 Jan 2018 14:54:22 +0100
Subject: [PATCH 26/35] vim-plugins/neoyank: init

---
 pkgs/misc/vim-plugins/default.nix      | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 9724306265d4..ca7234087e4e 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -117,6 +117,7 @@ rec {
   neoinclude = neoinclude-vim;
   committia = committia-vim-git;
   vim-test = vim-test-git;
+  neoyank = neoyank-vim-git;
   peskcolor = peskcolor-vim-git;
   mayansmoke = mayansmoke-git;
 
@@ -1915,6 +1916,17 @@ rec {
 
   };
 
+  neoyank-vim-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "neoyank-vim-git-2017-12-19";
+    src = fetchgit {
+      url = "https://github.com/shougo/neoyank.vim.git";
+      rev = "5d6e6f80e1920fc38ab5cf779c424a1fdb49202d";
+      sha256 = "0l2gfwyiyzppb0hs9sx3x7ndq9zzinppzqq3njwjzd1qgfv29jpq";
+    };
+    dependencies = [];
+
+  };
+
   unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "unite-vim-2017-12-06";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 4f5bc851ce1b..141fc21facf2 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -259,6 +259,7 @@
 "github:janko-m/vim-test.git"
 "github:andsild/peskcolor.vim.git"
 "github:vim-scripts/mayansmoke.git"
+"github:shougo/neoyank.vim.git"
 "github:chemzqm/denite-git"
 "github:chemzqm/denite-extra"
 "github:bazelbuild/vim-bazel"

From 45ab7091a775dbd29c74887bd67cc6e97a34d66b Mon Sep 17 00:00:00 2001
From: Anders Sildnes <andsild@posteo.net>
Date: Thu, 25 Jan 2018 14:55:25 +0100
Subject: [PATCH 27/35] vim-plugins/tabpagebuffer: init

---
 pkgs/misc/vim-plugins/default.nix      | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index ca7234087e4e..bc52e67a89b0 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -96,6 +96,7 @@ rec {
   supertab            = Supertab;
   syntastic           = Syntastic;
   tabular             = Tabular;
+  tabpagebuffer       = tabpagebuffer-vim;
   tagbar              = Tagbar;
   thumbnail           = thumbnail-vim;
   tmux-navigator      = vim-tmux-navigator;
@@ -1927,6 +1928,17 @@ rec {
 
   };
 
+  tabpagebuffer-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "tabpagebuffer-vim-2014-09-30";
+    src = fetchgit {
+      url = "https://github.com/shougo/tabpagebuffer.vim";
+      rev = "4d95c3e6fa5ad887498f4cbe486c11e39d4a1fbc";
+      sha256 = "1z6zlpzkhwy1p2pmx9qrwb91dp9v4yi8jrdvm1if2k79ij4sl08f";
+    };
+    dependencies = [];
+
+  };
+
   unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "unite-vim-2017-12-06";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 141fc21facf2..5f227e2638dc 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -240,6 +240,7 @@
 "xterm-color-table"
 "zeavim"
 "github:shougo/denite.nvim"
+"github:shougo/tabpagebuffer.vim"
 "github:shougo/neomru.vim"
 "github:shougo/echodoc.vim"
 "github:shougo/context_filetype.vim"

From 18dd939118c426db3782dc20067e8a646dc05b7f Mon Sep 17 00:00:00 2001
From: Anders Sildnes <andsild@posteo.net>
Date: Thu, 25 Jan 2018 15:00:14 +0100
Subject: [PATCH 28/35] vim-plugins/vim-smalls: init

---
 pkgs/misc/vim-plugins/default.nix      | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index bc52e67a89b0..af685f4e0d8e 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -2001,6 +2001,17 @@ rec {
 
   };
 
+  vim-smalls = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-smalls-2015-05-02";
+    src = fetchgit {
+      url = "https://github.com/t9md/vim-smalls";
+      rev = "9619eae81626bd63f88165e0520c467698264e34";
+      sha256 = "0s5z3zv220cg95yky2av6w0jmpc56ysyhsx0596ksvgz5jwhpbad";
+    };
+    dependencies = [];
+
+  };
+
   vim-hardtime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-hardtime-2017-03-31";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 5f227e2638dc..4e8f265fc999 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -252,6 +252,7 @@
 "github:chikatoike/concealedyank.vim"
 "github:osyo-manga/vim-textobj-multiblock"
 "github:cespare/vim-toml"
+"github:t9md/vim-smalls"
 "github:ehamberg/vim-cute-python.git"
 "github:shougo/neoinclude.vim"
 "github:rhysd/committia.vim.git"

From 7aa5e6bfafe9d6436a019c692e3638bc918e6ebe Mon Sep 17 00:00:00 2001
From: Anders Sildnes <andsild@posteo.net>
Date: Thu, 25 Jan 2018 15:00:42 +0100
Subject: [PATCH 29/35] vim-plugins/vim-themis: init

---
 pkgs/misc/vim-plugins/default.nix      | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index af685f4e0d8e..1fcc187d75e7 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -2056,6 +2056,17 @@ rec {
 
   };
 
+  vim-themis = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-themis-2017-12-28";
+    src = fetchgit {
+      url = "https://github.com/thinca/vim-themis";
+      rev = "691cd3912ba318dbd8d9fa0035fee629b424766d";
+      sha256 = "1mrdaah3iyg35v6cgvr3jav3386czialfcinwa3y9jy14basbqhd";
+    };
+    dependencies = [];
+
+  };
+
   molokai = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "molokai-2015-11-11";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 4e8f265fc999..ed316d609f15 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -251,6 +251,7 @@
 "github:rhysd/vim-operator-surround"
 "github:chikatoike/concealedyank.vim"
 "github:osyo-manga/vim-textobj-multiblock"
+"github:thinca/vim-themis"
 "github:cespare/vim-toml"
 "github:t9md/vim-smalls"
 "github:ehamberg/vim-cute-python.git"

From 1af14e0f1e0d7287b83066fe492e0b4e9eb20adc Mon Sep 17 00:00:00 2001
From: Anders Sildnes <andsild@posteo.net>
Date: Thu, 25 Jan 2018 15:03:24 +0100
Subject: [PATCH 30/35] vim-plugins/open-browser: init

---
 pkgs/misc/vim-plugins/default.nix      | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 1fcc187d75e7..9ede44ab8797 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -112,6 +112,7 @@ rec {
   neomru = neomru-vim;
   echodoc = echodoc-vim;
   context-filetype = context_filetype-vim;
+  open-browser = open-browser-vim;
   concealedyank = concealedyank-vim;
   cute-python = vim-cute-python-git;
   vim-grepper = vim-grepper-git;
@@ -2155,6 +2156,17 @@ rec {
 
   };
 
+  open-browser-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "open-browser-vim-2017-12-15";
+    src = fetchgit {
+      url = "https://github.com/tyru/open-browser.vim";
+      rev = "ee8decb2b26020320128eecd7a96383d995c8804";
+      sha256 = "1a9j13h174lkp1gqd80idwdb8d74gdkyfgvb2l153jcqyvwpzcl2";
+    };
+    dependencies = [];
+
+  };
+
   youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "youcompleteme-2017-12-03";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index ed316d609f15..73db19560693 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -245,6 +245,7 @@
 "github:shougo/echodoc.vim"
 "github:shougo/context_filetype.vim"
 "github:elzr/vim-json"
+"github:tyru/open-browser.vim"
 "github:kana/vim-operator-user"
 "github:kana/vim-niceblock"
 "github:kana/vim-operator-replace"

From b0864c33e34b2dac0c467cb29de3299d6f73c22c Mon Sep 17 00:00:00 2001
From: Anders Sildnes <andsild@posteo.net>
Date: Thu, 25 Jan 2018 15:03:57 +0100
Subject: [PATCH 31/35] vim-plugins/improved-ansiesc: init

---
 pkgs/misc/vim-plugins/default.nix      | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 9ede44ab8797..aa49742e70ac 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -2248,6 +2248,17 @@ rec {
 
   };
 
+  Improved-AnsiEsc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "Improved-AnsiEsc-2015-08-25";
+    src = fetchgit {
+      url = "https://github.com/vim-scripts/Improved-AnsiEsc";
+      rev = "e1c59a8e9203fab6b9150721f30548916da73351";
+      sha256 = "1smjs4kz2kmzprzp9az4957675nakb43146hshbby39j5xz4jsbz";
+    };
+    dependencies = [];
+
+  };
+
   Rename = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "Rename-2011-08-30";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 73db19560693..15e55a0a4bb7 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -268,4 +268,5 @@
 "github:chemzqm/denite-extra"
 "github:bazelbuild/vim-bazel"
 "github:reedes/vim-wordy"
+"github:vim-scripts/Improved-AnsiEsc"
 "github:itchyny/vim-gitbranch"

From d8311b87c2fd52aff413234dfe735bc57a5b2417 Mon Sep 17 00:00:00 2001
From: Anders Sildnes <andsild@posteo.net>
Date: Thu, 25 Jan 2018 15:59:42 +0100
Subject: [PATCH 32/35] vim-plugins/vim-textobj-user: init

---
 pkgs/misc/vim-plugins/default.nix      | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index aa49742e70ac..042c45488161 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1308,6 +1308,17 @@ rec {
 
   };
 
+  vim-textobj-user = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-textobj-user-2017-09-28";
+    src = fetchgit {
+      url = "https://github.com/kana/vim-textobj-user";
+      rev = "e231b65797b5765b3ee862d71077e9bd56f3ca3e";
+      sha256 = "0zsgr2cn8s42d7jllnxw2cvqkl27lc921d1mkph7ny7jgnghaay9";
+    };
+    dependencies = [];
+
+  };
+
   latex-box = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "latex-box-2015-06-01";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 15e55a0a4bb7..492218d33494 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -249,6 +249,7 @@
 "github:kana/vim-operator-user"
 "github:kana/vim-niceblock"
 "github:kana/vim-operator-replace"
+"github:kana/vim-textobj-user"
 "github:rhysd/vim-operator-surround"
 "github:chikatoike/concealedyank.vim"
 "github:osyo-manga/vim-textobj-multiblock"

From 81d444102c8c4f724ca47c520ac38a7a0a5a3788 Mon Sep 17 00:00:00 2001
From: Anders Sildnes <andsild@posteo.net>
Date: Thu, 25 Jan 2018 16:59:49 +0100
Subject: [PATCH 33/35] vim-plugins/auto_pairs: remove redundant/dead reference

---
 pkgs/misc/vim-plugins/default.nix      | 11 -----------
 pkgs/misc/vim-plugins/vim-plugin-names |  1 -
 2 files changed, 12 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 042c45488161..3899e4ca6f6e 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -142,17 +142,6 @@ rec {
 
   # --- generated packages bellow this line ---
 
-  Auto_Pairs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Auto_Pairs-2017-07-03";
-    src = fetchgit {
-      url = "git://github.com/jiangmiao/auto-pairs";
-      rev = "f0019fc6423e7ce7bbd01d196a7e027077687fda";
-      sha256 = "1kzrdq3adwxwm3fw65g05ww9405lwqi368win5kayamyj9i0z7r6";
-    };
-    dependencies = [];
-
-  };
-
   CSApprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "CSApprox-2013-07-26";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 492218d33494..bcdcd255727c 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -175,7 +175,6 @@
 "github:zig-lang/zig.vim"
 "goyo"
 "gruvbox"
-"jiangmiao-auto-pairs"
 "matchit.zip"
 "neco-look"
 "pathogen"

From cf0a87b44ed079fd02a9407e557aed7693e2fe11 Mon Sep 17 00:00:00 2001
From: Anders Sildnes <andsild@posteo.net>
Date: Thu, 25 Jan 2018 15:21:36 +0100
Subject: [PATCH 34/35] vim-plugins: sort plugin-names and fix indentation

---
 pkgs/misc/vim-plugins/default.nix      | 32 ++++++------
 pkgs/misc/vim-plugins/vim-plugin-names | 69 +++++++++++++-------------
 2 files changed, 50 insertions(+), 51 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 3899e4ca6f6e..39b1e4f6e777 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -52,6 +52,7 @@ rec {
   # aliasess
   "sourcemap.vim"     = sourcemap;
   Colour_Sampler_Pack = Colour-Sampler-Pack;
+  Gundo               = gundo-vim; # backwards compat, added 2015-10-03
   YouCompleteMe       = youcompleteme;
   airline             = vim-airline;
   alternative         = a-vim; # backwards compat, added 2014-10-21
@@ -61,31 +62,41 @@ rec {
   colors-solarized    = Solarized;
   colorsamplerpack    = Colour_Sampler_Pack;
   command_T           = command-t; # backwards compat, added 2014-10-18
+  committia           = committia-vim-git;
+  concealedyank       = concealedyank-vim;
+  context-filetype    = context_filetype-vim;
   css_color_5056      = vim-css-color;
   ctrlp               = ctrlp-vim;
+  cute-python         = vim-cute-python-git;
   denite              = denite-nvim;
   easy-align          = vim-easy-align;
   easymotion          = vim-easymotion;
+  echodoc             = echodoc-vim;
   eighties            = vim-eighties;
   ghc-mod-vim         = ghcmod;
   gist-vim            = Gist;
   gitgutter           = vim-gitgutter;
   gundo               = gundo-vim;
-  Gundo               = gundo-vim; # backwards compat, added 2015-10-03
   haskellConceal      = haskellconceal; # backwards compat, added 2014-10-18
-  haskellconceal      = vim-haskellconceal;
   haskellConcealPlus  = vim-haskellConcealPlus;
+  haskellconceal      = vim-haskellconceal;
   hier                = vim-hier;
   hlint-refactor      = hlint-refactor-vim;
   hoogle              = Hoogle;
   ipython             = vim-ipython;
   latex-live-preview  = vim-latex-live-preview;
+  mayansmoke          = mayansmoke-git;
   multiple-cursors    = vim-multiple-cursors;
   necoGhc             = neco-ghc; # backwards compat, added 2014-10-18
   neocomplete         = neocomplete-vim;
+  neoinclude          = neoinclude-vim;
+  neomru              = neomru-vim;
   neosnippet          = neosnippet-vim;
+  neoyank             = neoyank-vim-git;
   nerdcommenter       = The_NERD_Commenter;
   nerdtree            = The_NERD_tree;
+  open-browser        = open-browser-vim;
+  peskcolor           = peskcolor-vim-git;
   polyglot            = vim-polyglot;
   quickrun            = vim-quickrun;
   repeat              = vim-repeat;
@@ -95,33 +106,22 @@ rec {
   stylishHaskell      = stylish-haskell; # backwards compat, added 2014-10-18
   supertab            = Supertab;
   syntastic           = Syntastic;
-  tabular             = Tabular;
   tabpagebuffer       = tabpagebuffer-vim;
+  tabular             = Tabular;
   tagbar              = Tagbar;
   thumbnail           = thumbnail-vim;
   tmux-navigator      = vim-tmux-navigator;
   tmuxNavigator       = tmux-navigator; # backwards compat, added 2014-10-18
   tslime              = tslime-vim;
   unite               = unite-vim;
+  vim-grepper         = vim-grepper-git;
+  vim-test            = vim-test-git;
   vimproc             = vimproc-vim;
   vimshell            = vimshell-vim;
   watchdogs           = vim-watchdogs;
   webapi-vim          = WebAPI;
   wombat256           = wombat256-vim; # backwards compat, added 2015-7-8
   yankring            = YankRing;
-  neomru = neomru-vim;
-  echodoc = echodoc-vim;
-  context-filetype = context_filetype-vim;
-  open-browser = open-browser-vim;
-  concealedyank = concealedyank-vim;
-  cute-python = vim-cute-python-git;
-  vim-grepper = vim-grepper-git;
-  neoinclude = neoinclude-vim;
-  committia = committia-vim-git;
-  vim-test = vim-test-git;
-  neoyank = neoyank-vim-git;
-  peskcolor = peskcolor-vim-git;
-  mayansmoke = mayansmoke-git;
 
   # do not auto-update this one, as the name clashes with vim-snippets
   vim-docbk-snippets = buildVimPluginFrom2Nix {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index bcdcd255727c..5df03c0f0cb0 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -34,13 +34,19 @@
 "github:ajh17/Spacegray.vim"
 "github:albfan/nerdtree-git-plugin"
 "github:alvan/vim-closetag"
+"github:andsild/peskcolor.vim.git"
 "github:andviro/flake8-vim"
 "github:ap/vim-css-color"
 "github:autozimu/LanguageClient-neovim"
+"github:bazelbuild/vim-bazel"
 "github:bbchung/clighter8"
 "github:benekastah/neomake"
 "github:bitc/vim-hdevtools"
 "github:bronson/vim-trailing-whitespace"
+"github:cespare/vim-toml"
+"github:chemzqm/denite-extra"
+"github:chemzqm/denite-git"
+"github:chikatoike/concealedyank.vim"
 "github:christoomey/vim-sort-motion"
 "github:christoomey/vim-tmux-navigator"
 "github:ctjhoa/spacevim"
@@ -53,9 +59,11 @@
 "github:drmingdrmer/xptemplate"
 "github:eagletmt/neco-ghc"
 "github:editorconfig/editorconfig-vim"
+"github:ehamberg/vim-cute-python.git"
 "github:eikenb/acp"
 "github:elixir-lang/vim-elixir"
 "github:elmcast/elm-vim"
+"github:elzr/vim-json"
 "github:embear/vim-localvimrc"
 "github:enomsg/vim-haskellConcealPlus"
 "github:ensime/ensime-vim"
@@ -74,7 +82,9 @@
 "github:itchyny/calendar.vim"
 "github:itchyny/lightline.vim"
 "github:itchyny/thumbnail.vim"
+"github:itchyny/vim-gitbranch"
 "github:ivanov/vim-ipython"
+"github:janko-m/vim-test.git"
 "github:jceb/vim-hier"
 "github:jceb/vim-orgmode"
 "github:jeetsukumaran/vim-buffergator"
@@ -89,6 +99,9 @@
 "github:junegunn/limelight.vim"
 "github:junegunn/vim-peekaboo"
 "github:justincampbell/vim-eighties"
+"github:kana/vim-niceblock"
+"github:kana/vim-operator-replace"
+"github:kana/vim-operator-user"
 "github:latex-box-team/latex-box"
 "github:leafgarland/typescript-vim"
 "github:lepture/vim-jinja"
@@ -102,6 +115,7 @@
 "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"
@@ -113,33 +127,47 @@
 "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-completion-manager"
 "github:roxma/nvim-cm-racer"
-"github:ryanoasis/vim-devicons"
+"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:tpope/vim-dispatch"
 "github:tpope/vim-eunuch"
@@ -148,25 +176,28 @@
 "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:wincent/command-t"
 "github:will133/vim-dirdiff"
+"github:wincent/command-t"
 "github:xolox/vim-easytags"
 "github:xolox/vim-misc"
 "github:zah/nim.vim"
@@ -238,35 +269,3 @@
 "vundle"
 "xterm-color-table"
 "zeavim"
-"github:shougo/denite.nvim"
-"github:shougo/tabpagebuffer.vim"
-"github:shougo/neomru.vim"
-"github:shougo/echodoc.vim"
-"github:shougo/context_filetype.vim"
-"github:elzr/vim-json"
-"github:tyru/open-browser.vim"
-"github:kana/vim-operator-user"
-"github:kana/vim-niceblock"
-"github:kana/vim-operator-replace"
-"github:kana/vim-textobj-user"
-"github:rhysd/vim-operator-surround"
-"github:chikatoike/concealedyank.vim"
-"github:osyo-manga/vim-textobj-multiblock"
-"github:thinca/vim-themis"
-"github:cespare/vim-toml"
-"github:t9md/vim-smalls"
-"github:ehamberg/vim-cute-python.git"
-"github:shougo/neoinclude.vim"
-"github:rhysd/committia.vim.git"
-"github:shougo/neco-syntax"
-"github:mhinz/vim-grepper.git"
-"github:janko-m/vim-test.git"
-"github:andsild/peskcolor.vim.git"
-"github:vim-scripts/mayansmoke.git"
-"github:shougo/neoyank.vim.git"
-"github:chemzqm/denite-git"
-"github:chemzqm/denite-extra"
-"github:bazelbuild/vim-bazel"
-"github:reedes/vim-wordy"
-"github:vim-scripts/Improved-AnsiEsc"
-"github:itchyny/vim-gitbranch"

From 544e214975559b02f7461e403e9206b6d6fec0ea Mon Sep 17 00:00:00 2001
From: Anders Sildnes <andsild@posteo.net>
Date: Thu, 25 Jan 2018 17:07:57 +0100
Subject: [PATCH 35/35] vim-plugins: correct name for vim-github-dashboard

---
 pkgs/misc/vim-plugins/vim-plugin-names | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 5df03c0f0cb0..a60bb1976770 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -246,11 +246,11 @@
 "vim-airline"
 "vim-coffee-script"
 "vim-cursorword"
-"vim-dashboard"
 "vim-easy-align"
 "vim-ft-diff_fold"
 "vim-gista"
 "vim-gitgutter"
+"vim-github-dashboard"
 "vim-iced-coffee-script"
 "vim-javascript"
 "vim-jsbeautify"