diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index a1a78e9fb641..49935487afe9 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -10,6 +10,12 @@ inherit (vimUtils.override {inherit vim;}) rtpPath addRtp buildVimPlugin
   buildVimPluginFrom2Nix vimHelpTags;
 in
 
+# TL;DR
+# Add your plugin to ./vim-plugin-names
+# Generate via `vim-plugin-names-to-nix`
+# If plugin is complicated then create a PR to
+# https://github.com/jagajaga/vim-addon-vim2nix/tree/master/additional-nix-code
+
 # This attrs contains two sections:
 # The first contains plugins added manually, the second contains plugins
 # generated by call nix#ExportPluginsForNix.
@@ -17,587 +23,662 @@ in
 # attribute names should be the same as used by vim-pi to make dependency
 # resolution work
 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 {
+    name = "vim-plugin-names-to-nix";
+    namefiles = [./vim-plugin-names];  };
 
-  ### section I: manually mantained plugins
-  airline = vim-airline;
-  alternative = a; # backwards compat, added 2014-10-21
-  command_T = command-t; # backwards compat, added 2014-10-18
-  gitgutter = vim-gitgutter;
-  haskellConceal = haskellconceal; # backwards compat, added 2014-10-18
-  necoGhc = neco-ghc; # backwards compat, added 2014-10-18
-  nerdcommenter = The_NERD_Commenter;
-  stylishHaskell = stylish-haskell; # backwards compat, added 2014-10-18
-  tmuxNavigator = tmux-navigator; # backwards compat, added 2014-10-18
-  youcompleteme = YouCompleteMe;
+  # Section I
 
-  a = buildVimPlugin {
-    name = "a-git-2010-11-06";
+  # Section II
+  # Update with vimUtils.vimPlugins.pluginnames2Nix command
+
+  # aliasess
+  airline             = vim-airline;
+  alternative         = a-vim; # backwards compat, added 2014-10-21
+  coffee-script       = vim-coffee-script;
+  coffeeScript        = coffee-script; # backwards compat, added 2014-10-18
+  colors-solarized    = Solarized;
+  colorsamplerpack    = Colour_Sampler_Pack;
+  Colour_Sampler_Pack = Colour-Sampler-Pack;
+  command_T           = command-t; # backwards compat, added 2014-10-18
+  easy-align          = vim-easy-align;
+  easymotion          = vim-easymotion;
+  eighties            = vim-eighties;
+  ghc-mod-vim         = ghcmod;
+  gist-vim            = Gist;
+  gitgutter           = vim-gitgutter;
+  gundo               = Gundo;
+  haskellConceal      = haskellconceal; # backwards compat, added 2014-10-18
+  haskellconceal      = vim-haskellconceal;
+  hoogle              = Hoogle;
+  hier                = vim-hier;
+  ipython             = vim-ipython;
+  latex-live-preview  = vim-latex-live-preview;
+  necoGhc             = neco-ghc; # backwards compat, added 2014-10-18
+  nerdcommenter       = The_NERD_Commenter;
+  nerdtree            = The_NERD_tree;
+  quickrun            = vim-quickrun;
+  signature           = vim-signature;
+  "sourcemap.vim"     = sourcemap;
+  stylish-haskell     = vim-stylish-haskell;
+  stylishHaskell      = stylish-haskell; # backwards compat, added 2014-10-18
+  supertab            = Supertab;
+  syntastic           = Syntastic;
+  tabular             = Tabular;
+  tagbar              = Tagbar;
+  tmux-navigator      = vim-tmux-navigator;
+  tmuxNavigator       = tmux-navigator; # backwards compat, added 2014-10-18
+  watchdogs           = vim-watchdogs;
+  webapi-vim          = WebAPI;
+  yankring            = YankRing;
+  YouCompleteMe       = youcompleteme;
+  
+
+  Gist = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "Gist-2015-05-29";
     src = fetchgit {
-      url = "https://github.com/vim-scripts/a.vim.git";
-      rev = "2cbe946206ec622d9d8cf2c99317f204c4d41885";
-      sha256 = "ca0982873ed81e7f6545a6623b735104c574fe580d5f21b0aa3dc1557edac240";
-     };
+      url = "git://github.com/mattn/gist-vim";
+      rev = "235955468c2d85e5d0ece46d84948acf2bedeb20";
+      sha256 = "50ac95e145d00631acb3ae53261c880920b40b208fed1aaae71ed31d070e381e";
+    };
+    dependencies = [];
+
+  };
+
+  Gundo = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "Gundo";
+    src = fetchhg {
+      url = "https://bitbucket.org/sjl/gundo.vim";
+      rev = "eb9fc8676b89";
+      sha256 = "05lcxrd9ibfi02ja4jvl5y5pp884b8kh9aarw045b0mlldygv6cp";
+    };
+    dependencies = [];
+
+  };
+
+  Hoogle = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "Hoogle-2013-11-26";
+    src = fetchgit {
+      url = "git://github.com/Twinside/vim-hoogle";
+      rev = "81f28318b0d4174984c33df99db7752891c5c4e9";
+      sha256 = "0f96f3badb6218cac87d0f7027ff032ecc74f08ad3ada542898278ce11cbd5a0";
+    };
+    dependencies = [];
+
+  };
+
+  Solarized = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "Solarized-2011-05-09";
+    src = fetchgit {
+      url = "git://github.com/altercation/vim-colors-solarized";
+      rev = "528a59f26d12278698bb946f8fb82a63711eec21";
+      sha256 = "a1b2ef696eee94dafa76431c31ee260acdd13a7cf87939f27eca431d5aa5a315";
+    };
+    dependencies = [];
+
+  };
+
+  Supertab = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "Supertab-2015-02-15";
+    src = fetchgit {
+      url = "git://github.com/ervandew/supertab";
+      rev = "c8bfeceb1fc92ad58f2ae6967cbfcd6fbcb0d6e7";
+      sha256 = "e9e4054c683435b36adf87bebb4895c06a7e85130a807d8c9307588d4744b04b";
+    };
+    dependencies = [];
+
+  };
+
+  Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "Syntastic-2015-05-29";
+    src = fetchgit {
+      url = "git://github.com/scrooloose/syntastic";
+      rev = "5c6e78a2711aa5d04d116123d78684b620033c3d";
+      sha256 = "fa8781df0c37b5d120ab4b287a911a1545cd4342edf08f85d644097c50ff59b0";
+    };
+    dependencies = [];
+
+  };
+
+  Tabular = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "Tabular-2013-05-16";
+    src = fetchgit {
+      url = "git://github.com/godlygeek/tabular";
+      rev = "60f25648814f0695eeb6c1040d97adca93c4e0bb";
+      sha256 = "28c860ad621587f2c3213fae47d1a3997746527c17d51e9ab94c209eb7bfeb0f";
+    };
+    dependencies = [];
+
+  };
+
+  Tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "Tagbar-2015-05-10";
+    src = fetchgit {
+      url = "git://github.com/majutsushi/tagbar";
+      rev = "399b75256ac7333d7119d11047f6b3aff8fa2828";
+      sha256 = "8562fac0f2d690537b4c1049ba67b440116135167b48b9feb21655c9931b875c";
+    };
+    dependencies = [];
+
+  };
+
+  The_NERD_Commenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "The_NERD_Commenter-2014-07-08";
+    src = fetchgit {
+      url = "git://github.com/scrooloose/nerdcommenter";
+      rev = "6549cfde45339bd4f711504196ff3e8b766ef5e6";
+      sha256 = "ef270ae5617237d68b3d618068e758af8ffd8d3ba27a3799149f7a106cfd178e";
+    };
+    dependencies = [];
+
+  };
+
+  The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "The_NERD_tree-2015-05-13";
+    src = fetchgit {
+      url = "git://github.com/scrooloose/nerdtree";
+      rev = "af85499edace2acca27ce41790ac333f62b689bb";
+      sha256 = "12f68eb374ccc8cbfcf88b85cf44a4a18856be4e30a50850b8f3d0b186207f0c";
+    };
+    dependencies = [];
+
+  };
+
+  UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "UltiSnips-2015-05-11";
+    src = fetchgit {
+      url = "git://github.com/sirver/ultisnips";
+      rev = "188e00f7b87297ea7737f9494d531c7073637332";
+      sha256 = "9fb127b32bd0e2ae139b3b6008849f4566cfb1c29087e787570428c770a3430c";
+    };
+    dependencies = [];
+
+  };
+
+  VimOutliner = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "VimOutliner-2015-01-09";
+    src = fetchgit {
+      url = "git://github.com/vimoutliner/vimoutliner";
+      rev = "7c995f973c54b0d026137615af28059890edb197";
+      sha256 = "9d1526ec99904fd2ccfdb4dd6763b4cd04048cb74bb7a0a4c9b4a7b1f5d75cb5";
+    };
+    dependencies = [];
+
+  };
+
+  WebAPI = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "WebAPI-2015-05-14";
+    src = fetchgit {
+      url = "git://github.com/mattn/webapi-vim";
+      rev = "6d577e49aeb81b4ede280161ca1e550c9328d098";
+      sha256 = "cb57200ada38ff5388e043075e900d3794020bb6f063a2845c71993e5543862a";
+    };
+    dependencies = [];
+
+  };
+
+  YankRing = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "YankRing";
+    src = fetchurl {
+      url = "http://www.vim.org/scripts/download_script.php?src_id=20842";
+      name = "yankring_180.zip";
+      sha256 = "0bsq4pxagy12jqxzs7gcf25k5ahwif13ayb9k8clyhm0jjdkf0la";
+    };
+    buildInputs = [ unzip ];
+    dependencies = [];
     meta = {
-      homepage = https://github.com/vim-scripts/a.vim;
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+       url = "http://www.vim.org/scripts/script.php?script_id=1234";
     };
