vividboarder/vim-settings
1
0
Fork 0
mirror of https://github.com/ViViDboarder/vim-settings.git synced 2024-11-17 21:46:27 +00:00
Code Issues Releases Wiki Activity

Oni support

Browse Source
This commit is contained in:
ViViDboarder 2018-06-13 13:19:22 -07:00
parent a0684794e9
commit 78b781b859
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vim/init.vim
View File

@ -43,14 +43,14 @@ endfunction
function! IsGuiApp() function! IsGuiApp()
return has("gui_running") || exists("neovim_dot_app") return has("gui_running") || exists("neovim_dot_app")
\ || has("gui_win32") || has("gui_macvim") \ || has("gui_win32") || has("gui_macvim")
\ || has("gui_vimr") \ || has("gui_vimr") || exists('g:gui_oni')
endfunction endfunction
" Auto install vim-plug " Auto install vim-plug
if empty(glob('~/.vim/autoload/plug.vim')) if empty(glob('~/.vim/autoload/plug.vim'))
silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs
\ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
autocmd VimEnter * PlugInstall autocmd VimEnter * PlugInstall
endif endif
call s:smart_source_rc('init') call s:smart_source_rc('init')

24
vim/rc/plugins.rc.vim
View File

@ -23,16 +23,20 @@ call s:smart_source_rc('plugins/gitgutter')
" }} Git " }} Git
" Searching {{ " Searching {{
if !executable('fzf') if !exists('g:gui_oni')
call s:smart_source_rc('plugins/ctrlp') if !executable('fzf')
call s:smart_source_rc('plugins/ctrlp')
endif
call s:smart_source_rc('plugins/fzf')
call s:smart_source_rc('plugins/vim-grepper')
endif endif
call s:smart_source_rc('plugins/fzf')
call s:smart_source_rc('plugins/vim-grepper')
" }} Searching " }} Searching
" Autocomplete {{ " Autocomplete {{
call s:smart_source_rc('plugins/omnicompletion') call s:smart_source_rc('plugins/omnicompletion')
if has('nvim') && has('python3') if exists('g:gui_oni')
" We'll keep Oni's autocomplete with Language Server
elseif has('nvim') && has('python3')
call s:smart_source_rc('plugins/deoplete') call s:smart_source_rc('plugins/deoplete')
elseif (has('lua') && (v:version > 703 || v:version == 703 && has('patch885'))) elseif (has('lua') && (v:version > 703 || v:version == 703 && has('patch885')))
call s:smart_source_rc('plugins/neocomplete') call s:smart_source_rc('plugins/neocomplete')
@ -45,7 +49,7 @@ end
Plug 'tpope/vim-surround' Plug 'tpope/vim-surround'
call s:smart_source_rc('plugins/tagbar') call s:smart_source_rc('plugins/tagbar')
call s:smart_source_rc('plugins/tcomment_vim') call s:smart_source_rc('plugins/tcomment_vim')
if (v:version > 703) if (v:version > 703) && !exists('g:gui_oni')
Plug 'ludovicchabant/vim-gutentags' " Auto generate tags files Plug 'ludovicchabant/vim-gutentags' " Auto generate tags files
end end
if has('nvim') if has('nvim')
@ -63,9 +67,13 @@ endif
" GUI {{ " GUI {{
Plug 'gregsexton/MatchTag' Plug 'gregsexton/MatchTag'
call s:smart_source_rc('plugins/airline') if !exists('g:gui_oni')
call s:smart_source_rc('plugins/airline')
endif
call s:smart_source_rc('plugins/dash') call s:smart_source_rc('plugins/dash')
call s:smart_source_rc('plugins/startify') if !exists('g:gui_oni')
call s:smart_source_rc('plugins/startify')
endif
" Plug 'edkolev/tmuxline.vim' " Removed because this can fail on some machines " Plug 'edkolev/tmuxline.vim' " Removed because this can fail on some machines
" let g:tmuxline_powerline_separators = 0 " let g:tmuxline_powerline_separators = 0