diff --git a/.gitmodules b/.gitmodules index f89367b..6f7e717 100644 --- a/.gitmodules +++ b/.gitmodules @@ -103,15 +103,6 @@ [submodule ".vim/bundle_extra/vim-hug-neovim-rpc"] path = .vim/bundle/vim-hug-neovim-rpc url = https://github.com/roxma/vim-hug-neovim-rpc -[submodule ".vim/bundle_extra/deoplete-go"] - path = .vim/bundle/deoplete-go - url = https://github.com/deoplete-plugins/deoplete-go.git -[submodule ".vim/bundle_extra/deoplete-clangx"] - path = .vim/bundle/deoplete-clangx - url = https://github.com/Shougo/deoplete-clangx.git -[submodule ".vim/bundle/deoplete-jedi"] - path = .vim/bundle/deoplete-jedi - url = https://github.com/deoplete-plugins/deoplete-jedi.git [submodule ".vim/bundle/base16-vim"] path = .vim/bundle/base16-vim url = https://github.com/chriskempson/base16-vim.git @@ -124,12 +115,9 @@ [submodule ".vim/bundle/vim-angry"] path = .vim/bundle/vim-angry url = https://github.com/b4winckler/vim-angry.git -[submodule ".vim/bundle/deoplete-ternjs"] - path = .vim/bundle/deoplete-ternjs - url = https://github.com/carlitux/deoplete-ternjs -[submodule ".vim/bundle/neco-vim"] - path = .vim/bundle/neco-vim - url = https://github.com/Shougo/neco-vim.git [submodule ".vim/bundle/ListToggle"] path = .vim/bundle/ListToggle url = https://github.com/Valloric/ListToggle.git +[submodule ".vim/bundle/LanguageClient-neovim"] + path = .vim/bundle/LanguageClient-neovim + url = https://github.com/autozimu/LanguageClient-neovim.git diff --git a/.vim/bundle/LanguageClient-neovim b/.vim/bundle/LanguageClient-neovim new file mode 160000 index 0000000..6fd9734 --- /dev/null +++ b/.vim/bundle/LanguageClient-neovim @@ -0,0 +1 @@ +Subproject commit 6fd97344926463bfd7c71e4fc3a9f2dc3480f3df diff --git a/.vim/bundle/deoplete-clangx b/.vim/bundle/deoplete-clangx deleted file mode 160000 index 602d48f..0000000 --- a/.vim/bundle/deoplete-clangx +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 602d48fb88ce1384c718fac1da2b833bedbeee48 diff --git a/.vim/bundle/deoplete-go b/.vim/bundle/deoplete-go deleted file mode 160000 index 4f1ccd2..0000000 --- a/.vim/bundle/deoplete-go +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4f1ccd2ed70211fd025d052ec725c0b835bea487 diff --git a/.vim/bundle/deoplete-jedi b/.vim/bundle/deoplete-jedi deleted file mode 160000 index 42f4c24..0000000 --- a/.vim/bundle/deoplete-jedi +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 42f4c24a951b0fb5e76a70e5234f16193a8a746d diff --git a/.vim/bundle/deoplete-ternjs b/.vim/bundle/deoplete-ternjs deleted file mode 160000 index 5405e84..0000000 --- a/.vim/bundle/deoplete-ternjs +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5405e84a44fc4ab5234c9a253ad4aa2b161e5897 diff --git a/.vim/bundle/neco-vim b/.vim/bundle/neco-vim deleted file mode 160000 index 4fbc3f5..0000000 --- a/.vim/bundle/neco-vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4fbc3f5f3a2b2d5299c388e2f1ffef04fcaf87ba diff --git a/.vim/plugins.vim b/.vim/plugins.vim index c94391a..e9d3978 100644 --- a/.vim/plugins.vim +++ b/.vim/plugins.vim @@ -15,22 +15,29 @@ if has('python3') endif endif +" LanguageClient-neovim +let g:LanguageClient_serverCommands = { + \ 'go': ['gopls'], + \ 'python': ['pyls'], + \ } + " fzf let $FZF_DEFAULT_COMMAND='ag --hidden --ignore .git -f -g "" 2> /dev/null' -let g:fzf_colors = -\ { 'fg': ['fg', 'Normal'], +let g:fzf_colors = { \ 'bg': ['bg', 'Normal'], - \ 'hl': ['fg', 'Comment'], - \ 'fg+': ['fg', 'CursorLine', 'CursorColumn', 'Normal'], \ 'bg+': ['bg', 'CursorLine', 'CursorColumn'], + \ 'border': ['fg', 'Ignore'], + \ 'fg': ['fg', 'Normal'], + \ 'fg+': ['fg', 'CursorLine', 'CursorColumn', 'Normal'], + \ 'header': ['fg', 'Comment'], + \ 'hl': ['fg', 'Comment'], \ 'hl+': ['fg', 'Statement'], \ 'info': ['fg', 'PreProc'], - \ 'border': ['fg', 'Ignore'], - \ 'prompt': ['fg', 'Conditional'], - \ 'pointer': ['fg', 'Exception'], \ 'marker': ['fg', 'Keyword'], + \ 'pointer': ['fg', 'Exception'], + \ 'prompt': ['fg', 'Conditional'], \ 'spinner': ['fg', 'Label'], - \ 'header': ['fg', 'Comment'] } + \ } " vim-airline let g:airline#extensions#tabline#enabled = 1 diff --git a/install.sh b/install.sh index 45fbc8d..a09574e 100755 --- a/install.sh +++ b/install.sh @@ -1,15 +1,10 @@ #!/bin/bash - git submodule update --init --recursive -if [ -x "$(command -v pip2)" ]; then - pip2 install --user pyflakes -fi - if [ -x "$(command -v pip3)" ]; then pip3 install --user pynvim fi -if [ -x "$(command -v npm)" ]; then - sudo npm install -g tern -fi +pushd ./.vim/bundle/LanguageClient-neovim +./install.sh +popd