+
+
   };
 
-  align = buildVimPlugin {
-    name = "align-git-2012-08-07";
+  commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "commentary-2014-11-10";
     src = fetchgit {
-      url = "https://github.com/vim-scripts/align.git";
-      rev = "787662fe90cd057942bc5b682fd70c87e1a9dd77";
-      sha256 = "f7b5764357370f03546556bd45558837f3790b0e86afadb63cd04d714a668a29";
-     };
-    meta = {
-      homepage = https://github.com/vim-scripts/align;
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+      url = "git://github.com/tpope/vim-commentary";
+      rev = "9c685131a5facfa0d643feca3a61b41c007d8170";
+      sha256 = "2a9f394d0669429469c2f1ddaf9a722c2773f35da08ea9496d3b4b4e85b6038d";
     };
+    dependencies = [];
+
   };
 
-  calendar = buildVimPlugin {
-    name = "calendar-git-2015-04-24";
+  ctrlp = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "ctrlp-2013-07-29";
     src = fetchgit {
-      url = "https://github.com/itchyny/calendar.vim.git";
-      rev = "4149b7bdbe159d9a7670fea9238fe3acac618d67";
-      sha256 = "4a04a03343f94fcbdb0eca44ba1eef8e1669f31e7aa5bf411e6fca4e5b8cdb30";
-    };
-    meta = {
-      homepage = https://github.com/itchyny/calendar.vim.git; 
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+      url = "git://github.com/kien/ctrlp.vim";
+      rev = "b5d3fe66a58a13d2ff8b6391f4387608496a030f";
+      sha256 = "41f7884973770552395b96f8693da70999dc815462d4018c560d3ff6be462e76";
     };
+    dependencies = [];
+
   };
 
-
-  command-t = buildVimPlugin {
-    name = "command-t-git-2015-04-29";
+  extradite = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "extradite-2015-01-26";
     src = fetchgit {
-      url = "https://github.com/wincent/Command-T";
-      rev = "f7344ebbe95c532b2ad01f19877d6d611db0193b";
-      sha256 = "0l0ajdi3dj2w0zfvgy5fkyl8wln6r8x6ikqvr31rxxzkpwmyxmr1";
+      url = "git://github.com/int3/vim-extradite";
+      rev = "a1dc4b63befd5032e65a0c94e7257d4636aa6a3f";
+      sha256 = "94e05bbe36c9d4cee9832530531eedff0da509d5a0a52beee4e524fd4ad96714";
     };
-    buildInputs = [ perl ruby ];
-    buildPhase = ''
-      pushd ruby/command-t
-      ruby extconf.rb
-      make
-      popd
-    '';
+    dependencies = [];
+
   };
 
-  easymotion = buildVimPlugin {
-    name = "easymotion-git-2015-04-21";
+  fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "fugitive-2015-05-31";
     src = fetchgit {
-      url = "https://github.com/lokaltog/vim-easymotion";
-      rev = "9f1c449edfce6d61c7f620e3a9c1389b7b7e334f";
-      sha256 = "ba358f3acc120d9cf1854205bde0fa345d156e7f69a1854987e74bb137889c54";
-    };
-    meta = {
-      homepage = https://github.com/lokaltog/vim-easymotion; 
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+      url = "git://github.com/tpope/vim-fugitive";
+      rev = "e065e4f841f4a033ac9a6156573a446007617b1d";
+      sha256 = "339e2418da5f7e04490e6732010abd2f287c935e7a20df5832611f94ed42013f";
     };
+    dependencies = [];
+
   };
 
-
-  eighties = buildVimPlugin {
-    name = "eighties-git-2015-04-16";
+  ghcmod = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "ghcmod-2015-03-17";
     src = fetchgit {
-      url = "https://github.com/justincampbell/vim-eighties";
-      rev = "d202e6015163bbb4f7c9973f2eac66c2351e8c24";
-      sha256 = "ad7341c8d7ab659b062a67f893962b08596466a6a3a3395f28a4f4031a36eb9c";
-    };
-    buildPhase = ":";
-    meta = with stdenv.lib; {
-      description = "Automatically resizes your windows to 80 characters";
-      homepage    = https://github.com/justincampbell/vim-eighties;
-      license     = licenses.publicDomain;
-      maintainers = with maintainers; [ lovek323 ];
-      platforms   = platforms.unix;
+      url = "git://github.com/eagletmt/ghcmod-vim";
+      rev = "7e5f6102aa709244f5d4cedec807eac4b901c4cb";
+      sha256 = "47c5f5c4bf73dca653550b460306fa3808d864a685903bdb95ba07a6e1cd2899";
     };
+    dependencies = [];
+
   };
 
-
-
-  golang = buildVimPlugin {
-    name = "golang-git-2014-08-06";
+  vim-addon-vim2nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-addon-vim2nix-2015-06-01";
     src = fetchgit {
-      url = "https://github.com/jnwhiteh/vim-golang.git";
-      rev = "e6d0c6a72a66af2674b96233c4747661e0f47a8c";
-      sha256 = "1231a2eff780dbff4f885fcb4f656f7dd70597e1037ca800470de03bf0c5e7af";
-     };
-    meta = {
-      homepage = https://github.com/jnwhiteh/vim-golang;
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+      url = "git://github.com/JagaJaga/vim-addon-vim2nix";
+      rev = "fc2eeffca48b224ef15beda57586f6d1271ff68d";
+      sha256 = "b626dab117b9331b6f9ff0bf05ac1f479db82a60dd5cb87a0f3a8d3d7de9220e";
     };
+    dependencies = ["vim-addon-manager"];
+
   };
 
-  hardtime = buildVimPlugin {
-    name = "hardtime-git-2014-10-21";
+  lushtags = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "lushtags-2013-12-27";
     src = fetchgit {
-      url = "https://github.com/takac/vim-hardtime.git";
-      rev = "b401c72528d1c23e4cc9bc9585fda4361d0199bf";
-      sha256 = "65e4bda7531076147fc46f496c8e56c740d1fcf8fe85c18cb2d2070d0c3803cd";
-     };
-    meta = {
-      homepage = https://github.com/takac/vim-hardtime;
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
-    };
-  };
-
-  haskellconceal = buildVimPlugin {
-    name = "haskellconceal-git-2014-08-07";
-    src = fetchgit {
-      url = "https://github.com/twinside/vim-haskellconceal.git";
-      rev = "1d85e8f10b675d38ec117368ec8032f486c27f98";
-      sha256 = "8ae762939ea435333031a094f3c63e6edd534ac849f0008fa0440440f1f2f633";
-     };
-    meta = {
-      homepage = https://github.com/twinside/vim-haskellconceal;
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
-    };
-  };
-
-
-  hasksyn = buildVimPlugin {
-    name = "hasksyn-git-2014-09-03";
-    src = fetchgit {
-      url = "https://github.com/travitch/hasksyn.git";
-      rev = "c434040bf13a17ca20a551223021b3ace7e453b9";
-      sha256 = "b1a735928aeca7011b83133959d59b9c95ab8535fd00ce9968fae4c3b1381931";
-     };
-    meta = {
-      homepage = https://github.com/travitch/hasksyn;
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
-    };
-  };
-
-  hdevtools = buildVimPlugin {
-    name = "hdevtools-git-2012-12-29";
-    src = fetchgit {
-      url = "https://github.com/bitc/vim-hdevtools.git";
-      rev = "474947c52ff9c93dd36f3c49de90bd9a78f0baa1";
-      sha256 = "bf5f096b665c51ce611c6c1bfddc3267c4b2f94af84b04482b07272a6a5a92f3";
-     };
-    meta = {
-      homepage = https://github.com/bitc/vim-hdevtools;
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
-    };
-  };
-
-  hier = buildVimPlugin {
-    name = "hier-git-2011-08-27";
-    src = fetchgit {
-      url = "https://github.com/jceb/vim-hier.git";
-      rev = "0b8c365263551a67404ebd7e528c55e17c1d3de7";
-      sha256 = "f62836545abfe379f9c5410da28409947407cd282ef784b2db89aed0756a1785";
-     };
-    buildInputs = [ vim ];
-    meta = {
-      homepage = https://github.com/jceb/vim-hier;
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
-    };
-  };
-
-  idris-vim = buildVimPlugin {
-    name = "idris-vim-git-2014-12-29";
-    src = fetchgit {
-      url = "https://github.com/idris-hackers/idris-vim.git";
-      rev = "6bdb44b85406b75e3b3a4fa265deab1dbe8c6ff1";
-      sha256 = "87677f3aa81f15dbaf4337f709952fd47c9fa28e8086033f2cfbd5b1f256e5ff";
-    };
-    meta = {
-      homepage = https://github.com/idris-hackers/idris-vim; 
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
-    };
-  };
-
-  ipython = buildVimPlugin {
-    name = "ipython-git-2015-01-12";
-    src = fetchgit {
-      url = "https://github.com/ivanov/vim-ipython.git";
-      rev = "a47d92b371588a81f8501c66604d79e2827c60a8";
-      sha256 = "7cf2dbed5b404164199d4784331b21d90d371275b1d324298cde9eeda3c4eb53";
-    };
-    meta = {
-      homepage = https://github.com/ivanov/vim-ipython; 
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
-    };
-  };
-
-  latex-box = buildVimPlugin {
-    name = "latex-box-git-2015-05-11";
-    src = fetchgit {
-      url = "https://github.com/latex-box-team/latex-box";
-      rev = "ede8371663e89c6e033f8ae387590422b8ea6dd0";
-      sha256 = "1d0f5244e681cc5c972ad043ebc2b8b5f751ba216ca44d4c07821dcb641c5f3d";
-    };
-    meta = {
-      homepage = https://github.com/latex-box-team/latex-box; 
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
-    };
-  };
-
-  lushtags = buildVimPlugin {
-    name = "lushtags-git-2013-12-27";
-    src = fetchgit {
-      url = "https://github.com/bitc/lushtags.git";
+      url = "git://github.com/bitc/lushtags";
       rev = "429fab3b748ae04ee5de0cbf75d947f15441e798";
       sha256 = "5170019fbe64b15be30a0ba82e6b01364d115ccad6ef690a6df86f73af22a0a7";
-     };
-    meta = {
-      homepage = https://github.com/bitc/lushtags;
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
     };
+    dependencies = [];
+
   };
 
