Make config compatible with neovim

This commit is contained in:
Julian Ospald 2018-06-14 00:39:44 +02:00
parent 2acb6b5459
commit 75731d35c2
No known key found for this signature in database
GPG Key ID: 511B62C09D50CD28

49
vimrc
View File

@ -25,16 +25,10 @@ Plug 'vim-scripts/genindent.vim'
Plug 'sjl/gundo.vim' Plug 'sjl/gundo.vim'
Plug 'idris-hackers/idris-vim' Plug 'idris-hackers/idris-vim'
Plug 'wimstefan/Lightning' Plug 'wimstefan/Lightning'
Plug 'vim-scripts/LustyJuggler'
Plug 'yegappan/mru' Plug 'yegappan/mru'
Plug 'scrooloose/nerdcommenter' Plug 'scrooloose/nerdcommenter'
Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' } Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' }
Plug 'NLKNguyen/papercolor-theme' Plug 'NLKNguyen/papercolor-theme'
Plug 'powerline/powerline', {
\ 'branch': 'develop',
\ 'do': 'python setup.py install --user',
\ 'rtp': 'powerline/bindings/vim',
\ }
Plug 'vim-scripts/promela.vim' Plug 'vim-scripts/promela.vim'
Plug 'AndrewRadev/simple_bookmarks.vim' Plug 'AndrewRadev/simple_bookmarks.vim'
Plug 'Keithbsmiley/swift.vim' Plug 'Keithbsmiley/swift.vim'
@ -51,6 +45,17 @@ Plug 'nathanaelkane/vim-indent-guides'
Plug 'xolox/vim-misc' Plug 'xolox/vim-misc'
Plug 'Shougo/vimproc.vim', {'do' : 'make'} Plug 'Shougo/vimproc.vim', {'do' : 'make'}
Plug 'tpope/vim-rhubarb' Plug 'tpope/vim-rhubarb'
if has("nvim")
Plug 'iCyMind/NeoSolarized'
Plug 'vim-airline/vim-airline'
else
Plug 'vim-scripts/LustyJuggler'
Plug 'powerline/powerline', {
\ 'branch': 'develop',
\ 'do': 'python setup.py install --user',
\ 'rtp': 'powerline/bindings/vim',
\ }
endif
" local_vimrc " local_vimrc
Plug 'LucHermitte/lh-vim-lib' Plug 'LucHermitte/lh-vim-lib'
@ -127,12 +132,14 @@ Plug 'derekwyatt/vim-scala', { 'for': 'scala' }
" unmanaged " unmanaged
Plug '~/.vim/unmanaged-vim-plug/bufonly' Plug '~/.vim/unmanaged-vim-plug/bufonly'
Plug '~/.vim/unmanaged-vim-plug/colorschemedegrade' Plug '~/.vim/unmanaged-vim-plug/colorschemedegrade'
Plug '~/.vim/unmanaged-vim-plug/fontzoom'
Plug '~/.vim/unmanaged-vim-plug/fuzzyfinder' Plug '~/.vim/unmanaged-vim-plug/fuzzyfinder'
Plug '~/.vim/unmanaged-vim-plug/L9' Plug '~/.vim/unmanaged-vim-plug/L9'
Plug '~/.vim/unmanaged-vim-plug/log' Plug '~/.vim/unmanaged-vim-plug/log'
Plug '~/.vim/unmanaged-vim-plug/ScrollColor' Plug '~/.vim/unmanaged-vim-plug/ScrollColor'
Plug '~/.vim/unmanaged-vim-plug/txtfmt' Plug '~/.vim/unmanaged-vim-plug/txtfmt'
if !has("nvim")
Plug '~/.vim/unmanaged-vim-plug/fontzoom'
endif
" Initialize plugin system " Initialize plugin system
@ -142,6 +149,8 @@ call plug#end()
" ===== further plugin initialization ===== " ===== further plugin initialization =====
so ~/.vim/plugged/cmdalias.vim/plugin/cmdalias.vim so ~/.vim/plugged/cmdalias.vim/plugin/cmdalias.vim
if !has("nvim")
"powerline "powerline
python from powerline.vim import setup as powerline_setup python from powerline.vim import setup as powerline_setup
python powerline_setup() python powerline_setup()
@ -150,6 +159,7 @@ set laststatus=2
" lj " lj
let g:LustyJugglerSuppressRubyWarning = 1 let g:LustyJugglerSuppressRubyWarning = 1
endif
" global settings " global settings
@ -262,12 +272,33 @@ let g:BASH_Ctrl_j = 'off'
"set t_Co=256 "set t_Co=256
"let g:solarized_termcolors=256 "let g:solarized_termcolors=256
if has('gui_running') if has('gui_running')
if has("nvim")
let g:neosolarized_contrast = "normal"
let g:neosolarized_visibility = "normal"
let g:neosolarized_vertSplitBgTrans = 0
let g:neosolarized_bold = 1
let g:neosolarized_underline = 1
let g:neosolarized_italic = 1
set background=dark set background=dark
colorscheme solarized colorscheme NeoSolarized
else else
set background=dark set background=dark
colorscheme solarized colorscheme solarized
" colorscheme dante endif
else
if has("nvim")
let g:neosolarized_contrast = "normal"
let g:neosolarized_visibility = "normal"
let g:neosolarized_vertSplitBgTrans = 0
let g:neosolarized_bold = 1
let g:neosolarized_underline = 1
let g:neosolarized_italic = 1
set background=dark
colorscheme NeoSolarized
else
set background=dark
colorscheme solarized
endif
endif endif
" =========================== " ===========================