diff options
| -rw-r--r-- | .gitmodules | 21 | ||||
| m--------- | bundle/clang | 0 | ||||
| m--------- | bundle/deoplete | 0 | ||||
| m--------- | bundle/deoplete-clangx | 0 | ||||
| m--------- | bundle/neocomplete | 0 | ||||
| m--------- | bundle/neoinclude | 0 | ||||
| m--------- | bundle/nvim-yarp | 0 | ||||
| m--------- | bundle/vim-hug-neovim-rpc | 0 | ||||
| -rw-r--r-- | config/deoplete.vim | 7 | ||||
| -rw-r--r-- | config/neocomplete.vim | 105 | ||||
| -rw-r--r-- | vimrc | 3 |
11 files changed, 24 insertions, 112 deletions
diff --git a/.gitmodules b/.gitmodules index 11d4f4e..8b6df92 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ [submodule "bundle/unbundle"] path = bundle/unbundle url = https://github.com/sunaku/vim-unbundle.git -[submodule "bundle/neocomplete"] - path = bundle/neocomplete - url = https://github.com/Shougo/neocomplete.vim.git [submodule "bundle/neco-ghc"] path = bundle/neco-ghc url = https://github.com/eagletmt/neco-ghc @@ -22,9 +19,6 @@ [submodule "bundle/airline"] path = bundle/airline url = https://github.com/bling/vim-airline.git -[submodule "bundle/clang"] - path = bundle/clang - url = https://github.com/Rip-Rip/clang_complete.git [submodule "bundle/grammarous"] path = bundle/grammarous url = https://github.com/rhysd/vim-grammarous.git @@ -34,3 +28,18 @@ [submodule "bundle/clang-format"] path = bundle/clang-format url = https://github.com/rhysd/vim-clang-format.git +[submodule "bundle/deoplete"] + path = bundle/deoplete + url = https://github.com/Shougo/deoplete.nvim.git +[submodule "bundle/nvim-yarp"] + path = bundle/nvim-yarp + url = https://github.com/roxma/nvim-yarp.git +[submodule "bundle/vim-hug-neovim-rpc"] + path = bundle/vim-hug-neovim-rpc + url = https://github.com/roxma/vim-hug-neovim-rpc.git +[submodule "bundle/deoplete-clangx"] + path = bundle/deoplete-clangx + url = https://github.com/Shougo/deoplete-clangx.git +[submodule "bundle/neoinclude"] + path = bundle/neoinclude + url = https://github.com/Shougo/neoinclude.vim.git diff --git a/bundle/clang b/bundle/clang deleted file mode 160000 -Subproject 0b98d7533ad967aac3fc4c1a5b0508dafa8a676 diff --git a/bundle/deoplete b/bundle/deoplete new file mode 160000 +Subproject 22db8b273c746bb228a8728f4dd3a5b934d709a diff --git a/bundle/deoplete-clangx b/bundle/deoplete-clangx new file mode 160000 +Subproject 197738ed344f4b1709b726a08cc5f3231fff2f1 diff --git a/bundle/neocomplete b/bundle/neocomplete deleted file mode 160000 -Subproject d3b4d2860ec34648a2d6df4631718a6a7cfa5d4 diff --git a/bundle/neoinclude b/bundle/neoinclude new file mode 160000 +Subproject 5125e73de0a8b4f2c399e4896e21be1b8f7b3d3 diff --git a/bundle/nvim-yarp b/bundle/nvim-yarp new file mode 160000 +Subproject 81caad80107abb9c2f5159e02e2cd95876370be diff --git a/bundle/vim-hug-neovim-rpc b/bundle/vim-hug-neovim-rpc new file mode 160000 +Subproject 6532acee7a06b2420160279fdd397b9d8e5f1e8 diff --git a/config/deoplete.vim b/config/deoplete.vim new file mode 100644 index 0000000..3e2de67 --- /dev/null +++ b/config/deoplete.vim @@ -0,0 +1,7 @@ +" Change clang binary path +" call deoplete#custom#var('clangx', 'clang_binary', '/home/ztuowen/sycl/install/bin/clang') +call deoplete#custom#var('clangx', 'clang_binary', '/usr/bin/clang') + +" Change clang options +call deoplete#custom#var('clangx', 'default_c_options', '') +call deoplete#custom#var('clangx', 'default_cpp_options', '') diff --git a/config/neocomplete.vim b/config/neocomplete.vim deleted file mode 100644 index 84fc466..0000000 --- a/config/neocomplete.vim +++ /dev/null @@ -1,105 +0,0 @@ -" Note: This option must set it in .vimrc(_vimrc). NOT IN .gvimrc(_gvimrc)! -" Disable AutoComplPop. -let g:acp_enableAtStartup = 0 -" Use neocomplete. -let g:neocomplete#enable_at_startup = 1 -" Use smartcase. -let g:neocomplete#enable_smart_case = 1 -" Set minimum syntax keyword length. -let g:neocomplete#sources#syntax#min_keyword_length = 3 -let g:neocomplete#lock_buffer_name_pattern = '\*ku\*' -let g:necoghc_enable_detailed_browse = 1 - -if !exists('g:neocomplete#force_omni_input_patterns') - let g:neocomplete#force_omni_input_patterns = {} -endif -let g:neocomplete#force_omni_input_patterns.c = -\ '[^.[:digit:] *\t]\%(\.\|->\)\w*' -let g:neocomplete#force_omni_input_patterns.cpp = -\ '[^.[:digit:] *\t]\%(\.\|->\)\w*\|\h\w*::\w*' -let g:neocomplete#force_omni_input_patterns.objc = -\ '\[\h\w*\s\h\?\|\h\w*\%(\.\|->\)' -let g:neocomplete#force_omni_input_patterns.objcpp = -\ '\[\h\w*\s\h\?\|\h\w*\%(\.\|->\)\|\h\w*::\w*' -let g:clang_complete_auto = 0 -let g:clang_complete_copen =1 -let g:clang_auto_select = 0 -let g:clang_omnicppcomplete_compliance = 0 -let g:clang_make_default_keymappings = 0 -let g:clang_use_library = 1 - -" Define dictionary. -let g:neocomplete#sources#dictionary#dictionaries = { - \ 'default' : '', - \ 'vimshell' : $HOME.'/.vimshell_hist', - \ 'scheme' : $HOME.'/.gosh_completions' - \ } - -" Define keyword. -if !exists('g:neocomplete#keyword_patterns') - let g:neocomplete#keyword_patterns = {} -endif -let g:neocomplete#keyword_patterns['default'] = '\h\w*' - -" Plugin key-mappings. -inoremap <expr><C-g> neocomplete#undo_completion() -inoremap <expr><C-l> neocomplete#complete_common_string() - -" Recommended key-mappings. -" <CR>: close popup and save indent. -inoremap <silent> <CR> <C-r>=<SID>my_cr_function()<CR> -function! s:my_cr_function() - return neocomplete#close_popup() . "\<CR>" - " For no inserting <CR> key. - "return pumvisible() ? neocomplete#close_popup() : "\<CR>" -endfunction -" <TAB>: completion. -inoremap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>" -" <C-h>, <BS>: close popup and delete backword char. -inoremap <expr><C-h> neocomplete#smart_close_popup()."\<C-h>" -inoremap <expr><BS> neocomplete#smart_close_popup()."\<C-h>" -inoremap <expr><C-y> neocomplete#close_popup() -inoremap <expr><C-e> neocomplete#cancel_popup() -" Close popup by <Space>. -"inoremap <expr><Space> pumvisible() ? neocomplete#close_popup() : "\<Space>" - -" For cursor moving in insert mode(Not recommended) -"inoremap <expr><Left> neocomplete#close_popup() . "\<Left>" -"inoremap <expr><Right> neocomplete#close_popup() . "\<Right>" -"inoremap <expr><Up> neocomplete#close_popup() . "\<Up>" -"inoremap <expr><Down> neocomplete#close_popup() . "\<Down>" -" Or set this. -"let g:neocomplete#enable_cursor_hold_i = 1 -" Or set this. -"let g:neocomplete#enable_insert_char_pre = 1 - -" AutoComplPop like behavior. -"let g:neocomplete#enable_auto_select = 1 - -" Shell like behavior(not recommended). -"set completeopt+=longest -"let g:neocomplete#enable_auto_select = 1 -"let g:neocomplete#disable_auto_complete = 1 -"inoremap <expr><TAB> pumvisible() ? "\<Down>" : "\<C-x>\<C-u>" - -" Enable omni completion. -autocmd FileType css setlocal omnifunc=csscomplete#CompleteCSS -autocmd FileType html,markdown setlocal omnifunc=htmlcomplete#CompleteTags -autocmd FileType javascript setlocal omnifunc=javascriptcomplete#CompleteJS -autocmd FileType python setlocal omnifunc=pythoncomplete#Complete -autocmd FileType xml setlocal omnifunc=xmlcomplete#CompleteTags -autocmd FileType haskell setlocal omnifunc=necoghc#omnifunc -autocmd FileType c,cpp,cuda setlocal omnifunc=ClangComplete - -" Enable heavy omni completion. -if !exists('g:neocomplete#sources#omni#input_patterns') - let g:neocomplete#sources#omni#input_patterns = {} -endif - -"let g:neocomplete#sources#omni#input_patterns.php = '[^. \t]->\h\w*\|\h\w*::' -""let g:neocomplete#sources#omni#input_patterns.c = '[^.[:digit:] *\t]\%(\.\|->\)' -"let g:neocomplete#sources#omni#input_patterns.cpp = '[^.[:digit:] *\t]\%(\.\|->\)\|\h\w*::' -" -"" For perlomni.vim setting. -" https://github.com/c9s/perlomni.vim -let g:neocomplete#sources#omni#input_patterns.perl = '\h\w*->\h\w*\|\h\w*::' @@ -1,5 +1,6 @@ let g:airline_powerline_fonts=1 -let g:neocomplete#enable_at_startup = 1 +let g:deoplete#enable_at_startup = 1 + set laststatus=2 " set UTF-8 encoding set enc=utf-8 |