matt/vim-solarized8
1
0
Fork 0
mirror of https://github.com/lifepillar/vim-solarized8.git synced 2025-12-10 15:57:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect g:terminal_color_* variables for NeoVim.

Browse Source 
Fixes https://github.com/lifepillar/vim-solarized8/issues/46.
This commit is contained in:
Lifepillar
2018-08-26 09:14:32 +03:00
parent 4dc4539c49
commit 9b74a5faf5
11 changed files with 410 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

170
colors/solarized8_flat.vim
View File

@@ -4,7 +4,7 @@
" Maintainer: Lifepillar <lifepillar@lifepillar.me>
" Website: https://github.com/lifepillar/vim-solarized8
" License: OSI approved MIT license
" Last Updated: Wed Aug 22 14:17:35 2018
" Last Updated: Sun Aug 26 09:12:59 2018
if !(has('termguicolors') && &termguicolors) && !has('gui_running')
\ && (!exists('&t_Co') || &t_Co < (get(g:, 'solarized_use16', &t_Co < 256) ? 16 : 256))
@@ -24,6 +24,26 @@ if !get(g:, 'solarized_use16', &t_Co < 256)
if &background ==# 'dark'
let g:terminal_ansi_colors = ['#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5',
\ '#002b36', '#cb4b16', '#586e75', '#657b83', '#839496', '#6c71c4', '#93a1a1', '#fdf6e3']
if has('nvim')
hi! link TermCursor Cursor
hi TermCursorNC ctermfg=235 ctermbg=242 guifg=#002b36 guibg=#586e75 guisp=NONE cterm=NONE gui=NONE
let g:terminal_color_0='#073642'
let g:terminal_color_1='#dc322f'
let g:terminal_color_2='#859900'
let g:terminal_color_3='#b58900'
let g:terminal_color_4='#268bd2'
let g:terminal_color_5='#d33682'
let g:terminal_color_6='#2aa198'
let g:terminal_color_7='#eee8d5'
let g:terminal_color_8='#002b36'
let g:terminal_color_9='#cb4b16'
let g:terminal_color_10='#586e75'
let g:terminal_color_11='#657b83'
let g:terminal_color_12='#839496'
let g:terminal_color_13='#6c71c4'
let g:terminal_color_14='#93a1a1'
let g:terminal_color_15='#fdf6e3'
endif
if !has('gui_running') && get(g:, 'solarized_termtrans', 0)
hi Normal ctermfg=246 ctermbg=NONE guifg=#839496 guibg=NONE guisp=NONE cterm=NONE gui=NONE
hi Terminal ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE
@@ -353,31 +373,31 @@ if !get(g:, 'solarized_use16', &t_Co < 256)
hi pandocEmphasisTable cterm=italic
hi pandocEmphasis cterm=italic
endif
if has('nvim')
hi! link TermCursor Cursor
hi TermCursorNC ctermfg=235 ctermbg=242 guifg=#002b36 guibg=#586e75 guisp=NONE cterm=NONE gui=NONE
let g:terminal_color_8='#002b36'
let g:terminal_color_0='#073642'
let g:terminal_color_10='#586e75'
let g:terminal_color_11='#657b83'
let g:terminal_color_12='#839496'
let g:terminal_color_14='#93a1a1'
let g:terminal_color_7='#eee8d5'
let g:terminal_color_15='#fdf6e3'
let g:terminal_color_3='#b58900'
let g:terminal_color_9='#cb4b16'
let g:terminal_color_1='#dc322f'
let g:terminal_color_5='#d33682'
let g:terminal_color_13='#6c71c4'
let g:terminal_color_4='#268bd2'
let g:terminal_color_6='#2aa198'
let g:terminal_color_2='#859900'
endif
finish
endif
let g:terminal_ansi_colors = ['#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5',
\ '#002b36', '#cb4b16', '#586e75', '#657b83', '#839496', '#6c71c4', '#93a1a1', '#fdf6e3']
if has('nvim')
hi! link TermCursor Cursor
hi TermCursorNC ctermfg=230 ctermbg=247 guifg=#fdf6e3 guibg=#93a1a1 guisp=NONE cterm=NONE gui=NONE
let g:terminal_color_0='#073642'
let g:terminal_color_1='#dc322f'
let g:terminal_color_2='#859900'
let g:terminal_color_3='#b58900'
let g:terminal_color_4='#268bd2'
let g:terminal_color_5='#d33682'
let g:terminal_color_6='#2aa198'
let g:terminal_color_7='#eee8d5'
let g:terminal_color_8='#002b36'
let g:terminal_color_9='#cb4b16'
let g:terminal_color_10='#586e75'
let g:terminal_color_11='#657b83'
let g:terminal_color_12='#839496'
let g:terminal_color_13='#6c71c4'
let g:terminal_color_14='#93a1a1'
let g:terminal_color_15='#fdf6e3'
endif
if !has('gui_running') && get(g:, 'solarized_termtrans', 0)
hi Normal ctermfg=66 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=NONE cterm=NONE gui=NONE
hi Terminal ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE
@@ -719,26 +739,6 @@ if !get(g:, 'solarized_use16', &t_Co < 256)
hi pandocEmphasisTable cterm=italic
hi pandocEmphasis cterm=italic
endif
if has('nvim')
hi! link TermCursor Cursor
hi TermCursorNC ctermfg=230 ctermbg=247 guifg=#fdf6e3 guibg=#93a1a1 guisp=NONE cterm=NONE gui=NONE
let g:terminal_color_8='#fdf6e3'
let g:terminal_color_0='#eee8d5'
let g:terminal_color_10='#93a1a1'
let g:terminal_color_11='#839496'
let g:terminal_color_12='#657b83'
let g:terminal_color_14='#586e75'
let g:terminal_color_7='#073642'
let g:terminal_color_15='#002b36'
let g:terminal_color_3='#b58900'
let g:terminal_color_9='#cb4b16'
let g:terminal_color_1='#dc322f'
let g:terminal_color_5='#d33682'
let g:terminal_color_13='#6c71c4'
let g:terminal_color_4='#268bd2'
let g:terminal_color_6='#2aa198'
let g:terminal_color_2='#859900'
endif
finish
endif
@@ -746,6 +746,26 @@ endif
if &background ==# 'dark'
let g:terminal_ansi_colors = ['#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5',
\ '#002b36', '#cb4b16', '#586e75', '#657b83', '#839496', '#6c71c4', '#93a1a1', '#fdf6e3']
if has('nvim')
hi! link TermCursor Cursor
hi TermCursorNC ctermfg=8 ctermbg=10 guifg=#002b36 guibg=#586e75 guisp=NONE cterm=NONE gui=NONE
let g:terminal_color_0='#073642'
let g:terminal_color_1='#dc322f'
let g:terminal_color_2='#859900'
let g:terminal_color_3='#b58900'
let g:terminal_color_4='#268bd2'
let g:terminal_color_5='#d33682'
let g:terminal_color_6='#2aa198'
let g:terminal_color_7='#eee8d5'
let g:terminal_color_8='#002b36'
let g:terminal_color_9='#cb4b16'
let g:terminal_color_10='#586e75'
let g:terminal_color_11='#657b83'
let g:terminal_color_12='#839496'
let g:terminal_color_13='#6c71c4'
let g:terminal_color_14='#93a1a1'
let g:terminal_color_15='#fdf6e3'
endif
if !has('gui_running') && get(g:, 'solarized_termtrans', 0)
hi Normal ctermfg=12 ctermbg=NONE guifg=#839496 guibg=NONE guisp=NONE cterm=NONE gui=NONE
hi Terminal ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE
@@ -1075,31 +1095,31 @@ if &background ==# 'dark'
hi pandocEmphasisTable cterm=italic
hi pandocEmphasis cterm=italic
endif
if has('nvim')
hi! link TermCursor Cursor
hi TermCursorNC ctermfg=8 ctermbg=10 guifg=#002b36 guibg=#586e75 guisp=NONE cterm=NONE gui=NONE
let g:terminal_color_8='#002b36'
let g:terminal_color_0='#073642'
let g:terminal_color_10='#586e75'
let g:terminal_color_11='#657b83'
let g:terminal_color_12='#839496'
let g:terminal_color_14='#93a1a1'
let g:terminal_color_7='#eee8d5'
let g:terminal_color_15='#fdf6e3'
let g:terminal_color_3='#b58900'
let g:terminal_color_9='#cb4b16'
let g:terminal_color_1='#dc322f'
let g:terminal_color_5='#d33682'
let g:terminal_color_13='#6c71c4'
let g:terminal_color_4='#268bd2'
let g:terminal_color_6='#2aa198'
let g:terminal_color_2='#859900'
endif
finish
endif
let g:terminal_ansi_colors = ['#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5',
\ '#002b36', '#cb4b16', '#586e75', '#657b83', '#839496', '#6c71c4', '#93a1a1', '#fdf6e3']
if has('nvim')
hi! link TermCursor Cursor
hi TermCursorNC ctermfg=15 ctermbg=14 guifg=#fdf6e3 guibg=#93a1a1 guisp=NONE cterm=NONE gui=NONE
let g:terminal_color_0='#073642'
let g:terminal_color_1='#dc322f'
let g:terminal_color_2='#859900'
let g:terminal_color_3='#b58900'
let g:terminal_color_4='#268bd2'
let g:terminal_color_5='#d33682'
let g:terminal_color_6='#2aa198'
let g:terminal_color_7='#eee8d5'
let g:terminal_color_8='#002b36'
let g:terminal_color_9='#cb4b16'
let g:terminal_color_10='#586e75'
let g:terminal_color_11='#657b83'
let g:terminal_color_12='#839496'
let g:terminal_color_13='#6c71c4'
let g:terminal_color_14='#93a1a1'
let g:terminal_color_15='#fdf6e3'
endif
if !has('gui_running') && get(g:, 'solarized_termtrans', 0)
hi Normal ctermfg=11 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=NONE cterm=NONE gui=NONE
hi Terminal ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE
@@ -1441,26 +1461,6 @@ if get(g:, "solarized_term_italics", 0)
hi pandocEmphasisTable cterm=italic
hi pandocEmphasis cterm=italic
endif
if has('nvim')
hi! link TermCursor Cursor
hi TermCursorNC ctermfg=15 ctermbg=14 guifg=#fdf6e3 guibg=#93a1a1 guisp=NONE cterm=NONE gui=NONE
let g:terminal_color_8='#fdf6e3'
let g:terminal_color_0='#eee8d5'
let g:terminal_color_10='#93a1a1'
let g:terminal_color_11='#839496'
let g:terminal_color_12='#657b83'
let g:terminal_color_14='#586e75'
let g:terminal_color_7='#073642'
let g:terminal_color_15='#002b36'
let g:terminal_color_3='#b58900'
let g:terminal_color_9='#cb4b16'
let g:terminal_color_1='#dc322f'
let g:terminal_color_5='#d33682'
let g:terminal_color_13='#6c71c4'
let g:terminal_color_4='#268bd2'
let g:terminal_color_6='#2aa198'
let g:terminal_color_2='#859900'
endif
finish
" Background: dark
@@ -1481,6 +1481,8 @@ finish
" Color: cyan #2aa198 ~ 6
" Color: green #859900 ~ 2
" Color: back #002b36 ~ 8
" TermCursor -> Cursor
" TermCursorNC base03 base01
" Normal base0 none
" Terminal fg none
" Normal base0 back
@@ -1780,8 +1782,6 @@ finish
" pandocMetadataKey blue none
" pandocMetadata blue none bold
" pandocMetadataTitle -> pandocMetadata
" TermCursor -> Cursor
" TermCursorNC base03 base01
" Background: light
" Color: base3 #002b36 ~ 8
" Color: base2 #073642 ~ 0
@@ -1800,6 +1800,8 @@ finish
" Color: cyan #2aa198 ~ 6
" Color: green #859900 ~ 2
" Color: back #fdf6e3 ~ 15
" TermCursor -> Cursor
" TermCursorNC base03 base01
" Normal base0 none
" Terminal fg none
" Normal base0 back
@@ -2105,5 +2107,3 @@ finish
" pandocMetadataKey blue none
" pandocMetadata blue none bold
" pandocMetadataTitle -> pandocMetadata
" TermCursor -> Cursor
" TermCursorNC base03 base01