Add solarized8, sort plugins

config/01.plugins.vim

@@ -6,37 +6,34 @@ call plug#begin('~/.vim/plugged')
 
 " --- General setup ---
 Plug 'ctrlpvim/ctrlp.vim'
-Plug 'scrooloose/nerdtree'
 Plug 'itchyny/lightline.vim'
+Plug 'scrooloose/nerdtree'
 
 " --- Writing ---
-Plug 'reedes/vim-pencil'
-Plug 'reedes/vim-litecorrect'
-Plug 'junegunn/goyo.vim'
 Plug 'amix/vim-zenroom2'
+Plug 'junegunn/goyo.vim'
 Plug 'junegunn/limelight.vim'
+Plug 'reedes/vim-litecorrect'
+Plug 'reedes/vim-pencil'
 
 " --- Programming ---
-Plug 'scrooloose/nerdcommenter'
+" Plug 'fatih/vim-go'
 " Plug 'octol/vim-cpp-enhanced-highlight'
-Plug 'sheerun/vim-polyglot'
 " Plug 'rust-lang/rust.vim'
-" Plug 'fatih/vim-go'
-Plug 'tpope/vim-dispatch'
 " nightsense/night-and-day " Did not have time for config
-" Plug 'autozimu/LanguageClient-neovim', {
-"    \ 'branch': 'next',
-"    \ 'do': 'bash install.sh',
-"    \ }
-" Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
 Plug 'neoclide/coc.nvim', {'branch': 'release'}
+Plug 'scrooloose/nerdcommenter'
+Plug 'sheerun/vim-polyglot'
+Plug 'tpope/vim-dispatch'
+Plug 'tpope/vim-surround'
 
 " --- Colorschemes ---
 Plug 'altercation/vim-colors-solarized'
-Plug 'nightsense/stellarized'
-Plug 'nightsense/snow'
-Plug 'icymind/NeoSolarized'
 Plug 'andreypopp/vim-colors-plain'
+Plug 'lifepillar/vim-solarized8'
+Plug 'nightsense/snow'
+Plug 'nightsense/stellarized'
+Plug 'romainl/flattened'
 
 call plug#end()
 

config/07.gui.vim

@@ -4,40 +4,68 @@
 
 if has("gui_running")
   " COLORS: Solarized
-  "set background=light
+  "if system("defaults read -g AppleInterfaceStyle") =~ '^Dark'
+    "set background=dark
+  "else
+    "set background=light
+  "endif
   "let g:solarized_termtrans=1
   "let g:solarized_termcolors=256
   "let g:solarized_contrast = 'high'
   "let g:solarized_menu = 0
   "let g:solarized_hitrail = 1
   "colorscheme solarized
   "let g:lightline = { 'colorscheme': 'solarized' }
-  " COLORS: Stellarized
-  colorscheme stellarized
+  " COLORS: Solarized8
   if system("defaults read -g AppleInterfaceStyle") =~ '^Dark'
-    let g:lightline = { 'colorscheme': 'stellarized_dark' }
+    set background=dark
   else
-    let g:lightline = { 'colorscheme': 'stellarized_light' }
+    set background=light
   endif
+  "let g:solarized_termtrans=1  " 0, 1
+  "let g:solarized_visibility='normal'  " 'normal', 'low', 'high'
+  "let g:solarized_diffmode='normal'  " 'normal', 'low', 'high'
+  "let g:solarized_statusline='normal'  " 'normal', 'low', 'flat'
+  "let g:solarized_italics=1  " 1, 0
+  "let g:solarized_old_cursor_style=0 "0, 1
+  "let g:solarized_use16=0 "0, 1
+  "let g:solarized_extra_hi_groups=0 "0, 1
+  colorscheme solarized8
+  let g:lightline = { 'colorscheme': 'solarized' }
+  " COLORS: Stellarized
+  "colorscheme stellarized
+  "if system("defaults read -g AppleInterfaceStyle") =~ '^Dark'
+    "let g:lightline = { 'colorscheme': 'stellarized_dark' }
+  "else
+    "let g:lightline = { 'colorscheme': 'stellarized_light' }
+  "endif
   " COLORS: Snow
   "colorscheme snow
   "set background=dark
   "let g:lightline = { 'colorscheme': 'snow_dark' }
   " COLORS: One (https://github.com/rakr/vim-one)
 endif
 
-" Hide right scrollbar, toolbar, and nerdtree scrollbar
+
 if has("gui_running")
   set guioptions-=r  
   set guioptions-=T
   set guioptions-=L
   set guioptions-=e
   set t_Co=256
   set guitablabel=%M\ %t
-  " set guifont=Anonymous\ Pro:h14
-  set guifont=Menlo:h13
-  " set guifont=Iosevka:h13
-  " set guifont=Fira\ Code:h11
-  " set guifont=SF\ Mono:h11
-  " set guifont=Inconsolata:h14
+  if has("gui_vimr")
+    " Here goes some VimR specific settings like
+    " Nothing yet
+    " Hide right scrollbar, toolbar, and nerdtree scrollbar
+  else
+    " set guifont=Anonymous\ Pro:h14
+    set guifont=Menlo:h13
+    " set guifont=Iosevka:h13
+    " set guifont=Fira\ Code:h11
+    " set guifont=SF\ Mono:h11
+    " set guifont=Inconsolata:h14
+  endif
 endif
+
+