vim-plugins: sort plugin-names and fix indentation

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"