-  neco-ghc = buildVimPlugin {
-    name = "neco-ghc-git-2015-04-07";
+  vim-hdevtools = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-hdevtools-2012-12-29";
     src = fetchgit {
-      url = "https://github.com/eagletmt/neco-ghc";
+      url = "git://github.com/bitc/vim-hdevtools";
+      rev = "474947c52ff9c93dd36f3c49de90bd9a78f0baa1";
+      sha256 = "bf5f096b665c51ce611c6c1bfddc3267c4b2f94af84b04482b07272a6a5a92f3";
+    };
+    dependencies = [];
+
+  };
+
+  vim-tmux-navigator = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-tmux-navigator-2015-05-29";
+    src = fetchgit {
+      url = "git://github.com/christoomey/vim-tmux-navigator";
+      rev = "176452ead44118174ddad3502709a247d9c24bb4";
+      sha256 = "789c8b24b971a3b307ac296234230f1048ff2928c89302700bd4e5fc2edd2d8a";
+    };
+    dependencies = [];
+
+  };
+
+  neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "neco-ghc-2015-04-07";
+    src = fetchgit {
+      url = "git://github.com/eagletmt/neco-ghc";
       rev = "a45f4f98ee3f25eaa64a39328c253d4f78cd5fda";
       sha256 = "50bd8530b435c3ba0e0f01b230d7717074002ec229ddcc0cb20ee59ef2a28d59";
     };
-    meta = {
-      homepage = https://github.com/eagletmt/neco-ghc; 
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
-    };
+    dependencies = [];
+
   };
 
-  neocomplete = buildVimPlugin {
-    name = "neocomplete-git-2015-05-11";
+  YUNOcommit-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "YUNOcommit-vim-2014-11-26";
     src = fetchgit {
-      url = "https://github.com/Shougo/neocomplete.vim";
-      rev = "425eaacdaa126db647c1fc24c3357e6326c48bdc";
-      sha256 = "bb7dac68562fa5456aad0f993ee2caf962d53425e29659b7c5ae3d33d815a3ed";
-    };
-    meta = {
-      homepage = https://github.com/Shougo/neocomplete.vim; 
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+      url = "git://github.com/esneider/YUNOcommit.vim";
+      rev = "981082055a73ef076d7e27477874d2303153a448";
+      sha256 = "4bfd80720c353884e5c373b5457397a63e5e2e4ab4a97d6ce86c1740ac3b4c56";
     };
+    dependencies = [];
+
   };
 
-
-  neosnippet = buildVimPlugin {
-    name = "neosnippet-git-2015-05-04";
+  idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "idris-vim-2014-12-29";
     src = fetchgit {
-      url = "https://github.com/Shougo/neosnippet.vim";
-      rev = "48689a972d41256b423aa635dff689868a48e5bd";
-      sha256 = "a46be238526e0e39b4561c9a53351bbb43a5fec3a912bdf0b86ab2f031ccc383";
-    };
-    meta = {
-      homepage = https://github.com/Shougo/neosnippet.vim; 
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+      url = "git://github.com/idris-hackers/idris-vim";
+      rev = "6bdb44b85406b75e3b3a4fa265deab1dbe8c6ff1";
+      sha256 = "87677f3aa81f15dbaf4337f709952fd47c9fa28e8086033f2cfbd5b1f256e5ff";
     };
+    dependencies = [];
+
   };
 
-
-  neosnippet-snippets = buildVimPlugin {
-    name = "neosnippet-snippets-git-2015-05-10";
+  calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "calendar-vim-2015-05-21";
     src = fetchgit {
-      url = "https://github.com/Shougo/neosnippet-snippets";
-      rev = "c35446a74d3a5c11838a96b9f2e3673e56ced384";
-      sha256 = "92be7af28c0a64e8e3f0c5c7973fee36f7401d943ff97bd5deffe3f0e2760e5d";
-    };
-    meta = {
-      homepage = https://github.com/Shougo/neosnippet-snippets; 
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+      url = "git://github.com/itchyny/calendar.vim";
+      rev = "394c789d2235a7a056ba527daf722e9119cac1c8";
+      sha256 = "dfefb8d479096baa755185546624fffdd9c843da9c4fdbf17f213cdba599c08e";
     };
+    dependencies = [];
+
   };
 
-
-  quickrun = buildVimPlugin {
-    name = "quickrun-git-2015-05-02";
+  thumbnail-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "thumbnail-vim-2015-03-15";
     src = fetchgit {
-      url = "https://github.com/thinca/vim-quickrun";
-      rev = "b40cdc36c3600fd096323d3e08c3bbd5d55ec8a8";
-      sha256 = "32e5870ff9bb7ae3fdd2c279c6580935c0f3cd9b306ce34a9e14b227d59e193b";
-    };
-    meta = {
-      homepage = https://github.com/thinca/vim-quickrun; 
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+      url = "git://github.com/itchyny/thumbnail.vim";
+      rev = "19bd717307a8d0986a4a77116f47168fbe11e178";
+      sha256 = "c8c100e1b0ee9c75fc3b6db00b68c47d91bcca8979f6de046aade43fd09e3882";
     };
+    dependencies = [];
+
   };
 
-
-  racer = buildVimPlugin {
-    name = "racer-git-2015-05-04";
+  vim-ipython = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-ipython-2015-05-30";
     src = fetchgit {
-      url = "https://github.com/phildawes/racer";
-      rev = "bf2373ec08b0be03598283bd610c5b61bdb8738c";
-      sha256 = "938516aef0674053886fcf032faa5ae87d14e4412c77aadd981dbe145a01ae51";
+      url = "git://github.com/ivanov/vim-ipython";
+      rev = "5876b483902313143adc2dcdfd8de94036e191a6";
+      sha256 = "6c0f3011dca269d8c862abb5477bcdbe3ec2fbe4fc6cebeb38e7f0816cedaae5";
     };
+    dependencies = [];
+
+  };
+
+  vim-hier = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-hier-2011-08-27";
+    src = fetchgit {
+      url = "git://github.com/jceb/vim-hier";
+      rev = "0b8c365263551a67404ebd7e528c55e17c1d3de7";
+      sha256 = "f62836545abfe379f9c5410da28409947407cd282ef784b2db89aed0756a1785";
+    };
+    dependencies = [];
+    buildInputs = [ vim ];
+  };
+
+  vim-buffergator = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-buffergator-2015-03-31";
+    src = fetchgit {
+      url = "git://github.com/jeetsukumaran/vim-buffergator";
+      rev = "77cfdd127fcf026ea2d5e8f5aaf85502286b16b7";
+      sha256 = "2d3ce83b5ea7d0502cea3e91bf1e2a0b27a046879c1b5ff1854df47028dd4d48";
+    };
+    dependencies = [];
+
+  };
+
+  tslime-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "tslime-vim-2015-02-10";
+    src = fetchgit {
+      url = "git://github.com/jgdavey/tslime.vim";
+      rev = "71ec1cbe8f9ead9805f8e0c3b76c590aeb5ed0b7";
+      sha256 = "81f45f579dcc239ce0b9689044d0e92969f7538759ab0cd88596c7a010d8730b";
+    };
+    dependencies = [];
+
+  };
+
+  vim-nerdtree-tabs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-nerdtree-tabs-2014-09-25";
+    src = fetchgit {
+      url = "git://github.com/jistr/vim-nerdtree-tabs";
+      rev = "0decec122e9bb3e9328b01fa20a9650e79cc6ca7";
+      sha256 = "ac4bfc3ae18e8a62ef8e20d0dd0a0f7c172d0ebd5fed58c533ccccec3ae7bdc2";
+    };
+    dependencies = [];
+
+  };
+
+  vim-golang = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-golang-2014-08-06";
+    src = fetchgit {
+      url = "git://github.com/jnwhiteh/vim-golang";
+      rev = "e6d0c6a72a66af2674b96233c4747661e0f47a8c";
+      sha256 = "1231a2eff780dbff4f885fcb4f656f7dd70597e1037ca800470de03bf0c5e7af";
+    };
+    dependencies = [];
+
+  };
+
+  vim-xdebug = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-xdebug-2012-08-15";
+    src = fetchgit {
+      url = "git://github.com/joonty/vim-xdebug";
+      rev = "a4980fa65f7f159780593ee37c178281691ba2c4";
+      sha256 = "1ccb0e63eaf68548feb1c37b09c07c84b6bea9b350c4257549f091aa414601e2";
+    };
+    dependencies = [];
+    postInstall = false;
+  };
+
+  vim-eighties = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-eighties-2015-04-16";
+    src = fetchgit {
+      url = "git://github.com/justincampbell/vim-eighties";
+      rev = "d202e6015163bbb4f7c9973f2eac66c2351e8c24";
+      sha256 = "ad7341c8d7ab659b062a67f893962b08596466a6a3a3395f28a4f4031a36eb9c";
+    };
+    dependencies = [];
+
+  };
+
+  latex-box = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "latex-box-2015-05-16";
+    src = fetchgit {
+      url = "git://github.com/latex-box-team/latex-box";
+      rev = "55a88ed55a7631b91321916cf80c47077d478c9c";
+      sha256 = "96203a95d919db65574e187b793a7d846463d91fe641349732cc5d9aeb8242ac";
+    };
+    dependencies = [];
+
+  };
+
+  vim-jinja = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-jinja-2014-06-11";
+    src = fetchgit {
+      url = "git://github.com/lepture/vim-jinja";
+      rev = "4412484b410b15caecd71f2e52758b2a90ea124d";
+      sha256 = "650c7f23688e8982f30be3f7d45b73d9c1d283f10a6829e518e2583b4a52befc";
+    };
+    dependencies = [];
+
+  };
+
+  vim-easymotion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-easymotion-2015-04-21";
+    src = fetchgit {
+      url = "git://github.com/lokaltog/vim-easymotion";
+      rev = "9f1c449edfce6d61c7f620e3a9c1389b7b7e334f";
+      sha256 = "ba358f3acc120d9cf1854205bde0fa345d156e7f69a1854987e74bb137889c54";
+    };
+    dependencies = [];
+
+  };
+
+  vim-xkbswitch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-xkbswitch-2015-05-19";
+    src = fetchgit {
+      url = "git://github.com/lyokha/vim-xkbswitch";
+      rev = "0854ac6a810daae4a5c99bcae61613266ce75c26";
+      sha256 = "886a173d48340ad0ddeb3c852e4f2bdfc7b513a9d5a954115d081a3e276fa655";
+    };
+    dependencies = [];
+    buildInputs = [ xkb_switch ];
+  };
+
+  vim-stylish-haskell = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-stylish-haskell-2015-05-10";
+    src = fetchgit {
+      url = "git://github.com/nbouscal/vim-stylish-haskell";
+      rev = "c664376ba814de3f87cb7641f90b2c6a9dd53671";
+      sha256 = "12a9aad40112200060c3ee86f96589a264db287bdfeb3eb6fdf0f22a6656a5f6";
+    };
+    dependencies = [];
+
+  };
+
+  shabadou-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "shabadou-vim-2014-07-27";
+    src = fetchgit {
+      url = "git://github.com/osyo-manga/shabadou.vim";
+      rev = "c5af30bb0c028d53cfd89e00cab636c844034a9a";
+      sha256 = "392efa8a5e725219e478b571d9a30ddba88d47662467ed3123a168e8b55c4de6";
+    };
+    dependencies = [];
+
+  };
+
+  vim-watchdogs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-watchdogs-2015-04-16";
+    src = fetchgit {
+      url = "git://github.com/osyo-manga/vim-watchdogs";
+      rev = "5e3d1db592297f7d4c563900a6d224ff559f533e";
+      sha256 = "3d4c9624d86815dd47d7655eb58a703574f2ecb92238ae4e65dc67fc9960820a";
+    };
+    dependencies = [];
+
+  };
+
+  racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "racer-2015-06-01";
+    src = fetchgit {
+      url = "git://github.com/phildawes/racer";
+      rev = "7425ae5299ed3f89817945fd867403e825070df6";
+      sha256 = "0721528de38e179ab887ccb06339dabcc5aa43c564f47fa06a372ace6e9ba457";
+    };
+    dependencies = [];
     buildPhase = ''
       find . -type f -not -name 'racer.vim' -exec rm -rf {} \;
       rm -rf editors images src
     '';
