From 35e2fb01cbf2038826a17b9df52e7b4e72973cd3 Mon Sep 17 00:00:00 2001
From: Adam Jacob <adam@chef.io>
Date: Tue, 30 May 2017 10:19:17 -0700
Subject: [PATCH] Cleanup for plugins

---
 .gitignore |  3 +++
 Makefile   |  3 ++-
 vimrc      | 15 ++++-----------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9f252ab..8270a90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@
 *.swp
 bundle/*
 tags
+tags.lock
+tags.temp
+init.vim
diff --git a/Makefile b/Makefile
index 5606024..db7227e 100644
--- a/Makefile
+++ b/Makefile
@@ -6,5 +6,6 @@ install:
 	mkdir -p ~/.vim/bundle
 	ln -sf ~/.vim/vimrc ~/.vimrc
 	ln -sf ~/.vim/vimrc ~/.vim/init.vim
+	curl -fLo ~/.local/share/nvim/site/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
 
-	vim -c 'PlugInstall' -c 'qa!'
+	nvim -c 'PlugInstall' -c 'qa!'
diff --git a/vimrc b/vimrc
index d5ec022..2ffc4a5 100644
--- a/vimrc
+++ b/vimrc
@@ -3,28 +3,21 @@ call plug#begin('~/.local/share/nvim/plugged')
 Plug 'tpope/vim-fugitive'
 Plug 'scrooloose/nerdtree'
 Plug 'mileszs/ack.vim'
-Plug 'FuzzyFinder'
-Plug 'taglist.vim'
-Plug 'Gist.vim'
-Plug 'L9'
-Plug 'VimClojure'
+Plug 'keith/Gist.vim'
+Plug 'vim-scripts/L9'
 Plug 'tpope/vim-surround'
 Plug 'scrooloose/nerdcommenter'
 Plug 'duskhacker/sweet-rspec-vim'
 Plug 'tpope/vim-markdown'
 Plug 'tpope/vim-haml'
 Plug 'tpope/vim-rails'
-Plug 'confluencewiki.vim'
 Plug 'majutsushi/tagbar'
-Plug 'vim-orgmode'
 Plug 'vim-ruby/vim-ruby'
-Plug 'matchit.zip'
-Plug 'CSApprox'
+Plug 'vim-scripts/matchit.zip'
 Plug 'timcharper/textile.vim'
 Plug 'jimenezrick/vimerl'
 Plug 'altercation/vim-colors-solarized'
-"Plug 'w0rp/ale'
-Plug 'JSON.vim'
+Plug 'elzr/vim-json'
 Plug 'elixir-lang/vim-elixir'
 Plug 'junegunn/rainbow_parentheses.vim'
 Plug 'bling/vim-airline'