From 75731d35c2658af77e0d7c3df479e1fe9ef637da Mon Sep 17 00:00:00 2001
From: Julian Ospald <hasufell@posteo.de>
Date: Thu, 14 Jun 2018 00:39:44 +0200
Subject: [PATCH] Make config compatible with neovim

---
 vimrc | 69 +++++++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 50 insertions(+), 19 deletions(-)

diff --git a/vimrc b/vimrc
index 8b261f1..9182cd5 100644
--- a/vimrc
+++ b/vimrc
@@ -25,16 +25,10 @@ Plug 'vim-scripts/genindent.vim'
 Plug 'sjl/gundo.vim'
 Plug 'idris-hackers/idris-vim'
 Plug 'wimstefan/Lightning'
-Plug 'vim-scripts/LustyJuggler'
 Plug 'yegappan/mru'
 Plug 'scrooloose/nerdcommenter'
 Plug 'scrooloose/nerdtree', { 'on':  'NERDTreeToggle' }
 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 'AndrewRadev/simple_bookmarks.vim'
 Plug 'Keithbsmiley/swift.vim'
@@ -51,6 +45,17 @@ Plug 'nathanaelkane/vim-indent-guides'
 Plug 'xolox/vim-misc'
 Plug 'Shougo/vimproc.vim', {'do' : 'make'}
 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
 Plug 'LucHermitte/lh-vim-lib'
@@ -127,12 +132,14 @@ Plug 'derekwyatt/vim-scala', { 'for': 'scala' }
 " unmanaged
 Plug '~/.vim/unmanaged-vim-plug/bufonly'
 Plug '~/.vim/unmanaged-vim-plug/colorschemedegrade'
-Plug '~/.vim/unmanaged-vim-plug/fontzoom'
 Plug '~/.vim/unmanaged-vim-plug/fuzzyfinder'
 Plug '~/.vim/unmanaged-vim-plug/L9'
 Plug '~/.vim/unmanaged-vim-plug/log'
 Plug '~/.vim/unmanaged-vim-plug/ScrollColor'
 Plug '~/.vim/unmanaged-vim-plug/txtfmt'
+if !has("nvim")
+	Plug '~/.vim/unmanaged-vim-plug/fontzoom'
+endif
 
 
 " Initialize plugin system
@@ -142,14 +149,17 @@ call plug#end()
 " ===== further plugin initialization =====
 so ~/.vim/plugged/cmdalias.vim/plugin/cmdalias.vim
 
-"powerline
-python from powerline.vim import setup as powerline_setup
-python powerline_setup()
-python del powerline_setup
-set laststatus=2
 
-" lj
-let g:LustyJugglerSuppressRubyWarning = 1
+if !has("nvim")
+	"powerline
+	python from powerline.vim import setup as powerline_setup
+	python powerline_setup()
+	python del powerline_setup
+	set laststatus=2
+
+	" lj
+	let g:LustyJugglerSuppressRubyWarning = 1
+endif
 
 
 " global settings
@@ -262,12 +272,33 @@ let g:BASH_Ctrl_j = 'off'
 "set t_Co=256
 "let g:solarized_termcolors=256
 if has('gui_running')
-	set background=dark
-	colorscheme solarized
+	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
 else
-	set background=dark
-	colorscheme solarized
-"	colorscheme dante
+	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
 " ===========================