-    meta = {
-      homepage = https://github.com/phildawes/racer;
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
-    };
   };
 
-  shabadou = buildVimPlugin {
-    name = "shabadou-git-2014-07-27";
+  neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "neocomplete-vim-2015-05-26";
     src = fetchgit {
-      url = "https://github.com/osyo-manga/shabadou.vim.git";
-      rev = "c5af30bb0c028d53cfd89e00cab636c844034a9a";
-      sha256 = "392efa8a5e725219e478b571d9a30ddba88d47662467ed3123a168e8b55c4de6";
-     };
-    meta = {
-      homepage = https://github.com/osyo-manga/shabadou.vim;
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+      url = "git://github.com/shougo/neocomplete.vim";
+      rev = "0a8a7e8a72a23459c2eda5116fe9b22b0dad7a3e";
+      sha256 = "fe75653939e1299b71708a26a9af2ca1e4ac0f1daed8aa98ce46b8bb26c9bd71";
     };
+    dependencies = [];
+
   };
 
-  stylish-haskell = buildVimPlugin {
-    name = "stylish-haskell-git-2015-05-10";
+  neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "neosnippet-snippets-2015-05-28";
     src = fetchgit {
-      url = "https://github.com/nbouscal/vim-stylish-haskell";
-      rev = "c664376ba814de3f87cb7641f90b2c6a9dd53671";
-      sha256 = "12a9aad40112200060c3ee86f96589a264db287bdfeb3eb6fdf0f22a6656a5f6";
-    };
-    meta = {
-      homepage = https://github.com/nbouscal/vim-stylish-haskell; 
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+      url = "git://github.com/shougo/neosnippet-snippets";
+      rev = "842622af4ce0e559ba64f4b991d0de8b9cade6af";
+      sha256 = "5d9a3c2d06edb3146e0dbdbba7d8c411197914bea8192844a3c849987e23a72a";
     };
+    dependencies = [];
+
   };
 
-
-  tabmerge = buildVimPlugin {
-    name = "tabmerge-git-2010-10-17";
+  neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "neosnippet-vim-2015-05-12";
     src = fetchgit {
-      url = "https://github.com/vim-scripts/tabmerge.git";
-      rev = "074e5f06f26e7108a0570071a0f938a821768c06";
-      sha256 = "b84501b0fc5cd51bbb58f12f4c2b3a7c97b03fe2a76446b56a2c111bd4f7335f";
-     };
-    meta = {
-      homepage = https://github.com/vim-scripts/tabmerge;
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+      url = "git://github.com/shougo/neosnippet.vim";
+      rev = "e2c830db87e50e8cdb1128f3096664f68cb05cad";
+      sha256 = "bc950c1756d3c276dc231563749a9fbe7de0d5595e30428e1408bb530bc61e6f";
     };
+    dependencies = [];
+
   };
 
-  taglist = buildVimPlugin {
-    name = "taglist-4.6";
-    meta = with stdenv.lib; {
-      description = "Source code browser plugin";
-      homepage    = "http://www.vim.org/scripts/script.php?script_id=273";
-      license     = licenses.gpl3;
-      maintainers = with maintainers; [ lovek323 ];
-      platforms   = platforms.unix;
-    };
-    src = fetchurl {
-      url    = "http://www.vim.org/scripts/download_script.php?src_id=19574";
-      name   = "taglist_46.zip";
-      sha256 = "18cbv462vwg7vip2p99qlahm99hswav96cj4ki227kyi05q2lkjj";
-    };
-    setSourceRoot = ''
-      export sourceRoot=taglist
-      mkdir taglist
-      mv doc taglist
-      mv plugin taglist
-    '';
-    buildInputs = [ unzip ];
-  };
-
-  thumbnail = buildVimPlugin {
-    name = "thumbnail-git-2015-03-15";
+  vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vimproc-vim-2015-05-14";
     src = fetchgit {
-      url = "https://github.com/itchyny/thumbnail.vim.git";
-      rev = "19bd717307a8d0986a4a77116f47168fbe11e178";
-      sha256 = "c8c100e1b0ee9c75fc3b6db00b68c47d91bcca8979f6de046aade43fd09e3882";
-     };
-    meta = {
-      homepage = https://github.com/itchyny/thumbnail.vim;
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
-    };
-  };
-
-  tmux-navigator = buildVimPlugin {
-    name = "tmux-navigator-git-2015-03-16";
-    src = fetchgit {
-      url = "https://github.com/christoomey/vim-tmux-navigator.git";
-      rev = "928a52fbda90ec70b2eb6edaf570654df4521af0";
-      sha256 = "6f6912960245664146ead711886aad216b74f4c6b1feec975cab199114afb13c";
-     };
-    meta = {
-      homepage = https://github.com/christoomey/vim-tmux-navigator;
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
-    };
-  };
-
-
-  tslime = buildVimPlugin {
-    name = "tslime-git-2015-02-10";
-    src = fetchgit {
-      url = "https://github.com/jgdavey/tslime.vim.git";
-      rev = "71ec1cbe8f9ead9805f8e0c3b76c590aeb5ed0b7";
-      sha256 = "81f45f579dcc239ce0b9689044d0e92969f7538759ab0cd88596c7a010d8730b";
-     };
-    meta = {
-      homepage = https://github.com/jgdavey/tslime.vim;
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
-    };
-  };
-
-  vim-buffergator = buildVimPlugin {
-    name = "vim-buffergator-2015-03-31";
-    src = fetchFromGitHub {
-      owner = "jeetsukumaran";
-      repo = "vim-buffergator";
-      rev = "77cfdd127f";
-      sha256 = "11r9845kplwahf2d41whs2lg3bzy0dahs0mvmdbckp7ckq3gd3y4";
-      };
-     meta = with stdenv.lib; {
-      description = "Vim plugin to list, select and switch between buffers";
-      license = licenses.gpl3;
-      maintainers = with maintainers; [ hbunke ];
-     };
-  };
-
-  vim-jinja = buildVimPlugin {
-    name = "vim-jinja-git-2014-06-11";
-    src = fetchFromGitHub {
-      owner = "lepture";
-      repo = "vim-jinja";
-      rev = "4412484b41";
-      sha256="1z5ya953nn7233jjjs0ay61x5hfrfddx9xz31grq52cfd0ipy335";
-    };
-   meta = {
-    homepage = "https://github.com/lepture/vim-jinja";
-    maintainers = [ stdenv.lib.maintainers.hbunke ];
-    };
-  };
-
-  vim-nerdtree-tabs = buildVimPlugin {
-    name = "vim-nerdtree-tabs-2014-09-25";
-    src = fetchFromGitHub {
-      owner = "jistr";
-      repo = "vim-nerdtree-tabs";
-      rev = "0decec122e";
-      sha256 = "0m51vpxq0d3mxy9i18hczsbqsqi7vlzwgjnpryb8gb5wmy999d6l";
-    };
-    meta = with stdenv.lib; {
-      description = "NERDTree and tabs together in Vim, painlessly";
-      license = licenses.asl20;
-      maintainers = with maintainers; [ hbunke ];
-    };
-  };
-
-  vimproc = buildVimPlugin {
-    name = "vimproc-git-2015-05-10";
-    src = fetchgit {
-      url = "https://github.com/shougo/vimproc.vim";
-      rev = "421827f0971a62ba3d67e2ed158a7d282c5d05bb";
-      sha256 = "158d6d3990528730dbf699326cfb402c33ab3322e5d7ab6c95d84b0bd6292aee";
+      url = "git://github.com/shougo/vimproc.vim";
+      rev = "c286dcbdfca9e0ee1a4cb90f09c3f03638112f5a";
+      sha256 = "884753f4f188cee5fb11e4dfb5aaf8b80d4809e637ab91068af1a5787acdcb19";
     };
+    dependencies = [];
     buildInputs = [ which ];
 
     buildPhase = ''
       sed -i 's/vimproc_mac\.so/vimproc_unix\.so/' autoload/vimproc.vim
       make -f make_unix.mak
     '';
-
-    meta = {
-      homepage = https://github.com/shougo/vimproc.vim;
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
-    };
   };
 
