From 8b5ddd6a7ba4cd734dc892061621f8687af40258 Mon Sep 17 00:00:00 2001
From: Jeremy Kaplan <jdkaplan@metagram.net>
Date: Tue, 24 Sep 2019 21:51:41 -0700
Subject: [PATCH] neovim: Remove Shougo plugins

---
 .gitmodules              |  6 +--
 neovim/autoload/plug.vim |  1 +
 neovim/init.vim          | 93 +++++++++++++---------------------------
 3 files changed, 34 insertions(+), 66 deletions(-)
 create mode 120000 neovim/autoload/plug.vim

diff --git a/.gitmodules b/.gitmodules
index fab1385..054e05e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,6 +7,6 @@
 [submodule "tako/plugins"]
 	path = tako/plugins
 	url = https://gitlab.com/jdkaplan/tako-plugins.git
-[submodule "neovim/neosnippets"]
-	path = neovim/neosnippets
-	url = https://github.com/Shougo/neosnippet-snippets.git
+[submodule "neovim/plugins/github.com/junegunn/vim-plug"]
+	path = neovim/plugins/github.com/junegunn/vim-plug
+	url = https://github.com/junegunn/vim-plug.git
diff --git a/neovim/autoload/plug.vim b/neovim/autoload/plug.vim
new file mode 120000
index 0000000..5a39b44
--- /dev/null
+++ b/neovim/autoload/plug.vim
@@ -0,0 +1 @@
+../plugins/github.com/junegunn/vim-plug/plug.vim
\ No newline at end of file
diff --git a/neovim/init.vim b/neovim/init.vim
index 28bd3cf..152d990 100644
--- a/neovim/init.vim
+++ b/neovim/init.vim
@@ -6,51 +6,36 @@ let &shell = '/bin/sh'
 let g:python3_host_prog = expand('~/.virtualenvs/neovim3/bin/python')
 let g:python_host_prog  = expand('~/.virtualenvs/neovim2/bin/python')
 
-set runtimepath+=~/.config/nvim/plugins/repos/github.com/Shougo/dein.vim
-
-if dein#load_state('~/.config/nvim/plugins')
-  call dein#begin('~/.config/nvim/plugins')
-
-  call dein#add('airblade/vim-gitgutter')
-  call dein#add('airblade/vim-rooter')
-  call dein#add('cespare/vim-toml')
-  call dein#add('dense-analysis/ale')
-  call dein#add('elixir-editors/vim-elixir')
-  call dein#add('fatih/vim-go')
-  call dein#add('glts/vim-textobj-comment')
-  call dein#add('ianks/vim-tsx')
-  call dein#add('jeetsukumaran/vim-buffergator')
-  call dein#add('jiangmiao/auto-pairs')
-  call dein#add('jparise/vim-graphql')
-  call dein#add('junegunn/fzf')
-  call dein#add('junegunn/fzf.vim')
-  call dein#add('kana/vim-textobj-user')
-  call dein#add('leafgarland/typescript-vim')
-  call dein#add('LnL7/vim-nix')
-  call dein#add('mxw/vim-jsx')
-  call dein#add('ntpeters/vim-better-whitespace')
-  call dein#add('MarcWeber/vim-addon-local-vimrc')
-  call dein#add('pangloss/vim-javascript')
-  call dein#add('plasticboy/vim-markdown')
-  call dein#add('scrooloose/nerdtree')
-  call dein#add('Shougo/dein.vim') " let dein manage itself
-  call dein#add('Shougo/deoplete.nvim')
-  call dein#add('Shougo/neosnippet.vim')
-  call dein#add('tpope/vim-abolish')
-  call dein#add('tpope/vim-commentary')
-  call dein#add('tpope/vim-repeat')
-  call dein#add('tpope/vim-surround')
-  call dein#add('vim-python/python-syntax')
-  call dein#add('zchee/deoplete-go', {'build': 'make'})
-  call dein#add('zchee/deoplete-jedi')
-
-  call dein#end()
-  call dein#save_state()
-endif
-
-if dein#check_install()
-    call dein#install()
-endif
+set runtimepath+=~/.config/nvim/autoload
+call plug#begin('~/.local/share/nvim/plugged')
+Plug 'airblade/vim-gitgutter'
+Plug 'airblade/vim-rooter'
+Plug 'cespare/vim-toml'
+Plug 'dense-analysis/ale'
+Plug 'elixir-editors/vim-elixir'
+Plug 'fatih/vim-go'
+Plug 'glts/vim-textobj-comment'
+Plug 'ianks/vim-tsx'
+Plug 'jeetsukumaran/vim-buffergator'
+Plug 'jiangmiao/auto-pairs'
+Plug 'jparise/vim-graphql'
+Plug 'junegunn/fzf'
+Plug 'junegunn/fzf.vim'
+Plug 'kana/vim-textobj-user'
+Plug 'leafgarland/typescript-vim'
+Plug 'LnL7/vim-nix'
+Plug 'mxw/vim-jsx'
+Plug 'ntpeters/vim-better-whitespace'
+Plug 'MarcWeber/vim-addon-local-vimrc'
+Plug 'pangloss/vim-javascript'
+Plug 'plasticboy/vim-markdown'
+Plug 'scrooloose/nerdtree'
+Plug 'tpope/vim-abolish'
+Plug 'tpope/vim-commentary'
+Plug 'tpope/vim-repeat'
+Plug 'tpope/vim-surround'
+Plug 'vim-python/python-syntax'
+call plug#end()
 
 filetype plugin indent on
 syntax enable
@@ -148,14 +133,6 @@ map <silent> ;* :call fzf#run({
 \    'options': '+m',
 \})<CR>
 
-let g:deoplete#enable_at_startup = 1
-let g:deoplete#disable_auto_complete = 1
-inoremap <expr> <C-n> deoplete#mappings#manual_complete()
-autocmd CompleteDone * silent! pclose!
-set completeopt+=noselect
-set completeopt+=menuone
-set completeopt+=longest
-
 let g:ale_sign_error = '!'
 let g:ale_sign_warning = '?'
 let g:ale_echo_msg_format = '%linter%: %s'
@@ -241,7 +218,6 @@ let g:go_highlight_operators = 1
 let g:go_highlight_structs = 1
 let g:go_highlight_types = 1
 let g:go_fmt_command = "goimports"
-let g:go_snippet_engine = "neosnippet"
 
 let g:buffergator_viewport_split_policy = 'B'
 let g:buffergator_autoupdate = 1
@@ -252,15 +228,6 @@ let g:buffergator_suppress_keymaps = 1
 let g:buffergator_autodismiss_on_select = 0
 map <silent> <leader>b :BuffergatorToggle<CR>
 
-let g:neosnippet#snippets_directory='~/.config/nvim/neosnippets/neosnippets'
-let g:neosnippet#disable_runtime_snippets = {
-\    '_' : 1,
-\}
-imap <C-k> <Plug>(neosnippet_expand_or_jump)
-smap <C-k> <Plug>(neosnippet_expand_or_jump)
-xmap <C-k> <Plug>(neosnippet_expand_target)
-let g:neosnippet#enable_completed_snippet=1
-
 let g:rooter_manual_only = 1
 let g:rooter_patterns = ['.root', '.git', '.git/']
 noremap <silent> <leader>cd :execute 'cd' fnameescape(FindRootDirectory())<CR>:pwd<CR>