diff --git a/vim/plugins_config.vim b/vim/plugins_config.vim index cc283fc..e1f586c 100644 --- a/vim/plugins_config.vim +++ b/vim/plugins_config.vim @@ -84,8 +84,6 @@ augroup END let g:ale_fix_on_save = 1 -let g:ale_completion_enabled = 1 -" let g:ale_completion_autoimport = 1 let g:ale_lsp_show_message_severity = 'information' let g:ale_lsp_suggestions = 1 @@ -217,14 +215,14 @@ endif " These are the default mappings for vim-multi-cursor -let g:multi_cursor_start_word_key = '' -let g:multi_cursor_select_all_word_key = '' -let g:multi_cursor_start_key = 'g' -let g:multi_cursor_select_all_key = 'g' -let g:multi_cursor_next_key = '' -let g:multi_cursor_prev_key = '' -let g:multi_cursor_skip_key = '' -let g:multi_cursor_quit_key = '' +" let g:multi_cursor_start_word_key = '' +" let g:multi_cursor_select_all_word_key = '' +" let g:multi_cursor_start_key = 'g' +" let g:multi_cursor_select_all_key = 'g' +" let g:multi_cursor_next_key = '' +" let g:multi_cursor_prev_key = '' +" let g:multi_cursor_skip_key = '' +" let g:multi_cursor_quit_key = '' " indent-guides, toggle with ig let g:indent_guides_enable_on_vim_startup = 0 diff --git a/vim/plugs.vim b/vim/plugs.vim index 882cb9f..5ee0608 100644 --- a/vim/plugs.vim +++ b/vim/plugs.vim @@ -109,6 +109,16 @@ if isdirectory(vim_razer) Plug vim_razer endif +if has('nvim') + Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } +else + Plug 'Shougo/deoplete.nvim' + Plug 'roxma/nvim-yarp' + Plug 'roxma/vim-hug-neovim-rpc' +endif +let g:deoplete#enable_at_startup = 1 + + call plug#end() " Install plugins if missing diff --git a/vim/vimrc b/vim/vimrc index 32ef0d8..0428944 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -56,7 +56,7 @@ set hlsearch "highlight search results (using *) set expandtab shiftwidth=4 tabstop=4 "always use spaces " Completion menu config (see :h completopt) -set completeopt=menu,menuone,noselect,noinsert +set completeopt=menu,menuone,noselect,noinsert,preview " Show completion suggestions in popups instead of preview window set completeopt+=popup @@ -139,3 +139,8 @@ source $DOTFILES/vim/functions.vim if filereadable('.vimrc.local') source .vimrc.local endif + +" Use ALE and also some plugin 'foobar' as completion sources for all code. +call deoplete#custom#option('sources', { +\ '_': ['ale', 'ultisnips'], +\})