-  vimshell = buildVimPlugin {
-    name = "vimshell-git-2015-05-01";
+  vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vimshell-vim-2015-05-01";
     src = fetchgit {
-      url = "https://github.com/Shougo/vimshell.vim";
+      url = "git://github.com/shougo/vimshell.vim";
       rev = "4939e10609c434becf6423b2f3876bb9c2be3464";
       sha256 = "72bc6ca7b8ebcdf1d4617c73fc2688486f71a9f8b8601627fbbada3a4cfb28ca";
     };
-    meta = with stdenv.lib; {
-      description = "An extreme shell that doesn't depend on external shells and is written completely in Vim script";
-      homepage    = https://github.com/Shougo/vimshell.vim;
-      repositories.git = https://github.com/Shougo/vimshell.vim.git;
-      license     = licenses.gpl3;
-      maintainers = with maintainers; [ lovek323 ];
-      platforms   = platforms.unix;
-    };
-    buildInputs = [ vimproc ];
-    preBuild = ''
-      sed -ie '1 i\
-      set runtimepath+=${vimproc}/${rtpPath}/vimproc\
-      ' autoload/vimshell.vim
-    '';
+    dependencies = [ "vimproc-vim" ];
   };
 
-  vim-wakatime = buildVimPlugin {
-    name = "vim-wakatime-4.0.1";
-
-    src = fetchFromGitHub {
-      sha256 = "0vhnfjl9qv6qwfvf106cw4mg4xss2nsafz5k2jadkryss6f3ga10";
-      rev = "1e2ba90f708965719ed52c4ea2728bc3cfa32f6d";
-      repo = "vim-wakatime";
-      owner = "wakatime";
-    };
-
-    meta = with stdenv.lib; {
-      description = "Analytics about your programming";
-      homepage = https://wakatime.com;
-      license = licenses.bsd3;
-      platforms = with platforms; linux;
-      maintainers = with maintainers; [ nckx ];
-    };
-
-    buildInputs = [ python ];
-  };
-
-  watchdogs = buildVimPlugin {
-    name = "watchdogs-git-2015-04-16";
+  vim-hardtime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-hardtime-2014-10-21";
     src = fetchgit {
-      url = "https://github.com/osyo-manga/vim-watchdogs";
-      rev = "5e3d1db592297f7d4c563900a6d224ff559f533e";
-      sha256 = "3d4c9624d86815dd47d7655eb58a703574f2ecb92238ae4e65dc67fc9960820a";
-    };
-    meta = {
-      homepage = https://github.com/osyo-manga/vim-watchdogs; 
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+      url = "git://github.com/takac/vim-hardtime";
+      rev = "b401c72528d1c23e4cc9bc9585fda4361d0199bf";
+      sha256 = "65e4bda7531076147fc46f496c8e56c740d1fcf8fe85c18cb2d2070d0c3803cd";
     };
+    dependencies = [];
+
   };
 
-  xdebug = buildVimPlugin {
-    name = "xdebug-git-2012-08-15";
+  vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-quickrun-2015-05-15";
     src = fetchgit {
-      url = "https://github.com/joonty/vim-xdebug.git";
-      rev = "a4980fa65f7f159780593ee37c178281691ba2c4";
-      sha256 = "1ccb0e63eaf68548feb1c37b09c07c84b6bea9b350c4257549f091aa414601e2";
-     };
-    postInstall = false;
-    meta = {
-      homepage = https://github.com/joonty/vim-xdebug;
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+      url = "git://github.com/thinca/vim-quickrun";
+      rev = "c7800ea3d01209da678708e4d3b5175009551807";
+      sha256 = "375668b6fd7cf64a26f752afcdd976f79a9dc12b045eed8afafce6486740f143";
     };
+    dependencies = [];
+
   };
 
-  xkbswitch = buildVimPlugin {
-    name = "xkbswitch-git-2015-01-18";
+  hasksyn = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "hasksyn-2014-09-03";
     src = fetchgit {
-      url = "https://github.com/lyokha/vim-xkbswitch.git";
-      rev = "932765d8a45b0c8b994b920505b8f10cc7e8cad0";
-      sha256 = "20e1f7196b65d98687a27c8a3f2d0847701890a0818dfcfec13f24a3151b0e73";
-     };
-    buildInputs = [ xkb_switch ];
-    meta = {
-      homepage = https://github.com/lyokha/vim-xkbswitch; 
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+      url = "git://github.com/travitch/hasksyn";
+      rev = "c434040bf13a17ca20a551223021b3ace7e453b9";
+      sha256 = "b1a735928aeca7011b83133959d59b9c95ab8535fd00ce9968fae4c3b1381931";
     };
+    dependencies = [];
+
   };
 
-
- YouCompleteMe = buildVimPlugin {
-    name = "YouCompleteMe-git-2015-05-07";
+  vim-haskellconceal = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-haskellconceal-2014-10-28";
     src = fetchgit {
-      url = "https://github.com/Valloric/YouCompleteMe";
-      rev = "295769ccfd304246c1fae847416a2a15771f7d98";
-      sha256 = "04qcbbxm3qhb2f3awhrwprffm3jh54z4ag6r49aa8xk0l9k8i8sp";
+      url = "git://github.com/twinside/vim-haskellconceal";
+      rev = "f73c5dd660b7009a050b131783d7c17b4954e4d9";
+      sha256 = "1ebf98b170642d342207eb8c16551f9969f884b3be975b8755f1018947053ba8";
     };
+    dependencies = [];
 
+  };
+
+  youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "youcompleteme-2015-05-29";
+    src = fetchgit {
+      url = "git://github.com/valloric/youcompleteme";
+      rev = "c2d962dddb4cc86f771722e9775d2345d31fe8bb";
+      sha256 = "2543d42662e99401ac8b4ff938fe5452b6d0215befc155e9b24590533a4bfe06";
+    };
+    dependencies = [];
     buildInputs = [
       python cmake
       llvmPackages.clang-unwrapped llvmPackages.llvm
@@ -635,275 +716,80 @@ rec {
     };
   };
 
-
-  YUNOcommit = buildVimPlugin {
-    name = "YUNOcommit";
+  Colour-Sampler-Pack = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "Colour-Sampler-Pack-2012-11-29";
     src = fetchgit {
-      url = "https://github.com/esneider/YUNOcommit.vim";
-      rev = "981082055a73ef076d7e27477874d2303153a448";
-      sha256 = "4bfd80720c353884e5c373b5457397a63e5e2e4ab4a97d6ce86c1740ac3b4c56";
-    
+      url = "git://github.com/vim-scripts/Colour-Sampler-Pack";
+      rev = "05cded87b2ef29aaa9e930230bb88e23abff4441";
+      sha256 = "e3dd18f9fd36543e0c87257b7eaa999a82d75cbfa6dce4dfea403fa751c8620f";
     };
     dependencies = [];
-  };
-
-
-  ### section II: automatically generated plugin derivations
-  # Update with vimUtils.vimPlugins.pluginnames2Nix command
-
-  # 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 {
-    name = "vim-plugin-names-to-nix";
-    namefiles = [./vim-plugin-names];
-  };
-
-  # aliasess
-  tabular = Tabular;
-  tagbar = Tagbar;
-  coffee-script = vim-coffee-script;
-  coffeeScript = coffee-script; # backwards compat, added 2014-10-18
-  colors-solarized = Solarized;
-  colorsamplerpack = Colour_Sampler_Pack;
-  easy-align = vim-easy-align;
-  ghc-mod-vim = ghcmod;
-  gist-vim = Gist;
-  gundo = Gundo;
-  hoogle = Hoogle;
-  latex-live-preview = vim-latex-live-preview;
-  nerdtree = The_NERD_tree;
-  signature = vim-signature;
-  supertab = Supertab;
-  syntastic = Syntastic;
-  webapi-vim = WebAPI;
-  yankring = YankRing;
-  "sourcemap.vim" = sourcemap;
-
-
-  ### The following derivations are generated by nix#ExportPluginsForNix
-
-  "Colour_Sampler_Pack" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Colour_Sampler_Pack";
-    src = fetchurl {
-      url = "http://www.vim.org/scripts/download_script.php?src_id=18915";
-      name = "ColorSamplerPack.zip";
-      sha256 = "1wsrb3vpqn9fncnalfpvc8r92wk1mcskm4shb3s2h9x5dyihf2rd";
-    };
-    buildInputs = [ unzip ];
-    dependencies = [];
-    meta = {
-       url = "http://www.vim.org/scripts/script.php?script_id=625";
-    };
-
 
   };
