From dfadc40ba3bcd7bd64129c47ce3571a312272082 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sun, 23 May 2021 12:04:02 -0700
Subject: [PATCH] Remove deoplete

---
 .gitmodules                           | 9 ---------
 keymaps.vim                           | 5 ++---
 options.vim                           | 2 +-
 pack/plugins/start/deoplete.nvim      | 1 -
 pack/plugins/start/nvim-yarp          | 1 -
 pack/plugins/start/vim-hug-neovim-rpc | 1 -
 plugins.vim                           | 9 +--------
 7 files changed, 4 insertions(+), 24 deletions(-)
 delete mode 160000 pack/plugins/start/deoplete.nvim
 delete mode 160000 pack/plugins/start/nvim-yarp
 delete mode 160000 pack/plugins/start/vim-hug-neovim-rpc

diff --git a/.gitmodules b/.gitmodules
index 296db7b..94d28e0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -67,15 +67,6 @@
 [submodule ".vim/bundle/fzf.vim"]
 	path = pack/plugins/start/fzf.vim
 	url = https://github.com/junegunn/fzf.vim.git
-[submodule ".vim/bundle_extra/deoplete.nvim"]
-	path = pack/plugins/start/deoplete.nvim
-	url = https://github.com/Shougo/deoplete.nvim.git
-[submodule ".vim/bundle_extra/nvim-yarp"]
-	path = pack/plugins/start/nvim-yarp
-	url = https://github.com/roxma/nvim-yarp.git
-[submodule ".vim/bundle_extra/vim-hug-neovim-rpc"]
-	path = pack/plugins/start/vim-hug-neovim-rpc
-	url = https://github.com/roxma/vim-hug-neovim-rpc
 [submodule ".vim/bundle/tcomment_vim"]
 	path = pack/plugins/start/tcomment_vim
 	url = https://github.com/tomtom/tcomment_vim
diff --git a/keymaps.vim b/keymaps.vim
index e8245a1..5a2fa9a 100644
--- a/keymaps.vim
+++ b/keymaps.vim
@@ -39,11 +39,10 @@ nnoremap <C-l> <C-W>l
 nnoremap j gj
 nnoremap k gk
 
-inoremap <expr><tab> pumvisible() ? '<C-y>' : '<tab>'
-inoremap <expr><cr> pumvisible() ? '<C-e><cr>' : '<cr>'
-
 " util
 nnoremap <leader>ig :Guid<cr>
+inoremap <expr><tab> pumvisible() ? '<C-y>' : '<tab>'
+inoremap <expr><cr> pumvisible() ? '<C-e><cr>' : '<cr>'
 
 " ale
 nnoremap gd :ALEGoToDefinition<cr>
diff --git a/options.vim b/options.vim
index 43a0c93..dbe879c 100644
--- a/options.vim
+++ b/options.vim
@@ -13,7 +13,7 @@ set background=dark
 set backspace=indent,eol,start
 set belloff=all
 set complete-=i
-set completeopt=longest,menuone,noinsert
+set completeopt=menuone,noinsert
 set encoding=utf-8
 set expandtab
 set fileformats=unix,dos,mac
diff --git a/pack/plugins/start/deoplete.nvim b/pack/plugins/start/deoplete.nvim
deleted file mode 160000
index 27be5ec..0000000
--- a/pack/plugins/start/deoplete.nvim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 27be5ec45cf52223b225b25517bc088cfcf3c959
diff --git a/pack/plugins/start/nvim-yarp b/pack/plugins/start/nvim-yarp
deleted file mode 160000
index b710bf4..0000000
--- a/pack/plugins/start/nvim-yarp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b710bf4daccb603a423754794fb446e5fbb59576
diff --git a/pack/plugins/start/vim-hug-neovim-rpc b/pack/plugins/start/vim-hug-neovim-rpc
deleted file mode 160000
index 93ae387..0000000
--- a/pack/plugins/start/vim-hug-neovim-rpc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 93ae38792bc197c3bdffa2716ae493c67a5e7957
diff --git a/plugins.vim b/plugins.vim
index 1fdd4d7..8619b1d 100644
--- a/plugins.vim
+++ b/plugins.vim
@@ -1,18 +1,11 @@
 " ale
+let g:ale_completion_enabled = 1
 let g:ale_linters_explicit = 1
 let g:ale_cpp_ccls_init_options = {
     \ 'cacheDirectory': '/tmp/ccls',
     \ 'cacheFormat': 'binary',
     \ }
 
-" deoplete.nvim
-if has('python3')
-    let g:deoplete#enable_at_startup = 1
-    if len($PYTHON3_HOST_PROG) > 0
-        let g:python3_host_prog=$PYTHON3_HOST_PROG
-    endif
-endif
-
 " fzf
 let $FZF_DEFAULT_COMMAND='ag --hidden --ignore .git -f -g "" 2> /dev/null'
 if has('windows')