|
|
@ -23,9 +23,9 @@ if has("nvim") |
|
|
|
Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } |
|
|
|
else |
|
|
|
Plug 'Shougo/neocomplete.vim' |
|
|
|
endif |
|
|
|
Plug 'Shougo/neosnippet.vim' |
|
|
|
Plug 'Shougo/neosnippet-snippets' |
|
|
|
endif |
|
|
|
Plug 'easymotion/vim-easymotion' |
|
|
|
Plug 'bling/vim-airline' |
|
|
|
Plug 'tpope/vim-ragtag' |
|
|
@ -34,7 +34,7 @@ Plug 'tpope/vim-repeat' |
|
|
|
Plug 'vim-syntastic/syntastic' |
|
|
|
Plug 'altercation/vim-colors-solarized' |
|
|
|
Plug 'godlygeek/tabular' " Align text on symbols |
|
|
|
Plug 'ludovicchabant/vim-gutentags', { 'for': ['php', 'c', 'cpp'] } |
|
|
|
Plug 'ludovicchabant/vim-gutentags' |
|
|
|
Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' } " fuzzy file finder |
|
|
|
Plug 'junegunn/fzf.vim' " vim integration for fzf |
|
|
|
if has("nvim") |
|
|
@ -284,7 +284,19 @@ if !has("nvim") |
|
|
|
" https://github.com/c9s/perlomni.vim |
|
|
|
let g:neocomplete#sources#omni#input_patterns.perl = '\h\w*->\h\w*\|\h\w*::' |
|
|
|
|
|
|
|
" Plugin key-mappings. |
|
|
|
else |
|
|
|
" Use deoplete. |
|
|
|
let g:deoplete#enable_at_startup = 1 |
|
|
|
|
|
|
|
" Use TAB to cycle between matches |
|
|
|
inoremap <silent><expr><tab> pumvisible() ? "\<c-n>" : "\<tab>" |
|
|
|
inoremap <silent><expr><s-tab> pumvisible() ? "\<c-p>" : "\<s-tab>" |
|
|
|
|
|
|
|
let g:deoplete#ignore_sources = get(g:, 'deoplete#ignore_sources', {}) |
|
|
|
let g:deoplete#ignore_sources.php = ['omni'] |
|
|
|
endif |
|
|
|
|
|
|
|
" Neosnippet Settings |
|
|
|
imap <C-k> <Plug>(neosnippet_expand_or_jump) |
|
|
|
smap <C-k> <Plug>(neosnippet_expand_or_jump) |
|
|
|
xmap <C-k> <Plug>(neosnippet_expand_target) |
|
|
@ -302,17 +314,6 @@ if !has("nvim") |
|
|
|
set conceallevel=2 concealcursor=niv |
|
|
|
endif |
|
|
|
let g:neosnippet#snippets_directory = '~/.dotfiles/vim/neosnippets' |
|
|
|
else |
|
|
|
" Use deoplete. |
|
|
|
let g:deoplete#enable_at_startup = 1 |
|
|
|
|
|
|
|
" Use TAB to cycle between matches |
|
|
|
inoremap <silent><expr><tab> pumvisible() ? "\<c-n>" : "\<tab>" |
|
|
|
inoremap <silent><expr><s-tab> pumvisible() ? "\<c-p>" : "\<s-tab>" |
|
|
|
|
|
|
|
let g:deoplete#ignore_sources = get(g:, 'deoplete#ignore_sources', {}) |
|
|
|
let g:deoplete#ignore_sources.php = ['omni'] |
|
|
|
endif |
|
|
|
"}}} |
|
|
|
|
|
|
|
set foldmethod=marker" |