-  "Gist" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Gist-2015-05-06";
+
+  a-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "a-vim-git-2010-11-06";
     src = fetchgit {
-      url = "git://github.com/mattn/gist-vim";
-      rev = "6130b8ee438ad55572c5de1cb974ef824163a1f4";
-      sha256 = "5142abefc6f5eaf5f2cce4f5222782b7d9e1033a3e54db7bca0dcf2bd7575853";
+      url = "git://github.com/vim-scripts/a.vim";
+      rev = "2cbe946206ec622d9d8cf2c99317f204c4d41885";
+      sha256 = "ca0982873ed81e7f6545a6623b735104c574fe580d5f21b0aa3dc1557edac240";
     };
     dependencies = [];
 
   };
-  "Gundo" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Gundo";
-    src = fetchhg {
-      url = "https://bitbucket.org/sjl/gundo.vim";
-      rev = "eb9fc8676b89";
-      sha256 = "05lcxrd9ibfi02ja4jvl5y5pp884b8kh9aarw045b0mlldygv6cp";
-    };
-    dependencies = [];
 
-  };
-  "Hoogle" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Hoogle-2013-11-26";
+  align = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "align-git-2012-08-07";
     src = fetchgit {
-      url = "git://github.com/Twinside/vim-hoogle";
-      rev = "81f28318b0d4174984c33df99db7752891c5c4e9";
-      sha256 = "0f96f3badb6218cac87d0f7027ff032ecc74f08ad3ada542898278ce11cbd5a0";
+      url = "git://github.com/vim-scripts/align";
+      rev = "787662fe90cd057942bc5b682fd70c87e1a9dd77";
+      sha256 = "f7b5764357370f03546556bd45558837f3790b0e86afadb63cd04d714a668a29";
     };
     dependencies = [];
 
   };
-  "Solarized" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Solarized-2011-05-09";
+
+  tabmerge = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "tabmerge-2010-10-17";
     src = fetchgit {
-      url = "git://github.com/altercation/vim-colors-solarized";
-      rev = "528a59f26d12278698bb946f8fb82a63711eec21";
-      sha256 = "a1b2ef696eee94dafa76431c31ee260acdd13a7cf87939f27eca431d5aa5a315";
+      url = "git://github.com/vim-scripts/tabmerge";
+      rev = "074e5f06f26e7108a0570071a0f938a821768c06";
+      sha256 = "b84501b0fc5cd51bbb58f12f4c2b3a7c97b03fe2a76446b56a2c111bd4f7335f";
     };
     dependencies = [];
 
   };
-  "Supertab" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Supertab-2015-02-15";
+
+  vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-wakatime-2015-05-31";
     src = fetchgit {
-      url = "git://github.com/ervandew/supertab";
-      rev = "c8bfeceb1fc92ad58f2ae6967cbfcd6fbcb0d6e7";
-      sha256 = "e9e4054c683435b36adf87bebb4895c06a7e85130a807d8c9307588d4744b04b";
+      url = "git://github.com/wakatime/vim-wakatime";
+      rev = "1e2ba90f708965719ed52c4ea2728bc3cfa32f6d";
+      sha256 = "ebd5a651554742727944f4a705ccbe990875d4ed656fc535183474091bcf1f1c";
     };
     dependencies = [];
-
+    buildInputs = [ python ];
   };
-  "Syntastic" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Syntastic-2015-05-09";
+
+  command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "command-t-2015-04-29";
     src = fetchgit {
-      url = "git://github.com/scrooloose/syntastic";
-      rev = "5dba05af4fb9e69472a994bb1228c6b86a47911a";
-      sha256 = "a6f2a77dec55d2bb2abe742e24865d2311c12f030290f31ad9219e4d787a6d3c";
+      url = "git://github.com/wincent/command-t";
+      rev = "f7344ebbe95c532b2ad01f19877d6d611db0193b";
+      sha256 = "21d7ee2bbff3f79ec3c81bcf683acac6528ea89faef8b7dd075cc83662930a50";
     };
     dependencies = [];
-
+    buildInputs = [ perl ruby ];
+    buildPhase = ''
+      pushd ruby/command-t
+      ruby extconf.rb
+      make
+      popd
+    '';
   };
-  "Tabular" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Tabular-2013-05-16";
-    src = fetchgit {
-      url = "git://github.com/godlygeek/tabular";
-      rev = "60f25648814f0695eeb6c1040d97adca93c4e0bb";
-      sha256 = "28c860ad621587f2c3213fae47d1a3997746527c17d51e9ab94c209eb7bfeb0f";
-    };
-    dependencies = [];
 
-  };
-  "Tagbar" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Tagbar-2015-05-10";
-    src = fetchgit {
-      url = "git://github.com/majutsushi/tagbar";
-      rev = "399b75256ac7333d7119d11047f6b3aff8fa2828";
-      sha256 = "8562fac0f2d690537b4c1049ba67b440116135167b48b9feb21655c9931b875c";
-    };
-    dependencies = [];
-
-  };
-  "The_NERD_Commenter" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_Commenter-2014-07-08";
-    src = fetchgit {
-      url = "git://github.com/scrooloose/nerdcommenter";
-      rev = "6549cfde45339bd4f711504196ff3e8b766ef5e6";
-      sha256 = "ef270ae5617237d68b3d618068e758af8ffd8d3ba27a3799149f7a106cfd178e";
-    };
-    dependencies = [];
-
-  };
-  "The_NERD_tree" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_tree-2015-05-06";
-    src = fetchgit {
-      url = "git://github.com/scrooloose/nerdtree";
-      rev = "a87b1bf3c566c3f80090996a2a2a1201318478a8";
-      sha256 = "4422563a44f14aa008b5e7ef8b7df1f7fc1ffdca1323a3cb1c115409e325a87e";
-    };
-    dependencies = [];
-
-  };
-  "UltiSnips" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "UltiSnips-2015-05-11";
-    src = fetchgit {
-      url = "git://github.com/sirver/ultisnips";
-      rev = "188e00f7b87297ea7737f9494d531c7073637332";
-      sha256 = "9fb127b32bd0e2ae139b3b6008849f4566cfb1c29087e787570428c770a3430c";
-    };
-    dependencies = [];
-
-  };
-  "VimOutliner" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "VimOutliner-2015-01-09";
-    src = fetchgit {
-      url = "git://github.com/vimoutliner/vimoutliner";
-      rev = "7c995f973c54b0d026137615af28059890edb197";
-      sha256 = "9d1526ec99904fd2ccfdb4dd6763b4cd04048cb74bb7a0a4c9b4a7b1f5d75cb5";
-    };
-    dependencies = [];
-
-  };
-  "WebAPI" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "WebAPI-2014-10-27";
-    src = fetchgit {
-      url = "git://github.com/mattn/webapi-vim";
-      rev = "a7789abffe936db56e3152e23733847f94755753";
-      sha256 = "455b84d9fd13200ff5ced5d796075f434a7fb9c00f506769174579266ae2be80";
-    };
-    dependencies = [];
-
-  };
-  "YankRing" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "YankRing";
-    src = fetchurl {
-      url = "http://www.vim.org/scripts/download_script.php?src_id=20842";
-      name = "yankring_180.zip";
-      sha256 = "0bsq4pxagy12jqxzs7gcf25k5ahwif13ayb9k8clyhm0jjdkf0la";
-    };
-    buildInputs = [ unzip ];
-    dependencies = [];
-    meta = {
-       url = "http://www.vim.org/scripts/script.php?script_id=1234";
-    };
-
-
-  };
-  "commentary" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "commentary-2014-11-10";
-    src = fetchgit {
-      url = "git://github.com/tpope/vim-commentary";
-      rev = "9c685131a5facfa0d643feca3a61b41c007d8170";
-      sha256 = "2a9f394d0669429469c2f1ddaf9a722c2773f35da08ea9496d3b4b4e85b6038d";
-    };
-    dependencies = [];
-
-  };
-  "ctrlp" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-2013-07-29";
-    src = fetchgit {
-      url = "git://github.com/kien/ctrlp.vim";
-      rev = "b5d3fe66a58a13d2ff8b6391f4387608496a030f";
-      sha256 = "41f7884973770552395b96f8693da70999dc815462d4018c560d3ff6be462e76";
-    };
-    dependencies = [];
-
-  };
-  "extradite" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "extradite-2015-01-26";
-    src = fetchgit {
-      url = "git://github.com/int3/vim-extradite";
-      rev = "a1dc4b63befd5032e65a0c94e7257d4636aa6a3f";
-      sha256 = "94e05bbe36c9d4cee9832530531eedff0da509d5a0a52beee4e524fd4ad96714";
-    };
-    dependencies = [];
-
-  };
-  "fugitive" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fugitive-2015-03-31";
-    src = fetchgit {
-      url = "git://github.com/tpope/vim-fugitive";
-      rev = "4cc201cbe3a0c3faa4cde1b82ba941d410e5e81c";
-      sha256 = "f7e79b5e823639d0b9e2c46c29cdae621b22b3bb0c601dce058083877dad2e13";
-    };
-    dependencies = [];
-
-  };
-  "ghcmod" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ghcmod-2015-03-17";
-    src = fetchgit {
-      url = "git://github.com/eagletmt/ghcmod-vim";
-      rev = "7e5f6102aa709244f5d4cedec807eac4b901c4cb";
-      sha256 = "47c5f5c4bf73dca653550b460306fa3808d864a685903bdb95ba07a6e1cd2899";
-    };
-    dependencies = [];
-
-  };
-  "github:JagaJaga/vim-addon-vim2nix" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "github-JagaJaga-vim-addon-vim2nix-2015-03-06";
-    src = fetchgit {
-      url = "git://github.com/JagaJaga/vim-addon-vim2nix";
-      rev = "343d8a4e43a5b40f134e73be7140f754ca74d2e5";
-      sha256 = "466ac56d4397d964cf21a63d31f2628fdea40bc94a54018affe8717de8514564";
-    };
-    dependencies = ["vim-addon-manager"];
-
-  };
-  "matchit.zip" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "matchit.zip";
+  matchit-zip = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "matchit-zip";
     src = fetchurl {
       url = "http://www.vim.org/scripts/download_script.php?src_id=8196";
       name = "matchit.zip";
@@ -915,15 +801,16 @@ rec {
        url = "http://www.vim.org/scripts/script.php?script_id=39";
     };
 
-  unpackPhase = ''
-    (
-     sourceRoot=d
-     mkdir $sourceRoot; cd $sourceRoot;
-     unzip $src
-    )
-  '';
+    unpackPhase = ''
+      (
+       sourceRoot=d
+       mkdir $sourceRoot; cd $sourceRoot;
+       unzip $src
+      )
+    '';
   };
-  "pathogen" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "pathogen-2014-11-06";
     src = fetchgit {
       url = "git://github.com/tpope/vim-pathogen";
@@ -933,7 +820,8 @@ rec {
     dependencies = [];
 
   };
-  "quickfixstatus" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  quickfixstatus = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "quickfixstatus-2011-09-02";
     src = fetchgit {
       url = "git://github.com/dannyob/quickfixstatus";
@@ -943,7 +831,8 @@ rec {
     dependencies = [];
 
   };
-  "rainbow_parentheses" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  rainbow_parentheses = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "rainbow_parentheses-2013-03-04";
     src = fetchgit {
       url = "git://github.com/kien/rainbow_parentheses.vim";
@@ -953,7 +842,8 @@ rec {
     dependencies = [];
 
   };
-  "rust" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  rust = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "rust-2015-01-29";
     src = fetchgit {
       url = "git://github.com/wting/rust.vim";
@@ -963,7 +853,8 @@ rec {
     dependencies = [];
 
   };
-  "sensible" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "sensible-2015-04-04";
     src = fetchgit {
       url = "git://github.com/tpope/vim-sensible";
@@ -973,7 +864,8 @@ rec {
     dependencies = [];
 
   };
-  "snipmate" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  snipmate = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "snipmate-2015-04-04";
     src = fetchgit {
       url = "git://github.com/garbas/vim-snipmate";
@@ -983,7 +875,8 @@ rec {
     dependencies = ["vim-addon-mw-utils" "tlib"];
 
   };
-  "sourcemap" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  sourcemap = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "sourcemap-2012-09-19";
     src = fetchgit {
       url = "git://github.com/chikatoike/sourcemap.vim";
@@ -993,7 +886,8 @@ rec {
     dependencies = [];
 
   };
-  "surround" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  surround = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "surround-2015-03-15";
     src = fetchgit {
       url = "git://github.com/tpope/vim-surround";
@@ -1003,7 +897,8 @@ rec {
     dependencies = [];
 
   };
-  "table-mode" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "table-mode-2015-04-21";
     src = fetchgit {
       url = "git://github.com/dhruvasagar/vim-table-mode";
@@ -1013,17 +908,40 @@ rec {
     dependencies = [];
 
   };
-  "tlib" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tlib-2015-05-04";
+
+  taglist = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "taglist";
+    src = fetchurl {
+      url = "http://www.vim.org/scripts/download_script.php?src_id=19574";
+      name = "taglist_46.zip";
+      sha256 = "18cbv462vwg7vip2p99qlahm99hswav96cj4ki227kyi05q2lkjj";
+    };
+    buildInputs = [ unzip ];
+    dependencies = [];
+    meta = {
+       url = "http://www.vim.org/scripts/script.php?script_id=273";
+    };
+
+    setSourceRoot = ''
+      export sourceRoot=taglist
+      mkdir taglist
+      mv doc taglist
+      mv plugin taglist
+    '';
+  };
+
+  tlib = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "tlib-2015-05-20";
     src = fetchgit {
       url = "git://github.com/tomtom/tlib_vim";
-      rev = "ecf9e08de8b8ed8cf5e1f69f69471b04b7d55652";
-      sha256 = "5d3d5f066b23be90c3c4de54967056378fff931594154c4e5541a3bcd424b795";
+      rev = "c9ffbef0718a35bd30eb711456e2100e4adf79f7";
+      sha256 = "b0752538ee629c6f2c52d3b2b2fb61247bcd186ef9610ad8ae5c7d24ea41d971";
     };
     dependencies = [];
 
   };
-  "undotree" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  undotree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "undotree-2015-03-01";
     src = fetchgit {
       url = "git://github.com/mbbill/undotree";
@@ -1033,7 +951,8 @@ rec {
     dependencies = [];
 
   };
-  "vim-addon-actions" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-addon-actions = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-actions-2014-09-22";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-actions";
@@ -1043,7 +962,8 @@ rec {
     dependencies = ["vim-addon-mw-utils" "tlib"];
 
   };
-  "vim-addon-async" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-addon-async = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-async-2013-10-18";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-async";
@@ -1053,7 +973,8 @@ rec {
     dependencies = ["vim-addon-signs"];
 
   };
-  "vim-addon-background-cmd" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-addon-background-cmd = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-background-cmd-2015-01-05";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-background-cmd";
@@ -1063,7 +984,8 @@ rec {
     dependencies = ["vim-addon-mw-utils"];
 
   };
-  "vim-addon-commenting" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-addon-commenting = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-commenting-2013-06-10";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-commenting";
@@ -1073,7 +995,8 @@ rec {
     dependencies = [];
 
   };
-  "vim-addon-completion" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-addon-completion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-completion-2015-02-10";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-completion";
@@ -1083,7 +1006,8 @@ rec {
     dependencies = ["tlib"];
 
   };
-  "vim-addon-errorformats" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-addon-errorformats = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-errorformats-2014-11-05";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-errorformats";
@@ -1093,7 +1017,8 @@ rec {
     dependencies = [];
 
   };
-  "vim-addon-goto-thing-at-cursor" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-addon-goto-thing-at-cursor = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-goto-thing-at-cursor-2012-01-11";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-goto-thing-at-cursor";
@@ -1103,7 +1028,8 @@ rec {
     dependencies = ["tlib"];
 
   };
-  "vim-addon-local-vimrc" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-addon-local-vimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-local-vimrc-2015-03-19";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-local-vimrc";
@@ -1113,7 +1039,8 @@ rec {
     dependencies = [];
 
   };
-  "vim-addon-manager" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-addon-manager = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-manager-2014-12-03";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-manager";
@@ -1123,7 +1050,8 @@ rec {
     dependencies = [];
 
   };
-  "vim-addon-mru" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-addon-mru = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-mru-2013-08-08";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-mru";
@@ -1133,7 +1061,8 @@ rec {
     dependencies = ["vim-addon-other" "vim-addon-mw-utils"];
 
   };
-  "vim-addon-mw-utils" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-addon-mw-utils = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-mw-utils-2012-11-05";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-mw-utils";
@@ -1143,7 +1072,8 @@ rec {
     dependencies = [];
 
   };
-  "vim-addon-nix" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-addon-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-nix-2015-03-10";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-nix";
@@ -1153,7 +1083,8 @@ rec {
     dependencies = ["vim-addon-completion" "vim-addon-goto-thing-at-cursor" "vim-addon-errorformats" "vim-addon-actions" "vim-addon-mw-utils" "tlib"];
 
   };
-  "vim-addon-other" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-addon-other = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-other-2014-07-15";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-other";
@@ -1163,7 +1094,8 @@ rec {
     dependencies = ["vim-addon-actions" "vim-addon-mw-utils"];
 
   };
-  "vim-addon-php-manual" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-addon-php-manual = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-php-manual-2015-01-01";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-php-manual";
@@ -1173,7 +1105,8 @@ rec {
     dependencies = [];
 
   };
-  "vim-addon-signs" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-addon-signs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-signs-2013-04-19";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-signs";
@@ -1183,7 +1116,8 @@ rec {
     dependencies = [];
 
   };
-  "vim-addon-sql" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-addon-sql = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-sql-2014-01-18";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-sql";
@@ -1193,7 +1127,8 @@ rec {
     dependencies = ["vim-addon-completion" "vim-addon-background-cmd" "tlib"];
 
   };
-  "vim-addon-syntax-checker" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-addon-syntax-checker = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-syntax-checker-2013-07-12";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-syntax-checker";
@@ -1203,7 +1138,8 @@ rec {
     dependencies = ["vim-addon-mw-utils" "tlib"];
 
   };
-  "vim-addon-toggle-buffer" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-addon-toggle-buffer = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-toggle-buffer-2012-01-13";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-toggle-buffer";
@@ -1213,7 +1149,8 @@ rec {
     dependencies = ["vim-addon-mw-utils" "tlib"];
 
   };
-  "vim-addon-xdebug" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-addon-xdebug = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-xdebug-2014-08-29";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-xdebug";
@@ -1223,17 +1160,19 @@ rec {
     dependencies = ["WebAPI" "vim-addon-mw-utils" "vim-addon-signs" "vim-addon-async"];
 
   };
-  "vim-airline" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-2015-03-24";
+
+  vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-airline-2015-05-25";
     src = fetchgit {
       url = "git://github.com/bling/vim-airline";
-      rev = "f45ecdac15d99ed2354873a8b4d40432fd0a85a3";
-      sha256 = "30176b06f13838fe7b0374e2ed529c0d26abe432ff7453c7443b2f204cf70012";
+      rev = "67de5f2257f8d5def7a31e3009d4298ce977cb80";
+      sha256 = "0ca13f68b22ce3112117d7194f3d6b4e1280f032bc7bbca6fba4df185ff1da2a";
     };
     dependencies = [];
 
   };
-  "vim-coffee-script" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-coffee-script-2015-04-20";
     src = fetchgit {
       url = "git://github.com/kchmck/vim-coffee-script";
@@ -1243,7 +1182,8 @@ rec {
     dependencies = [];
 
   };
-  "vim-easy-align" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-easy-align = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-easy-align-2014-12-14";
     src = fetchgit {
       url = "git://github.com/junegunn/vim-easy-align";
@@ -1253,7 +1193,8 @@ rec {
     dependencies = [];
 
   };
-  "vim-gista" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-gista = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-gista-2015-01-29";
     src = fetchgit {
       url = "git://github.com/lambdalisue/vim-gista";
@@ -1263,7 +1204,8 @@ rec {
     dependencies = [];
 
   };
-  "vim-gitgutter" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-gitgutter-2015-05-08";
     src = fetchgit {
       url = "git://github.com/airblade/vim-gitgutter";
@@ -1273,7 +1215,8 @@ rec {
     dependencies = [];
 
   };
-  "vim-iced-coffee-script" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-iced-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-iced-coffee-script-2013-12-27";
     src = fetchgit {
       url = "git://github.com/noc7c9/vim-iced-coffee-script";
@@ -1283,37 +1226,41 @@ rec {
     dependencies = [];
 
   };
-  "vim-latex-live-preview" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-latex-live-preview-2013-11-25";
+
+  vim-latex-live-preview = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-latex-live-preview-2015-05-11";
     src = fetchgit {
       url = "git://github.com/xuhdev/vim-latex-live-preview";
-      rev = "18625ceca4de5984f3df50cdd0202fc13eb9e37c";
-      sha256 = "261852d3830189a50176f997a4c6b4ec7e25893c5b7842a3eb57eb7771158722";
+      rev = "7695dd4ebddb735bec632d468e2202d070029cb8";
+      sha256 = "3551e2a84a98b07f5edce6e35bad5cd2a78da1ef60dd94202c623e238b05bfc8";
     };
     dependencies = [];
 
   };
-  "vim-signature" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signature-2015-04-24";
+
+  vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-signature-2015-05-19";
     src = fetchgit {
       url = "git://github.com/kshenoy/vim-signature";
-      rev = "7586613e5dcfd2f09d32197aa5a10ed025da21f4";
-      sha256 = "0bce1c37adc06a386438e13c6e3e0af5829a13e4e65fbd703234680bc3d769fc";
+      rev = "7ab61e2a5101ec139a54735b432a6e95a22770d8";
+      sha256 = "041b906cd27bcb922732e324b671adbf6ea0106105230ea43111ca9f844b64c3";
     };
     dependencies = [];
 
   };
-  "vim-snippets" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-snippets-2015-05-05";
+
+  vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-snippets-2015-05-31";
     src = fetchgit {
       url = "git://github.com/honza/vim-snippets";
-      rev = "1327c1ba54c8c367995b536b8cb7d8e7cc7c4c03";
-      sha256 = "fb6a7a2fa0939a64f8bac4411dfa36dc5a6e1385e5016978045614039ab89720";
+      rev = "0e9eff1bf36728b6423171f962a8d6e5de7a4621";
+      sha256 = "0d2342a184806ba9357871ef77229a29854a665fd4e75674638136d2054c0551";
     };
     dependencies = [];
 
   };
-  "vim2hs" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim2hs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim2hs-2014-04-16";
     src = fetchgit {
       url = "git://github.com/dag/vim2hs";
@@ -1323,7 +1270,8 @@ rec {
     dependencies = [];
 
   };
-  "vundle" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vundle-2015-03-21";
     src = fetchgit {
       url = "git://github.com/gmarik/vundle";
@@ -1333,7 +1281,8 @@ rec {
     dependencies = [];
 
   };
-  "wombat256" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  wombat256 = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "wombat256";
     src = fetchurl {
       url = "http://www.vim.org/scripts/download_script.php?src_id=13400";
@@ -1348,6 +1297,4 @@ rec {
 
 
   };
-
-
 }
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 39f6aa189040..c095237bc9a9 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -1,57 +1,98 @@
-"vim-addon-syntax-checker"
-"vim-addon-other"
-"vim-addon-local-vimrc"
-"snipmate"
-"vim-snippets"
-"vim-addon-mru"
-"vim-addon-commenting"
-"vim-addon-sql"
-"vim-addon-async"
-"vim-addon-toggle-buffer"
-"vim-addon-mw-utils"
-"matchit.zip"
-"vim-addon-xdebug"
-"vim-addon-php-manual"
-"sourcemap"
-"vim-iced-coffee-script"
-"ctrlp"
-"commentary"
-"Colour_Sampler_Pack"
+"Gist"
+"Gundo"
+"Hoogle"
 "Solarized"
-"vim-coffee-script"
-"vim-easy-align"
-"Tagbar"
-"Tabular"
-"table-mode"
-"Syntastic"
-"vim-signature"
-"surround"
 "Supertab"
-"rust"
-"rainbow_parentheses"
-"pathogen"
-"quickfixstatus"
+"Syntastic"
+"Tabular"
+"Tagbar"
 "The_NERD_Commenter"
 "The_NERD_tree"
-"vim-latex-live-preview"
-"Hoogle"
-"Gundo"
-"vim-gitgutter"
-"Gist"
-"ghcmod"
-"fugitive"
-"extradite"
-"vim-airline"
-"VimOutliner"
-"vim2hs"
-"undotree"
 "UltiSnips"
-"wombat256"
-"vundle"
+"VimOutliner"
 "WebAPI"
 "YankRing"
-"vim-addon-manager"
-"vim-addon-nix"
-"vim-gista"
+"commentary"
+"ctrlp"
+"extradite"
+"fugitive"
+"ghcmod"
 "github:JagaJaga/vim-addon-vim2nix"
+"github:bitc/lushtags"
+"github:bitc/vim-hdevtools"
+"github:christoomey/vim-tmux-navigator"
+"github:eagletmt/neco-ghc"
+"github:esneider/YUNOcommit.vim"
+"github:idris-hackers/idris-vim"
+"github:itchyny/calendar.vim"
+"github:itchyny/thumbnail.vim"
+"github:ivanov/vim-ipython"
+"github:jceb/vim-hier"
+"github:jeetsukumaran/vim-buffergator"
+"github:jgdavey/tslime.vim"
+"github:jistr/vim-nerdtree-tabs"
+"github:jnwhiteh/vim-golang"
+"github:joonty/vim-xdebug"
+"github:justincampbell/vim-eighties"
+"github:latex-box-team/latex-box"
+"github:lepture/vim-jinja"
+"github:lokaltog/vim-easymotion"
+"github:lyokha/vim-xkbswitch"
+"github:nbouscal/vim-stylish-haskell"
+"github:osyo-manga/shabadou.vim"
+"github:osyo-manga/vim-watchdogs"
+"github:phildawes/racer"
+"github:shougo/neocomplete.vim"
+"github:shougo/neosnippet-snippets"
+"github:shougo/neosnippet.vim"
+"github:shougo/vimproc.vim"
+"github:shougo/vimshell.vim"
+"github:takac/vim-hardtime"
+"github:thinca/vim-quickrun"
+"github:travitch/hasksyn"
+"github:twinside/vim-haskellconceal"
+"github:valloric/youcompleteme"
+"github:vim-scripts/Colour-Sampler-Pack"
+"github:vim-scripts/a.vim"
+"github:vim-scripts/align"
+"github:vim-scripts/tabmerge"
+"github:wakatime/vim-wakatime"
+"github:wincent/command-t"
+"matchit.zip"
+"pathogen"
+"quickfixstatus"
+"rainbow_parentheses"
+"rust"
 "sensible"
+"snipmate"
+"sourcemap"
+"surround"
+"table-mode"
+"taglist"
+"undotree"
+"vim-addon-async"
+"vim-addon-commenting"
+"vim-addon-completion"
+"vim-addon-local-vimrc"
+"vim-addon-manager"
+"vim-addon-mru"
+"vim-addon-mw-utils"
+"vim-addon-nix"
+"vim-addon-other"
+"vim-addon-php-manual"
+"vim-addon-sql"
+"vim-addon-syntax-checker"
+"vim-addon-toggle-buffer"
+"vim-addon-xdebug"
+"vim-airline"
+"vim-coffee-script"
+"vim-easy-align"
+"vim-gista"
+"vim-gitgutter"
+"vim-iced-coffee-script"
+"vim-latex-live-preview"
+"vim-signature"
+"vim-snippets"
+"vim2hs"
+"vundle"
+"wombat256"
diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index 9140acffe0d8..ec1724a9f9a1 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -102,7 +102,7 @@ Then create a temp vim file and insert:
 
 Then ":source %" it.
 
-nix#ExportPluginsForNix is provided by github.com/MarcWeber/vim-addon-vim2nix
+nix#ExportPluginsForNix is provided by github.com/JagaJaga/vim-addon-vim2nix
 
 A buffer will open containing the plugin derivation lines as well list 
 fitting the vimrcConfig.vam.pluginDictionaries option.
@@ -296,7 +296,7 @@ rec {
   pluginnames2Nix = {name, namefiles} : vim_configurable.customize {
     inherit name;
     vimrcConfig.vam.knownPlugins = vimPlugins;
-    vimrcConfig.vam.pluginDictionaries = ["github:JagaJaga/vim-addon-vim2nix"]; # Using fork until patch is accepted by upstream
+    vimrcConfig.vam.pluginDictionaries = ["vim-addon-vim2nix"]; # Using fork until patch is accepted by upstream
     vimrcConfig.customRC = ''
       " Yes - this is impure and will create the cache file and checkout vim-pi
       " into ~/.vim/vim-addons