diff options
| author | Chris Kempson <git@chriskempson.com> | 2017-11-07 07:26:30 +0000 |
|---|---|---|
| committer | Chris Kempson <git@chriskempson.com> | 2017-11-07 07:26:30 +0000 |
| commit | 3fd9fbd13455a8e6adb7b9cf0fa0a39fa46fea8c (patch) | |
| tree | c99b430dc9178a678ac933ac3ab69c995800c258 /colors | |
| parent | 9382428078e6562ca687476e5f2e4b262cec5623 (diff) | |
Updates output
Diffstat (limited to 'colors')
99 files changed, 10093 insertions, 4549 deletions
diff --git a/colors/base16-3024.vim b/colors/base16-3024.vim index 9bb4581..dec12fd 100644 --- a/colors/base16-3024.vim +++ b/colors/base16-3024.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "090300" -let s:gui01 = "3a3432" -let s:gui02 = "4a4543" -let s:gui03 = "5c5855" -let s:gui04 = "807d7c" -let s:gui05 = "a5a2a2" -let s:gui06 = "d6d5d4" -let s:gui07 = "f7f7f7" -let s:gui08 = "db2d20" -let s:gui09 = "e8bbd0" -let s:gui0A = "fded02" -let s:gui0B = "01a252" -let s:gui0C = "b5e4f4" -let s:gui0D = "01a0e4" -let s:gui0E = "a16a94" -let s:gui0F = "cdab53" +let s:gui00 = "090300" +let g:base16_gui00 = "090300" +let s:gui01 = "3a3432" +let g:base16_gui01 = "3a3432" +let s:gui02 = "4a4543" +let g:base16_gui02 = "4a4543" +let s:gui03 = "5c5855" +let g:base16_gui03 = "5c5855" +let s:gui04 = "807d7c" +let g:base16_gui04 = "807d7c" +let s:gui05 = "a5a2a2" +let g:base16_gui05 = "a5a2a2" +let s:gui06 = "d6d5d4" +let g:base16_gui06 = "d6d5d4" +let s:gui07 = "f7f7f7" +let g:base16_gui07 = "f7f7f7" +let s:gui08 = "db2d20" +let g:base16_gui08 = "db2d20" +let s:gui09 = "e8bbd0" +let g:base16_gui09 = "e8bbd0" +let s:gui0A = "fded02" +let g:base16_gui0A = "fded02" +let s:gui0B = "01a252" +let g:base16_gui0B = "01a252" +let s:gui0C = "b5e4f4" +let g:base16_gui0C = "b5e4f4" +let s:gui0D = "01a0e4" +let g:base16_gui0D = "01a0e4" +let s:gui0E = "a16a94" +let g:base16_gui0E = "a16a94" +let s:gui0F = "cdab53" +let g:base16_gui0F = "cdab53" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#b5e4f4" let g:terminal_color_7 = "#a5a2a2" let g:terminal_color_8 = "#5c5855" - let g:terminal_color_9 = "#e8bbd0" - let g:terminal_color_10 = "#3a3432" - let g:terminal_color_11 = "#4a4543" - let g:terminal_color_12 = "#807d7c" - let g:terminal_color_13 = "#d6d5d4" - let g:terminal_color_14 = "#cdab53" + let g:terminal_color_9 = "#db2d20" + let g:terminal_color_10 = "#01a252" + let g:terminal_color_11 = "#fded02" + let g:terminal_color_12 = "#01a0e4" + let g:terminal_color_13 = "#a16a94" + let g:terminal_color_14 = "#b5e4f4" let g:terminal_color_15 = "#f7f7f7" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-3024" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-apathy.vim b/colors/base16-apathy.vim index d8ed869..3f67a4c 100644 --- a/colors/base16-apathy.vim +++ b/colors/base16-apathy.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "031A16" -let s:gui01 = "0B342D" -let s:gui02 = "184E45" -let s:gui03 = "2B685E" -let s:gui04 = "5F9C92" -let s:gui05 = "81B5AC" -let s:gui06 = "A7CEC8" -let s:gui07 = "D2E7E4" -let s:gui08 = "3E9688" -let s:gui09 = "3E7996" -let s:gui0A = "3E4C96" -let s:gui0B = "883E96" -let s:gui0C = "963E4C" -let s:gui0D = "96883E" -let s:gui0E = "4C963E" -let s:gui0F = "3E965B" +let s:gui00 = "031A16" +let g:base16_gui00 = "031A16" +let s:gui01 = "0B342D" +let g:base16_gui01 = "0B342D" +let s:gui02 = "184E45" +let g:base16_gui02 = "184E45" +let s:gui03 = "2B685E" +let g:base16_gui03 = "2B685E" +let s:gui04 = "5F9C92" +let g:base16_gui04 = "5F9C92" +let s:gui05 = "81B5AC" +let g:base16_gui05 = "81B5AC" +let s:gui06 = "A7CEC8" +let g:base16_gui06 = "A7CEC8" +let s:gui07 = "D2E7E4" +let g:base16_gui07 = "D2E7E4" +let s:gui08 = "3E9688" +let g:base16_gui08 = "3E9688" +let s:gui09 = "3E7996" +let g:base16_gui09 = "3E7996" +let s:gui0A = "3E4C96" +let g:base16_gui0A = "3E4C96" +let s:gui0B = "883E96" +let g:base16_gui0B = "883E96" +let s:gui0C = "963E4C" +let g:base16_gui0C = "963E4C" +let s:gui0D = "96883E" +let g:base16_gui0D = "96883E" +let s:gui0E = "4C963E" +let g:base16_gui0E = "4C963E" +let s:gui0F = "3E965B" +let g:base16_gui0F = "3E965B" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#963E4C" let g:terminal_color_7 = "#81B5AC" let g:terminal_color_8 = "#2B685E" - let g:terminal_color_9 = "#3E7996" - let g:terminal_color_10 = "#0B342D" - let g:terminal_color_11 = "#184E45" - let g:terminal_color_12 = "#5F9C92" - let g:terminal_color_13 = "#A7CEC8" - let g:terminal_color_14 = "#3E965B" + let g:terminal_color_9 = "#3E9688" + let g:terminal_color_10 = "#883E96" + let g:terminal_color_11 = "#3E4C96" + let g:terminal_color_12 = "#96883E" + let g:terminal_color_13 = "#4C963E" + let g:terminal_color_14 = "#963E4C" let g:terminal_color_15 = "#D2E7E4" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-apathy" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-ashes.vim b/colors/base16-ashes.vim index 3cada36..dbc8fc4 100644 --- a/colors/base16-ashes.vim +++ b/colors/base16-ashes.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "1C2023" -let s:gui01 = "393F45" -let s:gui02 = "565E65" -let s:gui03 = "747C84" -let s:gui04 = "ADB3BA" -let s:gui05 = "C7CCD1" -let s:gui06 = "DFE2E5" -let s:gui07 = "F3F4F5" -let s:gui08 = "C7AE95" -let s:gui09 = "C7C795" -let s:gui0A = "AEC795" -let s:gui0B = "95C7AE" -let s:gui0C = "95AEC7" -let s:gui0D = "AE95C7" -let s:gui0E = "C795AE" -let s:gui0F = "C79595" +let s:gui00 = "1C2023" +let g:base16_gui00 = "1C2023" +let s:gui01 = "393F45" +let g:base16_gui01 = "393F45" +let s:gui02 = "565E65" +let g:base16_gui02 = "565E65" +let s:gui03 = "747C84" +let g:base16_gui03 = "747C84" +let s:gui04 = "ADB3BA" +let g:base16_gui04 = "ADB3BA" +let s:gui05 = "C7CCD1" +let g:base16_gui05 = "C7CCD1" +let s:gui06 = "DFE2E5" +let g:base16_gui06 = "DFE2E5" +let s:gui07 = "F3F4F5" +let g:base16_gui07 = "F3F4F5" +let s:gui08 = "C7AE95" +let g:base16_gui08 = "C7AE95" +let s:gui09 = "C7C795" +let g:base16_gui09 = "C7C795" +let s:gui0A = "AEC795" +let g:base16_gui0A = "AEC795" +let s:gui0B = "95C7AE" +let g:base16_gui0B = "95C7AE" +let s:gui0C = "95AEC7" +let g:base16_gui0C = "95AEC7" +let s:gui0D = "AE95C7" +let g:base16_gui0D = "AE95C7" +let s:gui0E = "C795AE" +let g:base16_gui0E = "C795AE" +let s:gui0F = "C79595" +let g:base16_gui0F = "C79595" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#95AEC7" let g:terminal_color_7 = "#C7CCD1" let g:terminal_color_8 = "#747C84" - let g:terminal_color_9 = "#C7C795" - let g:terminal_color_10 = "#393F45" - let g:terminal_color_11 = "#565E65" - let g:terminal_color_12 = "#ADB3BA" - let g:terminal_color_13 = "#DFE2E5" - let g:terminal_color_14 = "#C79595" + let g:terminal_color_9 = "#C7AE95" + let g:terminal_color_10 = "#95C7AE" + let g:terminal_color_11 = "#AEC795" + let g:terminal_color_12 = "#AE95C7" + let g:terminal_color_13 = "#C795AE" + let g:terminal_color_14 = "#95AEC7" let g:terminal_color_15 = "#F3F4F5" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-ashes" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-atelier-cave-light.vim b/colors/base16-atelier-cave-light.vim index cc40eb9..d1d4238 100644 --- a/colors/base16-atelier-cave-light.vim +++ b/colors/base16-atelier-cave-light.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "efecf4" -let s:gui01 = "e2dfe7" -let s:gui02 = "8b8792" -let s:gui03 = "7e7887" -let s:gui04 = "655f6d" -let s:gui05 = "585260" -let s:gui06 = "26232a" -let s:gui07 = "19171c" -let s:gui08 = "be4678" -let s:gui09 = "aa573c" -let s:gui0A = "a06e3b" -let s:gui0B = "2a9292" -let s:gui0C = "398bc6" -let s:gui0D = "576ddb" -let s:gui0E = "955ae7" -let s:gui0F = "bf40bf" +let s:gui00 = "efecf4" +let g:base16_gui00 = "efecf4" +let s:gui01 = "e2dfe7" +let g:base16_gui01 = "e2dfe7" +let s:gui02 = "8b8792" +let g:base16_gui02 = "8b8792" +let s:gui03 = "7e7887" +let g:base16_gui03 = "7e7887" +let s:gui04 = "655f6d" +let g:base16_gui04 = "655f6d" +let s:gui05 = "585260" +let g:base16_gui05 = "585260" +let s:gui06 = "26232a" +let g:base16_gui06 = "26232a" +let s:gui07 = "19171c" +let g:base16_gui07 = "19171c" +let s:gui08 = "be4678" +let g:base16_gui08 = "be4678" +let s:gui09 = "aa573c" +let g:base16_gui09 = "aa573c" +let s:gui0A = "a06e3b" +let g:base16_gui0A = "a06e3b" +let s:gui0B = "2a9292" +let g:base16_gui0B = "2a9292" +let s:gui0C = "398bc6" +let g:base16_gui0C = "398bc6" +let s:gui0D = "576ddb" +let g:base16_gui0D = "576ddb" +let s:gui0E = "955ae7" +let g:base16_gui0E = "955ae7" +let s:gui0F = "bf40bf" +let g:base16_gui0F = "bf40bf" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#398bc6" let g:terminal_color_7 = "#585260" let g:terminal_color_8 = "#7e7887" - let g:terminal_color_9 = "#aa573c" - let g:terminal_color_10 = "#e2dfe7" - let g:terminal_color_11 = "#8b8792" - let g:terminal_color_12 = "#655f6d" - let g:terminal_color_13 = "#26232a" - let g:terminal_color_14 = "#bf40bf" + let g:terminal_color_9 = "#be4678" + let g:terminal_color_10 = "#2a9292" + let g:terminal_color_11 = "#a06e3b" + let g:terminal_color_12 = "#576ddb" + let g:terminal_color_13 = "#955ae7" + let g:terminal_color_14 = "#398bc6" let g:terminal_color_15 = "#19171c" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-atelier-cave-light" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-atelier-cave.vim b/colors/base16-atelier-cave.vim index 8b1ca9f..b16bb44 100644 --- a/colors/base16-atelier-cave.vim +++ b/colors/base16-atelier-cave.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "19171c" -let s:gui01 = "26232a" -let s:gui02 = "585260" -let s:gui03 = "655f6d" -let s:gui04 = "7e7887" -let s:gui05 = "8b8792" -let s:gui06 = "e2dfe7" -let s:gui07 = "efecf4" -let s:gui08 = "be4678" -let s:gui09 = "aa573c" -let s:gui0A = "a06e3b" -let s:gui0B = "2a9292" -let s:gui0C = "398bc6" -let s:gui0D = "576ddb" -let s:gui0E = "955ae7" -let s:gui0F = "bf40bf" +let s:gui00 = "19171c" +let g:base16_gui00 = "19171c" +let s:gui01 = "26232a" +let g:base16_gui01 = "26232a" +let s:gui02 = "585260" +let g:base16_gui02 = "585260" +let s:gui03 = "655f6d" +let g:base16_gui03 = "655f6d" +let s:gui04 = "7e7887" +let g:base16_gui04 = "7e7887" +let s:gui05 = "8b8792" +let g:base16_gui05 = "8b8792" +let s:gui06 = "e2dfe7" +let g:base16_gui06 = "e2dfe7" +let s:gui07 = "efecf4" +let g:base16_gui07 = "efecf4" +let s:gui08 = "be4678" +let g:base16_gui08 = "be4678" +let s:gui09 = "aa573c" +let g:base16_gui09 = "aa573c" +let s:gui0A = "a06e3b" +let g:base16_gui0A = "a06e3b" +let s:gui0B = "2a9292" +let g:base16_gui0B = "2a9292" +let s:gui0C = "398bc6" +let g:base16_gui0C = "398bc6" +let s:gui0D = "576ddb" +let g:base16_gui0D = "576ddb" +let s:gui0E = "955ae7" +let g:base16_gui0E = "955ae7" +let s:gui0F = "bf40bf" +let g:base16_gui0F = "bf40bf" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#398bc6" let g:terminal_color_7 = "#8b8792" let g:terminal_color_8 = "#655f6d" - let g:terminal_color_9 = "#aa573c" - let g:terminal_color_10 = "#26232a" - let g:terminal_color_11 = "#585260" - let g:terminal_color_12 = "#7e7887" - let g:terminal_color_13 = "#e2dfe7" - let g:terminal_color_14 = "#bf40bf" + let g:terminal_color_9 = "#be4678" + let g:terminal_color_10 = "#2a9292" + let g:terminal_color_11 = "#a06e3b" + let g:terminal_color_12 = "#576ddb" + let g:terminal_color_13 = "#955ae7" + let g:terminal_color_14 = "#398bc6" let g:terminal_color_15 = "#efecf4" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-atelier-cave" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-atelier-dune-light.vim b/colors/base16-atelier-dune-light.vim index c181a6e..de5fc7a 100644 --- a/colors/base16-atelier-dune-light.vim +++ b/colors/base16-atelier-dune-light.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "fefbec" -let s:gui01 = "e8e4cf" -let s:gui02 = "a6a28c" -let s:gui03 = "999580" -let s:gui04 = "7d7a68" -let s:gui05 = "6e6b5e" -let s:gui06 = "292824" -let s:gui07 = "20201d" -let s:gui08 = "d73737" -let s:gui09 = "b65611" -let s:gui0A = "ae9513" -let s:gui0B = "60ac39" -let s:gui0C = "1fad83" -let s:gui0D = "6684e1" -let s:gui0E = "b854d4" -let s:gui0F = "d43552" +let s:gui00 = "fefbec" +let g:base16_gui00 = "fefbec" +let s:gui01 = "e8e4cf" +let g:base16_gui01 = "e8e4cf" +let s:gui02 = "a6a28c" +let g:base16_gui02 = "a6a28c" +let s:gui03 = "999580" +let g:base16_gui03 = "999580" +let s:gui04 = "7d7a68" +let g:base16_gui04 = "7d7a68" +let s:gui05 = "6e6b5e" +let g:base16_gui05 = "6e6b5e" +let s:gui06 = "292824" +let g:base16_gui06 = "292824" +let s:gui07 = "20201d" +let g:base16_gui07 = "20201d" +let s:gui08 = "d73737" +let g:base16_gui08 = "d73737" +let s:gui09 = "b65611" +let g:base16_gui09 = "b65611" +let s:gui0A = "ae9513" +let g:base16_gui0A = "ae9513" +let s:gui0B = "60ac39" +let g:base16_gui0B = "60ac39" +let s:gui0C = "1fad83" +let g:base16_gui0C = "1fad83" +let s:gui0D = "6684e1" +let g:base16_gui0D = "6684e1" +let s:gui0E = "b854d4" +let g:base16_gui0E = "b854d4" +let s:gui0F = "d43552" +let g:base16_gui0F = "d43552" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#1fad83" let g:terminal_color_7 = "#6e6b5e" let g:terminal_color_8 = "#999580" - let g:terminal_color_9 = "#b65611" - let g:terminal_color_10 = "#e8e4cf" - let g:terminal_color_11 = "#a6a28c" - let g:terminal_color_12 = "#7d7a68" - let g:terminal_color_13 = "#292824" - let g:terminal_color_14 = "#d43552" + let g:terminal_color_9 = "#d73737" + let g:terminal_color_10 = "#60ac39" + let g:terminal_color_11 = "#ae9513" + let g:terminal_color_12 = "#6684e1" + let g:terminal_color_13 = "#b854d4" + let g:terminal_color_14 = "#1fad83" let g:terminal_color_15 = "#20201d" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-atelier-dune-light" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-atelier-dune.vim b/colors/base16-atelier-dune.vim index 4f636bd..93dc6f1 100644 --- a/colors/base16-atelier-dune.vim +++ b/colors/base16-atelier-dune.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "20201d" -let s:gui01 = "292824" -let s:gui02 = "6e6b5e" -let s:gui03 = "7d7a68" -let s:gui04 = "999580" -let s:gui05 = "a6a28c" -let s:gui06 = "e8e4cf" -let s:gui07 = "fefbec" -let s:gui08 = "d73737" -let s:gui09 = "b65611" -let s:gui0A = "ae9513" -let s:gui0B = "60ac39" -let s:gui0C = "1fad83" -let s:gui0D = "6684e1" -let s:gui0E = "b854d4" -let s:gui0F = "d43552" +let s:gui00 = "20201d" +let g:base16_gui00 = "20201d" +let s:gui01 = "292824" +let g:base16_gui01 = "292824" +let s:gui02 = "6e6b5e" +let g:base16_gui02 = "6e6b5e" +let s:gui03 = "7d7a68" +let g:base16_gui03 = "7d7a68" +let s:gui04 = "999580" +let g:base16_gui04 = "999580" +let s:gui05 = "a6a28c" +let g:base16_gui05 = "a6a28c" +let s:gui06 = "e8e4cf" +let g:base16_gui06 = "e8e4cf" +let s:gui07 = "fefbec" +let g:base16_gui07 = "fefbec" +let s:gui08 = "d73737" +let g:base16_gui08 = "d73737" +let s:gui09 = "b65611" +let g:base16_gui09 = "b65611" +let s:gui0A = "ae9513" +let g:base16_gui0A = "ae9513" +let s:gui0B = "60ac39" +let g:base16_gui0B = "60ac39" +let s:gui0C = "1fad83" +let g:base16_gui0C = "1fad83" +let s:gui0D = "6684e1" +let g:base16_gui0D = "6684e1" +let s:gui0E = "b854d4" +let g:base16_gui0E = "b854d4" +let s:gui0F = "d43552" +let g:base16_gui0F = "d43552" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#1fad83" let g:terminal_color_7 = "#a6a28c" let g:terminal_color_8 = "#7d7a68" - let g:terminal_color_9 = "#b65611" - let g:terminal_color_10 = "#292824" - let g:terminal_color_11 = "#6e6b5e" - let g:terminal_color_12 = "#999580" - let g:terminal_color_13 = "#e8e4cf" - let g:terminal_color_14 = "#d43552" + let g:terminal_color_9 = "#d73737" + let g:terminal_color_10 = "#60ac39" + let g:terminal_color_11 = "#ae9513" + let g:terminal_color_12 = "#6684e1" + let g:terminal_color_13 = "#b854d4" + let g:terminal_color_14 = "#1fad83" let g:terminal_color_15 = "#fefbec" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-atelier-dune" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-atelier-estuary-light.vim b/colors/base16-atelier-estuary-light.vim index 8a4b320..81cf8d6 100644 --- a/colors/base16-atelier-estuary-light.vim +++ b/colors/base16-atelier-estuary-light.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "f4f3ec" -let s:gui01 = "e7e6df" -let s:gui02 = "929181" -let s:gui03 = "878573" -let s:gui04 = "6c6b5a" -let s:gui05 = "5f5e4e" -let s:gui06 = "302f27" -let s:gui07 = "22221b" -let s:gui08 = "ba6236" -let s:gui09 = "ae7313" -let s:gui0A = "a5980d" -let s:gui0B = "7d9726" -let s:gui0C = "5b9d48" -let s:gui0D = "36a166" -let s:gui0E = "5f9182" -let s:gui0F = "9d6c7c" +let s:gui00 = "f4f3ec" +let g:base16_gui00 = "f4f3ec" +let s:gui01 = "e7e6df" +let g:base16_gui01 = "e7e6df" +let s:gui02 = "929181" +let g:base16_gui02 = "929181" +let s:gui03 = "878573" +let g:base16_gui03 = "878573" +let s:gui04 = "6c6b5a" +let g:base16_gui04 = "6c6b5a" +let s:gui05 = "5f5e4e" +let g:base16_gui05 = "5f5e4e" +let s:gui06 = "302f27" +let g:base16_gui06 = "302f27" +let s:gui07 = "22221b" +let g:base16_gui07 = "22221b" +let s:gui08 = "ba6236" +let g:base16_gui08 = "ba6236" +let s:gui09 = "ae7313" +let g:base16_gui09 = "ae7313" +let s:gui0A = "a5980d" +let g:base16_gui0A = "a5980d" +let s:gui0B = "7d9726" +let g:base16_gui0B = "7d9726" +let s:gui0C = "5b9d48" +let g:base16_gui0C = "5b9d48" +let s:gui0D = "36a166" +let g:base16_gui0D = "36a166" +let s:gui0E = "5f9182" +let g:base16_gui0E = "5f9182" +let s:gui0F = "9d6c7c" +let g:base16_gui0F = "9d6c7c" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#5b9d48" let g:terminal_color_7 = "#5f5e4e" let g:terminal_color_8 = "#878573" - let g:terminal_color_9 = "#ae7313" - let g:terminal_color_10 = "#e7e6df" - let g:terminal_color_11 = "#929181" - let g:terminal_color_12 = "#6c6b5a" - let g:terminal_color_13 = "#302f27" - let g:terminal_color_14 = "#9d6c7c" + let g:terminal_color_9 = "#ba6236" + let g:terminal_color_10 = "#7d9726" + let g:terminal_color_11 = "#a5980d" + let g:terminal_color_12 = "#36a166" + let g:terminal_color_13 = "#5f9182" + let g:terminal_color_14 = "#5b9d48" let g:terminal_color_15 = "#22221b" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-atelier-estuary-light" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-atelier-estuary.vim b/colors/base16-atelier-estuary.vim index e4f3ed6..fa34dfc 100644 --- a/colors/base16-atelier-estuary.vim +++ b/colors/base16-atelier-estuary.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "22221b" -let s:gui01 = "302f27" -let s:gui02 = "5f5e4e" -let s:gui03 = "6c6b5a" -let s:gui04 = "878573" -let s:gui05 = "929181" -let s:gui06 = "e7e6df" -let s:gui07 = "f4f3ec" -let s:gui08 = "ba6236" -let s:gui09 = "ae7313" -let s:gui0A = "a5980d" -let s:gui0B = "7d9726" -let s:gui0C = "5b9d48" -let s:gui0D = "36a166" -let s:gui0E = "5f9182" -let s:gui0F = "9d6c7c" +let s:gui00 = "22221b" +let g:base16_gui00 = "22221b" +let s:gui01 = "302f27" +let g:base16_gui01 = "302f27" +let s:gui02 = "5f5e4e" +let g:base16_gui02 = "5f5e4e" +let s:gui03 = "6c6b5a" +let g:base16_gui03 = "6c6b5a" +let s:gui04 = "878573" +let g:base16_gui04 = "878573" +let s:gui05 = "929181" +let g:base16_gui05 = "929181" +let s:gui06 = "e7e6df" +let g:base16_gui06 = "e7e6df" +let s:gui07 = "f4f3ec" +let g:base16_gui07 = "f4f3ec" +let s:gui08 = "ba6236" +let g:base16_gui08 = "ba6236" +let s:gui09 = "ae7313" +let g:base16_gui09 = "ae7313" +let s:gui0A = "a5980d" +let g:base16_gui0A = "a5980d" +let s:gui0B = "7d9726" +let g:base16_gui0B = "7d9726" +let s:gui0C = "5b9d48" +let g:base16_gui0C = "5b9d48" +let s:gui0D = "36a166" +let g:base16_gui0D = "36a166" +let s:gui0E = "5f9182" +let g:base16_gui0E = "5f9182" +let s:gui0F = "9d6c7c" +let g:base16_gui0F = "9d6c7c" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#5b9d48" let g:terminal_color_7 = "#929181" let g:terminal_color_8 = "#6c6b5a" - let g:terminal_color_9 = "#ae7313" - let g:terminal_color_10 = "#302f27" - let g:terminal_color_11 = "#5f5e4e" - let g:terminal_color_12 = "#878573" - let g:terminal_color_13 = "#e7e6df" - let g:terminal_color_14 = "#9d6c7c" + let g:terminal_color_9 = "#ba6236" + let g:terminal_color_10 = "#7d9726" + let g:terminal_color_11 = "#a5980d" + let g:terminal_color_12 = "#36a166" + let g:terminal_color_13 = "#5f9182" + let g:terminal_color_14 = "#5b9d48" let g:terminal_color_15 = "#f4f3ec" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-atelier-estuary" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-atelier-forest-light.vim b/colors/base16-atelier-forest-light.vim index 9494b77..93fee12 100644 --- a/colors/base16-atelier-forest-light.vim +++ b/colors/base16-atelier-forest-light.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "f1efee" -let s:gui01 = "e6e2e0" -let s:gui02 = "a8a19f" -let s:gui03 = "9c9491" -let s:gui04 = "766e6b" -let s:gui05 = "68615e" -let s:gui06 = "2c2421" -let s:gui07 = "1b1918" -let s:gui08 = "f22c40" -let s:gui09 = "df5320" -let s:gui0A = "c38418" -let s:gui0B = "7b9726" -let s:gui0C = "3d97b8" -let s:gui0D = "407ee7" -let s:gui0E = "6666ea" -let s:gui0F = "c33ff3" +let s:gui00 = "f1efee" +let g:base16_gui00 = "f1efee" +let s:gui01 = "e6e2e0" +let g:base16_gui01 = "e6e2e0" +let s:gui02 = "a8a19f" +let g:base16_gui02 = "a8a19f" +let s:gui03 = "9c9491" +let g:base16_gui03 = "9c9491" +let s:gui04 = "766e6b" +let g:base16_gui04 = "766e6b" +let s:gui05 = "68615e" +let g:base16_gui05 = "68615e" +let s:gui06 = "2c2421" +let g:base16_gui06 = "2c2421" +let s:gui07 = "1b1918" +let g:base16_gui07 = "1b1918" +let s:gui08 = "f22c40" +let g:base16_gui08 = "f22c40" +let s:gui09 = "df5320" +let g:base16_gui09 = "df5320" +let s:gui0A = "c38418" +let g:base16_gui0A = "c38418" +let s:gui0B = "7b9726" +let g:base16_gui0B = "7b9726" +let s:gui0C = "3d97b8" +let g:base16_gui0C = "3d97b8" +let s:gui0D = "407ee7" +let g:base16_gui0D = "407ee7" +let s:gui0E = "6666ea" +let g:base16_gui0E = "6666ea" +let s:gui0F = "c33ff3" +let g:base16_gui0F = "c33ff3" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#3d97b8" let g:terminal_color_7 = "#68615e" let g:terminal_color_8 = "#9c9491" - let g:terminal_color_9 = "#df5320" - let g:terminal_color_10 = "#e6e2e0" - let g:terminal_color_11 = "#a8a19f" - let g:terminal_color_12 = "#766e6b" - let g:terminal_color_13 = "#2c2421" - let g:terminal_color_14 = "#c33ff3" + let g:terminal_color_9 = "#f22c40" + let g:terminal_color_10 = "#7b9726" + let g:terminal_color_11 = "#c38418" + let g:terminal_color_12 = "#407ee7" + let g:terminal_color_13 = "#6666ea" + let g:terminal_color_14 = "#3d97b8" let g:terminal_color_15 = "#1b1918" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-atelier-forest-light" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-atelier-forest.vim b/colors/base16-atelier-forest.vim index f64687d..25fa324 100644 --- a/colors/base16-atelier-forest.vim +++ b/colors/base16-atelier-forest.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "1b1918" -let s:gui01 = "2c2421" -let s:gui02 = "68615e" -let s:gui03 = "766e6b" -let s:gui04 = "9c9491" -let s:gui05 = "a8a19f" -let s:gui06 = "e6e2e0" -let s:gui07 = "f1efee" -let s:gui08 = "f22c40" -let s:gui09 = "df5320" -let s:gui0A = "c38418" -let s:gui0B = "7b9726" -let s:gui0C = "3d97b8" -let s:gui0D = "407ee7" -let s:gui0E = "6666ea" -let s:gui0F = "c33ff3" +let s:gui00 = "1b1918" +let g:base16_gui00 = "1b1918" +let s:gui01 = "2c2421" +let g:base16_gui01 = "2c2421" +let s:gui02 = "68615e" +let g:base16_gui02 = "68615e" +let s:gui03 = "766e6b" +let g:base16_gui03 = "766e6b" +let s:gui04 = "9c9491" +let g:base16_gui04 = "9c9491" +let s:gui05 = "a8a19f" +let g:base16_gui05 = "a8a19f" +let s:gui06 = "e6e2e0" +let g:base16_gui06 = "e6e2e0" +let s:gui07 = "f1efee" +let g:base16_gui07 = "f1efee" +let s:gui08 = "f22c40" +let g:base16_gui08 = "f22c40" +let s:gui09 = "df5320" +let g:base16_gui09 = "df5320" +let s:gui0A = "c38418" +let g:base16_gui0A = "c38418" +let s:gui0B = "7b9726" +let g:base16_gui0B = "7b9726" +let s:gui0C = "3d97b8" +let g:base16_gui0C = "3d97b8" +let s:gui0D = "407ee7" +let g:base16_gui0D = "407ee7" +let s:gui0E = "6666ea" +let g:base16_gui0E = "6666ea" +let s:gui0F = "c33ff3" +let g:base16_gui0F = "c33ff3" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#3d97b8" let g:terminal_color_7 = "#a8a19f" let g:terminal_color_8 = "#766e6b" - let g:terminal_color_9 = "#df5320" - let g:terminal_color_10 = "#2c2421" - let g:terminal_color_11 = "#68615e" - let g:terminal_color_12 = "#9c9491" - let g:terminal_color_13 = "#e6e2e0" - let g:terminal_color_14 = "#c33ff3" + let g:terminal_color_9 = "#f22c40" + let g:terminal_color_10 = "#7b9726" + let g:terminal_color_11 = "#c38418" + let g:terminal_color_12 = "#407ee7" + let g:terminal_color_13 = "#6666ea" + let g:terminal_color_14 = "#3d97b8" let g:terminal_color_15 = "#f1efee" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-atelier-forest" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-atelier-heath-light.vim b/colors/base16-atelier-heath-light.vim index b87fe02..e9117e6 100644 --- a/colors/base16-atelier-heath-light.vim +++ b/colors/base16-atelier-heath-light.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "f7f3f7" -let s:gui01 = "d8cad8" -let s:gui02 = "ab9bab" -let s:gui03 = "9e8f9e" -let s:gui04 = "776977" -let s:gui05 = "695d69" -let s:gui06 = "292329" -let s:gui07 = "1b181b" -let s:gui08 = "ca402b" -let s:gui09 = "a65926" -let s:gui0A = "bb8a35" -let s:gui0B = "918b3b" -let s:gui0C = "159393" -let s:gui0D = "516aec" -let s:gui0E = "7b59c0" -let s:gui0F = "cc33cc" +let s:gui00 = "f7f3f7" +let g:base16_gui00 = "f7f3f7" +let s:gui01 = "d8cad8" +let g:base16_gui01 = "d8cad8" +let s:gui02 = "ab9bab" +let g:base16_gui02 = "ab9bab" +let s:gui03 = "9e8f9e" +let g:base16_gui03 = "9e8f9e" +let s:gui04 = "776977" +let g:base16_gui04 = "776977" +let s:gui05 = "695d69" +let g:base16_gui05 = "695d69" +let s:gui06 = "292329" +let g:base16_gui06 = "292329" +let s:gui07 = "1b181b" +let g:base16_gui07 = "1b181b" +let s:gui08 = "ca402b" +let g:base16_gui08 = "ca402b" +let s:gui09 = "a65926" +let g:base16_gui09 = "a65926" +let s:gui0A = "bb8a35" +let g:base16_gui0A = "bb8a35" +let s:gui0B = "918b3b" +let g:base16_gui0B = "918b3b" +let s:gui0C = "159393" +let g:base16_gui0C = "159393" +let s:gui0D = "516aec" +let g:base16_gui0D = "516aec" +let s:gui0E = "7b59c0" +let g:base16_gui0E = "7b59c0" +let s:gui0F = "cc33cc" +let g:base16_gui0F = "cc33cc" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#159393" let g:terminal_color_7 = "#695d69" let g:terminal_color_8 = "#9e8f9e" - let g:terminal_color_9 = "#a65926" - let g:terminal_color_10 = "#d8cad8" - let g:terminal_color_11 = "#ab9bab" - let g:terminal_color_12 = "#776977" - let g:terminal_color_13 = "#292329" - let g:terminal_color_14 = "#cc33cc" + let g:terminal_color_9 = "#ca402b" + let g:terminal_color_10 = "#918b3b" + let g:terminal_color_11 = "#bb8a35" + let g:terminal_color_12 = "#516aec" + let g:terminal_color_13 = "#7b59c0" + let g:terminal_color_14 = "#159393" let g:terminal_color_15 = "#1b181b" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-atelier-heath-light" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-atelier-heath.vim b/colors/base16-atelier-heath.vim index 088139f..c49de02 100644 --- a/colors/base16-atelier-heath.vim +++ b/colors/base16-atelier-heath.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "1b181b" -let s:gui01 = "292329" -let s:gui02 = "695d69" -let s:gui03 = "776977" -let s:gui04 = "9e8f9e" -let s:gui05 = "ab9bab" -let s:gui06 = "d8cad8" -let s:gui07 = "f7f3f7" -let s:gui08 = "ca402b" -let s:gui09 = "a65926" -let s:gui0A = "bb8a35" -let s:gui0B = "918b3b" -let s:gui0C = "159393" -let s:gui0D = "516aec" -let s:gui0E = "7b59c0" -let s:gui0F = "cc33cc" +let s:gui00 = "1b181b" +let g:base16_gui00 = "1b181b" +let s:gui01 = "292329" +let g:base16_gui01 = "292329" +let s:gui02 = "695d69" +let g:base16_gui02 = "695d69" +let s:gui03 = "776977" +let g:base16_gui03 = "776977" +let s:gui04 = "9e8f9e" +let g:base16_gui04 = "9e8f9e" +let s:gui05 = "ab9bab" +let g:base16_gui05 = "ab9bab" +let s:gui06 = "d8cad8" +let g:base16_gui06 = "d8cad8" +let s:gui07 = "f7f3f7" +let g:base16_gui07 = "f7f3f7" +let s:gui08 = "ca402b" +let g:base16_gui08 = "ca402b" +let s:gui09 = "a65926" +let g:base16_gui09 = "a65926" +let s:gui0A = "bb8a35" +let g:base16_gui0A = "bb8a35" +let s:gui0B = "918b3b" +let g:base16_gui0B = "918b3b" +let s:gui0C = "159393" +let g:base16_gui0C = "159393" +let s:gui0D = "516aec" +let g:base16_gui0D = "516aec" +let s:gui0E = "7b59c0" +let g:base16_gui0E = "7b59c0" +let s:gui0F = "cc33cc" +let g:base16_gui0F = "cc33cc" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#159393" let g:terminal_color_7 = "#ab9bab" let g:terminal_color_8 = "#776977" - let g:terminal_color_9 = "#a65926" - let g:terminal_color_10 = "#292329" - let g:terminal_color_11 = "#695d69" - let g:terminal_color_12 = "#9e8f9e" - let g:terminal_color_13 = "#d8cad8" - let g:terminal_color_14 = "#cc33cc" + let g:terminal_color_9 = "#ca402b" + let g:terminal_color_10 = "#918b3b" + let g:terminal_color_11 = "#bb8a35" + let g:terminal_color_12 = "#516aec" + let g:terminal_color_13 = "#7b59c0" + let g:terminal_color_14 = "#159393" let g:terminal_color_15 = "#f7f3f7" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-atelier-heath" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-atelier-lakeside-light.vim b/colors/base16-atelier-lakeside-light.vim index 37b2009..4f0ba59 100644 --- a/colors/base16-atelier-lakeside-light.vim +++ b/colors/base16-atelier-lakeside-light.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "ebf8ff" -let s:gui01 = "c1e4f6" -let s:gui02 = "7ea2b4" -let s:gui03 = "7195a8" -let s:gui04 = "5a7b8c" -let s:gui05 = "516d7b" -let s:gui06 = "1f292e" -let s:gui07 = "161b1d" -let s:gui08 = "d22d72" -let s:gui09 = "935c25" -let s:gui0A = "8a8a0f" -let s:gui0B = "568c3b" -let s:gui0C = "2d8f6f" -let s:gui0D = "257fad" -let s:gui0E = "6b6bb8" -let s:gui0F = "b72dd2" +let s:gui00 = "ebf8ff" +let g:base16_gui00 = "ebf8ff" +let s:gui01 = "c1e4f6" +let g:base16_gui01 = "c1e4f6" +let s:gui02 = "7ea2b4" +let g:base16_gui02 = "7ea2b4" +let s:gui03 = "7195a8" +let g:base16_gui03 = "7195a8" +let s:gui04 = "5a7b8c" +let g:base16_gui04 = "5a7b8c" +let s:gui05 = "516d7b" +let g:base16_gui05 = "516d7b" +let s:gui06 = "1f292e" +let g:base16_gui06 = "1f292e" +let s:gui07 = "161b1d" +let g:base16_gui07 = "161b1d" +let s:gui08 = "d22d72" +let g:base16_gui08 = "d22d72" +let s:gui09 = "935c25" +let g:base16_gui09 = "935c25" +let s:gui0A = "8a8a0f" +let g:base16_gui0A = "8a8a0f" +let s:gui0B = "568c3b" +let g:base16_gui0B = "568c3b" +let s:gui0C = "2d8f6f" +let g:base16_gui0C = "2d8f6f" +let s:gui0D = "257fad" +let g:base16_gui0D = "257fad" +let s:gui0E = "6b6bb8" +let g:base16_gui0E = "6b6bb8" +let s:gui0F = "b72dd2" +let g:base16_gui0F = "b72dd2" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#2d8f6f" let g:terminal_color_7 = "#516d7b" let g:terminal_color_8 = "#7195a8" - let g:terminal_color_9 = "#935c25" - let g:terminal_color_10 = "#c1e4f6" - let g:terminal_color_11 = "#7ea2b4" - let g:terminal_color_12 = "#5a7b8c" - let g:terminal_color_13 = "#1f292e" - let g:terminal_color_14 = "#b72dd2" + let g:terminal_color_9 = "#d22d72" + let g:terminal_color_10 = "#568c3b" + let g:terminal_color_11 = "#8a8a0f" + let g:terminal_color_12 = "#257fad" + let g:terminal_color_13 = "#6b6bb8" + let g:terminal_color_14 = "#2d8f6f" let g:terminal_color_15 = "#161b1d" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-atelier-lakeside-light" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-atelier-lakeside.vim b/colors/base16-atelier-lakeside.vim index 78d306e..ad27ccf 100644 --- a/colors/base16-atelier-lakeside.vim +++ b/colors/base16-atelier-lakeside.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "161b1d" -let s:gui01 = "1f292e" -let s:gui02 = "516d7b" -let s:gui03 = "5a7b8c" -let s:gui04 = "7195a8" -let s:gui05 = "7ea2b4" -let s:gui06 = "c1e4f6" -let s:gui07 = "ebf8ff" -let s:gui08 = "d22d72" -let s:gui09 = "935c25" -let s:gui0A = "8a8a0f" -let s:gui0B = "568c3b" -let s:gui0C = "2d8f6f" -let s:gui0D = "257fad" -let s:gui0E = "6b6bb8" -let s:gui0F = "b72dd2" +let s:gui00 = "161b1d" +let g:base16_gui00 = "161b1d" +let s:gui01 = "1f292e" +let g:base16_gui01 = "1f292e" +let s:gui02 = "516d7b" +let g:base16_gui02 = "516d7b" +let s:gui03 = "5a7b8c" +let g:base16_gui03 = "5a7b8c" +let s:gui04 = "7195a8" +let g:base16_gui04 = "7195a8" +let s:gui05 = "7ea2b4" +let g:base16_gui05 = "7ea2b4" +let s:gui06 = "c1e4f6" +let g:base16_gui06 = "c1e4f6" +let s:gui07 = "ebf8ff" +let g:base16_gui07 = "ebf8ff" +let s:gui08 = "d22d72" +let g:base16_gui08 = "d22d72" +let s:gui09 = "935c25" +let g:base16_gui09 = "935c25" +let s:gui0A = "8a8a0f" +let g:base16_gui0A = "8a8a0f" +let s:gui0B = "568c3b" +let g:base16_gui0B = "568c3b" +let s:gui0C = "2d8f6f" +let g:base16_gui0C = "2d8f6f" +let s:gui0D = "257fad" +let g:base16_gui0D = "257fad" +let s:gui0E = "6b6bb8" +let g:base16_gui0E = "6b6bb8" +let s:gui0F = "b72dd2" +let g:base16_gui0F = "b72dd2" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#2d8f6f" let g:terminal_color_7 = "#7ea2b4" let g:terminal_color_8 = "#5a7b8c" - let g:terminal_color_9 = "#935c25" - let g:terminal_color_10 = "#1f292e" - let g:terminal_color_11 = "#516d7b" - let g:terminal_color_12 = "#7195a8" - let g:terminal_color_13 = "#c1e4f6" - let g:terminal_color_14 = "#b72dd2" + let g:terminal_color_9 = "#d22d72" + let g:terminal_color_10 = "#568c3b" + let g:terminal_color_11 = "#8a8a0f" + let g:terminal_color_12 = "#257fad" + let g:terminal_color_13 = "#6b6bb8" + let g:terminal_color_14 = "#2d8f6f" let g:terminal_color_15 = "#ebf8ff" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-atelier-lakeside" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-atelier-plateau-light.vim b/colors/base16-atelier-plateau-light.vim index 1045204..42908a4 100644 --- a/colors/base16-atelier-plateau-light.vim +++ b/colors/base16-atelier-plateau-light.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "f4ecec" -let s:gui01 = "e7dfdf" -let s:gui02 = "8a8585" -let s:gui03 = "7e7777" -let s:gui04 = "655d5d" -let s:gui05 = "585050" -let s:gui06 = "292424" -let s:gui07 = "1b1818" -let s:gui08 = "ca4949" -let s:gui09 = "b45a3c" -let s:gui0A = "a06e3b" -let s:gui0B = "4b8b8b" -let s:gui0C = "5485b6" -let s:gui0D = "7272ca" -let s:gui0E = "8464c4" -let s:gui0F = "bd5187" +let s:gui00 = "f4ecec" +let g:base16_gui00 = "f4ecec" +let s:gui01 = "e7dfdf" +let g:base16_gui01 = "e7dfdf" +let s:gui02 = "8a8585" +let g:base16_gui02 = "8a8585" +let s:gui03 = "7e7777" +let g:base16_gui03 = "7e7777" +let s:gui04 = "655d5d" +let g:base16_gui04 = "655d5d" +let s:gui05 = "585050" +let g:base16_gui05 = "585050" +let s:gui06 = "292424" +let g:base16_gui06 = "292424" +let s:gui07 = "1b1818" +let g:base16_gui07 = "1b1818" +let s:gui08 = "ca4949" +let g:base16_gui08 = "ca4949" +let s:gui09 = "b45a3c" +let g:base16_gui09 = "b45a3c" +let s:gui0A = "a06e3b" +let g:base16_gui0A = "a06e3b" +let s:gui0B = "4b8b8b" +let g:base16_gui0B = "4b8b8b" +let s:gui0C = "5485b6" +let g:base16_gui0C = "5485b6" +let s:gui0D = "7272ca" +let g:base16_gui0D = "7272ca" +let s:gui0E = "8464c4" +let g:base16_gui0E = "8464c4" +let s:gui0F = "bd5187" +let g:base16_gui0F = "bd5187" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#5485b6" let g:terminal_color_7 = "#585050" let g:terminal_color_8 = "#7e7777" - let g:terminal_color_9 = "#b45a3c" - let g:terminal_color_10 = "#e7dfdf" - let g:terminal_color_11 = "#8a8585" - let g:terminal_color_12 = "#655d5d" - let g:terminal_color_13 = "#292424" - let g:terminal_color_14 = "#bd5187" + let g:terminal_color_9 = "#ca4949" + let g:terminal_color_10 = "#4b8b8b" + let g:terminal_color_11 = "#a06e3b" + let g:terminal_color_12 = "#7272ca" + let g:terminal_color_13 = "#8464c4" + let g:terminal_color_14 = "#5485b6" let g:terminal_color_15 = "#1b1818" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-atelier-plateau-light" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-atelier-plateau.vim b/colors/base16-atelier-plateau.vim index 4407d1f..c38e14c 100644 --- a/colors/base16-atelier-plateau.vim +++ b/colors/base16-atelier-plateau.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "1b1818" -let s:gui01 = "292424" -let s:gui02 = "585050" -let s:gui03 = "655d5d" -let s:gui04 = "7e7777" -let s:gui05 = "8a8585" -let s:gui06 = "e7dfdf" -let s:gui07 = "f4ecec" -let s:gui08 = "ca4949" -let s:gui09 = "b45a3c" -let s:gui0A = "a06e3b" -let s:gui0B = "4b8b8b" -let s:gui0C = "5485b6" -let s:gui0D = "7272ca" -let s:gui0E = "8464c4" -let s:gui0F = "bd5187" +let s:gui00 = "1b1818" +let g:base16_gui00 = "1b1818" +let s:gui01 = "292424" +let g:base16_gui01 = "292424" +let s:gui02 = "585050" +let g:base16_gui02 = "585050" +let s:gui03 = "655d5d" +let g:base16_gui03 = "655d5d" +let s:gui04 = "7e7777" +let g:base16_gui04 = "7e7777" +let s:gui05 = "8a8585" +let g:base16_gui05 = "8a8585" +let s:gui06 = "e7dfdf" +let g:base16_gui06 = "e7dfdf" +let s:gui07 = "f4ecec" +let g:base16_gui07 = "f4ecec" +let s:gui08 = "ca4949" +let g:base16_gui08 = "ca4949" +let s:gui09 = "b45a3c" +let g:base16_gui09 = "b45a3c" +let s:gui0A = "a06e3b" +let g:base16_gui0A = "a06e3b" +let s:gui0B = "4b8b8b" +let g:base16_gui0B = "4b8b8b" +let s:gui0C = "5485b6" +let g:base16_gui0C = "5485b6" +let s:gui0D = "7272ca" +let g:base16_gui0D = "7272ca" +let s:gui0E = "8464c4" +let g:base16_gui0E = "8464c4" +let s:gui0F = "bd5187" +let g:base16_gui0F = "bd5187" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#5485b6" let g:terminal_color_7 = "#8a8585" let g:terminal_color_8 = "#655d5d" - let g:terminal_color_9 = "#b45a3c" - let g:terminal_color_10 = "#292424" - let g:terminal_color_11 = "#585050" - let g:terminal_color_12 = "#7e7777" - let g:terminal_color_13 = "#e7dfdf" - let g:terminal_color_14 = "#bd5187" + let g:terminal_color_9 = "#ca4949" + let g:terminal_color_10 = "#4b8b8b" + let g:terminal_color_11 = "#a06e3b" + let g:terminal_color_12 = "#7272ca" + let g:terminal_color_13 = "#8464c4" + let g:terminal_color_14 = "#5485b6" let g:terminal_color_15 = "#f4ecec" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-atelier-plateau" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-atelier-savanna-light.vim b/colors/base16-atelier-savanna-light.vim index a79034d..160b458 100644 --- a/colors/base16-atelier-savanna-light.vim +++ b/colors/base16-atelier-savanna-light.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "ecf4ee" -let s:gui01 = "dfe7e2" -let s:gui02 = "87928a" -let s:gui03 = "78877d" -let s:gui04 = "5f6d64" -let s:gui05 = "526057" -let s:gui06 = "232a25" -let s:gui07 = "171c19" -let s:gui08 = "b16139" -let s:gui09 = "9f713c" -let s:gui0A = "a07e3b" -let s:gui0B = "489963" -let s:gui0C = "1c9aa0" -let s:gui0D = "478c90" -let s:gui0E = "55859b" -let s:gui0F = "867469" +let s:gui00 = "ecf4ee" +let g:base16_gui00 = "ecf4ee" +let s:gui01 = "dfe7e2" +let g:base16_gui01 = "dfe7e2" +let s:gui02 = "87928a" +let g:base16_gui02 = "87928a" +let s:gui03 = "78877d" +let g:base16_gui03 = "78877d" +let s:gui04 = "5f6d64" +let g:base16_gui04 = "5f6d64" +let s:gui05 = "526057" +let g:base16_gui05 = "526057" +let s:gui06 = "232a25" +let g:base16_gui06 = "232a25" +let s:gui07 = "171c19" +let g:base16_gui07 = "171c19" +let s:gui08 = "b16139" +let g:base16_gui08 = "b16139" +let s:gui09 = "9f713c" +let g:base16_gui09 = "9f713c" +let s:gui0A = "a07e3b" +let g:base16_gui0A = "a07e3b" +let s:gui0B = "489963" +let g:base16_gui0B = "489963" +let s:gui0C = "1c9aa0" +let g:base16_gui0C = "1c9aa0" +let s:gui0D = "478c90" +let g:base16_gui0D = "478c90" +let s:gui0E = "55859b" +let g:base16_gui0E = "55859b" +let s:gui0F = "867469" +let g:base16_gui0F = "867469" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#1c9aa0" let g:terminal_color_7 = "#526057" let g:terminal_color_8 = "#78877d" - let g:terminal_color_9 = "#9f713c" - let g:terminal_color_10 = "#dfe7e2" - let g:terminal_color_11 = "#87928a" - let g:terminal_color_12 = "#5f6d64" - let g:terminal_color_13 = "#232a25" - let g:terminal_color_14 = "#867469" + let g:terminal_color_9 = "#b16139" + let g:terminal_color_10 = "#489963" + let g:terminal_color_11 = "#a07e3b" + let g:terminal_color_12 = "#478c90" + let g:terminal_color_13 = "#55859b" + let g:terminal_color_14 = "#1c9aa0" let g:terminal_color_15 = "#171c19" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-atelier-savanna-light" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-atelier-savanna.vim b/colors/base16-atelier-savanna.vim index 78812dd..095f5e5 100644 --- a/colors/base16-atelier-savanna.vim +++ b/colors/base16-atelier-savanna.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "171c19" -let s:gui01 = "232a25" -let s:gui02 = "526057" -let s:gui03 = "5f6d64" -let s:gui04 = "78877d" -let s:gui05 = "87928a" -let s:gui06 = "dfe7e2" -let s:gui07 = "ecf4ee" -let s:gui08 = "b16139" -let s:gui09 = "9f713c" -let s:gui0A = "a07e3b" -let s:gui0B = "489963" -let s:gui0C = "1c9aa0" -let s:gui0D = "478c90" -let s:gui0E = "55859b" -let s:gui0F = "867469" +let s:gui00 = "171c19" +let g:base16_gui00 = "171c19" +let s:gui01 = "232a25" +let g:base16_gui01 = "232a25" +let s:gui02 = "526057" +let g:base16_gui02 = "526057" +let s:gui03 = "5f6d64" +let g:base16_gui03 = "5f6d64" +let s:gui04 = "78877d" +let g:base16_gui04 = "78877d" +let s:gui05 = "87928a" +let g:base16_gui05 = "87928a" +let s:gui06 = "dfe7e2" +let g:base16_gui06 = "dfe7e2" +let s:gui07 = "ecf4ee" +let g:base16_gui07 = "ecf4ee" +let s:gui08 = "b16139" +let g:base16_gui08 = "b16139" +let s:gui09 = "9f713c" +let g:base16_gui09 = "9f713c" +let s:gui0A = "a07e3b" +let g:base16_gui0A = "a07e3b" +let s:gui0B = "489963" +let g:base16_gui0B = "489963" +let s:gui0C = "1c9aa0" +let g:base16_gui0C = "1c9aa0" +let s:gui0D = "478c90" +let g:base16_gui0D = "478c90" +let s:gui0E = "55859b" +let g:base16_gui0E = "55859b" +let s:gui0F = "867469" +let g:base16_gui0F = "867469" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#1c9aa0" let g:terminal_color_7 = "#87928a" let g:terminal_color_8 = "#5f6d64" - let g:terminal_color_9 = "#9f713c" - let g:terminal_color_10 = "#232a25" - let g:terminal_color_11 = "#526057" - let g:terminal_color_12 = "#78877d" - let g:terminal_color_13 = "#dfe7e2" - let g:terminal_color_14 = "#867469" + let g:terminal_color_9 = "#b16139" + let g:terminal_color_10 = "#489963" + let g:terminal_color_11 = "#a07e3b" + let g:terminal_color_12 = "#478c90" + let g:terminal_color_13 = "#55859b" + let g:terminal_color_14 = "#1c9aa0" let g:terminal_color_15 = "#ecf4ee" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-atelier-savanna" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-atelier-seaside-light.vim b/colors/base16-atelier-seaside-light.vim index 90a1296..078ac40 100644 --- a/colors/base16-atelier-seaside-light.vim +++ b/colors/base16-atelier-seaside-light.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "f4fbf4" -let s:gui01 = "cfe8cf" -let s:gui02 = "8ca68c" -let s:gui03 = "809980" -let s:gui04 = "687d68" -let s:gui05 = "5e6e5e" -let s:gui06 = "242924" -let s:gui07 = "131513" -let s:gui08 = "e6193c" -let s:gui09 = "87711d" -let s:gui0A = "98981b" -let s:gui0B = "29a329" -let s:gui0C = "1999b3" -let s:gui0D = "3d62f5" -let s:gui0E = "ad2bee" -let s:gui0F = "e619c3" +let s:gui00 = "f4fbf4" +let g:base16_gui00 = "f4fbf4" +let s:gui01 = "cfe8cf" +let g:base16_gui01 = "cfe8cf" +let s:gui02 = "8ca68c" +let g:base16_gui02 = "8ca68c" +let s:gui03 = "809980" +let g:base16_gui03 = "809980" +let s:gui04 = "687d68" +let g:base16_gui04 = "687d68" +let s:gui05 = "5e6e5e" +let g:base16_gui05 = "5e6e5e" +let s:gui06 = "242924" +let g:base16_gui06 = "242924" +let s:gui07 = "131513" +let g:base16_gui07 = "131513" +let s:gui08 = "e6193c" +let g:base16_gui08 = "e6193c" +let s:gui09 = "87711d" +let g:base16_gui09 = "87711d" +let s:gui0A = "98981b" +let g:base16_gui0A = "98981b" +let s:gui0B = "29a329" +let g:base16_gui0B = "29a329" +let s:gui0C = "1999b3" +let g:base16_gui0C = "1999b3" +let s:gui0D = "3d62f5" +let g:base16_gui0D = "3d62f5" +let s:gui0E = "ad2bee" +let g:base16_gui0E = "ad2bee" +let s:gui0F = "e619c3" +let g:base16_gui0F = "e619c3" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#1999b3" let g:terminal_color_7 = "#5e6e5e" let g:terminal_color_8 = "#809980" - let g:terminal_color_9 = "#87711d" - let g:terminal_color_10 = "#cfe8cf" - let g:terminal_color_11 = "#8ca68c" - let g:terminal_color_12 = "#687d68" - let g:terminal_color_13 = "#242924" - let g:terminal_color_14 = "#e619c3" + let g:terminal_color_9 = "#e6193c" + let g:terminal_color_10 = "#29a329" + let g:terminal_color_11 = "#98981b" + let g:terminal_color_12 = "#3d62f5" + let g:terminal_color_13 = "#ad2bee" + let g:terminal_color_14 = "#1999b3" let g:terminal_color_15 = "#131513" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-atelier-seaside-light" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-atelier-seaside.vim b/colors/base16-atelier-seaside.vim index c88af5e..92e07c6 100644 --- a/colors/base16-atelier-seaside.vim +++ b/colors/base16-atelier-seaside.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "131513" -let s:gui01 = "242924" -let s:gui02 = "5e6e5e" -let s:gui03 = "687d68" -let s:gui04 = "809980" -let s:gui05 = "8ca68c" -let s:gui06 = "cfe8cf" -let s:gui07 = "f4fbf4" -let s:gui08 = "e6193c" -let s:gui09 = "87711d" -let s:gui0A = "98981b" -let s:gui0B = "29a329" -let s:gui0C = "1999b3" -let s:gui0D = "3d62f5" -let s:gui0E = "ad2bee" -let s:gui0F = "e619c3" +let s:gui00 = "131513" +let g:base16_gui00 = "131513" +let s:gui01 = "242924" +let g:base16_gui01 = "242924" +let s:gui02 = "5e6e5e" +let g:base16_gui02 = "5e6e5e" +let s:gui03 = "687d68" +let g:base16_gui03 = "687d68" +let s:gui04 = "809980" +let g:base16_gui04 = "809980" +let s:gui05 = "8ca68c" +let g:base16_gui05 = "8ca68c" +let s:gui06 = "cfe8cf" +let g:base16_gui06 = "cfe8cf" +let s:gui07 = "f4fbf4" +let g:base16_gui07 = "f4fbf4" +let s:gui08 = "e6193c" +let g:base16_gui08 = "e6193c" +let s:gui09 = "87711d" +let g:base16_gui09 = "87711d" +let s:gui0A = "98981b" +let g:base16_gui0A = "98981b" +let s:gui0B = "29a329" +let g:base16_gui0B = "29a329" +let s:gui0C = "1999b3" +let g:base16_gui0C = "1999b3" +let s:gui0D = "3d62f5" +let g:base16_gui0D = "3d62f5" +let s:gui0E = "ad2bee" +let g:base16_gui0E = "ad2bee" +let s:gui0F = "e619c3" +let g:base16_gui0F = "e619c3" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#1999b3" let g:terminal_color_7 = "#8ca68c" let g:terminal_color_8 = "#687d68" - let g:terminal_color_9 = "#87711d" - let g:terminal_color_10 = "#242924" - let g:terminal_color_11 = "#5e6e5e" - let g:terminal_color_12 = "#809980" - let g:terminal_color_13 = "#cfe8cf" - let g:terminal_color_14 = "#e619c3" + let g:terminal_color_9 = "#e6193c" + let g:terminal_color_10 = "#29a329" + let g:terminal_color_11 = "#98981b" + let g:terminal_color_12 = "#3d62f5" + let g:terminal_color_13 = "#ad2bee" + let g:terminal_color_14 = "#1999b3" let g:terminal_color_15 = "#f4fbf4" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-atelier-seaside" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-atelier-sulphurpool-light.vim b/colors/base16-atelier-sulphurpool-light.vim index 5c6dadc..a53a03b 100644 --- a/colors/base16-atelier-sulphurpool-light.vim +++ b/colors/base16-atelier-sulphurpool-light.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "f5f7ff" -let s:gui01 = "dfe2f1" -let s:gui02 = "979db4" -let s:gui03 = "898ea4" -let s:gui04 = "6b7394" -let s:gui05 = "5e6687" -let s:gui06 = "293256" -let s:gui07 = "202746" -let s:gui08 = "c94922" -let s:gui09 = "c76b29" -let s:gui0A = "c08b30" -let s:gui0B = "ac9739" -let s:gui0C = "22a2c9" -let s:gui0D = "3d8fd1" -let s:gui0E = "6679cc" -let s:gui0F = "9c637a" +let s:gui00 = "f5f7ff" +let g:base16_gui00 = "f5f7ff" +let s:gui01 = "dfe2f1" +let g:base16_gui01 = "dfe2f1" +let s:gui02 = "979db4" +let g:base16_gui02 = "979db4" +let s:gui03 = "898ea4" +let g:base16_gui03 = "898ea4" +let s:gui04 = "6b7394" +let g:base16_gui04 = "6b7394" +let s:gui05 = "5e6687" +let g:base16_gui05 = "5e6687" +let s:gui06 = "293256" +let g:base16_gui06 = "293256" +let s:gui07 = "202746" +let g:base16_gui07 = "202746" +let s:gui08 = "c94922" +let g:base16_gui08 = "c94922" +let s:gui09 = "c76b29" +let g:base16_gui09 = "c76b29" +let s:gui0A = "c08b30" +let g:base16_gui0A = "c08b30" +let s:gui0B = "ac9739" +let g:base16_gui0B = "ac9739" +let s:gui0C = "22a2c9" +let g:base16_gui0C = "22a2c9" +let s:gui0D = "3d8fd1" +let g:base16_gui0D = "3d8fd1" +let s:gui0E = "6679cc" +let g:base16_gui0E = "6679cc" +let s:gui0F = "9c637a" +let g:base16_gui0F = "9c637a" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#22a2c9" let g:terminal_color_7 = "#5e6687" let g:terminal_color_8 = "#898ea4" - let g:terminal_color_9 = "#c76b29" - let g:terminal_color_10 = "#dfe2f1" - let g:terminal_color_11 = "#979db4" - let g:terminal_color_12 = "#6b7394" - let g:terminal_color_13 = "#293256" - let g:terminal_color_14 = "#9c637a" + let g:terminal_color_9 = "#c94922" + let g:terminal_color_10 = "#ac9739" + let g:terminal_color_11 = "#c08b30" + let g:terminal_color_12 = "#3d8fd1" + let g:terminal_color_13 = "#6679cc" + let g:terminal_color_14 = "#22a2c9" let g:terminal_color_15 = "#202746" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-atelier-sulphurpool-light" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-atelier-sulphurpool.vim b/colors/base16-atelier-sulphurpool.vim index e8fbad2..fc23854 100644 --- a/colors/base16-atelier-sulphurpool.vim +++ b/colors/base16-atelier-sulphurpool.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "202746" -let s:gui01 = "293256" -let s:gui02 = "5e6687" -let s:gui03 = "6b7394" -let s:gui04 = "898ea4" -let s:gui05 = "979db4" -let s:gui06 = "dfe2f1" -let s:gui07 = "f5f7ff" -let s:gui08 = "c94922" -let s:gui09 = "c76b29" -let s:gui0A = "c08b30" -let s:gui0B = "ac9739" -let s:gui0C = "22a2c9" -let s:gui0D = "3d8fd1" -let s:gui0E = "6679cc" -let s:gui0F = "9c637a" +let s:gui00 = "202746" +let g:base16_gui00 = "202746" +let s:gui01 = "293256" +let g:base16_gui01 = "293256" +let s:gui02 = "5e6687" +let g:base16_gui02 = "5e6687" +let s:gui03 = "6b7394" +let g:base16_gui03 = "6b7394" +let s:gui04 = "898ea4" +let g:base16_gui04 = "898ea4" +let s:gui05 = "979db4" +let g:base16_gui05 = "979db4" +let s:gui06 = "dfe2f1" +let g:base16_gui06 = "dfe2f1" +let s:gui07 = "f5f7ff" +let g:base16_gui07 = "f5f7ff" +let s:gui08 = "c94922" +let g:base16_gui08 = "c94922" +let s:gui09 = "c76b29" +let g:base16_gui09 = "c76b29" +let s:gui0A = "c08b30" +let g:base16_gui0A = "c08b30" +let s:gui0B = "ac9739" +let g:base16_gui0B = "ac9739" +let s:gui0C = "22a2c9" +let g:base16_gui0C = "22a2c9" +let s:gui0D = "3d8fd1" +let g:base16_gui0D = "3d8fd1" +let s:gui0E = "6679cc" +let g:base16_gui0E = "6679cc" +let s:gui0F = "9c637a" +let g:base16_gui0F = "9c637a" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#22a2c9" let g:terminal_color_7 = "#979db4" let g:terminal_color_8 = "#6b7394" - let g:terminal_color_9 = "#c76b29" - let g:terminal_color_10 = "#293256" - let g:terminal_color_11 = "#5e6687" - let g:terminal_color_12 = "#898ea4" - let g:terminal_color_13 = "#dfe2f1" - let g:terminal_color_14 = "#9c637a" + let g:terminal_color_9 = "#c94922" + let g:terminal_color_10 = "#ac9739" + let g:terminal_color_11 = "#c08b30" + let g:terminal_color_12 = "#3d8fd1" + let g:terminal_color_13 = "#6679cc" + let g:terminal_color_14 = "#22a2c9" let g:terminal_color_15 = "#f5f7ff" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-atelier-sulphurpool" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-bespin.vim b/colors/base16-bespin.vim index b49e315..38609d0 100644 --- a/colors/base16-bespin.vim +++ b/colors/base16-bespin.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "28211c" -let s:gui01 = "36312e" -let s:gui02 = "5e5d5c" -let s:gui03 = "666666" -let s:gui04 = "797977" -let s:gui05 = "8a8986" -let s:gui06 = "9d9b97" -let s:gui07 = "baae9e" -let s:gui08 = "cf6a4c" -let s:gui09 = "cf7d34" -let s:gui0A = "f9ee98" -let s:gui0B = "54be0d" -let s:gui0C = "afc4db" -let s:gui0D = "5ea6ea" -let s:gui0E = "9b859d" -let s:gui0F = "937121" +let s:gui00 = "28211c" +let g:base16_gui00 = "28211c" +let s:gui01 = "36312e" +let g:base16_gui01 = "36312e" +let s:gui02 = "5e5d5c" +let g:base16_gui02 = "5e5d5c" +let s:gui03 = "666666" +let g:base16_gui03 = "666666" +let s:gui04 = "797977" +let g:base16_gui04 = "797977" +let s:gui05 = "8a8986" +let g:base16_gui05 = "8a8986" +let s:gui06 = "9d9b97" +let g:base16_gui06 = "9d9b97" +let s:gui07 = "baae9e" +let g:base16_gui07 = "baae9e" +let s:gui08 = "cf6a4c" +let g:base16_gui08 = "cf6a4c" +let s:gui09 = "cf7d34" +let g:base16_gui09 = "cf7d34" +let s:gui0A = "f9ee98" +let g:base16_gui0A = "f9ee98" +let s:gui0B = "54be0d" +let g:base16_gui0B = "54be0d" +let s:gui0C = "afc4db" +let g:base16_gui0C = "afc4db" +let s:gui0D = "5ea6ea" +let g:base16_gui0D = "5ea6ea" +let s:gui0E = "9b859d" +let g:base16_gui0E = "9b859d" +let s:gui0F = "937121" +let g:base16_gui0F = "937121" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#afc4db" let g:terminal_color_7 = "#8a8986" let g:terminal_color_8 = "#666666" - let g:terminal_color_9 = "#cf7d34" - let g:terminal_color_10 = "#36312e" - let g:terminal_color_11 = "#5e5d5c" - let g:terminal_color_12 = "#797977" - let g:terminal_color_13 = "#9d9b97" - let g:terminal_color_14 = "#937121" + let g:terminal_color_9 = "#cf6a4c" + let g:terminal_color_10 = "#54be0d" + let g:terminal_color_11 = "#f9ee98" + let g:terminal_color_12 = "#5ea6ea" + let g:terminal_color_13 = "#9b859d" + let g:terminal_color_14 = "#afc4db" let g:terminal_color_15 = "#baae9e" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-bespin" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-brewer.vim b/colors/base16-brewer.vim index 447f6a7..790b729 100644 --- a/colors/base16-brewer.vim +++ b/colors/base16-brewer.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "0c0d0e" -let s:gui01 = "2e2f30" -let s:gui02 = "515253" -let s:gui03 = "737475" -let s:gui04 = "959697" -let s:gui05 = "b7b8b9" -let s:gui06 = "dadbdc" -let s:gui07 = "fcfdfe" -let s:gui08 = "e31a1c" -let s:gui09 = "e6550d" -let s:gui0A = "dca060" -let s:gui0B = "31a354" -let s:gui0C = "80b1d3" -let s:gui0D = "3182bd" -let s:gui0E = "756bb1" -let s:gui0F = "b15928" +let s:gui00 = "0c0d0e" +let g:base16_gui00 = "0c0d0e" +let s:gui01 = "2e2f30" +let g:base16_gui01 = "2e2f30" +let s:gui02 = "515253" +let g:base16_gui02 = "515253" +let s:gui03 = "737475" +let g:base16_gui03 = "737475" +let s:gui04 = "959697" +let g:base16_gui04 = "959697" +let s:gui05 = "b7b8b9" +let g:base16_gui05 = "b7b8b9" +let s:gui06 = "dadbdc" +let g:base16_gui06 = "dadbdc" +let s:gui07 = "fcfdfe" +let g:base16_gui07 = "fcfdfe" +let s:gui08 = "e31a1c" +let g:base16_gui08 = "e31a1c" +let s:gui09 = "e6550d" +let g:base16_gui09 = "e6550d" +let s:gui0A = "dca060" +let g:base16_gui0A = "dca060" +let s:gui0B = "31a354" +let g:base16_gui0B = "31a354" +let s:gui0C = "80b1d3" +let g:base16_gui0C = "80b1d3" +let s:gui0D = "3182bd" +let g:base16_gui0D = "3182bd" +let s:gui0E = "756bb1" +let g:base16_gui0E = "756bb1" +let s:gui0F = "b15928" +let g:base16_gui0F = "b15928" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#80b1d3" let g:terminal_color_7 = "#b7b8b9" let g:terminal_color_8 = "#737475" - let g:terminal_color_9 = "#e6550d" - let g:terminal_color_10 = "#2e2f30" - let g:terminal_color_11 = "#515253" - let g:terminal_color_12 = "#959697" - let g:terminal_color_13 = "#dadbdc" - let g:terminal_color_14 = "#b15928" + let g:terminal_color_9 = "#e31a1c" + let g:terminal_color_10 = "#31a354" + let g:terminal_color_11 = "#dca060" + let g:terminal_color_12 = "#3182bd" + let g:terminal_color_13 = "#756bb1" + let g:terminal_color_14 = "#80b1d3" let g:terminal_color_15 = "#fcfdfe" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-brewer" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-bright.vim b/colors/base16-bright.vim index 2f968fb..b38574b 100644 --- a/colors/base16-bright.vim +++ b/colors/base16-bright.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "000000" -let s:gui01 = "303030" -let s:gui02 = "505050" -let s:gui03 = "b0b0b0" -let s:gui04 = "d0d0d0" -let s:gui05 = "e0e0e0" -let s:gui06 = "f5f5f5" -let s:gui07 = "ffffff" -let s:gui08 = "fb0120" -let s:gui09 = "fc6d24" -let s:gui0A = "fda331" -let s:gui0B = "a1c659" -let s:gui0C = "76c7b7" -let s:gui0D = "6fb3d2" -let s:gui0E = "d381c3" -let s:gui0F = "be643c" +let s:gui00 = "000000" +let g:base16_gui00 = "000000" +let s:gui01 = "303030" +let g:base16_gui01 = "303030" +let s:gui02 = "505050" +let g:base16_gui02 = "505050" +let s:gui03 = "b0b0b0" +let g:base16_gui03 = "b0b0b0" +let s:gui04 = "d0d0d0" +let g:base16_gui04 = "d0d0d0" +let s:gui05 = "e0e0e0" +let g:base16_gui05 = "e0e0e0" +let s:gui06 = "f5f5f5" +let g:base16_gui06 = "f5f5f5" +let s:gui07 = "ffffff" +let g:base16_gui07 = "ffffff" +let s:gui08 = "fb0120" +let g:base16_gui08 = "fb0120" +let s:gui09 = "fc6d24" +let g:base16_gui09 = "fc6d24" +let s:gui0A = "fda331" +let g:base16_gui0A = "fda331" +let s:gui0B = "a1c659" +let g:base16_gui0B = "a1c659" +let s:gui0C = "76c7b7" +let g:base16_gui0C = "76c7b7" +let s:gui0D = "6fb3d2" +let g:base16_gui0D = "6fb3d2" +let s:gui0E = "d381c3" +let g:base16_gui0E = "d381c3" +let s:gui0F = "be643c" +let g:base16_gui0F = "be643c" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#76c7b7" let g:terminal_color_7 = "#e0e0e0" let g:terminal_color_8 = "#b0b0b0" - let g:terminal_color_9 = "#fc6d24" - let g:terminal_color_10 = "#303030" - let g:terminal_color_11 = "#505050" - let g:terminal_color_12 = "#d0d0d0" - let g:terminal_color_13 = "#f5f5f5" - let g:terminal_color_14 = "#be643c" + let g:terminal_color_9 = "#fb0120" + let g:terminal_color_10 = "#a1c659" + let g:terminal_color_11 = "#fda331" + let g:terminal_color_12 = "#6fb3d2" + let g:terminal_color_13 = "#d381c3" + let g:terminal_color_14 = "#76c7b7" let g:terminal_color_15 = "#ffffff" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-bright" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-brushtrees-dark.vim b/colors/base16-brushtrees-dark.vim index 142b5f7..bbddcdc 100644 --- a/colors/base16-brushtrees-dark.vim +++ b/colors/base16-brushtrees-dark.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "485867" -let s:gui01 = "5A6D7A" -let s:gui02 = "6D828E" -let s:gui03 = "8299A1" -let s:gui04 = "98AFB5" -let s:gui05 = "B0C5C8" -let s:gui06 = "C9DBDC" -let s:gui07 = "E3EFEF" -let s:gui08 = "b38686" -let s:gui09 = "d8bba2" -let s:gui0A = "aab386" -let s:gui0B = "87b386" -let s:gui0C = "86b3b3" -let s:gui0D = "868cb3" -let s:gui0E = "b386b2" -let s:gui0F = "b39f9f" +let s:gui00 = "485867" +let g:base16_gui00 = "485867" +let s:gui01 = "5A6D7A" +let g:base16_gui01 = "5A6D7A" +let s:gui02 = "6D828E" +let g:base16_gui02 = "6D828E" +let s:gui03 = "8299A1" +let g:base16_gui03 = "8299A1" +let s:gui04 = "98AFB5" +let g:base16_gui04 = "98AFB5" +let s:gui05 = "B0C5C8" +let g:base16_gui05 = "B0C5C8" +let s:gui06 = "C9DBDC" +let g:base16_gui06 = "C9DBDC" +let s:gui07 = "E3EFEF" +let g:base16_gui07 = "E3EFEF" +let s:gui08 = "b38686" +let g:base16_gui08 = "b38686" +let s:gui09 = "d8bba2" +let g:base16_gui09 = "d8bba2" +let s:gui0A = "aab386" +let g:base16_gui0A = "aab386" +let s:gui0B = "87b386" +let g:base16_gui0B = "87b386" +let s:gui0C = "86b3b3" +let g:base16_gui0C = "86b3b3" +let s:gui0D = "868cb3" +let g:base16_gui0D = "868cb3" +let s:gui0E = "b386b2" +let g:base16_gui0E = "b386b2" +let s:gui0F = "b39f9f" +let g:base16_gui0F = "b39f9f" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#86b3b3" let g:terminal_color_7 = "#B0C5C8" let g:terminal_color_8 = "#8299A1" - let g:terminal_color_9 = "#d8bba2" - let g:terminal_color_10 = "#5A6D7A" - let g:terminal_color_11 = "#6D828E" - let g:terminal_color_12 = "#98AFB5" - let g:terminal_color_13 = "#C9DBDC" - let g:terminal_color_14 = "#b39f9f" + let g:terminal_color_9 = "#b38686" + let g:terminal_color_10 = "#87b386" + let g:terminal_color_11 = "#aab386" + let g:terminal_color_12 = "#868cb3" + let g:terminal_color_13 = "#b386b2" + let g:terminal_color_14 = "#86b3b3" let g:terminal_color_15 = "#E3EFEF" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-brushtrees-dark" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-brushtrees.vim b/colors/base16-brushtrees.vim index ab335ba..8730e09 100644 --- a/colors/base16-brushtrees.vim +++ b/colors/base16-brushtrees.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "E3EFEF" -let s:gui01 = "C9DBDC" -let s:gui02 = "B0C5C8" -let s:gui03 = "98AFB5" -let s:gui04 = "8299A1" -let s:gui05 = "6D828E" -let s:gui06 = "5A6D7A" -let s:gui07 = "485867" -let s:gui08 = "b38686" -let s:gui09 = "d8bba2" -let s:gui0A = "aab386" -let s:gui0B = "87b386" -let s:gui0C = "86b3b3" -let s:gui0D = "868cb3" -let s:gui0E = "b386b2" -let s:gui0F = "b39f9f" +let s:gui00 = "E3EFEF" +let g:base16_gui00 = "E3EFEF" +let s:gui01 = "C9DBDC" +let g:base16_gui01 = "C9DBDC" +let s:gui02 = "B0C5C8" +let g:base16_gui02 = "B0C5C8" +let s:gui03 = "98AFB5" +let g:base16_gui03 = "98AFB5" +let s:gui04 = "8299A1" +let g:base16_gui04 = "8299A1" +let s:gui05 = "6D828E" +let g:base16_gui05 = "6D828E" +let s:gui06 = "5A6D7A" +let g:base16_gui06 = "5A6D7A" +let s:gui07 = "485867" +let g:base16_gui07 = "485867" +let s:gui08 = "b38686" +let g:base16_gui08 = "b38686" +let s:gui09 = "d8bba2" +let g:base16_gui09 = "d8bba2" +let s:gui0A = "aab386" +let g:base16_gui0A = "aab386" +let s:gui0B = "87b386" +let g:base16_gui0B = "87b386" +let s:gui0C = "86b3b3" +let g:base16_gui0C = "86b3b3" +let s:gui0D = "868cb3" +let g:base16_gui0D = "868cb3" +let s:gui0E = "b386b2" +let g:base16_gui0E = "b386b2" +let s:gui0F = "b39f9f" +let g:base16_gui0F = "b39f9f" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#86b3b3" let g:terminal_color_7 = "#6D828E" let g:terminal_color_8 = "#98AFB5" - let g:terminal_color_9 = "#d8bba2" - let g:terminal_color_10 = "#C9DBDC" - let g:terminal_color_11 = "#B0C5C8" - let g:terminal_color_12 = "#8299A1" - let g:terminal_color_13 = "#5A6D7A" - let g:terminal_color_14 = "#b39f9f" + let g:terminal_color_9 = "#b38686" + let g:terminal_color_10 = "#87b386" + let g:terminal_color_11 = "#aab386" + let g:terminal_color_12 = "#868cb3" + let g:terminal_color_13 = "#b386b2" + let g:terminal_color_14 = "#86b3b3" let g:terminal_color_15 = "#485867" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-brushtrees" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-chalk.vim b/colors/base16-chalk.vim index 0019f72..600ead1 100644 --- a/colors/base16-chalk.vim +++ b/colors/base16-chalk.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "151515" -let s:gui01 = "202020" -let s:gui02 = "303030" -let s:gui03 = "505050" -let s:gui04 = "b0b0b0" -let s:gui05 = "d0d0d0" -let s:gui06 = "e0e0e0" -let s:gui07 = "f5f5f5" -let s:gui08 = "fb9fb1" -let s:gui09 = "eda987" -let s:gui0A = "ddb26f" -let s:gui0B = "acc267" -let s:gui0C = "12cfc0" -let s:gui0D = "6fc2ef" -let s:gui0E = "e1a3ee" -let s:gui0F = "deaf8f" +let s:gui00 = "151515" +let g:base16_gui00 = "151515" +let s:gui01 = "202020" +let g:base16_gui01 = "202020" +let s:gui02 = "303030" +let g:base16_gui02 = "303030" +let s:gui03 = "505050" +let g:base16_gui03 = "505050" +let s:gui04 = "b0b0b0" +let g:base16_gui04 = "b0b0b0" +let s:gui05 = "d0d0d0" +let g:base16_gui05 = "d0d0d0" +let s:gui06 = "e0e0e0" +let g:base16_gui06 = "e0e0e0" +let s:gui07 = "f5f5f5" +let g:base16_gui07 = "f5f5f5" +let s:gui08 = "fb9fb1" +let g:base16_gui08 = "fb9fb1" +let s:gui09 = "eda987" +let g:base16_gui09 = "eda987" +let s:gui0A = "ddb26f" +let g:base16_gui0A = "ddb26f" +let s:gui0B = "acc267" +let g:base16_gui0B = "acc267" +let s:gui0C = "12cfc0" +let g:base16_gui0C = "12cfc0" +let s:gui0D = "6fc2ef" +let g:base16_gui0D = "6fc2ef" +let s:gui0E = "e1a3ee" +let g:base16_gui0E = "e1a3ee" +let s:gui0F = "deaf8f" +let g:base16_gui0F = "deaf8f" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#12cfc0" let g:terminal_color_7 = "#d0d0d0" let g:terminal_color_8 = "#505050" - let g:terminal_color_9 = "#eda987" - let g:terminal_color_10 = "#202020" - let g:terminal_color_11 = "#303030" - let g:terminal_color_12 = "#b0b0b0" - let g:terminal_color_13 = "#e0e0e0" - let g:terminal_color_14 = "#deaf8f" + let g:terminal_color_9 = "#fb9fb1" + let g:terminal_color_10 = "#acc267" + let g:terminal_color_11 = "#ddb26f" + let g:terminal_color_12 = "#6fc2ef" + let g:terminal_color_13 = "#e1a3ee" + let g:terminal_color_14 = "#12cfc0" let g:terminal_color_15 = "#f5f5f5" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-chalk" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-circus.vim b/colors/base16-circus.vim index 5ec8393..92b69e6 100644 --- a/colors/base16-circus.vim +++ b/colors/base16-circus.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "191919" -let s:gui01 = "202020" -let s:gui02 = "303030" -let s:gui03 = "5f5a60" -let s:gui04 = "505050" -let s:gui05 = "a7a7a7" -let s:gui06 = "808080" -let s:gui07 = "ffffff" -let s:gui08 = "dc657d" -let s:gui09 = "4bb1a7" -let s:gui0A = "c3ba63" -let s:gui0B = "84b97c" -let s:gui0C = "4bb1a7" -let s:gui0D = "639ee4" -let s:gui0E = "b888e2" -let s:gui0F = "b888e2" +let s:gui00 = "191919" +let g:base16_gui00 = "191919" +let s:gui01 = "202020" +let g:base16_gui01 = "202020" +let s:gui02 = "303030" +let g:base16_gui02 = "303030" +let s:gui03 = "5f5a60" +let g:base16_gui03 = "5f5a60" +let s:gui04 = "505050" +let g:base16_gui04 = "505050" +let s:gui05 = "a7a7a7" +let g:base16_gui05 = "a7a7a7" +let s:gui06 = "808080" +let g:base16_gui06 = "808080" +let s:gui07 = "ffffff" +let g:base16_gui07 = "ffffff" +let s:gui08 = "dc657d" +let g:base16_gui08 = "dc657d" +let s:gui09 = "4bb1a7" +let g:base16_gui09 = "4bb1a7" +let s:gui0A = "c3ba63" +let g:base16_gui0A = "c3ba63" +let s:gui0B = "84b97c" +let g:base16_gui0B = "84b97c" +let s:gui0C = "4bb1a7" +let g:base16_gui0C = "4bb1a7" +let s:gui0D = "639ee4" +let g:base16_gui0D = "639ee4" +let s:gui0E = "b888e2" +let g:base16_gui0E = "b888e2" +let s:gui0F = "b888e2" +let g:base16_gui0F = "b888e2" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#4bb1a7" let g:terminal_color_7 = "#a7a7a7" let g:terminal_color_8 = "#5f5a60" - let g:terminal_color_9 = "#4bb1a7" - let g:terminal_color_10 = "#202020" - let g:terminal_color_11 = "#303030" - let g:terminal_color_12 = "#505050" - let g:terminal_color_13 = "#808080" - let g:terminal_color_14 = "#b888e2" + let g:terminal_color_9 = "#dc657d" + let g:terminal_color_10 = "#84b97c" + let g:terminal_color_11 = "#c3ba63" + let g:terminal_color_12 = "#639ee4" + let g:terminal_color_13 = "#b888e2" + let g:terminal_color_14 = "#4bb1a7" let g:terminal_color_15 = "#ffffff" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-circus" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-classic-dark.vim b/colors/base16-classic-dark.vim index 56d6976..5f1a4f7 100644 --- a/colors/base16-classic-dark.vim +++ b/colors/base16-classic-dark.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "151515" -let s:gui01 = "202020" -let s:gui02 = "303030" -let s:gui03 = "505050" -let s:gui04 = "B0B0B0" -let s:gui05 = "D0D0D0" -let s:gui06 = "E0E0E0" -let s:gui07 = "F5F5F5" -let s:gui08 = "AC4142" -let s:gui09 = "D28445" -let s:gui0A = "F4BF75" -let s:gui0B = "90A959" -let s:gui0C = "75B5AA" -let s:gui0D = "6A9FB5" -let s:gui0E = "AA759F" -let s:gui0F = "8F5536" +let s:gui00 = "151515" +let g:base16_gui00 = "151515" +let s:gui01 = "202020" +let g:base16_gui01 = "202020" +let s:gui02 = "303030" +let g:base16_gui02 = "303030" +let s:gui03 = "505050" +let g:base16_gui03 = "505050" +let s:gui04 = "B0B0B0" +let g:base16_gui04 = "B0B0B0" +let s:gui05 = "D0D0D0" +let g:base16_gui05 = "D0D0D0" +let s:gui06 = "E0E0E0" +let g:base16_gui06 = "E0E0E0" +let s:gui07 = "F5F5F5" +let g:base16_gui07 = "F5F5F5" +let s:gui08 = "AC4142" +let g:base16_gui08 = "AC4142" +let s:gui09 = "D28445" +let g:base16_gui09 = "D28445" +let s:gui0A = "F4BF75" +let g:base16_gui0A = "F4BF75" +let s:gui0B = "90A959" +let g:base16_gui0B = "90A959" +let s:gui0C = "75B5AA" +let g:base16_gui0C = "75B5AA" +let s:gui0D = "6A9FB5" +let g:base16_gui0D = "6A9FB5" +let s:gui0E = "AA759F" +let g:base16_gui0E = "AA759F" +let s:gui0F = "8F5536" +let g:base16_gui0F = "8F5536" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#75B5AA" let g:terminal_color_7 = "#D0D0D0" let g:terminal_color_8 = "#505050" - let g:terminal_color_9 = "#D28445" - let g:terminal_color_10 = "#202020" - let g:terminal_color_11 = "#303030" - let g:terminal_color_12 = "#B0B0B0" - let g:terminal_color_13 = "#E0E0E0" - let g:terminal_color_14 = "#8F5536" + let g:terminal_color_9 = "#AC4142" + let g:terminal_color_10 = "#90A959" + let g:terminal_color_11 = "#F4BF75" + let g:terminal_color_12 = "#6A9FB5" + let g:terminal_color_13 = "#AA759F" + let g:terminal_color_14 = "#75B5AA" let g:terminal_color_15 = "#F5F5F5" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-classic-dark" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-classic-light.vim b/colors/base16-classic-light.vim index 423ac49..5c1d406 100644 --- a/colors/base16-classic-light.vim +++ b/colors/base16-classic-light.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "F5F5F5" -let s:gui01 = "E0E0E0" -let s:gui02 = "D0D0D0" -let s:gui03 = "B0B0B0" -let s:gui04 = "505050" -let s:gui05 = "303030" -let s:gui06 = "202020" -let s:gui07 = "151515" -let s:gui08 = "AC4142" -let s:gui09 = "D28445" -let s:gui0A = "F4BF75" -let s:gui0B = "90A959" -let s:gui0C = "75B5AA" -let s:gui0D = "6A9FB5" -let s:gui0E = "AA759F" -let s:gui0F = "8F5536" +let s:gui00 = "F5F5F5" +let g:base16_gui00 = "F5F5F5" +let s:gui01 = "E0E0E0" +let g:base16_gui01 = "E0E0E0" +let s:gui02 = "D0D0D0" +let g:base16_gui02 = "D0D0D0" +let s:gui03 = "B0B0B0" +let g:base16_gui03 = "B0B0B0" +let s:gui04 = "505050" +let g:base16_gui04 = "505050" +let s:gui05 = "303030" +let g:base16_gui05 = "303030" +let s:gui06 = "202020" +let g:base16_gui06 = "202020" +let s:gui07 = "151515" +let g:base16_gui07 = "151515" +let s:gui08 = "AC4142" +let g:base16_gui08 = "AC4142" +let s:gui09 = "D28445" +let g:base16_gui09 = "D28445" +let s:gui0A = "F4BF75" +let g:base16_gui0A = "F4BF75" +let s:gui0B = "90A959" +let g:base16_gui0B = "90A959" +let s:gui0C = "75B5AA" +let g:base16_gui0C = "75B5AA" +let s:gui0D = "6A9FB5" +let g:base16_gui0D = "6A9FB5" +let s:gui0E = "AA759F" +let g:base16_gui0E = "AA759F" +let s:gui0F = "8F5536" +let g:base16_gui0F = "8F5536" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#75B5AA" let g:terminal_color_7 = "#303030" let g:terminal_color_8 = "#B0B0B0" - let g:terminal_color_9 = "#D28445" - let g:terminal_color_10 = "#E0E0E0" - let g:terminal_color_11 = "#D0D0D0" - let g:terminal_color_12 = "#505050" - let g:terminal_color_13 = "#202020" - let g:terminal_color_14 = "#8F5536" + let g:terminal_color_9 = "#AC4142" + let g:terminal_color_10 = "#90A959" + let g:terminal_color_11 = "#F4BF75" + let g:terminal_color_12 = "#6A9FB5" + let g:terminal_color_13 = "#AA759F" + let g:terminal_color_14 = "#75B5AA" let g:terminal_color_15 = "#151515" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-classic-light" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-codeschool.vim b/colors/base16-codeschool.vim index 4ecfc92..fdb55ba 100644 --- a/colors/base16-codeschool.vim +++ b/colors/base16-codeschool.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "232c31" -let s:gui01 = "1c3657" -let s:gui02 = "2a343a" -let s:gui03 = "3f4944" -let s:gui04 = "84898c" -let s:gui05 = "9ea7a6" -let s:gui06 = "a7cfa3" -let s:gui07 = "b5d8f6" -let s:gui08 = "2a5491" -let s:gui09 = "43820d" -let s:gui0A = "a03b1e" -let s:gui0B = "237986" -let s:gui0C = "b02f30" -let s:gui0D = "484d79" -let s:gui0E = "c59820" -let s:gui0F = "c98344" +let s:gui00 = "232c31" +let g:base16_gui00 = "232c31" +let s:gui01 = "1c3657" +let g:base16_gui01 = "1c3657" +let s:gui02 = "2a343a" +let g:base16_gui02 = "2a343a" +let s:gui03 = "3f4944" +let g:base16_gui03 = "3f4944" +let s:gui04 = "84898c" +let g:base16_gui04 = "84898c" +let s:gui05 = "9ea7a6" +let g:base16_gui05 = "9ea7a6" +let s:gui06 = "a7cfa3" +let g:base16_gui06 = "a7cfa3" +let s:gui07 = "b5d8f6" +let g:base16_gui07 = "b5d8f6" +let s:gui08 = "2a5491" +let g:base16_gui08 = "2a5491" +let s:gui09 = "43820d" +let g:base16_gui09 = "43820d" +let s:gui0A = "a03b1e" +let g:base16_gui0A = "a03b1e" +let s:gui0B = "237986" +let g:base16_gui0B = "237986" +let s:gui0C = "b02f30" +let g:base16_gui0C = "b02f30" +let s:gui0D = "484d79" +let g:base16_gui0D = "484d79" +let s:gui0E = "c59820" +let g:base16_gui0E = "c59820" +let s:gui0F = "c98344" +let g:base16_gui0F = "c98344" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#b02f30" let g:terminal_color_7 = "#9ea7a6" let g:terminal_color_8 = "#3f4944" - let g:terminal_color_9 = "#43820d" - let g:terminal_color_10 = "#1c3657" - let g:terminal_color_11 = "#2a343a" - let g:terminal_color_12 = "#84898c" - let g:terminal_color_13 = "#a7cfa3" - let g:terminal_color_14 = "#c98344" + let g:terminal_color_9 = "#2a5491" + let g:terminal_color_10 = "#237986" + let g:terminal_color_11 = "#a03b1e" + let g:terminal_color_12 = "#484d79" + let g:terminal_color_13 = "#c59820" + let g:terminal_color_14 = "#b02f30" let g:terminal_color_15 = "#b5d8f6" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-codeschool" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-cupcake.vim b/colors/base16-cupcake.vim index 1e10290..2a8e417 100644 --- a/colors/base16-cupcake.vim +++ b/colors/base16-cupcake.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "fbf1f2" -let s:gui01 = "f2f1f4" -let s:gui02 = "d8d5dd" -let s:gui03 = "bfb9c6" -let s:gui04 = "a59daf" -let s:gui05 = "8b8198" -let s:gui06 = "72677E" -let s:gui07 = "585062" -let s:gui08 = "D57E85" -let s:gui09 = "EBB790" -let s:gui0A = "DCB16C" -let s:gui0B = "A3B367" -let s:gui0C = "69A9A7" -let s:gui0D = "7297B9" -let s:gui0E = "BB99B4" -let s:gui0F = "BAA58C" +let s:gui00 = "fbf1f2" +let g:base16_gui00 = "fbf1f2" +let s:gui01 = "f2f1f4" +let g:base16_gui01 = "f2f1f4" +let s:gui02 = "d8d5dd" +let g:base16_gui02 = "d8d5dd" +let s:gui03 = "bfb9c6" +let g:base16_gui03 = "bfb9c6" +let s:gui04 = "a59daf" +let g:base16_gui04 = "a59daf" +let s:gui05 = "8b8198" +let g:base16_gui05 = "8b8198" +let s:gui06 = "72677E" +let g:base16_gui06 = "72677E" +let s:gui07 = "585062" +let g:base16_gui07 = "585062" +let s:gui08 = "D57E85" +let g:base16_gui08 = "D57E85" +let s:gui09 = "EBB790" +let g:base16_gui09 = "EBB790" +let s:gui0A = "DCB16C" +let g:base16_gui0A = "DCB16C" +let s:gui0B = "A3B367" +let g:base16_gui0B = "A3B367" +let s:gui0C = "69A9A7" +let g:base16_gui0C = "69A9A7" +let s:gui0D = "7297B9" +let g:base16_gui0D = "7297B9" +let s:gui0E = "BB99B4" +let g:base16_gui0E = "BB99B4" +let s:gui0F = "BAA58C" +let g:base16_gui0F = "BAA58C" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#69A9A7" let g:terminal_color_7 = "#8b8198" let g:terminal_color_8 = "#bfb9c6" - let g:terminal_color_9 = "#EBB790" - let g:terminal_color_10 = "#f2f1f4" - let g:terminal_color_11 = "#d8d5dd" - let g:terminal_color_12 = "#a59daf" - let g:terminal_color_13 = "#72677E" - let g:terminal_color_14 = "#BAA58C" + let g:terminal_color_9 = "#D57E85" + let g:terminal_color_10 = "#A3B367" + let g:terminal_color_11 = "#DCB16C" + let g:terminal_color_12 = "#7297B9" + let g:terminal_color_13 = "#BB99B4" + let g:terminal_color_14 = "#69A9A7" let g:terminal_color_15 = "#585062" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-cupcake" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-cupertino.vim b/colors/base16-cupertino.vim index c0395e9..424d7be 100644 --- a/colors/base16-cupertino.vim +++ b/colors/base16-cupertino.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "ffffff" -let s:gui01 = "c0c0c0" -let s:gui02 = "c0c0c0" -let s:gui03 = "808080" -let s:gui04 = "808080" -let s:gui05 = "404040" -let s:gui06 = "404040" -let s:gui07 = "5e5e5e" -let s:gui08 = "c41a15" -let s:gui09 = "eb8500" -let s:gui0A = "826b28" -let s:gui0B = "007400" -let s:gui0C = "318495" -let s:gui0D = "0000ff" -let s:gui0E = "a90d91" -let s:gui0F = "826b28" +let s:gui00 = "ffffff" +let g:base16_gui00 = "ffffff" +let s:gui01 = "c0c0c0" +let g:base16_gui01 = "c0c0c0" +let s:gui02 = "c0c0c0" +let g:base16_gui02 = "c0c0c0" +let s:gui03 = "808080" +let g:base16_gui03 = "808080" +let s:gui04 = "808080" +let g:base16_gui04 = "808080" +let s:gui05 = "404040" +let g:base16_gui05 = "404040" +let s:gui06 = "404040" +let g:base16_gui06 = "404040" +let s:gui07 = "5e5e5e" +let g:base16_gui07 = "5e5e5e" +let s:gui08 = "c41a15" +let g:base16_gui08 = "c41a15" +let s:gui09 = "eb8500" +let g:base16_gui09 = "eb8500" +let s:gui0A = "826b28" +let g:base16_gui0A = "826b28" +let s:gui0B = "007400" +let g:base16_gui0B = "007400" +let s:gui0C = "318495" +let g:base16_gui0C = "318495" +let s:gui0D = "0000ff" +let g:base16_gui0D = "0000ff" +let s:gui0E = "a90d91" +let g:base16_gui0E = "a90d91" +let s:gui0F = "826b28" +let g:base16_gui0F = "826b28" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#318495" let g:terminal_color_7 = "#404040" let g:terminal_color_8 = "#808080" - let g:terminal_color_9 = "#eb8500" - let g:terminal_color_10 = "#c0c0c0" - let g:terminal_color_11 = "#c0c0c0" - let g:terminal_color_12 = "#808080" - let g:terminal_color_13 = "#404040" - let g:terminal_color_14 = "#826b28" + let g:terminal_color_9 = "#c41a15" + let g:terminal_color_10 = "#007400" + let g:terminal_color_11 = "#826b28" + let g:terminal_color_12 = "#0000ff" + let g:terminal_color_13 = "#a90d91" + let g:terminal_color_14 = "#318495" let g:terminal_color_15 = "#5e5e5e" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-cupertino" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-darktooth.vim b/colors/base16-darktooth.vim index 5cbda5d..0dba323 100644 --- a/colors/base16-darktooth.vim +++ b/colors/base16-darktooth.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "1D2021" -let s:gui01 = "32302F" -let s:gui02 = "504945" -let s:gui03 = "665C54" -let s:gui04 = "928374" -let s:gui05 = "A89984" -let s:gui06 = "D5C4A1" -let s:gui07 = "FDF4C1" -let s:gui08 = "FB543F" -let s:gui09 = "FE8625" -let s:gui0A = "FAC03B" -let s:gui0B = "95C085" -let s:gui0C = "8BA59B" -let s:gui0D = "0D6678" -let s:gui0E = "8F4673" -let s:gui0F = "A87322" +let s:gui00 = "1D2021" +let g:base16_gui00 = "1D2021" +let s:gui01 = "32302F" +let g:base16_gui01 = "32302F" +let s:gui02 = "504945" +let g:base16_gui02 = "504945" +let s:gui03 = "665C54" +let g:base16_gui03 = "665C54" +let s:gui04 = "928374" +let g:base16_gui04 = "928374" +let s:gui05 = "A89984" +let g:base16_gui05 = "A89984" +let s:gui06 = "D5C4A1" +let g:base16_gui06 = "D5C4A1" +let s:gui07 = "FDF4C1" +let g:base16_gui07 = "FDF4C1" +let s:gui08 = "FB543F" +let g:base16_gui08 = "FB543F" +let s:gui09 = "FE8625" +let g:base16_gui09 = "FE8625" +let s:gui0A = "FAC03B" +let g:base16_gui0A = "FAC03B" +let s:gui0B = "95C085" +let g:base16_gui0B = "95C085" +let s:gui0C = "8BA59B" +let g:base16_gui0C = "8BA59B" +let s:gui0D = "0D6678" +let g:base16_gui0D = "0D6678" +let s:gui0E = "8F4673" +let g:base16_gui0E = "8F4673" +let s:gui0F = "A87322" +let g:base16_gui0F = "A87322" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#8BA59B" let g:terminal_color_7 = "#A89984" let g:terminal_color_8 = "#665C54" - let g:terminal_color_9 = "#FE8625" - let g:terminal_color_10 = "#32302F" - let g:terminal_color_11 = "#504945" - let g:terminal_color_12 = "#928374" - let g:terminal_color_13 = "#D5C4A1" - let g:terminal_color_14 = "#A87322" + let g:terminal_color_9 = "#FB543F" + let g:terminal_color_10 = "#95C085" + let g:terminal_color_11 = "#FAC03B" + let g:terminal_color_12 = "#0D6678" + let g:terminal_color_13 = "#8F4673" + let g:terminal_color_14 = "#8BA59B" let g:terminal_color_15 = "#FDF4C1" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-darktooth" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-default-dark.vim b/colors/base16-default-dark.vim index ea529ec..16c4e90 100644 --- a/colors/base16-default-dark.vim +++ b/colors/base16-default-dark.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "181818" -let s:gui01 = "282828" -let s:gui02 = "383838" -let s:gui03 = "585858" -let s:gui04 = "b8b8b8" -let s:gui05 = "d8d8d8" -let s:gui06 = "e8e8e8" -let s:gui07 = "f8f8f8" -let s:gui08 = "ab4642" -let s:gui09 = "dc9656" -let s:gui0A = "f7ca88" -let s:gui0B = "a1b56c" -let s:gui0C = "86c1b9" -let s:gui0D = "7cafc2" -let s:gui0E = "ba8baf" -let s:gui0F = "a16946" +let s:gui00 = "181818" +let g:base16_gui00 = "181818" +let s:gui01 = "282828" +let g:base16_gui01 = "282828" +let s:gui02 = "383838" +let g:base16_gui02 = "383838" +let s:gui03 = "585858" +let g:base16_gui03 = "585858" +let s:gui04 = "b8b8b8" +let g:base16_gui04 = "b8b8b8" +let s:gui05 = "d8d8d8" +let g:base16_gui05 = "d8d8d8" +let s:gui06 = "e8e8e8" +let g:base16_gui06 = "e8e8e8" +let s:gui07 = "f8f8f8" +let g:base16_gui07 = "f8f8f8" +let s:gui08 = "ab4642" +let g:base16_gui08 = "ab4642" +let s:gui09 = "dc9656" +let g:base16_gui09 = "dc9656" +let s:gui0A = "f7ca88" +let g:base16_gui0A = "f7ca88" +let s:gui0B = "a1b56c" +let g:base16_gui0B = "a1b56c" +let s:gui0C = "86c1b9" +let g:base16_gui0C = "86c1b9" +let s:gui0D = "7cafc2" +let g:base16_gui0D = "7cafc2" +let s:gui0E = "ba8baf" +let g:base16_gui0E = "ba8baf" +let s:gui0F = "a16946" +let g:base16_gui0F = "a16946" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#86c1b9" let g:terminal_color_7 = "#d8d8d8" let g:terminal_color_8 = "#585858" - let g:terminal_color_9 = "#dc9656" - let g:terminal_color_10 = "#282828" - let g:terminal_color_11 = "#383838" - let g:terminal_color_12 = "#b8b8b8" - let g:terminal_color_13 = "#e8e8e8" - let g:terminal_color_14 = "#a16946" + let g:terminal_color_9 = "#ab4642" + let g:terminal_color_10 = "#a1b56c" + let g:terminal_color_11 = "#f7ca88" + let g:terminal_color_12 = "#7cafc2" + let g:terminal_color_13 = "#ba8baf" + let g:terminal_color_14 = "#86c1b9" let g:terminal_color_15 = "#f8f8f8" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-default-dark" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-default-light.vim b/colors/base16-default-light.vim index 299eadf..c5bee7a 100644 --- a/colors/base16-default-light.vim +++ b/colors/base16-default-light.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "f8f8f8" -let s:gui01 = "e8e8e8" -let s:gui02 = "d8d8d8" -let s:gui03 = "b8b8b8" -let s:gui04 = "585858" -let s:gui05 = "383838" -let s:gui06 = "282828" -let s:gui07 = "181818" -let s:gui08 = "ab4642" -let s:gui09 = "dc9656" -let s:gui0A = "f7ca88" -let s:gui0B = "a1b56c" -let s:gui0C = "86c1b9" -let s:gui0D = "7cafc2" -let s:gui0E = "ba8baf" -let s:gui0F = "a16946" +let s:gui00 = "f8f8f8" +let g:base16_gui00 = "f8f8f8" +let s:gui01 = "e8e8e8" +let g:base16_gui01 = "e8e8e8" +let s:gui02 = "d8d8d8" +let g:base16_gui02 = "d8d8d8" +let s:gui03 = "b8b8b8" +let g:base16_gui03 = "b8b8b8" +let s:gui04 = "585858" +let g:base16_gui04 = "585858" +let s:gui05 = "383838" +let g:base16_gui05 = "383838" +let s:gui06 = "282828" +let g:base16_gui06 = "282828" +let s:gui07 = "181818" +let g:base16_gui07 = "181818" +let s:gui08 = "ab4642" +let g:base16_gui08 = "ab4642" +let s:gui09 = "dc9656" +let g:base16_gui09 = "dc9656" +let s:gui0A = "f7ca88" +let g:base16_gui0A = "f7ca88" +let s:gui0B = "a1b56c" +let g:base16_gui0B = "a1b56c" +let s:gui0C = "86c1b9" +let g:base16_gui0C = "86c1b9" +let s:gui0D = "7cafc2" +let g:base16_gui0D = "7cafc2" +let s:gui0E = "ba8baf" +let g:base16_gui0E = "ba8baf" +let s:gui0F = "a16946" +let g:base16_gui0F = "a16946" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#86c1b9" let g:terminal_color_7 = "#383838" let g:terminal_color_8 = "#b8b8b8" - let g:terminal_color_9 = "#dc9656" - let g:terminal_color_10 = "#e8e8e8" - let g:terminal_color_11 = "#d8d8d8" - let g:terminal_color_12 = "#585858" - let g:terminal_color_13 = "#282828" - let g:terminal_color_14 = "#a16946" + let g:terminal_color_9 = "#ab4642" + let g:terminal_color_10 = "#a1b56c" + let g:terminal_color_11 = "#f7ca88" + let g:terminal_color_12 = "#7cafc2" + let g:terminal_color_13 = "#ba8baf" + let g:terminal_color_14 = "#86c1b9" let g:terminal_color_15 = "#181818" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-default-light" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-dracula.vim b/colors/base16-dracula.vim index 16cab70..d1bcec2 100644 --- a/colors/base16-dracula.vim +++ b/colors/base16-dracula.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "282936" -let s:gui01 = "3a3c4e" -let s:gui02 = "4d4f68" -let s:gui03 = "626483" -let s:gui04 = "62d6e8" -let s:gui05 = "e9e9f4" -let s:gui06 = "f1f2f8" -let s:gui07 = "f7f7fb" -let s:gui08 = "ea51b2" -let s:gui09 = "b45bcf" -let s:gui0A = "00f769" -let s:gui0B = "ebff87" -let s:gui0C = "a1efe4" -let s:gui0D = "62d6e8" -let s:gui0E = "b45bcf" -let s:gui0F = "00f769" +let s:gui00 = "282936" +let g:base16_gui00 = "282936" +let s:gui01 = "3a3c4e" +let g:base16_gui01 = "3a3c4e" +let s:gui02 = "4d4f68" +let g:base16_gui02 = "4d4f68" +let s:gui03 = "626483" +let g:base16_gui03 = "626483" +let s:gui04 = "62d6e8" +let g:base16_gui04 = "62d6e8" +let s:gui05 = "e9e9f4" +let g:base16_gui05 = "e9e9f4" +let s:gui06 = "f1f2f8" +let g:base16_gui06 = "f1f2f8" +let s:gui07 = "f7f7fb" +let g:base16_gui07 = "f7f7fb" +let s:gui08 = "ea51b2" +let g:base16_gui08 = "ea51b2" +let s:gui09 = "b45bcf" +let g:base16_gui09 = "b45bcf" +let s:gui0A = "00f769" +let g:base16_gui0A = "00f769" +let s:gui0B = "ebff87" +let g:base16_gui0B = "ebff87" +let s:gui0C = "a1efe4" +let g:base16_gui0C = "a1efe4" +let s:gui0D = "62d6e8" +let g:base16_gui0D = "62d6e8" +let s:gui0E = "b45bcf" +let g:base16_gui0E = "b45bcf" +let s:gui0F = "00f769" +let g:base16_gui0F = "00f769" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#a1efe4" let g:terminal_color_7 = "#e9e9f4" let g:terminal_color_8 = "#626483" - let g:terminal_color_9 = "#b45bcf" - let g:terminal_color_10 = "#3a3c4e" - let g:terminal_color_11 = "#4d4f68" + let g:terminal_color_9 = "#ea51b2" + let g:terminal_color_10 = "#ebff87" + let g:terminal_color_11 = "#00f769" let g:terminal_color_12 = "#62d6e8" - let g:terminal_color_13 = "#f1f2f8" - let g:terminal_color_14 = "#00f769" + let g:terminal_color_13 = "#b45bcf" + let g:terminal_color_14 = "#a1efe4" let g:terminal_color_15 = "#f7f7fb" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-dracula" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-eighties.vim b/colors/base16-eighties.vim index 9946e47..e5ba23c 100644 --- a/colors/base16-eighties.vim +++ b/colors/base16-eighties.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "2d2d2d" -let s:gui01 = "393939" -let s:gui02 = "515151" -let s:gui03 = "747369" -let s:gui04 = "a09f93" -let s:gui05 = "d3d0c8" -let s:gui06 = "e8e6df" -let s:gui07 = "f2f0ec" -let s:gui08 = "f2777a" -let s:gui09 = "f99157" -let s:gui0A = "ffcc66" -let s:gui0B = "99cc99" -let s:gui0C = "66cccc" -let s:gui0D = "6699cc" -let s:gui0E = "cc99cc" -let s:gui0F = "d27b53" +let s:gui00 = "2d2d2d" +let g:base16_gui00 = "2d2d2d" +let s:gui01 = "393939" +let g:base16_gui01 = "393939" +let s:gui02 = "515151" +let g:base16_gui02 = "515151" +let s:gui03 = "747369" +let g:base16_gui03 = "747369" +let s:gui04 = "a09f93" +let g:base16_gui04 = "a09f93" +let s:gui05 = "d3d0c8" +let g:base16_gui05 = "d3d0c8" +let s:gui06 = "e8e6df" +let g:base16_gui06 = "e8e6df" +let s:gui07 = "f2f0ec" +let g:base16_gui07 = "f2f0ec" +let s:gui08 = "f2777a" +let g:base16_gui08 = "f2777a" +let s:gui09 = "f99157" +let g:base16_gui09 = "f99157" +let s:gui0A = "ffcc66" +let g:base16_gui0A = "ffcc66" +let s:gui0B = "99cc99" +let g:base16_gui0B = "99cc99" +let s:gui0C = "66cccc" +let g:base16_gui0C = "66cccc" +let s:gui0D = "6699cc" +let g:base16_gui0D = "6699cc" +let s:gui0E = "cc99cc" +let g:base16_gui0E = "cc99cc" +let s:gui0F = "d27b53" +let g:base16_gui0F = "d27b53" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#66cccc" let g:terminal_color_7 = "#d3d0c8" let g:terminal_color_8 = "#747369" - let g:terminal_color_9 = "#f99157" - let g:terminal_color_10 = "#393939" - let g:terminal_color_11 = "#515151" - let g:terminal_color_12 = "#a09f93" - let g:terminal_color_13 = "#e8e6df" - let g:terminal_color_14 = "#d27b53" + let g:terminal_color_9 = "#f2777a" + let g:terminal_color_10 = "#99cc99" + let g:terminal_color_11 = "#ffcc66" + let g:terminal_color_12 = "#6699cc" + let g:terminal_color_13 = "#cc99cc" + let g:terminal_color_14 = "#66cccc" let g:terminal_color_15 = "#f2f0ec" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-eighties" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-embers.vim b/colors/base16-embers.vim index ac095c9..a2c89e9 100644 --- a/colors/base16-embers.vim +++ b/colors/base16-embers.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "16130F" -let s:gui01 = "2C2620" -let s:gui02 = "433B32" -let s:gui03 = "5A5047" -let s:gui04 = "8A8075" -let s:gui05 = "A39A90" -let s:gui06 = "BEB6AE" -let s:gui07 = "DBD6D1" -let s:gui08 = "826D57" -let s:gui09 = "828257" -let s:gui0A = "6D8257" -let s:gui0B = "57826D" -let s:gui0C = "576D82" -let s:gui0D = "6D5782" -let s:gui0E = "82576D" -let s:gui0F = "825757" +let s:gui00 = "16130F" +let g:base16_gui00 = "16130F" +let s:gui01 = "2C2620" +let g:base16_gui01 = "2C2620" +let s:gui02 = "433B32" +let g:base16_gui02 = "433B32" +let s:gui03 = "5A5047" +let g:base16_gui03 = "5A5047" +let s:gui04 = "8A8075" +let g:base16_gui04 = "8A8075" +let s:gui05 = "A39A90" +let g:base16_gui05 = "A39A90" +let s:gui06 = "BEB6AE" +let g:base16_gui06 = "BEB6AE" +let s:gui07 = "DBD6D1" +let g:base16_gui07 = "DBD6D1" +let s:gui08 = "826D57" +let g:base16_gui08 = "826D57" +let s:gui09 = "828257" +let g:base16_gui09 = "828257" +let s:gui0A = "6D8257" +let g:base16_gui0A = "6D8257" +let s:gui0B = "57826D" +let g:base16_gui0B = "57826D" +let s:gui0C = "576D82" +let g:base16_gui0C = "576D82" +let s:gui0D = "6D5782" +let g:base16_gui0D = "6D5782" +let s:gui0E = "82576D" +let g:base16_gui0E = "82576D" +let s:gui0F = "825757" +let g:base16_gui0F = "825757" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#576D82" let g:terminal_color_7 = "#A39A90" let g:terminal_color_8 = "#5A5047" - let g:terminal_color_9 = "#828257" - let g:terminal_color_10 = "#2C2620" - let g:terminal_color_11 = "#433B32" - let g:terminal_color_12 = "#8A8075" - let g:terminal_color_13 = "#BEB6AE" - let g:terminal_color_14 = "#825757" + let g:terminal_color_9 = "#826D57" + let g:terminal_color_10 = "#57826D" + let g:terminal_color_11 = "#6D8257" + let g:terminal_color_12 = "#6D5782" + let g:terminal_color_13 = "#82576D" + let g:terminal_color_14 = "#576D82" let g:terminal_color_15 = "#DBD6D1" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-embers" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-flat.vim b/colors/base16-flat.vim index 95628c2..0e58d85 100644 --- a/colors/base16-flat.vim +++ b/colors/base16-flat.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "2C3E50" -let s:gui01 = "34495E" -let s:gui02 = "7F8C8D" -let s:gui03 = "95A5A6" -let s:gui04 = "BDC3C7" -let s:gui05 = "e0e0e0" -let s:gui06 = "f5f5f5" -let s:gui07 = "ECF0F1" -let s:gui08 = "E74C3C" -let s:gui09 = "E67E22" -let s:gui0A = "F1C40F" -let s:gui0B = "2ECC71" -let s:gui0C = "1ABC9C" -let s:gui0D = "3498DB" -let s:gui0E = "9B59B6" -let s:gui0F = "be643c" +let s:gui00 = "2C3E50" +let g:base16_gui00 = "2C3E50" +let s:gui01 = "34495E" +let g:base16_gui01 = "34495E" +let s:gui02 = "7F8C8D" +let g:base16_gui02 = "7F8C8D" +let s:gui03 = "95A5A6" +let g:base16_gui03 = "95A5A6" +let s:gui04 = "BDC3C7" +let g:base16_gui04 = "BDC3C7" +let s:gui05 = "e0e0e0" +let g:base16_gui05 = "e0e0e0" +let s:gui06 = "f5f5f5" +let g:base16_gui06 = "f5f5f5" +let s:gui07 = "ECF0F1" +let g:base16_gui07 = "ECF0F1" +let s:gui08 = "E74C3C" +let g:base16_gui08 = "E74C3C" +let s:gui09 = "E67E22" +let g:base16_gui09 = "E67E22" +let s:gui0A = "F1C40F" +let g:base16_gui0A = "F1C40F" +let s:gui0B = "2ECC71" +let g:base16_gui0B = "2ECC71" +let s:gui0C = "1ABC9C" +let g:base16_gui0C = "1ABC9C" +let s:gui0D = "3498DB" +let g:base16_gui0D = "3498DB" +let s:gui0E = "9B59B6" +let g:base16_gui0E = "9B59B6" +let s:gui0F = "be643c" +let g:base16_gui0F = "be643c" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#1ABC9C" let g:terminal_color_7 = "#e0e0e0" let g:terminal_color_8 = "#95A5A6" - let g:terminal_color_9 = "#E67E22" - let g:terminal_color_10 = "#34495E" - let g:terminal_color_11 = "#7F8C8D" - let g:terminal_color_12 = "#BDC3C7" - let g:terminal_color_13 = "#f5f5f5" - let g:terminal_color_14 = "#be643c" + let g:terminal_color_9 = "#E74C3C" + let g:terminal_color_10 = "#2ECC71" + let g:terminal_color_11 = "#F1C40F" + let g:terminal_color_12 = "#3498DB" + let g:terminal_color_13 = "#9B59B6" + let g:terminal_color_14 = "#1ABC9C" let g:terminal_color_15 = "#ECF0F1" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-flat" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-github.vim b/colors/base16-github.vim index a23bd81..e606f75 100644 --- a/colors/base16-github.vim +++ b/colors/base16-github.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "ffffff" -let s:gui01 = "f5f5f5" -let s:gui02 = "c8c8fa" -let s:gui03 = "969896" -let s:gui04 = "e8e8e8" -let s:gui05 = "333333" -let s:gui06 = "ffffff" -let s:gui07 = "ffffff" -let s:gui08 = "ed6a43" -let s:gui09 = "0086b3" -let s:gui0A = "795da3" -let s:gui0B = "183691" -let s:gui0C = "183691" -let s:gui0D = "795da3" -let s:gui0E = "a71d5d" -let s:gui0F = "333333" +let s:gui00 = "ffffff" +let g:base16_gui00 = "ffffff" +let s:gui01 = "f5f5f5" +let g:base16_gui01 = "f5f5f5" +let s:gui02 = "c8c8fa" +let g:base16_gui02 = "c8c8fa" +let s:gui03 = "969896" +let g:base16_gui03 = "969896" +let s:gui04 = "e8e8e8" +let g:base16_gui04 = "e8e8e8" +let s:gui05 = "333333" +let g:base16_gui05 = "333333" +let s:gui06 = "ffffff" +let g:base16_gui06 = "ffffff" +let s:gui07 = "ffffff" +let g:base16_gui07 = "ffffff" +let s:gui08 = "ed6a43" +let g:base16_gui08 = "ed6a43" +let s:gui09 = "0086b3" +let g:base16_gui09 = "0086b3" +let s:gui0A = "795da3" +let g:base16_gui0A = "795da3" +let s:gui0B = "183691" +let g:base16_gui0B = "183691" +let s:gui0C = "183691" +let g:base16_gui0C = "183691" +let s:gui0D = "795da3" +let g:base16_gui0D = "795da3" +let s:gui0E = "a71d5d" +let g:base16_gui0E = "a71d5d" +let s:gui0F = "333333" +let g:base16_gui0F = "333333" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#183691" let g:terminal_color_7 = "#333333" let g:terminal_color_8 = "#969896" - let g:terminal_color_9 = "#0086b3" - let g:terminal_color_10 = "#f5f5f5" - let g:terminal_color_11 = "#c8c8fa" - let g:terminal_color_12 = "#e8e8e8" - let g:terminal_color_13 = "#ffffff" - let g:terminal_color_14 = "#333333" + let g:terminal_color_9 = "#ed6a43" + let g:terminal_color_10 = "#183691" + let g:terminal_color_11 = "#795da3" + let g:terminal_color_12 = "#795da3" + let g:terminal_color_13 = "#a71d5d" + let g:terminal_color_14 = "#183691" let g:terminal_color_15 = "#ffffff" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-github" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-google-dark.vim b/colors/base16-google-dark.vim index 0155bcd..ee0039d 100644 --- a/colors/base16-google-dark.vim +++ b/colors/base16-google-dark.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "1d1f21" -let s:gui01 = "282a2e" -let s:gui02 = "373b41" -let s:gui03 = "969896" -let s:gui04 = "b4b7b4" -let s:gui05 = "c5c8c6" -let s:gui06 = "e0e0e0" -let s:gui07 = "ffffff" -let s:gui08 = "CC342B" -let s:gui09 = "F96A38" -let s:gui0A = "FBA922" -let s:gui0B = "198844" -let s:gui0C = "3971ED" -let s:gui0D = "3971ED" -let s:gui0E = "A36AC7" -let s:gui0F = "3971ED" +let s:gui00 = "1d1f21" +let g:base16_gui00 = "1d1f21" +let s:gui01 = "282a2e" +let g:base16_gui01 = "282a2e" +let s:gui02 = "373b41" +let g:base16_gui02 = "373b41" +let s:gui03 = "969896" +let g:base16_gui03 = "969896" +let s:gui04 = "b4b7b4" +let g:base16_gui04 = "b4b7b4" +let s:gui05 = "c5c8c6" +let g:base16_gui05 = "c5c8c6" +let s:gui06 = "e0e0e0" +let g:base16_gui06 = "e0e0e0" +let s:gui07 = "ffffff" +let g:base16_gui07 = "ffffff" +let s:gui08 = "CC342B" +let g:base16_gui08 = "CC342B" +let s:gui09 = "F96A38" +let g:base16_gui09 = "F96A38" +let s:gui0A = "FBA922" +let g:base16_gui0A = "FBA922" +let s:gui0B = "198844" +let g:base16_gui0B = "198844" +let s:gui0C = "3971ED" +let g:base16_gui0C = "3971ED" +let s:gui0D = "3971ED" +let g:base16_gui0D = "3971ED" +let s:gui0E = "A36AC7" +let g:base16_gui0E = "A36AC7" +let s:gui0F = "3971ED" +let g:base16_gui0F = "3971ED" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#3971ED" let g:terminal_color_7 = "#c5c8c6" let g:terminal_color_8 = "#969896" - let g:terminal_color_9 = "#F96A38" - let g:terminal_color_10 = "#282a2e" - let g:terminal_color_11 = "#373b41" - let g:terminal_color_12 = "#b4b7b4" - let g:terminal_color_13 = "#e0e0e0" + let g:terminal_color_9 = "#CC342B" + let g:terminal_color_10 = "#198844" + let g:terminal_color_11 = "#FBA922" + let g:terminal_color_12 = "#3971ED" + let g:terminal_color_13 = "#A36AC7" let g:terminal_color_14 = "#3971ED" let g:terminal_color_15 = "#ffffff" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-google-dark" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-google-light.vim b/colors/base16-google-light.vim index 98e6995..409dd1d 100644 --- a/colors/base16-google-light.vim +++ b/colors/base16-google-light.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "ffffff" -let s:gui01 = "e0e0e0" -let s:gui02 = "c5c8c6" -let s:gui03 = "b4b7b4" -let s:gui04 = "969896" -let s:gui05 = "373b41" -let s:gui06 = "282a2e" -let s:gui07 = "1d1f21" -let s:gui08 = "CC342B" -let s:gui09 = "F96A38" -let s:gui0A = "FBA922" -let s:gui0B = "198844" -let s:gui0C = "3971ED" -let s:gui0D = "3971ED" -let s:gui0E = "A36AC7" -let s:gui0F = "3971ED" +let s:gui00 = "ffffff" +let g:base16_gui00 = "ffffff" +let s:gui01 = "e0e0e0" +let g:base16_gui01 = "e0e0e0" +let s:gui02 = "c5c8c6" +let g:base16_gui02 = "c5c8c6" +let s:gui03 = "b4b7b4" +let g:base16_gui03 = "b4b7b4" +let s:gui04 = "969896" +let g:base16_gui04 = "969896" +let s:gui05 = "373b41" +let g:base16_gui05 = "373b41" +let s:gui06 = "282a2e" +let g:base16_gui06 = "282a2e" +let s:gui07 = "1d1f21" +let g:base16_gui07 = "1d1f21" +let s:gui08 = "CC342B" +let g:base16_gui08 = "CC342B" +let s:gui09 = "F96A38" +let g:base16_gui09 = "F96A38" +let s:gui0A = "FBA922" +let g:base16_gui0A = "FBA922" +let s:gui0B = "198844" +let g:base16_gui0B = "198844" +let s:gui0C = "3971ED" +let g:base16_gui0C = "3971ED" +let s:gui0D = "3971ED" +let g:base16_gui0D = "3971ED" +let s:gui0E = "A36AC7" +let g:base16_gui0E = "A36AC7" +let s:gui0F = "3971ED" +let g:base16_gui0F = "3971ED" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#3971ED" let g:terminal_color_7 = "#373b41" let g:terminal_color_8 = "#b4b7b4" - let g:terminal_color_9 = "#F96A38" - let g:terminal_color_10 = "#e0e0e0" - let g:terminal_color_11 = "#c5c8c6" - let g:terminal_color_12 = "#969896" - let g:terminal_color_13 = "#282a2e" + let g:terminal_color_9 = "#CC342B" + let g:terminal_color_10 = "#198844" + let g:terminal_color_11 = "#FBA922" + let g:terminal_color_12 = "#3971ED" + let g:terminal_color_13 = "#A36AC7" let g:terminal_color_14 = "#3971ED" let g:terminal_color_15 = "#1d1f21" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-google-light" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-grayscale-dark.vim b/colors/base16-grayscale-dark.vim index acd21a6..0f192c1 100644 --- a/colors/base16-grayscale-dark.vim +++ b/colors/base16-grayscale-dark.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "101010" -let s:gui01 = "252525" -let s:gui02 = "464646" -let s:gui03 = "525252" -let s:gui04 = "ababab" -let s:gui05 = "b9b9b9" -let s:gui06 = "e3e3e3" -let s:gui07 = "f7f7f7" -let s:gui08 = "7c7c7c" -let s:gui09 = "999999" -let s:gui0A = "a0a0a0" -let s:gui0B = "8e8e8e" -let s:gui0C = "868686" -let s:gui0D = "686868" -let s:gui0E = "747474" -let s:gui0F = "5e5e5e" +let s:gui00 = "101010" +let g:base16_gui00 = "101010" +let s:gui01 = "252525" +let g:base16_gui01 = "252525" +let s:gui02 = "464646" +let g:base16_gui02 = "464646" +let s:gui03 = "525252" +let g:base16_gui03 = "525252" +let s:gui04 = "ababab" +let g:base16_gui04 = "ababab" +let s:gui05 = "b9b9b9" +let g:base16_gui05 = "b9b9b9" +let s:gui06 = "e3e3e3" +let g:base16_gui06 = "e3e3e3" +let s:gui07 = "f7f7f7" +let g:base16_gui07 = "f7f7f7" +let s:gui08 = "7c7c7c" +let g:base16_gui08 = "7c7c7c" +let s:gui09 = "999999" +let g:base16_gui09 = "999999" +let s:gui0A = "a0a0a0" +let g:base16_gui0A = "a0a0a0" +let s:gui0B = "8e8e8e" +let g:base16_gui0B = "8e8e8e" +let s:gui0C = "868686" +let g:base16_gui0C = "868686" +let s:gui0D = "686868" +let g:base16_gui0D = "686868" +let s:gui0E = "747474" +let g:base16_gui0E = "747474" +let s:gui0F = "5e5e5e" +let g:base16_gui0F = "5e5e5e" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#868686" let g:terminal_color_7 = "#b9b9b9" let g:terminal_color_8 = "#525252" - let g:terminal_color_9 = "#999999" - let g:terminal_color_10 = "#252525" - let g:terminal_color_11 = "#464646" - let g:terminal_color_12 = "#ababab" - let g:terminal_color_13 = "#e3e3e3" - let g:terminal_color_14 = "#5e5e5e" + let g:terminal_color_9 = "#7c7c7c" + let g:terminal_color_10 = "#8e8e8e" + let g:terminal_color_11 = "#a0a0a0" + let g:terminal_color_12 = "#686868" + let g:terminal_color_13 = "#747474" + let g:terminal_color_14 = "#868686" let g:terminal_color_15 = "#f7f7f7" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-grayscale-dark" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-grayscale-light.vim b/colors/base16-grayscale-light.vim index 1be8de6..a9a812b 100644 --- a/colors/base16-grayscale-light.vim +++ b/colors/base16-grayscale-light.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "f7f7f7" -let s:gui01 = "e3e3e3" -let s:gui02 = "b9b9b9" -let s:gui03 = "ababab" -let s:gui04 = "525252" -let s:gui05 = "464646" -let s:gui06 = "252525" -let s:gui07 = "101010" -let s:gui08 = "7c7c7c" -let s:gui09 = "999999" -let s:gui0A = "a0a0a0" -let s:gui0B = "8e8e8e" -let s:gui0C = "868686" -let s:gui0D = "686868" -let s:gui0E = "747474" -let s:gui0F = "5e5e5e" +let s:gui00 = "f7f7f7" +let g:base16_gui00 = "f7f7f7" +let s:gui01 = "e3e3e3" +let g:base16_gui01 = "e3e3e3" +let s:gui02 = "b9b9b9" +let g:base16_gui02 = "b9b9b9" +let s:gui03 = "ababab" +let g:base16_gui03 = "ababab" +let s:gui04 = "525252" +let g:base16_gui04 = "525252" +let s:gui05 = "464646" +let g:base16_gui05 = "464646" +let s:gui06 = "252525" +let g:base16_gui06 = "252525" +let s:gui07 = "101010" +let g:base16_gui07 = "101010" +let s:gui08 = "7c7c7c" +let g:base16_gui08 = "7c7c7c" +let s:gui09 = "999999" +let g:base16_gui09 = "999999" +let s:gui0A = "a0a0a0" +let g:base16_gui0A = "a0a0a0" +let s:gui0B = "8e8e8e" +let g:base16_gui0B = "8e8e8e" +let s:gui0C = "868686" +let g:base16_gui0C = "868686" +let s:gui0D = "686868" +let g:base16_gui0D = "686868" +let s:gui0E = "747474" +let g:base16_gui0E = "747474" +let s:gui0F = "5e5e5e" +let g:base16_gui0F = "5e5e5e" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#868686" let g:terminal_color_7 = "#464646" let g:terminal_color_8 = "#ababab" - let g:terminal_color_9 = "#999999" - let g:terminal_color_10 = "#e3e3e3" - let g:terminal_color_11 = "#b9b9b9" - let g:terminal_color_12 = "#525252" - let g:terminal_color_13 = "#252525" - let g:terminal_color_14 = "#5e5e5e" + let g:terminal_color_9 = "#7c7c7c" + let g:terminal_color_10 = "#8e8e8e" + let g:terminal_color_11 = "#a0a0a0" + let g:terminal_color_12 = "#686868" + let g:terminal_color_13 = "#747474" + let g:terminal_color_14 = "#868686" let g:terminal_color_15 = "#101010" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-grayscale-light" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-greenscreen.vim b/colors/base16-greenscreen.vim index 8b20ad0..87b4774 100644 --- a/colors/base16-greenscreen.vim +++ b/colors/base16-greenscreen.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "001100" -let s:gui01 = "003300" -let s:gui02 = "005500" -let s:gui03 = "007700" -let s:gui04 = "009900" -let s:gui05 = "00bb00" -let s:gui06 = "00dd00" -let s:gui07 = "00ff00" -let s:gui08 = "007700" -let s:gui09 = "009900" -let s:gui0A = "007700" -let s:gui0B = "00bb00" -let s:gui0C = "005500" -let s:gui0D = "009900" -let s:gui0E = "00bb00" -let s:gui0F = "005500" +let s:gui00 = "001100" +let g:base16_gui00 = "001100" +let s:gui01 = "003300" +let g:base16_gui01 = "003300" +let s:gui02 = "005500" +let g:base16_gui02 = "005500" +let s:gui03 = "007700" +let g:base16_gui03 = "007700" +let s:gui04 = "009900" +let g:base16_gui04 = "009900" +let s:gui05 = "00bb00" +let g:base16_gui05 = "00bb00" +let s:gui06 = "00dd00" +let g:base16_gui06 = "00dd00" +let s:gui07 = "00ff00" +let g:base16_gui07 = "00ff00" +let s:gui08 = "007700" +let g:base16_gui08 = "007700" +let s:gui09 = "009900" +let g:base16_gui09 = "009900" +let s:gui0A = "007700" +let g:base16_gui0A = "007700" +let s:gui0B = "00bb00" +let g:base16_gui0B = "00bb00" +let s:gui0C = "005500" +let g:base16_gui0C = "005500" +let s:gui0D = "009900" +let g:base16_gui0D = "009900" +let s:gui0E = "00bb00" +let g:base16_gui0E = "00bb00" +let s:gui0F = "005500" +let g:base16_gui0F = "005500" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#005500" let g:terminal_color_7 = "#00bb00" let g:terminal_color_8 = "#007700" - let g:terminal_color_9 = "#009900" - let g:terminal_color_10 = "#003300" - let g:terminal_color_11 = "#005500" + let g:terminal_color_9 = "#007700" + let g:terminal_color_10 = "#00bb00" + let g:terminal_color_11 = "#007700" let g:terminal_color_12 = "#009900" - let g:terminal_color_13 = "#00dd00" + let g:terminal_color_13 = "#00bb00" let g:terminal_color_14 = "#005500" let g:terminal_color_15 = "#00ff00" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-greenscreen" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-gruvbox-dark-hard.vim b/colors/base16-gruvbox-dark-hard.vim index 138671c..bdf28c5 100644 --- a/colors/base16-gruvbox-dark-hard.vim +++ b/colors/base16-gruvbox-dark-hard.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "1d2021" -let s:gui01 = "3c3836" -let s:gui02 = "504945" -let s:gui03 = "665c54" -let s:gui04 = "bdae93" -let s:gui05 = "d5c4a1" -let s:gui06 = "ebdbb2" -let s:gui07 = "fbf1c7" -let s:gui08 = "fb4934" -let s:gui09 = "fe8019" -let s:gui0A = "fabd2f" -let s:gui0B = "b8bb26" -let s:gui0C = "8ec07c" -let s:gui0D = "83a598" -let s:gui0E = "d3869b" -let s:gui0F = "d65d0e" +let s:gui00 = "1d2021" +let g:base16_gui00 = "1d2021" +let s:gui01 = "3c3836" +let g:base16_gui01 = "3c3836" +let s:gui02 = "504945" +let g:base16_gui02 = "504945" +let s:gui03 = "665c54" +let g:base16_gui03 = "665c54" +let s:gui04 = "bdae93" +let g:base16_gui04 = "bdae93" +let s:gui05 = "d5c4a1" +let g:base16_gui05 = "d5c4a1" +let s:gui06 = "ebdbb2" +let g:base16_gui06 = "ebdbb2" +let s:gui07 = "fbf1c7" +let g:base16_gui07 = "fbf1c7" +let s:gui08 = "fb4934" +let g:base16_gui08 = "fb4934" +let s:gui09 = "fe8019" +let g:base16_gui09 = "fe8019" +let s:gui0A = "fabd2f" +let g:base16_gui0A = "fabd2f" +let s:gui0B = "b8bb26" +let g:base16_gui0B = "b8bb26" +let s:gui0C = "8ec07c" +let g:base16_gui0C = "8ec07c" +let s:gui0D = "83a598" +let g:base16_gui0D = "83a598" +let s:gui0E = "d3869b" +let g:base16_gui0E = "d3869b" +let s:gui0F = "d65d0e" +let g:base16_gui0F = "d65d0e" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#8ec07c" let g:terminal_color_7 = "#d5c4a1" let g:terminal_color_8 = "#665c54" - let g:terminal_color_9 = "#fe8019" - let g:terminal_color_10 = "#3c3836" - let g:terminal_color_11 = "#504945" - let g:terminal_color_12 = "#bdae93" - let g:terminal_color_13 = "#ebdbb2" - let g:terminal_color_14 = "#d65d0e" + let g:terminal_color_9 = "#fb4934" + let g:terminal_color_10 = "#b8bb26" + let g:terminal_color_11 = "#fabd2f" + let g:terminal_color_12 = "#83a598" + let g:terminal_color_13 = "#d3869b" + let g:terminal_color_14 = "#8ec07c" let g:terminal_color_15 = "#fbf1c7" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-gruvbox-dark-hard" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-gruvbox-dark-medium.vim b/colors/base16-gruvbox-dark-medium.vim index 75f2a5c..fce66e4 100644 --- a/colors/base16-gruvbox-dark-medium.vim +++ b/colors/base16-gruvbox-dark-medium.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "282828" -let s:gui01 = "3c3836" -let s:gui02 = "504945" -let s:gui03 = "665c54" -let s:gui04 = "bdae93" -let s:gui05 = "d5c4a1" -let s:gui06 = "ebdbb2" -let s:gui07 = "fbf1c7" -let s:gui08 = "fb4934" -let s:gui09 = "fe8019" -let s:gui0A = "fabd2f" -let s:gui0B = "b8bb26" -let s:gui0C = "8ec07c" -let s:gui0D = "83a598" -let s:gui0E = "d3869b" -let s:gui0F = "d65d0e" +let s:gui00 = "282828" +let g:base16_gui00 = "282828" +let s:gui01 = "3c3836" +let g:base16_gui01 = "3c3836" +let s:gui02 = "504945" +let g:base16_gui02 = "504945" +let s:gui03 = "665c54" +let g:base16_gui03 = "665c54" +let s:gui04 = "bdae93" +let g:base16_gui04 = "bdae93" +let s:gui05 = "d5c4a1" +let g:base16_gui05 = "d5c4a1" +let s:gui06 = "ebdbb2" +let g:base16_gui06 = "ebdbb2" +let s:gui07 = "fbf1c7" +let g:base16_gui07 = "fbf1c7" +let s:gui08 = "fb4934" +let g:base16_gui08 = "fb4934" +let s:gui09 = "fe8019" +let g:base16_gui09 = "fe8019" +let s:gui0A = "fabd2f" +let g:base16_gui0A = "fabd2f" +let s:gui0B = "b8bb26" +let g:base16_gui0B = "b8bb26" +let s:gui0C = "8ec07c" +let g:base16_gui0C = "8ec07c" +let s:gui0D = "83a598" +let g:base16_gui0D = "83a598" +let s:gui0E = "d3869b" +let g:base16_gui0E = "d3869b" +let s:gui0F = "d65d0e" +let g:base16_gui0F = "d65d0e" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#8ec07c" let g:terminal_color_7 = "#d5c4a1" let g:terminal_color_8 = "#665c54" - let g:terminal_color_9 = "#fe8019" - let g:terminal_color_10 = "#3c3836" - let g:terminal_color_11 = "#504945" - let g:terminal_color_12 = "#bdae93" - let g:terminal_color_13 = "#ebdbb2" - let g:terminal_color_14 = "#d65d0e" + let g:terminal_color_9 = "#fb4934" + let g:terminal_color_10 = "#b8bb26" + let g:terminal_color_11 = "#fabd2f" + let g:terminal_color_12 = "#83a598" + let g:terminal_color_13 = "#d3869b" + let g:terminal_color_14 = "#8ec07c" let g:terminal_color_15 = "#fbf1c7" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-gruvbox-dark-medium" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-gruvbox-dark-pale.vim b/colors/base16-gruvbox-dark-pale.vim index 2ba0cbf..eeb3c34 100644 --- a/colors/base16-gruvbox-dark-pale.vim +++ b/colors/base16-gruvbox-dark-pale.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "262626" -let s:gui01 = "3a3a3a" -let s:gui02 = "4e4e4e" -let s:gui03 = "8a8a8a" -let s:gui04 = "949494" -let s:gui05 = "dab997" -let s:gui06 = "d5c4a1" -let s:gui07 = "ebdbb2" -let s:gui08 = "d75f5f" -let s:gui09 = "ff8700" -let s:gui0A = "ffaf00" -let s:gui0B = "afaf00" -let s:gui0C = "85ad85" -let s:gui0D = "83adad" -let s:gui0E = "d485ad" -let s:gui0F = "d65d0e" +let s:gui00 = "262626" +let g:base16_gui00 = "262626" +let s:gui01 = "3a3a3a" +let g:base16_gui01 = "3a3a3a" +let s:gui02 = "4e4e4e" +let g:base16_gui02 = "4e4e4e" +let s:gui03 = "8a8a8a" +let g:base16_gui03 = "8a8a8a" +let s:gui04 = "949494" +let g:base16_gui04 = "949494" +let s:gui05 = "dab997" +let g:base16_gui05 = "dab997" +let s:gui06 = "d5c4a1" +let g:base16_gui06 = "d5c4a1" +let s:gui07 = "ebdbb2" +let g:base16_gui07 = "ebdbb2" +let s:gui08 = "d75f5f" +let g:base16_gui08 = "d75f5f" +let s:gui09 = "ff8700" +let g:base16_gui09 = "ff8700" +let s:gui0A = "ffaf00" +let g:base16_gui0A = "ffaf00" +let s:gui0B = "afaf00" +let g:base16_gui0B = "afaf00" +let s:gui0C = "85ad85" +let g:base16_gui0C = "85ad85" +let s:gui0D = "83adad" +let g:base16_gui0D = "83adad" +let s:gui0E = "d485ad" +let g:base16_gui0E = "d485ad" +let s:gui0F = "d65d0e" +let g:base16_gui0F = "d65d0e" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#85ad85" let g:terminal_color_7 = "#dab997" let g:terminal_color_8 = "#8a8a8a" - let g:terminal_color_9 = "#ff8700" - let g:terminal_color_10 = "#3a3a3a" - let g:terminal_color_11 = "#4e4e4e" - let g:terminal_color_12 = "#949494" - let g:terminal_color_13 = "#d5c4a1" - let g:terminal_color_14 = "#d65d0e" + let g:terminal_color_9 = "#d75f5f" + let g:terminal_color_10 = "#afaf00" + let g:terminal_color_11 = "#ffaf00" + let g:terminal_color_12 = "#83adad" + let g:terminal_color_13 = "#d485ad" + let g:terminal_color_14 = "#85ad85" let g:terminal_color_15 = "#ebdbb2" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-gruvbox-dark-pale" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-gruvbox-dark-soft.vim b/colors/base16-gruvbox-dark-soft.vim index 5e2095c..a26c2f7 100644 --- a/colors/base16-gruvbox-dark-soft.vim +++ b/colors/base16-gruvbox-dark-soft.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "32302f" -let s:gui01 = "3c3836" -let s:gui02 = "504945" -let s:gui03 = "665c54" -let s:gui04 = "bdae93" -let s:gui05 = "d5c4a1" -let s:gui06 = "ebdbb2" -let s:gui07 = "fbf1c7" -let s:gui08 = "fb4934" -let s:gui09 = "fe8019" -let s:gui0A = "fabd2f" -let s:gui0B = "b8bb26" -let s:gui0C = "8ec07c" -let s:gui0D = "83a598" -let s:gui0E = "d3869b" -let s:gui0F = "d65d0e" +let s:gui00 = "32302f" +let g:base16_gui00 = "32302f" +let s:gui01 = "3c3836" +let g:base16_gui01 = "3c3836" +let s:gui02 = "504945" +let g:base16_gui02 = "504945" +let s:gui03 = "665c54" +let g:base16_gui03 = "665c54" +let s:gui04 = "bdae93" +let g:base16_gui04 = "bdae93" +let s:gui05 = "d5c4a1" +let g:base16_gui05 = "d5c4a1" +let s:gui06 = "ebdbb2" +let g:base16_gui06 = "ebdbb2" +let s:gui07 = "fbf1c7" +let g:base16_gui07 = "fbf1c7" +let s:gui08 = "fb4934" +let g:base16_gui08 = "fb4934" +let s:gui09 = "fe8019" +let g:base16_gui09 = "fe8019" +let s:gui0A = "fabd2f" +let g:base16_gui0A = "fabd2f" +let s:gui0B = "b8bb26" +let g:base16_gui0B = "b8bb26" +let s:gui0C = "8ec07c" +let g:base16_gui0C = "8ec07c" +let s:gui0D = "83a598" +let g:base16_gui0D = "83a598" +let s:gui0E = "d3869b" +let g:base16_gui0E = "d3869b" +let s:gui0F = "d65d0e" +let g:base16_gui0F = "d65d0e" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#8ec07c" let g:terminal_color_7 = "#d5c4a1" let g:terminal_color_8 = "#665c54" - let g:terminal_color_9 = "#fe8019" - let g:terminal_color_10 = "#3c3836" - let g:terminal_color_11 = "#504945" - let g:terminal_color_12 = "#bdae93" - let g:terminal_color_13 = "#ebdbb2" - let g:terminal_color_14 = "#d65d0e" + let g:terminal_color_9 = "#fb4934" + let g:terminal_color_10 = "#b8bb26" + let g:terminal_color_11 = "#fabd2f" + let g:terminal_color_12 = "#83a598" + let g:terminal_color_13 = "#d3869b" + let g:terminal_color_14 = "#8ec07c" let g:terminal_color_15 = "#fbf1c7" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-gruvbox-dark-soft" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-gruvbox-light-hard.vim b/colors/base16-gruvbox-light-hard.vim index 51dafe1..22c6cd1 100644 --- a/colors/base16-gruvbox-light-hard.vim +++ b/colors/base16-gruvbox-light-hard.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "f9f5d7" -let s:gui01 = "ebdbb2" -let s:gui02 = "d5c4a1" -let s:gui03 = "bdae93" -let s:gui04 = "665c54" -let s:gui05 = "504945" -let s:gui06 = "3c3836" -let s:gui07 = "282828" -let s:gui08 = "9d0006" -let s:gui09 = "af3a03" -let s:gui0A = "b57614" -let s:gui0B = "79740e" -let s:gui0C = "427b58" -let s:gui0D = "076678" -let s:gui0E = "8f3f71" -let s:gui0F = "d65d0e" +let s:gui00 = "f9f5d7" +let g:base16_gui00 = "f9f5d7" +let s:gui01 = "ebdbb2" +let g:base16_gui01 = "ebdbb2" +let s:gui02 = "d5c4a1" +let g:base16_gui02 = "d5c4a1" +let s:gui03 = "bdae93" +let g:base16_gui03 = "bdae93" +let s:gui04 = "665c54" +let g:base16_gui04 = "665c54" +let s:gui05 = "504945" +let g:base16_gui05 = "504945" +let s:gui06 = "3c3836" +let g:base16_gui06 = "3c3836" +let s:gui07 = "282828" +let g:base16_gui07 = "282828" +let s:gui08 = "9d0006" +let g:base16_gui08 = "9d0006" +let s:gui09 = "af3a03" +let g:base16_gui09 = "af3a03" +let s:gui0A = "b57614" +let g:base16_gui0A = "b57614" +let s:gui0B = "79740e" +let g:base16_gui0B = "79740e" +let s:gui0C = "427b58" +let g:base16_gui0C = "427b58" +let s:gui0D = "076678" +let g:base16_gui0D = "076678" +let s:gui0E = "8f3f71" +let g:base16_gui0E = "8f3f71" +let s:gui0F = "d65d0e" +let g:base16_gui0F = "d65d0e" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#427b58" let g:terminal_color_7 = "#504945" let g:terminal_color_8 = "#bdae93" - let g:terminal_color_9 = "#af3a03" - let g:terminal_color_10 = "#ebdbb2" - let g:terminal_color_11 = "#d5c4a1" - let g:terminal_color_12 = "#665c54" - let g:terminal_color_13 = "#3c3836" - let g:terminal_color_14 = "#d65d0e" + let g:terminal_color_9 = "#9d0006" + let g:terminal_color_10 = "#79740e" + let g:terminal_color_11 = "#b57614" + let g:terminal_color_12 = "#076678" + let g:terminal_color_13 = "#8f3f71" + let g:terminal_color_14 = "#427b58" let g:terminal_color_15 = "#282828" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-gruvbox-light-hard" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-gruvbox-light-medium.vim b/colors/base16-gruvbox-light-medium.vim index 51a2b95..ce3de67 100644 --- a/colors/base16-gruvbox-light-medium.vim +++ b/colors/base16-gruvbox-light-medium.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "fbf1c7" -let s:gui01 = "ebdbb2" -let s:gui02 = "d5c4a1" -let s:gui03 = "bdae93" -let s:gui04 = "665c54" -let s:gui05 = "504945" -let s:gui06 = "3c3836" -let s:gui07 = "282828" -let s:gui08 = "9d0006" -let s:gui09 = "af3a03" -let s:gui0A = "b57614" -let s:gui0B = "79740e" -let s:gui0C = "427b58" -let s:gui0D = "076678" -let s:gui0E = "8f3f71" -let s:gui0F = "d65d0e" +let s:gui00 = "fbf1c7" +let g:base16_gui00 = "fbf1c7" +let s:gui01 = "ebdbb2" +let g:base16_gui01 = "ebdbb2" +let s:gui02 = "d5c4a1" +let g:base16_gui02 = "d5c4a1" +let s:gui03 = "bdae93" +let g:base16_gui03 = "bdae93" +let s:gui04 = "665c54" +let g:base16_gui04 = "665c54" +let s:gui05 = "504945" +let g:base16_gui05 = "504945" +let s:gui06 = "3c3836" +let g:base16_gui06 = "3c3836" +let s:gui07 = "282828" +let g:base16_gui07 = "282828" +let s:gui08 = "9d0006" +let g:base16_gui08 = "9d0006" +let s:gui09 = "af3a03" +let g:base16_gui09 = "af3a03" +let s:gui0A = "b57614" +let g:base16_gui0A = "b57614" +let s:gui0B = "79740e" +let g:base16_gui0B = "79740e" +let s:gui0C = "427b58" +let g:base16_gui0C = "427b58" +let s:gui0D = "076678" +let g:base16_gui0D = "076678" +let s:gui0E = "8f3f71" +let g:base16_gui0E = "8f3f71" +let s:gui0F = "d65d0e" +let g:base16_gui0F = "d65d0e" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#427b58" let g:terminal_color_7 = "#504945" let g:terminal_color_8 = "#bdae93" - let g:terminal_color_9 = "#af3a03" - let g:terminal_color_10 = "#ebdbb2" - let g:terminal_color_11 = "#d5c4a1" - let g:terminal_color_12 = "#665c54" - let g:terminal_color_13 = "#3c3836" - let g:terminal_color_14 = "#d65d0e" + let g:terminal_color_9 = "#9d0006" + let g:terminal_color_10 = "#79740e" + let g:terminal_color_11 = "#b57614" + let g:terminal_color_12 = "#076678" + let g:terminal_color_13 = "#8f3f71" + let g:terminal_color_14 = "#427b58" let g:terminal_color_15 = "#282828" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-gruvbox-light-medium" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-gruvbox-light-soft.vim b/colors/base16-gruvbox-light-soft.vim index be1ab4a..8d690cb 100644 --- a/colors/base16-gruvbox-light-soft.vim +++ b/colors/base16-gruvbox-light-soft.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "f2e5bc" -let s:gui01 = "ebdbb2" -let s:gui02 = "d5c4a1" -let s:gui03 = "bdae93" -let s:gui04 = "665c54" -let s:gui05 = "504945" -let s:gui06 = "3c3836" -let s:gui07 = "282828" -let s:gui08 = "9d0006" -let s:gui09 = "af3a03" -let s:gui0A = "b57614" -let s:gui0B = "79740e" -let s:gui0C = "427b58" -let s:gui0D = "076678" -let s:gui0E = "8f3f71" -let s:gui0F = "d65d0e" +let s:gui00 = "f2e5bc" +let g:base16_gui00 = "f2e5bc" +let s:gui01 = "ebdbb2" +let g:base16_gui01 = "ebdbb2" +let s:gui02 = "d5c4a1" +let g:base16_gui02 = "d5c4a1" +let s:gui03 = "bdae93" +let g:base16_gui03 = "bdae93" +let s:gui04 = "665c54" +let g:base16_gui04 = "665c54" +let s:gui05 = "504945" +let g:base16_gui05 = "504945" +let s:gui06 = "3c3836" +let g:base16_gui06 = "3c3836" +let s:gui07 = "282828" +let g:base16_gui07 = "282828" +let s:gui08 = "9d0006" +let g:base16_gui08 = "9d0006" +let s:gui09 = "af3a03" +let g:base16_gui09 = "af3a03" +let s:gui0A = "b57614" +let g:base16_gui0A = "b57614" +let s:gui0B = "79740e" +let g:base16_gui0B = "79740e" +let s:gui0C = "427b58" +let g:base16_gui0C = "427b58" +let s:gui0D = "076678" +let g:base16_gui0D = "076678" +let s:gui0E = "8f3f71" +let g:base16_gui0E = "8f3f71" +let s:gui0F = "d65d0e" +let g:base16_gui0F = "d65d0e" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#427b58" let g:terminal_color_7 = "#504945" let g:terminal_color_8 = "#bdae93" - let g:terminal_color_9 = "#af3a03" - let g:terminal_color_10 = "#ebdbb2" - let g:terminal_color_11 = "#d5c4a1" - let g:terminal_color_12 = "#665c54" - let g:terminal_color_13 = "#3c3836" - let g:terminal_color_14 = "#d65d0e" + let g:terminal_color_9 = "#9d0006" + let g:terminal_color_10 = "#79740e" + let g:terminal_color_11 = "#b57614" + let g:terminal_color_12 = "#076678" + let g:terminal_color_13 = "#8f3f71" + let g:terminal_color_14 = "#427b58" let g:terminal_color_15 = "#282828" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-gruvbox-light-soft" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-harmonic-dark.vim b/colors/base16-harmonic-dark.vim index d741873..7122675 100644 --- a/colors/base16-harmonic-dark.vim +++ b/colors/base16-harmonic-dark.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "0b1c2c" -let s:gui01 = "223b54" -let s:gui02 = "405c79" -let s:gui03 = "627e99" -let s:gui04 = "aabcce" -let s:gui05 = "cbd6e2" -let s:gui06 = "e5ebf1" -let s:gui07 = "f7f9fb" -let s:gui08 = "bf8b56" -let s:gui09 = "bfbf56" -let s:gui0A = "8bbf56" -let s:gui0B = "56bf8b" -let s:gui0C = "568bbf" -let s:gui0D = "8b56bf" -let s:gui0E = "bf568b" -let s:gui0F = "bf5656" +let s:gui00 = "0b1c2c" +let g:base16_gui00 = "0b1c2c" +let s:gui01 = "223b54" +let g:base16_gui01 = "223b54" +let s:gui02 = "405c79" +let g:base16_gui02 = "405c79" +let s:gui03 = "627e99" +let g:base16_gui03 = "627e99" +let s:gui04 = "aabcce" +let g:base16_gui04 = "aabcce" +let s:gui05 = "cbd6e2" +let g:base16_gui05 = "cbd6e2" +let s:gui06 = "e5ebf1" +let g:base16_gui06 = "e5ebf1" +let s:gui07 = "f7f9fb" +let g:base16_gui07 = "f7f9fb" +let s:gui08 = "bf8b56" +let g:base16_gui08 = "bf8b56" +let s:gui09 = "bfbf56" +let g:base16_gui09 = "bfbf56" +let s:gui0A = "8bbf56" +let g:base16_gui0A = "8bbf56" +let s:gui0B = "56bf8b" +let g:base16_gui0B = "56bf8b" +let s:gui0C = "568bbf" +let g:base16_gui0C = "568bbf" +let s:gui0D = "8b56bf" +let g:base16_gui0D = "8b56bf" +let s:gui0E = "bf568b" +let g:base16_gui0E = "bf568b" +let s:gui0F = "bf5656" +let g:base16_gui0F = "bf5656" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#568bbf" let g:terminal_color_7 = "#cbd6e2" let g:terminal_color_8 = "#627e99" - let g:terminal_color_9 = "#bfbf56" - let g:terminal_color_10 = "#223b54" - let g:terminal_color_11 = "#405c79" - let g:terminal_color_12 = "#aabcce" - let g:terminal_color_13 = "#e5ebf1" - let g:terminal_color_14 = "#bf5656" + let g:terminal_color_9 = "#bf8b56" + let g:terminal_color_10 = "#56bf8b" + let g:terminal_color_11 = "#8bbf56" + let g:terminal_color_12 = "#8b56bf" + let g:terminal_color_13 = "#bf568b" + let g:terminal_color_14 = "#568bbf" let g:terminal_color_15 = "#f7f9fb" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-harmonic-dark" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-harmonic-light.vim b/colors/base16-harmonic-light.vim index e930003..b105deb 100644 --- a/colors/base16-harmonic-light.vim +++ b/colors/base16-harmonic-light.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "f7f9fb" -let s:gui01 = "e5ebf1" -let s:gui02 = "cbd6e2" -let s:gui03 = "aabcce" -let s:gui04 = "627e99" -let s:gui05 = "405c79" -let s:gui06 = "223b54" -let s:gui07 = "0b1c2c" -let s:gui08 = "bf8b56" -let s:gui09 = "bfbf56" -let s:gui0A = "8bbf56" -let s:gui0B = "56bf8b" -let s:gui0C = "568bbf" -let s:gui0D = "8b56bf" -let s:gui0E = "bf568b" -let s:gui0F = "bf5656" +let s:gui00 = "f7f9fb" +let g:base16_gui00 = "f7f9fb" +let s:gui01 = "e5ebf1" +let g:base16_gui01 = "e5ebf1" +let s:gui02 = "cbd6e2" +let g:base16_gui02 = "cbd6e2" +let s:gui03 = "aabcce" +let g:base16_gui03 = "aabcce" +let s:gui04 = "627e99" +let g:base16_gui04 = "627e99" +let s:gui05 = "405c79" +let g:base16_gui05 = "405c79" +let s:gui06 = "223b54" +let g:base16_gui06 = "223b54" +let s:gui07 = "0b1c2c" +let g:base16_gui07 = "0b1c2c" +let s:gui08 = "bf8b56" +let g:base16_gui08 = "bf8b56" +let s:gui09 = "bfbf56" +let g:base16_gui09 = "bfbf56" +let s:gui0A = "8bbf56" +let g:base16_gui0A = "8bbf56" +let s:gui0B = "56bf8b" +let g:base16_gui0B = "56bf8b" +let s:gui0C = "568bbf" +let g:base16_gui0C = "568bbf" +let s:gui0D = "8b56bf" +let g:base16_gui0D = "8b56bf" +let s:gui0E = "bf568b" +let g:base16_gui0E = "bf568b" +let s:gui0F = "bf5656" +let g:base16_gui0F = "bf5656" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#568bbf" let g:terminal_color_7 = "#405c79" let g:terminal_color_8 = "#aabcce" - let g:terminal_color_9 = "#bfbf56" - let g:terminal_color_10 = "#e5ebf1" - let g:terminal_color_11 = "#cbd6e2" - let g:terminal_color_12 = "#627e99" - let g:terminal_color_13 = "#223b54" - let g:terminal_color_14 = "#bf5656" + let g:terminal_color_9 = "#bf8b56" + let g:terminal_color_10 = "#56bf8b" + let g:terminal_color_11 = "#8bbf56" + let g:terminal_color_12 = "#8b56bf" + let g:terminal_color_13 = "#bf568b" + let g:terminal_color_14 = "#568bbf" let g:terminal_color_15 = "#0b1c2c" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-harmonic-light" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-hopscotch.vim b/colors/base16-hopscotch.vim index 935ee9c..1b520da 100644 --- a/colors/base16-hopscotch.vim +++ b/colors/base16-hopscotch.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "322931" -let s:gui01 = "433b42" -let s:gui02 = "5c545b" -let s:gui03 = "797379" -let s:gui04 = "989498" -let s:gui05 = "b9b5b8" -let s:gui06 = "d5d3d5" -let s:gui07 = "ffffff" -let s:gui08 = "dd464c" -let s:gui09 = "fd8b19" -let s:gui0A = "fdcc59" -let s:gui0B = "8fc13e" -let s:gui0C = "149b93" -let s:gui0D = "1290bf" -let s:gui0E = "c85e7c" -let s:gui0F = "b33508" +let s:gui00 = "322931" +let g:base16_gui00 = "322931" +let s:gui01 = "433b42" +let g:base16_gui01 = "433b42" +let s:gui02 = "5c545b" +let g:base16_gui02 = "5c545b" +let s:gui03 = "797379" +let g:base16_gui03 = "797379" +let s:gui04 = "989498" +let g:base16_gui04 = "989498" +let s:gui05 = "b9b5b8" +let g:base16_gui05 = "b9b5b8" +let s:gui06 = "d5d3d5" +let g:base16_gui06 = "d5d3d5" +let s:gui07 = "ffffff" +let g:base16_gui07 = "ffffff" +let s:gui08 = "dd464c" +let g:base16_gui08 = "dd464c" +let s:gui09 = "fd8b19" +let g:base16_gui09 = "fd8b19" +let s:gui0A = "fdcc59" +let g:base16_gui0A = "fdcc59" +let s:gui0B = "8fc13e" +let g:base16_gui0B = "8fc13e" +let s:gui0C = "149b93" +let g:base16_gui0C = "149b93" +let s:gui0D = "1290bf" +let g:base16_gui0D = "1290bf" +let s:gui0E = "c85e7c" +let g:base16_gui0E = "c85e7c" +let s:gui0F = "b33508" +let g:base16_gui0F = "b33508" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#149b93" let g:terminal_color_7 = "#b9b5b8" let g:terminal_color_8 = "#797379" - let g:terminal_color_9 = "#fd8b19" - let g:terminal_color_10 = "#433b42" - let g:terminal_color_11 = "#5c545b" - let g:terminal_color_12 = "#989498" - let g:terminal_color_13 = "#d5d3d5" - let g:terminal_color_14 = "#b33508" + let g:terminal_color_9 = "#dd464c" + let g:terminal_color_10 = "#8fc13e" + let g:terminal_color_11 = "#fdcc59" + let g:terminal_color_12 = "#1290bf" + let g:terminal_color_13 = "#c85e7c" + let g:terminal_color_14 = "#149b93" let g:terminal_color_15 = "#ffffff" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-hopscotch" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-irblack.vim b/colors/base16-irblack.vim index 3e00883..86c50a4 100644 --- a/colors/base16-irblack.vim +++ b/colors/base16-irblack.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "000000" -let s:gui01 = "242422" -let s:gui02 = "484844" -let s:gui03 = "6c6c66" -let s:gui04 = "918f88" -let s:gui05 = "b5b3aa" -let s:gui06 = "d9d7cc" -let s:gui07 = "fdfbee" -let s:gui08 = "ff6c60" -let s:gui09 = "e9c062" -let s:gui0A = "ffffb6" -let s:gui0B = "a8ff60" -let s:gui0C = "c6c5fe" -let s:gui0D = "96cbfe" -let s:gui0E = "ff73fd" -let s:gui0F = "b18a3d" +let s:gui00 = "000000" +let g:base16_gui00 = "000000" +let s:gui01 = "242422" +let g:base16_gui01 = "242422" +let s:gui02 = "484844" +let g:base16_gui02 = "484844" +let s:gui03 = "6c6c66" +let g:base16_gui03 = "6c6c66" +let s:gui04 = "918f88" +let g:base16_gui04 = "918f88" +let s:gui05 = "b5b3aa" +let g:base16_gui05 = "b5b3aa" +let s:gui06 = "d9d7cc" +let g:base16_gui06 = "d9d7cc" +let s:gui07 = "fdfbee" +let g:base16_gui07 = "fdfbee" +let s:gui08 = "ff6c60" +let g:base16_gui08 = "ff6c60" +let s:gui09 = "e9c062" +let g:base16_gui09 = "e9c062" +let s:gui0A = "ffffb6" +let g:base16_gui0A = "ffffb6" +let s:gui0B = "a8ff60" +let g:base16_gui0B = "a8ff60" +let s:gui0C = "c6c5fe" +let g:base16_gui0C = "c6c5fe" +let s:gui0D = "96cbfe" +let g:base16_gui0D = "96cbfe" +let s:gui0E = "ff73fd" +let g:base16_gui0E = "ff73fd" +let s:gui0F = "b18a3d" +let g:base16_gui0F = "b18a3d" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#c6c5fe" let g:terminal_color_7 = "#b5b3aa" let g:terminal_color_8 = "#6c6c66" - let g:terminal_color_9 = "#e9c062" - let g:terminal_color_10 = "#242422" - let g:terminal_color_11 = "#484844" - let g:terminal_color_12 = "#918f88" - let g:terminal_color_13 = "#d9d7cc" - let g:terminal_color_14 = "#b18a3d" + let g:terminal_color_9 = "#ff6c60" + let g:terminal_color_10 = "#a8ff60" + let g:terminal_color_11 = "#ffffb6" + let g:terminal_color_12 = "#96cbfe" + let g:terminal_color_13 = "#ff73fd" + let g:terminal_color_14 = "#c6c5fe" let g:terminal_color_15 = "#fdfbee" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-irblack" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-isotope.vim b/colors/base16-isotope.vim index 7a1fd50..00a97ab 100644 --- a/colors/base16-isotope.vim +++ b/colors/base16-isotope.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "000000" -let s:gui01 = "404040" -let s:gui02 = "606060" -let s:gui03 = "808080" -let s:gui04 = "c0c0c0" -let s:gui05 = "d0d0d0" -let s:gui06 = "e0e0e0" -let s:gui07 = "ffffff" -let s:gui08 = "ff0000" -let s:gui09 = "ff9900" -let s:gui0A = "ff0099" -let s:gui0B = "33ff00" -let s:gui0C = "00ffff" -let s:gui0D = "0066ff" -let s:gui0E = "cc00ff" -let s:gui0F = "3300ff" +let s:gui00 = "000000" +let g:base16_gui00 = "000000" +let s:gui01 = "404040" +let g:base16_gui01 = "404040" +let s:gui02 = "606060" +let g:base16_gui02 = "606060" +let s:gui03 = "808080" +let g:base16_gui03 = "808080" +let s:gui04 = "c0c0c0" +let g:base16_gui04 = "c0c0c0" +let s:gui05 = "d0d0d0" +let g:base16_gui05 = "d0d0d0" +let s:gui06 = "e0e0e0" +let g:base16_gui06 = "e0e0e0" +let s:gui07 = "ffffff" +let g:base16_gui07 = "ffffff" +let s:gui08 = "ff0000" +let g:base16_gui08 = "ff0000" +let s:gui09 = "ff9900" +let g:base16_gui09 = "ff9900" +let s:gui0A = "ff0099" +let g:base16_gui0A = "ff0099" +let s:gui0B = "33ff00" +let g:base16_gui0B = "33ff00" +let s:gui0C = "00ffff" +let g:base16_gui0C = "00ffff" +let s:gui0D = "0066ff" +let g:base16_gui0D = "0066ff" +let s:gui0E = "cc00ff" +let g:base16_gui0E = "cc00ff" +let s:gui0F = "3300ff" +let g:base16_gui0F = "3300ff" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#00ffff" let g:terminal_color_7 = "#d0d0d0" let g:terminal_color_8 = "#808080" - let g:terminal_color_9 = "#ff9900" - let g:terminal_color_10 = "#404040" - let g:terminal_color_11 = "#606060" - let g:terminal_color_12 = "#c0c0c0" - let g:terminal_color_13 = "#e0e0e0" - let g:terminal_color_14 = "#3300ff" + let g:terminal_color_9 = "#ff0000" + let g:terminal_color_10 = "#33ff00" + let g:terminal_color_11 = "#ff0099" + let g:terminal_color_12 = "#0066ff" + let g:terminal_color_13 = "#cc00ff" + let g:terminal_color_14 = "#00ffff" let g:terminal_color_15 = "#ffffff" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-isotope" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-macintosh.vim b/colors/base16-macintosh.vim index 4ca8c63..1919214 100644 --- a/colors/base16-macintosh.vim +++ b/colors/base16-macintosh.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "000000" -let s:gui01 = "404040" -let s:gui02 = "404040" -let s:gui03 = "808080" -let s:gui04 = "808080" -let s:gui05 = "c0c0c0" -let s:gui06 = "c0c0c0" -let s:gui07 = "ffffff" -let s:gui08 = "dd0907" -let s:gui09 = "ff6403" -let s:gui0A = "fbf305" -let s:gui0B = "1fb714" -let s:gui0C = "02abea" -let s:gui0D = "0000d3" -let s:gui0E = "4700a5" -let s:gui0F = "90713a" +let s:gui00 = "000000" +let g:base16_gui00 = "000000" +let s:gui01 = "404040" +let g:base16_gui01 = "404040" +let s:gui02 = "404040" +let g:base16_gui02 = "404040" +let s:gui03 = "808080" +let g:base16_gui03 = "808080" +let s:gui04 = "808080" +let g:base16_gui04 = "808080" +let s:gui05 = "c0c0c0" +let g:base16_gui05 = "c0c0c0" +let s:gui06 = "c0c0c0" +let g:base16_gui06 = "c0c0c0" +let s:gui07 = "ffffff" +let g:base16_gui07 = "ffffff" +let s:gui08 = "dd0907" +let g:base16_gui08 = "dd0907" +let s:gui09 = "ff6403" +let g:base16_gui09 = "ff6403" +let s:gui0A = "fbf305" +let g:base16_gui0A = "fbf305" +let s:gui0B = "1fb714" +let g:base16_gui0B = "1fb714" +let s:gui0C = "02abea" +let g:base16_gui0C = "02abea" +let s:gui0D = "0000d3" +let g:base16_gui0D = "0000d3" +let s:gui0E = "4700a5" +let g:base16_gui0E = "4700a5" +let s:gui0F = "90713a" +let g:base16_gui0F = "90713a" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#02abea" let g:terminal_color_7 = "#c0c0c0" let g:terminal_color_8 = "#808080" - let g:terminal_color_9 = "#ff6403" - let g:terminal_color_10 = "#404040" - let g:terminal_color_11 = "#404040" - let g:terminal_color_12 = "#808080" - let g:terminal_color_13 = "#c0c0c0" - let g:terminal_color_14 = "#90713a" + let g:terminal_color_9 = "#dd0907" + let g:terminal_color_10 = "#1fb714" + let g:terminal_color_11 = "#fbf305" + let g:terminal_color_12 = "#0000d3" + let g:terminal_color_13 = "#4700a5" + let g:terminal_color_14 = "#02abea" let g:terminal_color_15 = "#ffffff" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-macintosh" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-marrakesh.vim b/colors/base16-marrakesh.vim index b6d988e..9068b6d 100644 --- a/colors/base16-marrakesh.vim +++ b/colors/base16-marrakesh.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "201602" -let s:gui01 = "302e00" -let s:gui02 = "5f5b17" -let s:gui03 = "6c6823" -let s:gui04 = "86813b" -let s:gui05 = "948e48" -let s:gui06 = "ccc37a" -let s:gui07 = "faf0a5" -let s:gui08 = "c35359" -let s:gui09 = "b36144" -let s:gui0A = "a88339" -let s:gui0B = "18974e" -let s:gui0C = "75a738" -let s:gui0D = "477ca1" -let s:gui0E = "8868b3" -let s:gui0F = "b3588e" +let s:gui00 = "201602" +let g:base16_gui00 = "201602" +let s:gui01 = "302e00" +let g:base16_gui01 = "302e00" +let s:gui02 = "5f5b17" +let g:base16_gui02 = "5f5b17" +let s:gui03 = "6c6823" +let g:base16_gui03 = "6c6823" +let s:gui04 = "86813b" +let g:base16_gui04 = "86813b" +let s:gui05 = "948e48" +let g:base16_gui05 = "948e48" +let s:gui06 = "ccc37a" +let g:base16_gui06 = "ccc37a" +let s:gui07 = "faf0a5" +let g:base16_gui07 = "faf0a5" +let s:gui08 = "c35359" +let g:base16_gui08 = "c35359" +let s:gui09 = "b36144" +let g:base16_gui09 = "b36144" +let s:gui0A = "a88339" +let g:base16_gui0A = "a88339" +let s:gui0B = "18974e" +let g:base16_gui0B = "18974e" +let s:gui0C = "75a738" +let g:base16_gui0C = "75a738" +let s:gui0D = "477ca1" +let g:base16_gui0D = "477ca1" +let s:gui0E = "8868b3" +let g:base16_gui0E = "8868b3" +let s:gui0F = "b3588e" +let g:base16_gui0F = "b3588e" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#75a738" let g:terminal_color_7 = "#948e48" let g:terminal_color_8 = "#6c6823" - let g:terminal_color_9 = "#b36144" - let g:terminal_color_10 = "#302e00" - let g:terminal_color_11 = "#5f5b17" - let g:terminal_color_12 = "#86813b" - let g:terminal_color_13 = "#ccc37a" - let g:terminal_color_14 = "#b3588e" + let g:terminal_color_9 = "#c35359" + let g:terminal_color_10 = "#18974e" + let g:terminal_color_11 = "#a88339" + let g:terminal_color_12 = "#477ca1" + let g:terminal_color_13 = "#8868b3" + let g:terminal_color_14 = "#75a738" let g:terminal_color_15 = "#faf0a5" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-marrakesh" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-materia.vim b/colors/base16-materia.vim index f3a45c3..89eb805 100644 --- a/colors/base16-materia.vim +++ b/colors/base16-materia.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "263238" -let s:gui01 = "2C393F" -let s:gui02 = "37474F" -let s:gui03 = "707880" -let s:gui04 = "C9CCD3" -let s:gui05 = "CDD3DE" -let s:gui06 = "D5DBE5" -let s:gui07 = "FFFFFF" -let s:gui08 = "EC5F67" -let s:gui09 = "EA9560" -let s:gui0A = "FFCC00" -let s:gui0B = "8BD649" -let s:gui0C = "80CBC4" -let s:gui0D = "89DDFF" -let s:gui0E = "82AAFF" -let s:gui0F = "EC5F67" +let s:gui00 = "263238" +let g:base16_gui00 = "263238" +let s:gui01 = "2C393F" +let g:base16_gui01 = "2C393F" +let s:gui02 = "37474F" +let g:base16_gui02 = "37474F" +let s:gui03 = "707880" +let g:base16_gui03 = "707880" +let s:gui04 = "C9CCD3" +let g:base16_gui04 = "C9CCD3" +let s:gui05 = "CDD3DE" +let g:base16_gui05 = "CDD3DE" +let s:gui06 = "D5DBE5" +let g:base16_gui06 = "D5DBE5" +let s:gui07 = "FFFFFF" +let g:base16_gui07 = "FFFFFF" +let s:gui08 = "EC5F67" +let g:base16_gui08 = "EC5F67" +let s:gui09 = "EA9560" +let g:base16_gui09 = "EA9560" +let s:gui0A = "FFCC00" +let g:base16_gui0A = "FFCC00" +let s:gui0B = "8BD649" +let g:base16_gui0B = "8BD649" +let s:gui0C = "80CBC4" +let g:base16_gui0C = "80CBC4" +let s:gui0D = "89DDFF" +let g:base16_gui0D = "89DDFF" +let s:gui0E = "82AAFF" +let g:base16_gui0E = "82AAFF" +let s:gui0F = "EC5F67" +let g:base16_gui0F = "EC5F67" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#80CBC4" let g:terminal_color_7 = "#CDD3DE" let g:terminal_color_8 = "#707880" - let g:terminal_color_9 = "#EA9560" - let g:terminal_color_10 = "#2C393F" - let g:terminal_color_11 = "#37474F" - let g:terminal_color_12 = "#C9CCD3" - let g:terminal_color_13 = "#D5DBE5" - let g:terminal_color_14 = "#EC5F67" + let g:terminal_color_9 = "#EC5F67" + let g:terminal_color_10 = "#8BD649" + let g:terminal_color_11 = "#FFCC00" + let g:terminal_color_12 = "#89DDFF" + let g:terminal_color_13 = "#82AAFF" + let g:terminal_color_14 = "#80CBC4" let g:terminal_color_15 = "#FFFFFF" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-materia" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-material-darker.vim b/colors/base16-material-darker.vim index 84e7453..e15b5b6 100644 --- a/colors/base16-material-darker.vim +++ b/colors/base16-material-darker.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "212121" -let s:gui01 = "303030" -let s:gui02 = "353535" -let s:gui03 = "4A4A4A" -let s:gui04 = "B2CCD6" -let s:gui05 = "EEFFFF" -let s:gui06 = "EEFFFF" -let s:gui07 = "FFFFFF" -let s:gui08 = "F07178" -let s:gui09 = "F78C6C" -let s:gui0A = "FFCB6B" -let s:gui0B = "C3E88D" -let s:gui0C = "89DDFF" -let s:gui0D = "82AAFF" -let s:gui0E = "C792EA" -let s:gui0F = "FF5370" +let s:gui00 = "212121" +let g:base16_gui00 = "212121" +let s:gui01 = "303030" +let g:base16_gui01 = "303030" +let s:gui02 = "353535" +let g:base16_gui02 = "353535" +let s:gui03 = "4A4A4A" +let g:base16_gui03 = "4A4A4A" +let s:gui04 = "B2CCD6" +let g:base16_gui04 = "B2CCD6" +let s:gui05 = "EEFFFF" +let g:base16_gui05 = "EEFFFF" +let s:gui06 = "EEFFFF" +let g:base16_gui06 = "EEFFFF" +let s:gui07 = "FFFFFF" +let g:base16_gui07 = "FFFFFF" +let s:gui08 = "F07178" +let g:base16_gui08 = "F07178" +let s:gui09 = "F78C6C" +let g:base16_gui09 = "F78C6C" +let s:gui0A = "FFCB6B" +let g:base16_gui0A = "FFCB6B" +let s:gui0B = "C3E88D" +let g:base16_gui0B = "C3E88D" +let s:gui0C = "89DDFF" +let g:base16_gui0C = "89DDFF" +let s:gui0D = "82AAFF" +let g:base16_gui0D = "82AAFF" +let s:gui0E = "C792EA" +let g:base16_gui0E = "C792EA" +let s:gui0F = "FF5370" +let g:base16_gui0F = "FF5370" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#89DDFF" let g:terminal_color_7 = "#EEFFFF" let g:terminal_color_8 = "#4A4A4A" - let g:terminal_color_9 = "#F78C6C" - let g:terminal_color_10 = "#303030" - let g:terminal_color_11 = "#353535" - let g:terminal_color_12 = "#B2CCD6" - let g:terminal_color_13 = "#EEFFFF" - let g:terminal_color_14 = "#FF5370" + let g:terminal_color_9 = "#F07178" + let g:terminal_color_10 = "#C3E88D" + let g:terminal_color_11 = "#FFCB6B" + let g:terminal_color_12 = "#82AAFF" + let g:terminal_color_13 = "#C792EA" + let g:terminal_color_14 = "#89DDFF" let g:terminal_color_15 = "#FFFFFF" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-material-darker" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-material-lighter.vim b/colors/base16-material-lighter.vim index 72e891f..5edbcf3 100644 --- a/colors/base16-material-lighter.vim +++ b/colors/base16-material-lighter.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "FAFAFA" -let s:gui01 = "E7EAEC" -let s:gui02 = "CCEAE7" -let s:gui03 = "CCD7DA" -let s:gui04 = "8796B0" -let s:gui05 = "80CBC4" -let s:gui06 = "80CBC4" -let s:gui07 = "FFFFFF" -let s:gui08 = "FF5370" -let s:gui09 = "F76D47" -let s:gui0A = "FFB62C" -let s:gui0B = "91B859" -let s:gui0C = "39ADB5" -let s:gui0D = "6182B8" -let s:gui0E = "7C4DFF" -let s:gui0F = "E53935" +let s:gui00 = "FAFAFA" +let g:base16_gui00 = "FAFAFA" +let s:gui01 = "E7EAEC" +let g:base16_gui01 = "E7EAEC" +let s:gui02 = "CCEAE7" +let g:base16_gui02 = "CCEAE7" +let s:gui03 = "CCD7DA" +let g:base16_gui03 = "CCD7DA" +let s:gui04 = "8796B0" +let g:base16_gui04 = "8796B0" +let s:gui05 = "80CBC4" +let g:base16_gui05 = "80CBC4" +let s:gui06 = "80CBC4" +let g:base16_gui06 = "80CBC4" +let s:gui07 = "FFFFFF" +let g:base16_gui07 = "FFFFFF" +let s:gui08 = "FF5370" +let g:base16_gui08 = "FF5370" +let s:gui09 = "F76D47" +let g:base16_gui09 = "F76D47" +let s:gui0A = "FFB62C" +let g:base16_gui0A = "FFB62C" +let s:gui0B = "91B859" +let g:base16_gui0B = "91B859" +let s:gui0C = "39ADB5" +let g:base16_gui0C = "39ADB5" +let s:gui0D = "6182B8" +let g:base16_gui0D = "6182B8" +let s:gui0E = "7C4DFF" +let g:base16_gui0E = "7C4DFF" +let s:gui0F = "E53935" +let g:base16_gui0F = "E53935" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#39ADB5" let g:terminal_color_7 = "#80CBC4" let g:terminal_color_8 = "#CCD7DA" - let g:terminal_color_9 = "#F76D47" - let g:terminal_color_10 = "#E7EAEC" - let g:terminal_color_11 = "#CCEAE7" - let g:terminal_color_12 = "#8796B0" - let g:terminal_color_13 = "#80CBC4" - let g:terminal_color_14 = "#E53935" + let g:terminal_color_9 = "#FF5370" + let g:terminal_color_10 = "#91B859" + let g:terminal_color_11 = "#FFB62C" + let g:terminal_color_12 = "#6182B8" + let g:terminal_color_13 = "#7C4DFF" + let g:terminal_color_14 = "#39ADB5" let g:terminal_color_15 = "#FFFFFF" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-material-lighter" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-material-palenight.vim b/colors/base16-material-palenight.vim index 9b56d3e..6104a87 100644 --- a/colors/base16-material-palenight.vim +++ b/colors/base16-material-palenight.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "292D3E" -let s:gui01 = "444267" -let s:gui02 = "32374D" -let s:gui03 = "676E95" -let s:gui04 = "8796B0" -let s:gui05 = "959DCB" -let s:gui06 = "959DCB" -let s:gui07 = "FFFFFF" -let s:gui08 = "F07178" -let s:gui09 = "F78C6C" -let s:gui0A = "FFCB6B" -let s:gui0B = "C3E88D" -let s:gui0C = "89DDFF" -let s:gui0D = "82AAFF" -let s:gui0E = "C792EA" -let s:gui0F = "FF5370" +let s:gui00 = "292D3E" +let g:base16_gui00 = "292D3E" +let s:gui01 = "444267" +let g:base16_gui01 = "444267" +let s:gui02 = "32374D" +let g:base16_gui02 = "32374D" +let s:gui03 = "676E95" +let g:base16_gui03 = "676E95" +let s:gui04 = "8796B0" +let g:base16_gui04 = "8796B0" +let s:gui05 = "959DCB" +let g:base16_gui05 = "959DCB" +let s:gui06 = "959DCB" +let g:base16_gui06 = "959DCB" +let s:gui07 = "FFFFFF" +let g:base16_gui07 = "FFFFFF" +let s:gui08 = "F07178" +let g:base16_gui08 = "F07178" +let s:gui09 = "F78C6C" +let g:base16_gui09 = "F78C6C" +let s:gui0A = "FFCB6B" +let g:base16_gui0A = "FFCB6B" +let s:gui0B = "C3E88D" +let g:base16_gui0B = "C3E88D" +let s:gui0C = "89DDFF" +let g:base16_gui0C = "89DDFF" +let s:gui0D = "82AAFF" +let g:base16_gui0D = "82AAFF" +let s:gui0E = "C792EA" +let g:base16_gui0E = "C792EA" +let s:gui0F = "FF5370" +let g:base16_gui0F = "FF5370" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#89DDFF" let g:terminal_color_7 = "#959DCB" let g:terminal_color_8 = "#676E95" - let g:terminal_color_9 = "#F78C6C" - let g:terminal_color_10 = "#444267" - let g:terminal_color_11 = "#32374D" - let g:terminal_color_12 = "#8796B0" - let g:terminal_color_13 = "#959DCB" - let g:terminal_color_14 = "#FF5370" + let g:terminal_color_9 = "#F07178" + let g:terminal_color_10 = "#C3E88D" + let g:terminal_color_11 = "#FFCB6B" + let g:terminal_color_12 = "#82AAFF" + let g:terminal_color_13 = "#C792EA" + let g:terminal_color_14 = "#89DDFF" let g:terminal_color_15 = "#FFFFFF" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-material-palenight" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-material.vim b/colors/base16-material.vim index 2adc90a..1e4e5ff 100644 --- a/colors/base16-material.vim +++ b/colors/base16-material.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "263238" -let s:gui01 = "2E3C43" -let s:gui02 = "314549" -let s:gui03 = "546E7A" -let s:gui04 = "B2CCD6" -let s:gui05 = "EEFFFF" -let s:gui06 = "EEFFFF" -let s:gui07 = "FFFFFF" -let s:gui08 = "F07178" -let s:gui09 = "F78C6C" -let s:gui0A = "FFCB6B" -let s:gui0B = "C3E88D" -let s:gui0C = "89DDFF" -let s:gui0D = "82AAFF" -let s:gui0E = "C792EA" -let s:gui0F = "FF5370" +let s:gui00 = "263238" +let g:base16_gui00 = "263238" +let s:gui01 = "2E3C43" +let g:base16_gui01 = "2E3C43" +let s:gui02 = "314549" +let g:base16_gui02 = "314549" +let s:gui03 = "546E7A" +let g:base16_gui03 = "546E7A" +let s:gui04 = "B2CCD6" +let g:base16_gui04 = "B2CCD6" +let s:gui05 = "EEFFFF" +let g:base16_gui05 = "EEFFFF" +let s:gui06 = "EEFFFF" +let g:base16_gui06 = "EEFFFF" +let s:gui07 = "FFFFFF" +let g:base16_gui07 = "FFFFFF" +let s:gui08 = "F07178" +let g:base16_gui08 = "F07178" +let s:gui09 = "F78C6C" +let g:base16_gui09 = "F78C6C" +let s:gui0A = "FFCB6B" +let g:base16_gui0A = "FFCB6B" +let s:gui0B = "C3E88D" +let g:base16_gui0B = "C3E88D" +let s:gui0C = "89DDFF" +let g:base16_gui0C = "89DDFF" +let s:gui0D = "82AAFF" +let g:base16_gui0D = "82AAFF" +let s:gui0E = "C792EA" +let g:base16_gui0E = "C792EA" +let s:gui0F = "FF5370" +let g:base16_gui0F = "FF5370" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#89DDFF" let g:terminal_color_7 = "#EEFFFF" let g:terminal_color_8 = "#546E7A" - let g:terminal_color_9 = "#F78C6C" - let g:terminal_color_10 = "#2E3C43" - let g:terminal_color_11 = "#314549" - let g:terminal_color_12 = "#B2CCD6" - let g:terminal_color_13 = "#EEFFFF" - let g:terminal_color_14 = "#FF5370" + let g:terminal_color_9 = "#F07178" + let g:terminal_color_10 = "#C3E88D" + let g:terminal_color_11 = "#FFCB6B" + let g:terminal_color_12 = "#82AAFF" + let g:terminal_color_13 = "#C792EA" + let g:terminal_color_14 = "#89DDFF" let g:terminal_color_15 = "#FFFFFF" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-material" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-mellow-purple.vim b/colors/base16-mellow-purple.vim index 9eecd2f..f03ed04 100644 --- a/colors/base16-mellow-purple.vim +++ b/colors/base16-mellow-purple.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "1e0528" -let s:gui01 = "1A092D" -let s:gui02 = "331354" -let s:gui03 = "320f55" -let s:gui04 = "873582" -let s:gui05 = "ffeeff" -let s:gui06 = "ffeeff" -let s:gui07 = "f8c0ff" -let s:gui08 = "00d9e9" -let s:gui09 = "aa00a3" -let s:gui0A = "955ae7" -let s:gui0B = "05cb0d" -let s:gui0C = "b900b1" -let s:gui0D = "550068" -let s:gui0E = "8991bb" -let s:gui0F = "4d6fff" +let s:gui00 = "1e0528" +let g:base16_gui00 = "1e0528" +let s:gui01 = "1A092D" +let g:base16_gui01 = "1A092D" +let s:gui02 = "331354" +let g:base16_gui02 = "331354" +let s:gui03 = "320f55" +let g:base16_gui03 = "320f55" +let s:gui04 = "873582" +let g:base16_gui04 = "873582" +let s:gui05 = "ffeeff" +let g:base16_gui05 = "ffeeff" +let s:gui06 = "ffeeff" +let g:base16_gui06 = "ffeeff" +let s:gui07 = "f8c0ff" +let g:base16_gui07 = "f8c0ff" +let s:gui08 = "00d9e9" +let g:base16_gui08 = "00d9e9" +let s:gui09 = "aa00a3" +let g:base16_gui09 = "aa00a3" +let s:gui0A = "955ae7" +let g:base16_gui0A = "955ae7" +let s:gui0B = "05cb0d" +let g:base16_gui0B = "05cb0d" +let s:gui0C = "b900b1" +let g:base16_gui0C = "b900b1" +let s:gui0D = "550068" +let g:base16_gui0D = "550068" +let s:gui0E = "8991bb" +let g:base16_gui0E = "8991bb" +let s:gui0F = "4d6fff" +let g:base16_gui0F = "4d6fff" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#b900b1" let g:terminal_color_7 = "#ffeeff" let g:terminal_color_8 = "#320f55" - let g:terminal_color_9 = "#aa00a3" - let g:terminal_color_10 = "#1A092D" - let g:terminal_color_11 = "#331354" - let g:terminal_color_12 = "#873582" - let g:terminal_color_13 = "#ffeeff" - let g:terminal_color_14 = "#4d6fff" + let g:terminal_color_9 = "#00d9e9" + let g:terminal_color_10 = "#05cb0d" + let g:terminal_color_11 = "#955ae7" + let g:terminal_color_12 = "#550068" + let g:terminal_color_13 = "#8991bb" + let g:terminal_color_14 = "#b900b1" let g:terminal_color_15 = "#f8c0ff" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-mellow-purple" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-mexico-light.vim b/colors/base16-mexico-light.vim index f4aa66a..a7278cb 100644 --- a/colors/base16-mexico-light.vim +++ b/colors/base16-mexico-light.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "f8f8f8" -let s:gui01 = "e8e8e8" -let s:gui02 = "d8d8d8" -let s:gui03 = "b8b8b8" -let s:gui04 = "585858" -let s:gui05 = "383838" -let s:gui06 = "282828" -let s:gui07 = "181818" -let s:gui08 = "ab4642" -let s:gui09 = "dc9656" -let s:gui0A = "f79a0e" -let s:gui0B = "538947" -let s:gui0C = "4b8093" -let s:gui0D = "7cafc2" -let s:gui0E = "96609e" -let s:gui0F = "a16946" +let s:gui00 = "f8f8f8" +let g:base16_gui00 = "f8f8f8" +let s:gui01 = "e8e8e8" +let g:base16_gui01 = "e8e8e8" +let s:gui02 = "d8d8d8" +let g:base16_gui02 = "d8d8d8" +let s:gui03 = "b8b8b8" +let g:base16_gui03 = "b8b8b8" +let s:gui04 = "585858" +let g:base16_gui04 = "585858" +let s:gui05 = "383838" +let g:base16_gui05 = "383838" +let s:gui06 = "282828" +let g:base16_gui06 = "282828" +let s:gui07 = "181818" +let g:base16_gui07 = "181818" +let s:gui08 = "ab4642" +let g:base16_gui08 = "ab4642" +let s:gui09 = "dc9656" +let g:base16_gui09 = "dc9656" +let s:gui0A = "f79a0e" +let g:base16_gui0A = "f79a0e" +let s:gui0B = "538947" +let g:base16_gui0B = "538947" +let s:gui0C = "4b8093" +let g:base16_gui0C = "4b8093" +let s:gui0D = "7cafc2" +let g:base16_gui0D = "7cafc2" +let s:gui0E = "96609e" +let g:base16_gui0E = "96609e" +let s:gui0F = "a16946" +let g:base16_gui0F = "a16946" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#4b8093" let g:terminal_color_7 = "#383838" let g:terminal_color_8 = "#b8b8b8" - let g:terminal_color_9 = "#dc9656" - let g:terminal_color_10 = "#e8e8e8" - let g:terminal_color_11 = "#d8d8d8" - let g:terminal_color_12 = "#585858" - let g:terminal_color_13 = "#282828" - let g:terminal_color_14 = "#a16946" + let g:terminal_color_9 = "#ab4642" + let g:terminal_color_10 = "#538947" + let g:terminal_color_11 = "#f79a0e" + let g:terminal_color_12 = "#7cafc2" + let g:terminal_color_13 = "#96609e" + let g:terminal_color_14 = "#4b8093" let g:terminal_color_15 = "#181818" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-mexico-light" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-mocha.vim b/colors/base16-mocha.vim index 5232dd4..cb72071 100644 --- a/colors/base16-mocha.vim +++ b/colors/base16-mocha.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "3B3228" -let s:gui01 = "534636" -let s:gui02 = "645240" -let s:gui03 = "7e705a" -let s:gui04 = "b8afad" -let s:gui05 = "d0c8c6" -let s:gui06 = "e9e1dd" -let s:gui07 = "f5eeeb" -let s:gui08 = "cb6077" -let s:gui09 = "d28b71" -let s:gui0A = "f4bc87" -let s:gui0B = "beb55b" -let s:gui0C = "7bbda4" -let s:gui0D = "8ab3b5" -let s:gui0E = "a89bb9" -let s:gui0F = "bb9584" +let s:gui00 = "3B3228" +let g:base16_gui00 = "3B3228" +let s:gui01 = "534636" +let g:base16_gui01 = "534636" +let s:gui02 = "645240" +let g:base16_gui02 = "645240" +let s:gui03 = "7e705a" +let g:base16_gui03 = "7e705a" +let s:gui04 = "b8afad" +let g:base16_gui04 = "b8afad" +let s:gui05 = "d0c8c6" +let g:base16_gui05 = "d0c8c6" +let s:gui06 = "e9e1dd" +let g:base16_gui06 = "e9e1dd" +let s:gui07 = "f5eeeb" +let g:base16_gui07 = "f5eeeb" +let s:gui08 = "cb6077" +let g:base16_gui08 = "cb6077" +let s:gui09 = "d28b71" +let g:base16_gui09 = "d28b71" +let s:gui0A = "f4bc87" +let g:base16_gui0A = "f4bc87" +let s:gui0B = "beb55b" +let g:base16_gui0B = "beb55b" +let s:gui0C = "7bbda4" +let g:base16_gui0C = "7bbda4" +let s:gui0D = "8ab3b5" +let g:base16_gui0D = "8ab3b5" +let s:gui0E = "a89bb9" +let g:base16_gui0E = "a89bb9" +let s:gui0F = "bb9584" +let g:base16_gui0F = "bb9584" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#7bbda4" let g:terminal_color_7 = "#d0c8c6" let g:terminal_color_8 = "#7e705a" - let g:terminal_color_9 = "#d28b71" - let g:terminal_color_10 = "#534636" - let g:terminal_color_11 = "#645240" - let g:terminal_color_12 = "#b8afad" - let g:terminal_color_13 = "#e9e1dd" - let g:terminal_color_14 = "#bb9584" + let g:terminal_color_9 = "#cb6077" + let g:terminal_color_10 = "#beb55b" + let g:terminal_color_11 = "#f4bc87" + let g:terminal_color_12 = "#8ab3b5" + let g:terminal_color_13 = "#a89bb9" + let g:terminal_color_14 = "#7bbda4" let g:terminal_color_15 = "#f5eeeb" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-mocha" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-monokai.vim b/colors/base16-monokai.vim index e961b3e..5ce25b5 100644 --- a/colors/base16-monokai.vim +++ b/colors/base16-monokai.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "272822" -let s:gui01 = "383830" -let s:gui02 = "49483e" -let s:gui03 = "75715e" -let s:gui04 = "a59f85" -let s:gui05 = "f8f8f2" -let s:gui06 = "f5f4f1" -let s:gui07 = "f9f8f5" -let s:gui08 = "f92672" -let s:gui09 = "fd971f" -let s:gui0A = "f4bf75" -let s:gui0B = "a6e22e" -let s:gui0C = "a1efe4" -let s:gui0D = "66d9ef" -let s:gui0E = "ae81ff" -let s:gui0F = "cc6633" +let s:gui00 = "272822" +let g:base16_gui00 = "272822" +let s:gui01 = "383830" +let g:base16_gui01 = "383830" +let s:gui02 = "49483e" +let g:base16_gui02 = "49483e" +let s:gui03 = "75715e" +let g:base16_gui03 = "75715e" +let s:gui04 = "a59f85" +let g:base16_gui04 = "a59f85" +let s:gui05 = "f8f8f2" +let g:base16_gui05 = "f8f8f2" +let s:gui06 = "f5f4f1" +let g:base16_gui06 = "f5f4f1" +let s:gui07 = "f9f8f5" +let g:base16_gui07 = "f9f8f5" +let s:gui08 = "f92672" +let g:base16_gui08 = "f92672" +let s:gui09 = "fd971f" +let g:base16_gui09 = "fd971f" +let s:gui0A = "f4bf75" +let g:base16_gui0A = "f4bf75" +let s:gui0B = "a6e22e" +let g:base16_gui0B = "a6e22e" +let s:gui0C = "a1efe4" +let g:base16_gui0C = "a1efe4" +let s:gui0D = "66d9ef" +let g:base16_gui0D = "66d9ef" +let s:gui0E = "ae81ff" +let g:base16_gui0E = "ae81ff" +let s:gui0F = "cc6633" +let g:base16_gui0F = "cc6633" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#a1efe4" let g:terminal_color_7 = "#f8f8f2" let g:terminal_color_8 = "#75715e" - let g:terminal_color_9 = "#fd971f" - let g:terminal_color_10 = "#383830" - let g:terminal_color_11 = "#49483e" - let g:terminal_color_12 = "#a59f85" - let g:terminal_color_13 = "#f5f4f1" - let g:terminal_color_14 = "#cc6633" + let g:terminal_color_9 = "#f92672" + let g:terminal_color_10 = "#a6e22e" + let g:terminal_color_11 = "#f4bf75" + let g:terminal_color_12 = "#66d9ef" + let g:terminal_color_13 = "#ae81ff" + let g:terminal_color_14 = "#a1efe4" let g:terminal_color_15 = "#f9f8f5" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-monokai" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-nord.vim b/colors/base16-nord.vim index 09eab83..0f3ca1c 100644 --- a/colors/base16-nord.vim +++ b/colors/base16-nord.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "2E3440" -let s:gui01 = "3B4252" -let s:gui02 = "434C5E" -let s:gui03 = "4C566A" -let s:gui04 = "D8DEE9" -let s:gui05 = "E5E9F0" -let s:gui06 = "ECEFF4" -let s:gui07 = "8FBCBB" -let s:gui08 = "88C0D0" -let s:gui09 = "81A1C1" -let s:gui0A = "5E81AC" -let s:gui0B = "BF616A" -let s:gui0C = "D08770" -let s:gui0D = "EBCB8B" -let s:gui0E = "A3BE8C" -let s:gui0F = "B48EAD" +let s:gui00 = "2E3440" +let g:base16_gui00 = "2E3440" +let s:gui01 = "3B4252" +let g:base16_gui01 = "3B4252" +let s:gui02 = "434C5E" +let g:base16_gui02 = "434C5E" +let s:gui03 = "4C566A" +let g:base16_gui03 = "4C566A" +let s:gui04 = "D8DEE9" +let g:base16_gui04 = "D8DEE9" +let s:gui05 = "E5E9F0" +let g:base16_gui05 = "E5E9F0" +let s:gui06 = "ECEFF4" +let g:base16_gui06 = "ECEFF4" +let s:gui07 = "8FBCBB" +let g:base16_gui07 = "8FBCBB" +let s:gui08 = "88C0D0" +let g:base16_gui08 = "88C0D0" +let s:gui09 = "81A1C1" +let g:base16_gui09 = "81A1C1" +let s:gui0A = "5E81AC" +let g:base16_gui0A = "5E81AC" +let s:gui0B = "BF616A" +let g:base16_gui0B = "BF616A" +let s:gui0C = "D08770" +let g:base16_gui0C = "D08770" +let s:gui0D = "EBCB8B" +let g:base16_gui0D = "EBCB8B" +let s:gui0E = "A3BE8C" +let g:base16_gui0E = "A3BE8C" +let s:gui0F = "B48EAD" +let g:base16_gui0F = "B48EAD" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#D08770" let g:terminal_color_7 = "#E5E9F0" let g:terminal_color_8 = "#4C566A" - let g:terminal_color_9 = "#81A1C1" - let g:terminal_color_10 = "#3B4252" - let g:terminal_color_11 = "#434C5E" - let g:terminal_color_12 = "#D8DEE9" - let g:terminal_color_13 = "#ECEFF4" - let g:terminal_color_14 = "#B48EAD" + let g:terminal_color_9 = "#88C0D0" + let g:terminal_color_10 = "#BF616A" + let g:terminal_color_11 = "#5E81AC" + let g:terminal_color_12 = "#EBCB8B" + let g:terminal_color_13 = "#A3BE8C" + let g:terminal_color_14 = "#D08770" let g:terminal_color_15 = "#8FBCBB" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-nord" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-ocean.vim b/colors/base16-ocean.vim index e1676d9..310ec2d 100644 --- a/colors/base16-ocean.vim +++ b/colors/base16-ocean.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "2b303b" -let s:gui01 = "343d46" -let s:gui02 = "4f5b66" -let s:gui03 = "65737e" -let s:gui04 = "a7adba" -let s:gui05 = "c0c5ce" -let s:gui06 = "dfe1e8" -let s:gui07 = "eff1f5" -let s:gui08 = "bf616a" -let s:gui09 = "d08770" -let s:gui0A = "ebcb8b" -let s:gui0B = "a3be8c" -let s:gui0C = "96b5b4" -let s:gui0D = "8fa1b3" -let s:gui0E = "b48ead" -let s:gui0F = "ab7967" +let s:gui00 = "2b303b" +let g:base16_gui00 = "2b303b" +let s:gui01 = "343d46" +let g:base16_gui01 = "343d46" +let s:gui02 = "4f5b66" +let g:base16_gui02 = "4f5b66" +let s:gui03 = "65737e" +let g:base16_gui03 = "65737e" +let s:gui04 = "a7adba" +let g:base16_gui04 = "a7adba" +let s:gui05 = "c0c5ce" +let g:base16_gui05 = "c0c5ce" +let s:gui06 = "dfe1e8" +let g:base16_gui06 = "dfe1e8" +let s:gui07 = "eff1f5" +let g:base16_gui07 = "eff1f5" +let s:gui08 = "bf616a" +let g:base16_gui08 = "bf616a" +let s:gui09 = "d08770" +let g:base16_gui09 = "d08770" +let s:gui0A = "ebcb8b" +let g:base16_gui0A = "ebcb8b" +let s:gui0B = "a3be8c" +let g:base16_gui0B = "a3be8c" +let s:gui0C = "96b5b4" +let g:base16_gui0C = "96b5b4" +let s:gui0D = "8fa1b3" +let g:base16_gui0D = "8fa1b3" +let s:gui0E = "b48ead" +let g:base16_gui0E = "b48ead" +let s:gui0F = "ab7967" +let g:base16_gui0F = "ab7967" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#96b5b4" let g:terminal_color_7 = "#c0c5ce" let g:terminal_color_8 = "#65737e" - let g:terminal_color_9 = "#d08770" - let g:terminal_color_10 = "#343d46" - let g:terminal_color_11 = "#4f5b66" - let g:terminal_color_12 = "#a7adba" - let g:terminal_color_13 = "#dfe1e8" - let g:terminal_color_14 = "#ab7967" + let g:terminal_color_9 = "#bf616a" + let g:terminal_color_10 = "#a3be8c" + let g:terminal_color_11 = "#ebcb8b" + let g:terminal_color_12 = "#8fa1b3" + let g:terminal_color_13 = "#b48ead" + let g:terminal_color_14 = "#96b5b4" let g:terminal_color_15 = "#eff1f5" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-ocean" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-oceanicnext.vim b/colors/base16-oceanicnext.vim index 13d2163..04c92a6 100644 --- a/colors/base16-oceanicnext.vim +++ b/colors/base16-oceanicnext.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "1B2B34" -let s:gui01 = "343D46" -let s:gui02 = "4F5B66" -let s:gui03 = "65737E" -let s:gui04 = "A7ADBA" -let s:gui05 = "C0C5CE" -let s:gui06 = "CDD3DE" -let s:gui07 = "D8DEE9" -let s:gui08 = "EC5f67" -let s:gui09 = "F99157" -let s:gui0A = "FAC863" -let s:gui0B = "99C794" -let s:gui0C = "5FB3B3" -let s:gui0D = "6699CC" -let s:gui0E = "C594C5" -let s:gui0F = "AB7967" +let s:gui00 = "1B2B34" +let g:base16_gui00 = "1B2B34" +let s:gui01 = "343D46" +let g:base16_gui01 = "343D46" +let s:gui02 = "4F5B66" +let g:base16_gui02 = "4F5B66" +let s:gui03 = "65737E" +let g:base16_gui03 = "65737E" +let s:gui04 = "A7ADBA" +let g:base16_gui04 = "A7ADBA" +let s:gui05 = "C0C5CE" +let g:base16_gui05 = "C0C5CE" +let s:gui06 = "CDD3DE" +let g:base16_gui06 = "CDD3DE" +let s:gui07 = "D8DEE9" +let g:base16_gui07 = "D8DEE9" +let s:gui08 = "EC5f67" +let g:base16_gui08 = "EC5f67" +let s:gui09 = "F99157" +let g:base16_gui09 = "F99157" +let s:gui0A = "FAC863" +let g:base16_gui0A = "FAC863" +let s:gui0B = "99C794" +let g:base16_gui0B = "99C794" +let s:gui0C = "5FB3B3" +let g:base16_gui0C = "5FB3B3" +let s:gui0D = "6699CC" +let g:base16_gui0D = "6699CC" +let s:gui0E = "C594C5" +let g:base16_gui0E = "C594C5" +let s:gui0F = "AB7967" +let g:base16_gui0F = "AB7967" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#5FB3B3" let g:terminal_color_7 = "#C0C5CE" let g:terminal_color_8 = "#65737E" - let g:terminal_color_9 = "#F99157" - let g:terminal_color_10 = "#343D46" - let g:terminal_color_11 = "#4F5B66" - let g:terminal_color_12 = "#A7ADBA" - let g:terminal_color_13 = "#CDD3DE" - let g:terminal_color_14 = "#AB7967" + let g:terminal_color_9 = "#EC5f67" + let g:terminal_color_10 = "#99C794" + let g:terminal_color_11 = "#FAC863" + let g:terminal_color_12 = "#6699CC" + let g:terminal_color_13 = "#C594C5" + let g:terminal_color_14 = "#5FB3B3" let g:terminal_color_15 = "#D8DEE9" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-oceanicnext" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-one-light.vim b/colors/base16-one-light.vim index d9a5abd..99f2403 100644 --- a/colors/base16-one-light.vim +++ b/colors/base16-one-light.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "fafafa" -let s:gui01 = "f0f0f1" -let s:gui02 = "e5e5e6" -let s:gui03 = "a0a1a7" -let s:gui04 = "696c77" -let s:gui05 = "383a42" -let s:gui06 = "202227" -let s:gui07 = "090a0b" -let s:gui08 = "ca1243" -let s:gui09 = "d75f00" -let s:gui0A = "c18401" -let s:gui0B = "50a14f" -let s:gui0C = "0184bc" -let s:gui0D = "4078f2" -let s:gui0E = "a626a4" -let s:gui0F = "986801" +let s:gui00 = "fafafa" +let g:base16_gui00 = "fafafa" +let s:gui01 = "f0f0f1" +let g:base16_gui01 = "f0f0f1" +let s:gui02 = "e5e5e6" +let g:base16_gui02 = "e5e5e6" +let s:gui03 = "a0a1a7" +let g:base16_gui03 = "a0a1a7" +let s:gui04 = "696c77" +let g:base16_gui04 = "696c77" +let s:gui05 = "383a42" +let g:base16_gui05 = "383a42" +let s:gui06 = "202227" +let g:base16_gui06 = "202227" +let s:gui07 = "090a0b" +let g:base16_gui07 = "090a0b" +let s:gui08 = "ca1243" +let g:base16_gui08 = "ca1243" +let s:gui09 = "d75f00" +let g:base16_gui09 = "d75f00" +let s:gui0A = "c18401" +let g:base16_gui0A = "c18401" +let s:gui0B = "50a14f" +let g:base16_gui0B = "50a14f" +let s:gui0C = "0184bc" +let g:base16_gui0C = "0184bc" +let s:gui0D = "4078f2" +let g:base16_gui0D = "4078f2" +let s:gui0E = "a626a4" +let g:base16_gui0E = "a626a4" +let s:gui0F = "986801" +let g:base16_gui0F = "986801" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#0184bc" let g:terminal_color_7 = "#383a42" let g:terminal_color_8 = "#a0a1a7" - let g:terminal_color_9 = "#d75f00" - let g:terminal_color_10 = "#f0f0f1" - let g:terminal_color_11 = "#e5e5e6" - let g:terminal_color_12 = "#696c77" - let g:terminal_color_13 = "#202227" - let g:terminal_color_14 = "#986801" + let g:terminal_color_9 = "#ca1243" + let g:terminal_color_10 = "#50a14f" + let g:terminal_color_11 = "#c18401" + let g:terminal_color_12 = "#4078f2" + let g:terminal_color_13 = "#a626a4" + let g:terminal_color_14 = "#0184bc" let g:terminal_color_15 = "#090a0b" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-one-light" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-onedark.vim b/colors/base16-onedark.vim index ad7c7b8..83eb050 100644 --- a/colors/base16-onedark.vim +++ b/colors/base16-onedark.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "282c34" -let s:gui01 = "353b45" -let s:gui02 = "3e4451" -let s:gui03 = "545862" -let s:gui04 = "565c64" -let s:gui05 = "abb2bf" -let s:gui06 = "b6bdca" -let s:gui07 = "c8ccd4" -let s:gui08 = "e06c75" -let s:gui09 = "d19a66" -let s:gui0A = "e5c07b" -let s:gui0B = "98c379" -let s:gui0C = "56b6c2" -let s:gui0D = "61afef" -let s:gui0E = "c678dd" -let s:gui0F = "be5046" +let s:gui00 = "282c34" +let g:base16_gui00 = "282c34" +let s:gui01 = "353b45" +let g:base16_gui01 = "353b45" +let s:gui02 = "3e4451" +let g:base16_gui02 = "3e4451" +let s:gui03 = "545862" +let g:base16_gui03 = "545862" +let s:gui04 = "565c64" +let g:base16_gui04 = "565c64" +let s:gui05 = "abb2bf" +let g:base16_gui05 = "abb2bf" +let s:gui06 = "b6bdca" +let g:base16_gui06 = "b6bdca" +let s:gui07 = "c8ccd4" +let g:base16_gui07 = "c8ccd4" +let s:gui08 = "e06c75" +let g:base16_gui08 = "e06c75" +let s:gui09 = "d19a66" +let g:base16_gui09 = "d19a66" +let s:gui0A = "e5c07b" +let g:base16_gui0A = "e5c07b" +let s:gui0B = "98c379" +let g:base16_gui0B = "98c379" +let s:gui0C = "56b6c2" +let g:base16_gui0C = "56b6c2" +let s:gui0D = "61afef" +let g:base16_gui0D = "61afef" +let s:gui0E = "c678dd" +let g:base16_gui0E = "c678dd" +let s:gui0F = "be5046" +let g:base16_gui0F = "be5046" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#56b6c2" let g:terminal_color_7 = "#abb2bf" let g:terminal_color_8 = "#545862" - let g:terminal_color_9 = "#d19a66" - let g:terminal_color_10 = "#353b45" - let g:terminal_color_11 = "#3e4451" - let g:terminal_color_12 = "#565c64" - let g:terminal_color_13 = "#b6bdca" - let g:terminal_color_14 = "#be5046" + let g:terminal_color_9 = "#e06c75" + let g:terminal_color_10 = "#98c379" + let g:terminal_color_11 = "#e5c07b" + let g:terminal_color_12 = "#61afef" + let g:terminal_color_13 = "#c678dd" + let g:terminal_color_14 = "#56b6c2" let g:terminal_color_15 = "#c8ccd4" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-onedark" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-paraiso.vim b/colors/base16-paraiso.vim index 6816e5e..6631db1 100644 --- a/colors/base16-paraiso.vim +++ b/colors/base16-paraiso.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "2f1e2e" -let s:gui01 = "41323f" -let s:gui02 = "4f424c" -let s:gui03 = "776e71" -let s:gui04 = "8d8687" -let s:gui05 = "a39e9b" -let s:gui06 = "b9b6b0" -let s:gui07 = "e7e9db" -let s:gui08 = "ef6155" -let s:gui09 = "f99b15" -let s:gui0A = "fec418" -let s:gui0B = "48b685" -let s:gui0C = "5bc4bf" -let s:gui0D = "06b6ef" -let s:gui0E = "815ba4" -let s:gui0F = "e96ba8" +let s:gui00 = "2f1e2e" +let g:base16_gui00 = "2f1e2e" +let s:gui01 = "41323f" +let g:base16_gui01 = "41323f" +let s:gui02 = "4f424c" +let g:base16_gui02 = "4f424c" +let s:gui03 = "776e71" +let g:base16_gui03 = "776e71" +let s:gui04 = "8d8687" +let g:base16_gui04 = "8d8687" +let s:gui05 = "a39e9b" +let g:base16_gui05 = "a39e9b" +let s:gui06 = "b9b6b0" +let g:base16_gui06 = "b9b6b0" +let s:gui07 = "e7e9db" +let g:base16_gui07 = "e7e9db" +let s:gui08 = "ef6155" +let g:base16_gui08 = "ef6155" +let s:gui09 = "f99b15" +let g:base16_gui09 = "f99b15" +let s:gui0A = "fec418" +let g:base16_gui0A = "fec418" +let s:gui0B = "48b685" +let g:base16_gui0B = "48b685" +let s:gui0C = "5bc4bf" +let g:base16_gui0C = "5bc4bf" +let s:gui0D = "06b6ef" +let g:base16_gui0D = "06b6ef" +let s:gui0E = "815ba4" +let g:base16_gui0E = "815ba4" +let s:gui0F = "e96ba8" +let g:base16_gui0F = "e96ba8" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#5bc4bf" let g:terminal_color_7 = "#a39e9b" let g:terminal_color_8 = "#776e71" - let g:terminal_color_9 = "#f99b15" - let g:terminal_color_10 = "#41323f" - let g:terminal_color_11 = "#4f424c" - let g:terminal_color_12 = "#8d8687" - let g:terminal_color_13 = "#b9b6b0" - let g:terminal_color_14 = "#e96ba8" + let g:terminal_color_9 = "#ef6155" + let g:terminal_color_10 = "#48b685" + let g:terminal_color_11 = "#fec418" + let g:terminal_color_12 = "#06b6ef" + let g:terminal_color_13 = "#815ba4" + let g:terminal_color_14 = "#5bc4bf" let g:terminal_color_15 = "#e7e9db" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-paraiso" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-phd.vim b/colors/base16-phd.vim index 7178692..f2e6a30 100644 --- a/colors/base16-phd.vim +++ b/colors/base16-phd.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "061229" -let s:gui01 = "2a3448" -let s:gui02 = "4d5666" -let s:gui03 = "717885" -let s:gui04 = "9a99a3" -let s:gui05 = "b8bbc2" -let s:gui06 = "dbdde0" -let s:gui07 = "ffffff" -let s:gui08 = "d07346" -let s:gui09 = "f0a000" -let s:gui0A = "fbd461" -let s:gui0B = "99bf52" -let s:gui0C = "72b9bf" -let s:gui0D = "5299bf" -let s:gui0E = "9989cc" -let s:gui0F = "b08060" +let s:gui00 = "061229" +let g:base16_gui00 = "061229" +let s:gui01 = "2a3448" +let g:base16_gui01 = "2a3448" +let s:gui02 = "4d5666" +let g:base16_gui02 = "4d5666" +let s:gui03 = "717885" +let g:base16_gui03 = "717885" +let s:gui04 = "9a99a3" +let g:base16_gui04 = "9a99a3" +let s:gui05 = "b8bbc2" +let g:base16_gui05 = "b8bbc2" +let s:gui06 = "dbdde0" +let g:base16_gui06 = "dbdde0" +let s:gui07 = "ffffff" +let g:base16_gui07 = "ffffff" +let s:gui08 = "d07346" +let g:base16_gui08 = "d07346" +let s:gui09 = "f0a000" +let g:base16_gui09 = "f0a000" +let s:gui0A = "fbd461" +let g:base16_gui0A = "fbd461" +let s:gui0B = "99bf52" +let g:base16_gui0B = "99bf52" +let s:gui0C = "72b9bf" +let g:base16_gui0C = "72b9bf" +let s:gui0D = "5299bf" +let g:base16_gui0D = "5299bf" +let s:gui0E = "9989cc" +let g:base16_gui0E = "9989cc" +let s:gui0F = "b08060" +let g:base16_gui0F = "b08060" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#72b9bf" let g:terminal_color_7 = "#b8bbc2" let g:terminal_color_8 = "#717885" - let g:terminal_color_9 = "#f0a000" - let g:terminal_color_10 = "#2a3448" - let g:terminal_color_11 = "#4d5666" - let g:terminal_color_12 = "#9a99a3" - let g:terminal_color_13 = "#dbdde0" - let g:terminal_color_14 = "#b08060" + let g:terminal_color_9 = "#d07346" + let g:terminal_color_10 = "#99bf52" + let g:terminal_color_11 = "#fbd461" + let g:terminal_color_12 = "#5299bf" + let g:terminal_color_13 = "#9989cc" + let g:terminal_color_14 = "#72b9bf" let g:terminal_color_15 = "#ffffff" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-phd" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-pico.vim b/colors/base16-pico.vim index 96a32b5..5f20e1b 100644 --- a/colors/base16-pico.vim +++ b/colors/base16-pico.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "000000" -let s:gui01 = "1d2b53" -let s:gui02 = "7e2553" -let s:gui03 = "008751" -let s:gui04 = "ab5236" -let s:gui05 = "5f574f" -let s:gui06 = "c2c3c7" -let s:gui07 = "fff1e8" -let s:gui08 = "ff004d" -let s:gui09 = "ffa300" -let s:gui0A = "fff024" -let s:gui0B = "00e756" -let s:gui0C = "29adff" -let s:gui0D = "83769c" -let s:gui0E = "ff77a8" -let s:gui0F = "ffccaa" +let s:gui00 = "000000" +let g:base16_gui00 = "000000" +let s:gui01 = "1d2b53" +let g:base16_gui01 = "1d2b53" +let s:gui02 = "7e2553" +let g:base16_gui02 = "7e2553" +let s:gui03 = "008751" +let g:base16_gui03 = "008751" +let s:gui04 = "ab5236" +let g:base16_gui04 = "ab5236" +let s:gui05 = "5f574f" +let g:base16_gui05 = "5f574f" +let s:gui06 = "c2c3c7" +let g:base16_gui06 = "c2c3c7" +let s:gui07 = "fff1e8" +let g:base16_gui07 = "fff1e8" +let s:gui08 = "ff004d" +let g:base16_gui08 = "ff004d" +let s:gui09 = "ffa300" +let g:base16_gui09 = "ffa300" +let s:gui0A = "fff024" +let g:base16_gui0A = "fff024" +let s:gui0B = "00e756" +let g:base16_gui0B = "00e756" +let s:gui0C = "29adff" +let g:base16_gui0C = "29adff" +let s:gui0D = "83769c" +let g:base16_gui0D = "83769c" +let s:gui0E = "ff77a8" +let g:base16_gui0E = "ff77a8" +let s:gui0F = "ffccaa" +let g:base16_gui0F = "ffccaa" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#29adff" let g:terminal_color_7 = "#5f574f" let g:terminal_color_8 = "#008751" - let g:terminal_color_9 = "#ffa300" - let g:terminal_color_10 = "#1d2b53" - let g:terminal_color_11 = "#7e2553" - let g:terminal_color_12 = "#ab5236" - let g:terminal_color_13 = "#c2c3c7" - let g:terminal_color_14 = "#ffccaa" + let g:terminal_color_9 = "#ff004d" + let g:terminal_color_10 = "#00e756" + let g:terminal_color_11 = "#fff024" + let g:terminal_color_12 = "#83769c" + let g:terminal_color_13 = "#ff77a8" + let g:terminal_color_14 = "#29adff" let g:terminal_color_15 = "#fff1e8" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-pico" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-pop.vim b/colors/base16-pop.vim index 75bef85..9d41517 100644 --- a/colors/base16-pop.vim +++ b/colors/base16-pop.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "000000" -let s:gui01 = "202020" -let s:gui02 = "303030" -let s:gui03 = "505050" -let s:gui04 = "b0b0b0" -let s:gui05 = "d0d0d0" -let s:gui06 = "e0e0e0" -let s:gui07 = "ffffff" -let s:gui08 = "eb008a" -let s:gui09 = "f29333" -let s:gui0A = "f8ca12" -let s:gui0B = "37b349" -let s:gui0C = "00aabb" -let s:gui0D = "0e5a94" -let s:gui0E = "b31e8d" -let s:gui0F = "7a2d00" +let s:gui00 = "000000" +let g:base16_gui00 = "000000" +let s:gui01 = "202020" +let g:base16_gui01 = "202020" +let s:gui02 = "303030" +let g:base16_gui02 = "303030" +let s:gui03 = "505050" +let g:base16_gui03 = "505050" +let s:gui04 = "b0b0b0" +let g:base16_gui04 = "b0b0b0" +let s:gui05 = "d0d0d0" +let g:base16_gui05 = "d0d0d0" +let s:gui06 = "e0e0e0" +let g:base16_gui06 = "e0e0e0" +let s:gui07 = "ffffff" +let g:base16_gui07 = "ffffff" +let s:gui08 = "eb008a" +let g:base16_gui08 = "eb008a" +let s:gui09 = "f29333" +let g:base16_gui09 = "f29333" +let s:gui0A = "f8ca12" +let g:base16_gui0A = "f8ca12" +let s:gui0B = "37b349" +let g:base16_gui0B = "37b349" +let s:gui0C = "00aabb" +let g:base16_gui0C = "00aabb" +let s:gui0D = "0e5a94" +let g:base16_gui0D = "0e5a94" +let s:gui0E = "b31e8d" +let g:base16_gui0E = "b31e8d" +let s:gui0F = "7a2d00" +let g:base16_gui0F = "7a2d00" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#00aabb" let g:terminal_color_7 = "#d0d0d0" let g:terminal_color_8 = "#505050" - let g:terminal_color_9 = "#f29333" - let g:terminal_color_10 = "#202020" - let g:terminal_color_11 = "#303030" - let g:terminal_color_12 = "#b0b0b0" - let g:terminal_color_13 = "#e0e0e0" - let g:terminal_color_14 = "#7a2d00" + let g:terminal_color_9 = "#eb008a" + let g:terminal_color_10 = "#37b349" + let g:terminal_color_11 = "#f8ca12" + let g:terminal_color_12 = "#0e5a94" + let g:terminal_color_13 = "#b31e8d" + let g:terminal_color_14 = "#00aabb" let g:terminal_color_15 = "#ffffff" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-pop" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-railscasts.vim b/colors/base16-railscasts.vim index 0908edc..c2bb4f5 100644 --- a/colors/base16-railscasts.vim +++ b/colors/base16-railscasts.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "2b2b2b" -let s:gui01 = "272935" -let s:gui02 = "3a4055" -let s:gui03 = "5a647e" -let s:gui04 = "d4cfc9" -let s:gui05 = "e6e1dc" -let s:gui06 = "f4f1ed" -let s:gui07 = "f9f7f3" -let s:gui08 = "da4939" -let s:gui09 = "cc7833" -let s:gui0A = "ffc66d" -let s:gui0B = "a5c261" -let s:gui0C = "519f50" -let s:gui0D = "6d9cbe" -let s:gui0E = "b6b3eb" -let s:gui0F = "bc9458" +let s:gui00 = "2b2b2b" +let g:base16_gui00 = "2b2b2b" +let s:gui01 = "272935" +let g:base16_gui01 = "272935" +let s:gui02 = "3a4055" +let g:base16_gui02 = "3a4055" +let s:gui03 = "5a647e" +let g:base16_gui03 = "5a647e" +let s:gui04 = "d4cfc9" +let g:base16_gui04 = "d4cfc9" +let s:gui05 = "e6e1dc" +let g:base16_gui05 = "e6e1dc" +let s:gui06 = "f4f1ed" +let g:base16_gui06 = "f4f1ed" +let s:gui07 = "f9f7f3" +let g:base16_gui07 = "f9f7f3" +let s:gui08 = "da4939" +let g:base16_gui08 = "da4939" +let s:gui09 = "cc7833" +let g:base16_gui09 = "cc7833" +let s:gui0A = "ffc66d" +let g:base16_gui0A = "ffc66d" +let s:gui0B = "a5c261" +let g:base16_gui0B = "a5c261" +let s:gui0C = "519f50" +let g:base16_gui0C = "519f50" +let s:gui0D = "6d9cbe" +let g:base16_gui0D = "6d9cbe" +let s:gui0E = "b6b3eb" +let g:base16_gui0E = "b6b3eb" +let s:gui0F = "bc9458" +let g:base16_gui0F = "bc9458" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#519f50" let g:terminal_color_7 = "#e6e1dc" let g:terminal_color_8 = "#5a647e" - let g:terminal_color_9 = "#cc7833" - let g:terminal_color_10 = "#272935" - let g:terminal_color_11 = "#3a4055" - let g:terminal_color_12 = "#d4cfc9" - let g:terminal_color_13 = "#f4f1ed" - let g:terminal_color_14 = "#bc9458" + let g:terminal_color_9 = "#da4939" + let g:terminal_color_10 = "#a5c261" + let g:terminal_color_11 = "#ffc66d" + let g:terminal_color_12 = "#6d9cbe" + let g:terminal_color_13 = "#b6b3eb" + let g:terminal_color_14 = "#519f50" let g:terminal_color_15 = "#f9f7f3" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-railscasts" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-rebecca.vim b/colors/base16-rebecca.vim index 6d3d822..93eb039 100644 --- a/colors/base16-rebecca.vim +++ b/colors/base16-rebecca.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "292a44" -let s:gui01 = "663399" -let s:gui02 = "383a62" -let s:gui03 = "666699" -let s:gui04 = "a0a0c5" -let s:gui05 = "f1eff8" -let s:gui06 = "ccccff" -let s:gui07 = "53495d" -let s:gui08 = "a0a0c5" -let s:gui09 = "efe4a1" -let s:gui0A = "ae81ff" -let s:gui0B = "6dfedf" -let s:gui0C = "8eaee0" -let s:gui0D = "2de0a7" -let s:gui0E = "7aa5ff" -let s:gui0F = "ff79c6" +let s:gui00 = "292a44" +let g:base16_gui00 = "292a44" +let s:gui01 = "663399" +let g:base16_gui01 = "663399" +let s:gui02 = "383a62" +let g:base16_gui02 = "383a62" +let s:gui03 = "666699" +let g:base16_gui03 = "666699" +let s:gui04 = "a0a0c5" +let g:base16_gui04 = "a0a0c5" +let s:gui05 = "f1eff8" +let g:base16_gui05 = "f1eff8" +let s:gui06 = "ccccff" +let g:base16_gui06 = "ccccff" +let s:gui07 = "53495d" +let g:base16_gui07 = "53495d" +let s:gui08 = "a0a0c5" +let g:base16_gui08 = "a0a0c5" +let s:gui09 = "efe4a1" +let g:base16_gui09 = "efe4a1" +let s:gui0A = "ae81ff" +let g:base16_gui0A = "ae81ff" +let s:gui0B = "6dfedf" +let g:base16_gui0B = "6dfedf" +let s:gui0C = "8eaee0" +let g:base16_gui0C = "8eaee0" +let s:gui0D = "2de0a7" +let g:base16_gui0D = "2de0a7" +let s:gui0E = "7aa5ff" +let g:base16_gui0E = "7aa5ff" +let s:gui0F = "ff79c6" +let g:base16_gui0F = "ff79c6" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#8eaee0" let g:terminal_color_7 = "#f1eff8" let g:terminal_color_8 = "#666699" - let g:terminal_color_9 = "#efe4a1" - let g:terminal_color_10 = "#663399" - let g:terminal_color_11 = "#383a62" - let g:terminal_color_12 = "#a0a0c5" - let g:terminal_color_13 = "#ccccff" - let g:terminal_color_14 = "#ff79c6" + let g:terminal_color_9 = "#a0a0c5" + let g:terminal_color_10 = "#6dfedf" + let g:terminal_color_11 = "#ae81ff" + let g:terminal_color_12 = "#2de0a7" + let g:terminal_color_13 = "#7aa5ff" + let g:terminal_color_14 = "#8eaee0" let g:terminal_color_15 = "#53495d" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-rebecca" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-seti.vim b/colors/base16-seti.vim index 009ed09..a7e75ab 100644 --- a/colors/base16-seti.vim +++ b/colors/base16-seti.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "151718" -let s:gui01 = "8ec43d" -let s:gui02 = "3B758C" -let s:gui03 = "41535B" -let s:gui04 = "43a5d5" -let s:gui05 = "d6d6d6" -let s:gui06 = "eeeeee" -let s:gui07 = "ffffff" -let s:gui08 = "Cd3f45" -let s:gui09 = "db7b55" -let s:gui0A = "e6cd69" -let s:gui0B = "9fca56" -let s:gui0C = "55dbbe" -let s:gui0D = "55b5db" -let s:gui0E = "a074c4" -let s:gui0F = "8a553f" +let s:gui00 = "151718" +let g:base16_gui00 = "151718" +let s:gui01 = "282a2b" +let g:base16_gui01 = "282a2b" +let s:gui02 = "3B758C" +let g:base16_gui02 = "3B758C" +let s:gui03 = "41535B" +let g:base16_gui03 = "41535B" +let s:gui04 = "43a5d5" +let g:base16_gui04 = "43a5d5" +let s:gui05 = "d6d6d6" +let g:base16_gui05 = "d6d6d6" +let s:gui06 = "eeeeee" +let g:base16_gui06 = "eeeeee" +let s:gui07 = "ffffff" +let g:base16_gui07 = "ffffff" +let s:gui08 = "Cd3f45" +let g:base16_gui08 = "Cd3f45" +let s:gui09 = "db7b55" +let g:base16_gui09 = "db7b55" +let s:gui0A = "e6cd69" +let g:base16_gui0A = "e6cd69" +let s:gui0B = "9fca56" +let g:base16_gui0B = "9fca56" +let s:gui0C = "55dbbe" +let g:base16_gui0C = "55dbbe" +let s:gui0D = "55b5db" +let g:base16_gui0D = "55b5db" +let s:gui0E = "a074c4" +let g:base16_gui0E = "a074c4" +let s:gui0F = "8a553f" +let g:base16_gui0F = "8a553f" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#55dbbe" let g:terminal_color_7 = "#d6d6d6" let g:terminal_color_8 = "#41535B" - let g:terminal_color_9 = "#db7b55" - let g:terminal_color_10 = "#8ec43d" - let g:terminal_color_11 = "#3B758C" - let g:terminal_color_12 = "#43a5d5" - let g:terminal_color_13 = "#eeeeee" - let g:terminal_color_14 = "#8a553f" + let g:terminal_color_9 = "#Cd3f45" + let g:terminal_color_10 = "#9fca56" + let g:terminal_color_11 = "#e6cd69" + let g:terminal_color_12 = "#55b5db" + let g:terminal_color_13 = "#a074c4" + let g:terminal_color_14 = "#55dbbe" let g:terminal_color_15 = "#ffffff" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-seti" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-shapeshifter.vim b/colors/base16-shapeshifter.vim index f065f87..4ff6e9e 100644 --- a/colors/base16-shapeshifter.vim +++ b/colors/base16-shapeshifter.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "f9f9f9" -let s:gui01 = "e0e0e0" -let s:gui02 = "ababab" -let s:gui03 = "555555" -let s:gui04 = "343434" -let s:gui05 = "102015" -let s:gui06 = "040404" -let s:gui07 = "000000" -let s:gui08 = "e92f2f" -let s:gui09 = "e09448" -let s:gui0A = "dddd13" -let s:gui0B = "0ed839" -let s:gui0C = "23edda" -let s:gui0D = "3b48e3" -let s:gui0E = "f996e2" -let s:gui0F = "69542d" +let s:gui00 = "f9f9f9" +let g:base16_gui00 = "f9f9f9" +let s:gui01 = "e0e0e0" +let g:base16_gui01 = "e0e0e0" +let s:gui02 = "ababab" +let g:base16_gui02 = "ababab" +let s:gui03 = "555555" +let g:base16_gui03 = "555555" +let s:gui04 = "343434" +let g:base16_gui04 = "343434" +let s:gui05 = "102015" +let g:base16_gui05 = "102015" +let s:gui06 = "040404" +let g:base16_gui06 = "040404" +let s:gui07 = "000000" +let g:base16_gui07 = "000000" +let s:gui08 = "e92f2f" +let g:base16_gui08 = "e92f2f" +let s:gui09 = "e09448" +let g:base16_gui09 = "e09448" +let s:gui0A = "dddd13" +let g:base16_gui0A = "dddd13" +let s:gui0B = "0ed839" +let g:base16_gui0B = "0ed839" +let s:gui0C = "23edda" +let g:base16_gui0C = "23edda" +let s:gui0D = "3b48e3" +let g:base16_gui0D = "3b48e3" +let s:gui0E = "f996e2" +let g:base16_gui0E = "f996e2" +let s:gui0F = "69542d" +let g:base16_gui0F = "69542d" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#23edda" let g:terminal_color_7 = "#102015" let g:terminal_color_8 = "#555555" - let g:terminal_color_9 = "#e09448" - let g:terminal_color_10 = "#e0e0e0" - let g:terminal_color_11 = "#ababab" - let g:terminal_color_12 = "#343434" - let g:terminal_color_13 = "#040404" - let g:terminal_color_14 = "#69542d" + let g:terminal_color_9 = "#e92f2f" + let g:terminal_color_10 = "#0ed839" + let g:terminal_color_11 = "#dddd13" + let g:terminal_color_12 = "#3b48e3" + let g:terminal_color_13 = "#f996e2" + let g:terminal_color_14 = "#23edda" let g:terminal_color_15 = "#000000" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-shapeshifter" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-solarflare.vim b/colors/base16-solarflare.vim index 1f12eee..19a2285 100644 --- a/colors/base16-solarflare.vim +++ b/colors/base16-solarflare.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "18262F" -let s:gui01 = "222E38" -let s:gui02 = "586875" -let s:gui03 = "667581" -let s:gui04 = "85939E" -let s:gui05 = "A6AFB8" -let s:gui06 = "E8E9ED" -let s:gui07 = "F5F7FA" -let s:gui08 = "EF5253" -let s:gui09 = "E66B2B" -let s:gui0A = "E4B51C" -let s:gui0B = "7CC844" -let s:gui0C = "52CBB0" -let s:gui0D = "33B5E1" -let s:gui0E = "A363D5" -let s:gui0F = "D73C9A" +let s:gui00 = "18262F" +let g:base16_gui00 = "18262F" +let s:gui01 = "222E38" +let g:base16_gui01 = "222E38" +let s:gui02 = "586875" +let g:base16_gui02 = "586875" +let s:gui03 = "667581" +let g:base16_gui03 = "667581" +let s:gui04 = "85939E" +let g:base16_gui04 = "85939E" +let s:gui05 = "A6AFB8" +let g:base16_gui05 = "A6AFB8" +let s:gui06 = "E8E9ED" +let g:base16_gui06 = "E8E9ED" +let s:gui07 = "F5F7FA" +let g:base16_gui07 = "F5F7FA" +let s:gui08 = "EF5253" +let g:base16_gui08 = "EF5253" +let s:gui09 = "E66B2B" +let g:base16_gui09 = "E66B2B" +let s:gui0A = "E4B51C" +let g:base16_gui0A = "E4B51C" +let s:gui0B = "7CC844" +let g:base16_gui0B = "7CC844" +let s:gui0C = "52CBB0" +let g:base16_gui0C = "52CBB0" +let s:gui0D = "33B5E1" +let g:base16_gui0D = "33B5E1" +let s:gui0E = "A363D5" +let g:base16_gui0E = "A363D5" +let s:gui0F = "D73C9A" +let g:base16_gui0F = "D73C9A" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#52CBB0" let g:terminal_color_7 = "#A6AFB8" let g:terminal_color_8 = "#667581" - let g:terminal_color_9 = "#E66B2B" - let g:terminal_color_10 = "#222E38" - let g:terminal_color_11 = "#586875" - let g:terminal_color_12 = "#85939E" - let g:terminal_color_13 = "#E8E9ED" - let g:terminal_color_14 = "#D73C9A" + let g:terminal_color_9 = "#EF5253" + let g:terminal_color_10 = "#7CC844" + let g:terminal_color_11 = "#E4B51C" + let g:terminal_color_12 = "#33B5E1" + let g:terminal_color_13 = "#A363D5" + let g:terminal_color_14 = "#52CBB0" let g:terminal_color_15 = "#F5F7FA" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-solarflare" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-solarized-dark.vim b/colors/base16-solarized-dark.vim index 055acf6..e19d5ca 100644 --- a/colors/base16-solarized-dark.vim +++ b/colors/base16-solarized-dark.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "002b36" -let s:gui01 = "073642" -let s:gui02 = "586e75" -let s:gui03 = "657b83" -let s:gui04 = "839496" -let s:gui05 = "93a1a1" -let s:gui06 = "eee8d5" -let s:gui07 = "fdf6e3" -let s:gui08 = "dc322f" -let s:gui09 = "cb4b16" -let s:gui0A = "b58900" -let s:gui0B = "859900" -let s:gui0C = "2aa198" -let s:gui0D = "268bd2" -let s:gui0E = "6c71c4" -let s:gui0F = "d33682" +let s:gui00 = "002b36" +let g:base16_gui00 = "002b36" +let s:gui01 = "073642" +let g:base16_gui01 = "073642" +let s:gui02 = "586e75" +let g:base16_gui02 = "586e75" +let s:gui03 = "657b83" +let g:base16_gui03 = "657b83" +let s:gui04 = "839496" +let g:base16_gui04 = "839496" +let s:gui05 = "93a1a1" +let g:base16_gui05 = "93a1a1" +let s:gui06 = "eee8d5" +let g:base16_gui06 = "eee8d5" +let s:gui07 = "fdf6e3" +let g:base16_gui07 = "fdf6e3" +let s:gui08 = "dc322f" +let g:base16_gui08 = "dc322f" +let s:gui09 = "cb4b16" +let g:base16_gui09 = "cb4b16" +let s:gui0A = "b58900" +let g:base16_gui0A = "b58900" +let s:gui0B = "859900" +let g:base16_gui0B = "859900" +let s:gui0C = "2aa198" +let g:base16_gui0C = "2aa198" +let s:gui0D = "268bd2" +let g:base16_gui0D = "268bd2" +let s:gui0E = "6c71c4" +let g:base16_gui0E = "6c71c4" +let s:gui0F = "d33682" +let g:base16_gui0F = "d33682" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#2aa198" let g:terminal_color_7 = "#93a1a1" let g:terminal_color_8 = "#657b83" - let g:terminal_color_9 = "#cb4b16" - let g:terminal_color_10 = "#073642" - let g:terminal_color_11 = "#586e75" - let g:terminal_color_12 = "#839496" - let g:terminal_color_13 = "#eee8d5" - let g:terminal_color_14 = "#d33682" + let g:terminal_color_9 = "#dc322f" + let g:terminal_color_10 = "#859900" + let g:terminal_color_11 = "#b58900" + let g:terminal_color_12 = "#268bd2" + let g:terminal_color_13 = "#6c71c4" + let g:terminal_color_14 = "#2aa198" let g:terminal_color_15 = "#fdf6e3" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-solarized-dark" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-solarized-light.vim b/colors/base16-solarized-light.vim index 5311d78..92567c2 100644 --- a/colors/base16-solarized-light.vim +++ b/colors/base16-solarized-light.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "fdf6e3" -let s:gui01 = "eee8d5" -let s:gui02 = "93a1a1" -let s:gui03 = "839496" -let s:gui04 = "657b83" -let s:gui05 = "586e75" -let s:gui06 = "073642" -let s:gui07 = "002b36" -let s:gui08 = "dc322f" -let s:gui09 = "cb4b16" -let s:gui0A = "b58900" -let s:gui0B = "859900" -let s:gui0C = "2aa198" -let s:gui0D = "268bd2" -let s:gui0E = "6c71c4" -let s:gui0F = "d33682" +let s:gui00 = "fdf6e3" +let g:base16_gui00 = "fdf6e3" +let s:gui01 = "eee8d5" +let g:base16_gui01 = "eee8d5" +let s:gui02 = "93a1a1" +let g:base16_gui02 = "93a1a1" +let s:gui03 = "839496" +let g:base16_gui03 = "839496" +let s:gui04 = "657b83" +let g:base16_gui04 = "657b83" +let s:gui05 = "586e75" +let g:base16_gui05 = "586e75" +let s:gui06 = "073642" +let g:base16_gui06 = "073642" +let s:gui07 = "002b36" +let g:base16_gui07 = "002b36" +let s:gui08 = "dc322f" +let g:base16_gui08 = "dc322f" +let s:gui09 = "cb4b16" +let g:base16_gui09 = "cb4b16" +let s:gui0A = "b58900" +let g:base16_gui0A = "b58900" +let s:gui0B = "859900" +let g:base16_gui0B = "859900" +let s:gui0C = "2aa198" +let g:base16_gui0C = "2aa198" +let s:gui0D = "268bd2" +let g:base16_gui0D = "268bd2" +let s:gui0E = "6c71c4" +let g:base16_gui0E = "6c71c4" +let s:gui0F = "d33682" +let g:base16_gui0F = "d33682" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#2aa198" let g:terminal_color_7 = "#586e75" let g:terminal_color_8 = "#839496" - let g:terminal_color_9 = "#cb4b16" - let g:terminal_color_10 = "#eee8d5" - let g:terminal_color_11 = "#93a1a1" - let g:terminal_color_12 = "#657b83" - let g:terminal_color_13 = "#073642" - let g:terminal_color_14 = "#d33682" + let g:terminal_color_9 = "#dc322f" + let g:terminal_color_10 = "#859900" + let g:terminal_color_11 = "#b58900" + let g:terminal_color_12 = "#268bd2" + let g:terminal_color_13 = "#6c71c4" + let g:terminal_color_14 = "#2aa198" let g:terminal_color_15 = "#002b36" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-solarized-light" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-spacemacs.vim b/colors/base16-spacemacs.vim index 5cedb81..9fa0333 100644 --- a/colors/base16-spacemacs.vim +++ b/colors/base16-spacemacs.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "1f2022" -let s:gui01 = "282828" -let s:gui02 = "444155" -let s:gui03 = "585858" -let s:gui04 = "b8b8b8" -let s:gui05 = "a3a3a3" -let s:gui06 = "e8e8e8" -let s:gui07 = "f8f8f8" -let s:gui08 = "f2241f" -let s:gui09 = "ffa500" -let s:gui0A = "b1951d" -let s:gui0B = "67b11d" -let s:gui0C = "2d9574" -let s:gui0D = "4f97d7" -let s:gui0E = "a31db1" -let s:gui0F = "b03060" +let s:gui00 = "1f2022" +let g:base16_gui00 = "1f2022" +let s:gui01 = "282828" +let g:base16_gui01 = "282828" +let s:gui02 = "444155" +let g:base16_gui02 = "444155" +let s:gui03 = "585858" +let g:base16_gui03 = "585858" +let s:gui04 = "b8b8b8" +let g:base16_gui04 = "b8b8b8" +let s:gui05 = "a3a3a3" +let g:base16_gui05 = "a3a3a3" +let s:gui06 = "e8e8e8" +let g:base16_gui06 = "e8e8e8" +let s:gui07 = "f8f8f8" +let g:base16_gui07 = "f8f8f8" +let s:gui08 = "f2241f" +let g:base16_gui08 = "f2241f" +let s:gui09 = "ffa500" +let g:base16_gui09 = "ffa500" +let s:gui0A = "b1951d" +let g:base16_gui0A = "b1951d" +let s:gui0B = "67b11d" +let g:base16_gui0B = "67b11d" +let s:gui0C = "2d9574" +let g:base16_gui0C = "2d9574" +let s:gui0D = "4f97d7" +let g:base16_gui0D = "4f97d7" +let s:gui0E = "a31db1" +let g:base16_gui0E = "a31db1" +let s:gui0F = "b03060" +let g:base16_gui0F = "b03060" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#2d9574" let g:terminal_color_7 = "#a3a3a3" let g:terminal_color_8 = "#585858" - let g:terminal_color_9 = "#ffa500" - let g:terminal_color_10 = "#282828" - let g:terminal_color_11 = "#444155" - let g:terminal_color_12 = "#b8b8b8" - let g:terminal_color_13 = "#e8e8e8" - let g:terminal_color_14 = "#b03060" + let g:terminal_color_9 = "#f2241f" + let g:terminal_color_10 = "#67b11d" + let g:terminal_color_11 = "#b1951d" + let g:terminal_color_12 = "#4f97d7" + let g:terminal_color_13 = "#a31db1" + let g:terminal_color_14 = "#2d9574" let g:terminal_color_15 = "#f8f8f8" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-spacemacs" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-summerfruit-dark.vim b/colors/base16-summerfruit-dark.vim index 6e75ca8..56e2c2b 100644 --- a/colors/base16-summerfruit-dark.vim +++ b/colors/base16-summerfruit-dark.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "151515" -let s:gui01 = "202020" -let s:gui02 = "303030" -let s:gui03 = "505050" -let s:gui04 = "B0B0B0" -let s:gui05 = "D0D0D0" -let s:gui06 = "E0E0E0" -let s:gui07 = "FFFFFF" -let s:gui08 = "FF0086" -let s:gui09 = "FD8900" -let s:gui0A = "ABA800" -let s:gui0B = "00C918" -let s:gui0C = "1FAAAA" -let s:gui0D = "3777E6" -let s:gui0E = "AD00A1" -let s:gui0F = "CC6633" +let s:gui00 = "151515" +let g:base16_gui00 = "151515" +let s:gui01 = "202020" +let g:base16_gui01 = "202020" +let s:gui02 = "303030" +let g:base16_gui02 = "303030" +let s:gui03 = "505050" +let g:base16_gui03 = "505050" +let s:gui04 = "B0B0B0" +let g:base16_gui04 = "B0B0B0" +let s:gui05 = "D0D0D0" +let g:base16_gui05 = "D0D0D0" +let s:gui06 = "E0E0E0" +let g:base16_gui06 = "E0E0E0" +let s:gui07 = "FFFFFF" +let g:base16_gui07 = "FFFFFF" +let s:gui08 = "FF0086" +let g:base16_gui08 = "FF0086" +let s:gui09 = "FD8900" +let g:base16_gui09 = "FD8900" +let s:gui0A = "ABA800" +let g:base16_gui0A = "ABA800" +let s:gui0B = "00C918" +let g:base16_gui0B = "00C918" +let s:gui0C = "1FAAAA" +let g:base16_gui0C = "1FAAAA" +let s:gui0D = "3777E6" +let g:base16_gui0D = "3777E6" +let s:gui0E = "AD00A1" +let g:base16_gui0E = "AD00A1" +let s:gui0F = "CC6633" +let g:base16_gui0F = "CC6633" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#1FAAAA" let g:terminal_color_7 = "#D0D0D0" let g:terminal_color_8 = "#505050" - let g:terminal_color_9 = "#FD8900" - let g:terminal_color_10 = "#202020" - let g:terminal_color_11 = "#303030" - let g:terminal_color_12 = "#B0B0B0" - let g:terminal_color_13 = "#E0E0E0" - let g:terminal_color_14 = "#CC6633" + let g:terminal_color_9 = "#FF0086" + let g:terminal_color_10 = "#00C918" + let g:terminal_color_11 = "#ABA800" + let g:terminal_color_12 = "#3777E6" + let g:terminal_color_13 = "#AD00A1" + let g:terminal_color_14 = "#1FAAAA" let g:terminal_color_15 = "#FFFFFF" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-summerfruit-dark" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-summerfruit-light.vim b/colors/base16-summerfruit-light.vim index e1620cd..8066b70 100644 --- a/colors/base16-summerfruit-light.vim +++ b/colors/base16-summerfruit-light.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "FFFFFF" -let s:gui01 = "E0E0E0" -let s:gui02 = "D0D0D0" -let s:gui03 = "B0B0B0" -let s:gui04 = "000000" -let s:gui05 = "101010" -let s:gui06 = "151515" -let s:gui07 = "202020" -let s:gui08 = "FF0086" -let s:gui09 = "FD8900" -let s:gui0A = "ABA800" -let s:gui0B = "00C918" -let s:gui0C = "1FAAAA" -let s:gui0D = "3777E6" -let s:gui0E = "AD00A1" -let s:gui0F = "CC6633" +let s:gui00 = "FFFFFF" +let g:base16_gui00 = "FFFFFF" +let s:gui01 = "E0E0E0" +let g:base16_gui01 = "E0E0E0" +let s:gui02 = "D0D0D0" +let g:base16_gui02 = "D0D0D0" +let s:gui03 = "B0B0B0" +let g:base16_gui03 = "B0B0B0" +let s:gui04 = "000000" +let g:base16_gui04 = "000000" +let s:gui05 = "101010" +let g:base16_gui05 = "101010" +let s:gui06 = "151515" +let g:base16_gui06 = "151515" +let s:gui07 = "202020" +let g:base16_gui07 = "202020" +let s:gui08 = "FF0086" +let g:base16_gui08 = "FF0086" +let s:gui09 = "FD8900" +let g:base16_gui09 = "FD8900" +let s:gui0A = "ABA800" +let g:base16_gui0A = "ABA800" +let s:gui0B = "00C918" +let g:base16_gui0B = "00C918" +let s:gui0C = "1FAAAA" +let g:base16_gui0C = "1FAAAA" +let s:gui0D = "3777E6" +let g:base16_gui0D = "3777E6" +let s:gui0E = "AD00A1" +let g:base16_gui0E = "AD00A1" +let s:gui0F = "CC6633" +let g:base16_gui0F = "CC6633" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#1FAAAA" let g:terminal_color_7 = "#101010" let g:terminal_color_8 = "#B0B0B0" - let g:terminal_color_9 = "#FD8900" - let g:terminal_color_10 = "#E0E0E0" - let g:terminal_color_11 = "#D0D0D0" - let g:terminal_color_12 = "#000000" - let g:terminal_color_13 = "#151515" - let g:terminal_color_14 = "#CC6633" + let g:terminal_color_9 = "#FF0086" + let g:terminal_color_10 = "#00C918" + let g:terminal_color_11 = "#ABA800" + let g:terminal_color_12 = "#3777E6" + let g:terminal_color_13 = "#AD00A1" + let g:terminal_color_14 = "#1FAAAA" let g:terminal_color_15 = "#202020" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-summerfruit-light" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-tomorrow-night.vim b/colors/base16-tomorrow-night.vim index c80222e..67aac18 100644 --- a/colors/base16-tomorrow-night.vim +++ b/colors/base16-tomorrow-night.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "1d1f21" -let s:gui01 = "282a2e" -let s:gui02 = "373b41" -let s:gui03 = "969896" -let s:gui04 = "b4b7b4" -let s:gui05 = "c5c8c6" -let s:gui06 = "e0e0e0" -let s:gui07 = "ffffff" -let s:gui08 = "cc6666" -let s:gui09 = "de935f" -let s:gui0A = "f0c674" -let s:gui0B = "b5bd68" -let s:gui0C = "8abeb7" -let s:gui0D = "81a2be" -let s:gui0E = "b294bb" -let s:gui0F = "a3685a" +let s:gui00 = "1d1f21" +let g:base16_gui00 = "1d1f21" +let s:gui01 = "282a2e" +let g:base16_gui01 = "282a2e" +let s:gui02 = "373b41" +let g:base16_gui02 = "373b41" +let s:gui03 = "969896" +let g:base16_gui03 = "969896" +let s:gui04 = "b4b7b4" +let g:base16_gui04 = "b4b7b4" +let s:gui05 = "c5c8c6" +let g:base16_gui05 = "c5c8c6" +let s:gui06 = "e0e0e0" +let g:base16_gui06 = "e0e0e0" +let s:gui07 = "ffffff" +let g:base16_gui07 = "ffffff" +let s:gui08 = "cc6666" +let g:base16_gui08 = "cc6666" +let s:gui09 = "de935f" +let g:base16_gui09 = "de935f" +let s:gui0A = "f0c674" +let g:base16_gui0A = "f0c674" +let s:gui0B = "b5bd68" +let g:base16_gui0B = "b5bd68" +let s:gui0C = "8abeb7" +let g:base16_gui0C = "8abeb7" +let s:gui0D = "81a2be" +let g:base16_gui0D = "81a2be" +let s:gui0E = "b294bb" +let g:base16_gui0E = "b294bb" +let s:gui0F = "a3685a" +let g:base16_gui0F = "a3685a" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#8abeb7" let g:terminal_color_7 = "#c5c8c6" let g:terminal_color_8 = "#969896" - let g:terminal_color_9 = "#de935f" - let g:terminal_color_10 = "#282a2e" - let g:terminal_color_11 = "#373b41" - let g:terminal_color_12 = "#b4b7b4" - let g:terminal_color_13 = "#e0e0e0" - let g:terminal_color_14 = "#a3685a" + let g:terminal_color_9 = "#cc6666" + let g:terminal_color_10 = "#b5bd68" + let g:terminal_color_11 = "#f0c674" + let g:terminal_color_12 = "#81a2be" + let g:terminal_color_13 = "#b294bb" + let g:terminal_color_14 = "#8abeb7" let g:terminal_color_15 = "#ffffff" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-tomorrow-night" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-tomorrow.vim b/colors/base16-tomorrow.vim index e590d56..5b0a606 100644 --- a/colors/base16-tomorrow.vim +++ b/colors/base16-tomorrow.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "ffffff" -let s:gui01 = "e0e0e0" -let s:gui02 = "d6d6d6" -let s:gui03 = "8e908c" -let s:gui04 = "969896" -let s:gui05 = "4d4d4c" -let s:gui06 = "282a2e" -let s:gui07 = "1d1f21" -let s:gui08 = "c82829" -let s:gui09 = "f5871f" -let s:gui0A = "eab700" -let s:gui0B = "718c00" -let s:gui0C = "3e999f" -let s:gui0D = "4271ae" -let s:gui0E = "8959a8" -let s:gui0F = "a3685a" +let s:gui00 = "ffffff" +let g:base16_gui00 = "ffffff" +let s:gui01 = "e0e0e0" +let g:base16_gui01 = "e0e0e0" +let s:gui02 = "d6d6d6" +let g:base16_gui02 = "d6d6d6" +let s:gui03 = "8e908c" +let g:base16_gui03 = "8e908c" +let s:gui04 = "969896" +let g:base16_gui04 = "969896" +let s:gui05 = "4d4d4c" +let g:base16_gui05 = "4d4d4c" +let s:gui06 = "282a2e" +let g:base16_gui06 = "282a2e" +let s:gui07 = "1d1f21" +let g:base16_gui07 = "1d1f21" +let s:gui08 = "c82829" +let g:base16_gui08 = "c82829" +let s:gui09 = "f5871f" +let g:base16_gui09 = "f5871f" +let s:gui0A = "eab700" +let g:base16_gui0A = "eab700" +let s:gui0B = "718c00" +let g:base16_gui0B = "718c00" +let s:gui0C = "3e999f" +let g:base16_gui0C = "3e999f" +let s:gui0D = "4271ae" +let g:base16_gui0D = "4271ae" +let s:gui0E = "8959a8" +let g:base16_gui0E = "8959a8" +let s:gui0F = "a3685a" +let g:base16_gui0F = "a3685a" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#3e999f" let g:terminal_color_7 = "#4d4d4c" let g:terminal_color_8 = "#8e908c" - let g:terminal_color_9 = "#f5871f" - let g:terminal_color_10 = "#e0e0e0" - let g:terminal_color_11 = "#d6d6d6" - let g:terminal_color_12 = "#969896" - let g:terminal_color_13 = "#282a2e" - let g:terminal_color_14 = "#a3685a" + let g:terminal_color_9 = "#c82829" + let g:terminal_color_10 = "#718c00" + let g:terminal_color_11 = "#eab700" + let g:terminal_color_12 = "#4271ae" + let g:terminal_color_13 = "#8959a8" + let g:terminal_color_14 = "#3e999f" let g:terminal_color_15 = "#1d1f21" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-tomorrow" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-tube.vim b/colors/base16-tube.vim index e909e0e..f840aa8 100644 --- a/colors/base16-tube.vim +++ b/colors/base16-tube.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "231f20" -let s:gui01 = "1c3f95" -let s:gui02 = "5a5758" -let s:gui03 = "737171" -let s:gui04 = "959ca1" -let s:gui05 = "d9d8d8" -let s:gui06 = "e7e7e8" -let s:gui07 = "ffffff" -let s:gui08 = "ee2e24" -let s:gui09 = "f386a1" -let s:gui0A = "ffd204" -let s:gui0B = "00853e" -let s:gui0C = "85cebc" -let s:gui0D = "009ddc" -let s:gui0E = "98005d" -let s:gui0F = "b06110" +let s:gui00 = "231f20" +let g:base16_gui00 = "231f20" +let s:gui01 = "1c3f95" +let g:base16_gui01 = "1c3f95" +let s:gui02 = "5a5758" +let g:base16_gui02 = "5a5758" +let s:gui03 = "737171" +let g:base16_gui03 = "737171" +let s:gui04 = "959ca1" +let g:base16_gui04 = "959ca1" +let s:gui05 = "d9d8d8" +let g:base16_gui05 = "d9d8d8" +let s:gui06 = "e7e7e8" +let g:base16_gui06 = "e7e7e8" +let s:gui07 = "ffffff" +let g:base16_gui07 = "ffffff" +let s:gui08 = "ee2e24" +let g:base16_gui08 = "ee2e24" +let s:gui09 = "f386a1" +let g:base16_gui09 = "f386a1" +let s:gui0A = "ffd204" +let g:base16_gui0A = "ffd204" +let s:gui0B = "00853e" +let g:base16_gui0B = "00853e" +let s:gui0C = "85cebc" +let g:base16_gui0C = "85cebc" +let s:gui0D = "009ddc" +let g:base16_gui0D = "009ddc" +let s:gui0E = "98005d" +let g:base16_gui0E = "98005d" +let s:gui0F = "b06110" +let g:base16_gui0F = "b06110" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#85cebc" let g:terminal_color_7 = "#d9d8d8" let g:terminal_color_8 = "#737171" - let g:terminal_color_9 = "#f386a1" - let g:terminal_color_10 = "#1c3f95" - let g:terminal_color_11 = "#5a5758" - let g:terminal_color_12 = "#959ca1" - let g:terminal_color_13 = "#e7e7e8" - let g:terminal_color_14 = "#b06110" + let g:terminal_color_9 = "#ee2e24" + let g:terminal_color_10 = "#00853e" + let g:terminal_color_11 = "#ffd204" + let g:terminal_color_12 = "#009ddc" + let g:terminal_color_13 = "#98005d" + let g:terminal_color_14 = "#85cebc" let g:terminal_color_15 = "#ffffff" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-tube" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-twilight.vim b/colors/base16-twilight.vim index 9225281..6d9552b 100644 --- a/colors/base16-twilight.vim +++ b/colors/base16-twilight.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "1e1e1e" -let s:gui01 = "323537" -let s:gui02 = "464b50" -let s:gui03 = "5f5a60" -let s:gui04 = "838184" -let s:gui05 = "a7a7a7" -let s:gui06 = "c3c3c3" -let s:gui07 = "ffffff" -let s:gui08 = "cf6a4c" -let s:gui09 = "cda869" -let s:gui0A = "f9ee98" -let s:gui0B = "8f9d6a" -let s:gui0C = "afc4db" -let s:gui0D = "7587a6" -let s:gui0E = "9b859d" -let s:gui0F = "9b703f" +let s:gui00 = "1e1e1e" +let g:base16_gui00 = "1e1e1e" +let s:gui01 = "323537" +let g:base16_gui01 = "323537" +let s:gui02 = "464b50" +let g:base16_gui02 = "464b50" +let s:gui03 = "5f5a60" +let g:base16_gui03 = "5f5a60" +let s:gui04 = "838184" +let g:base16_gui04 = "838184" +let s:gui05 = "a7a7a7" +let g:base16_gui05 = "a7a7a7" +let s:gui06 = "c3c3c3" +let g:base16_gui06 = "c3c3c3" +let s:gui07 = "ffffff" +let g:base16_gui07 = "ffffff" +let s:gui08 = "cf6a4c" +let g:base16_gui08 = "cf6a4c" +let s:gui09 = "cda869" +let g:base16_gui09 = "cda869" +let s:gui0A = "f9ee98" +let g:base16_gui0A = "f9ee98" +let s:gui0B = "8f9d6a" +let g:base16_gui0B = "8f9d6a" +let s:gui0C = "afc4db" +let g:base16_gui0C = "afc4db" +let s:gui0D = "7587a6" +let g:base16_gui0D = "7587a6" +let s:gui0E = "9b859d" +let g:base16_gui0E = "9b859d" +let s:gui0F = "9b703f" +let g:base16_gui0F = "9b703f" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#afc4db" let g:terminal_color_7 = "#a7a7a7" let g:terminal_color_8 = "#5f5a60" - let g:terminal_color_9 = "#cda869" - let g:terminal_color_10 = "#323537" - let g:terminal_color_11 = "#464b50" - let g:terminal_color_12 = "#838184" - let g:terminal_color_13 = "#c3c3c3" - let g:terminal_color_14 = "#9b703f" + let g:terminal_color_9 = "#cf6a4c" + let g:terminal_color_10 = "#8f9d6a" + let g:terminal_color_11 = "#f9ee98" + let g:terminal_color_12 = "#7587a6" + let g:terminal_color_13 = "#9b859d" + let g:terminal_color_14 = "#afc4db" let g:terminal_color_15 = "#ffffff" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-twilight" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-unikitty-dark.vim b/colors/base16-unikitty-dark.vim index 3af05bf..7ad6377 100644 --- a/colors/base16-unikitty-dark.vim +++ b/colors/base16-unikitty-dark.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "2e2a31" -let s:gui01 = "4a464d" -let s:gui02 = "666369" -let s:gui03 = "838085" -let s:gui04 = "9f9da2" -let s:gui05 = "bcbabe" -let s:gui06 = "d8d7da" -let s:gui07 = "f5f4f7" -let s:gui08 = "d8137f" -let s:gui09 = "d65407" -let s:gui0A = "dc8a0e" -let s:gui0B = "17ad98" -let s:gui0C = "149bda" -let s:gui0D = "796af5" -let s:gui0E = "bb60ea" -let s:gui0F = "c720ca" +let s:gui00 = "2e2a31" +let g:base16_gui00 = "2e2a31" +let s:gui01 = "4a464d" +let g:base16_gui01 = "4a464d" +let s:gui02 = "666369" +let g:base16_gui02 = "666369" +let s:gui03 = "838085" +let g:base16_gui03 = "838085" +let s:gui04 = "9f9da2" +let g:base16_gui04 = "9f9da2" +let s:gui05 = "bcbabe" +let g:base16_gui05 = "bcbabe" +let s:gui06 = "d8d7da" +let g:base16_gui06 = "d8d7da" +let s:gui07 = "f5f4f7" +let g:base16_gui07 = "f5f4f7" +let s:gui08 = "d8137f" +let g:base16_gui08 = "d8137f" +let s:gui09 = "d65407" +let g:base16_gui09 = "d65407" +let s:gui0A = "dc8a0e" +let g:base16_gui0A = "dc8a0e" +let s:gui0B = "17ad98" +let g:base16_gui0B = "17ad98" +let s:gui0C = "149bda" +let g:base16_gui0C = "149bda" +let s:gui0D = "796af5" +let g:base16_gui0D = "796af5" +let s:gui0E = "bb60ea" +let g:base16_gui0E = "bb60ea" +let s:gui0F = "c720ca" +let g:base16_gui0F = "c720ca" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#149bda" let g:terminal_color_7 = "#bcbabe" let g:terminal_color_8 = "#838085" - let g:terminal_color_9 = "#d65407" - let g:terminal_color_10 = "#4a464d" - let g:terminal_color_11 = "#666369" - let g:terminal_color_12 = "#9f9da2" - let g:terminal_color_13 = "#d8d7da" - let g:terminal_color_14 = "#c720ca" + let g:terminal_color_9 = "#d8137f" + let g:terminal_color_10 = "#17ad98" + let g:terminal_color_11 = "#dc8a0e" + let g:terminal_color_12 = "#796af5" + let g:terminal_color_13 = "#bb60ea" + let g:terminal_color_14 = "#149bda" let g:terminal_color_15 = "#f5f4f7" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-unikitty-dark" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-unikitty-light.vim b/colors/base16-unikitty-light.vim index 829addd..fa241d8 100644 --- a/colors/base16-unikitty-light.vim +++ b/colors/base16-unikitty-light.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "ffffff" -let s:gui01 = "e1e1e2" -let s:gui02 = "c4c3c5" -let s:gui03 = "a7a5a8" -let s:gui04 = "89878b" -let s:gui05 = "6c696e" -let s:gui06 = "4f4b51" -let s:gui07 = "322d34" -let s:gui08 = "d8137f" -let s:gui09 = "d65407" -let s:gui0A = "dc8a0e" -let s:gui0B = "17ad98" -let s:gui0C = "149bda" -let s:gui0D = "775dff" -let s:gui0E = "aa17e6" -let s:gui0F = "e013d0" +let s:gui00 = "ffffff" +let g:base16_gui00 = "ffffff" +let s:gui01 = "e1e1e2" +let g:base16_gui01 = "e1e1e2" +let s:gui02 = "c4c3c5" +let g:base16_gui02 = "c4c3c5" +let s:gui03 = "a7a5a8" +let g:base16_gui03 = "a7a5a8" +let s:gui04 = "89878b" +let g:base16_gui04 = "89878b" +let s:gui05 = "6c696e" +let g:base16_gui05 = "6c696e" +let s:gui06 = "4f4b51" +let g:base16_gui06 = "4f4b51" +let s:gui07 = "322d34" +let g:base16_gui07 = "322d34" +let s:gui08 = "d8137f" +let g:base16_gui08 = "d8137f" +let s:gui09 = "d65407" +let g:base16_gui09 = "d65407" +let s:gui0A = "dc8a0e" +let g:base16_gui0A = "dc8a0e" +let s:gui0B = "17ad98" +let g:base16_gui0B = "17ad98" +let s:gui0C = "149bda" +let g:base16_gui0C = "149bda" +let s:gui0D = "775dff" +let g:base16_gui0D = "775dff" +let s:gui0E = "aa17e6" +let g:base16_gui0E = "aa17e6" +let s:gui0F = "e013d0" +let g:base16_gui0F = "e013d0" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#149bda" let g:terminal_color_7 = "#6c696e" let g:terminal_color_8 = "#a7a5a8" - let g:terminal_color_9 = "#d65407" - let g:terminal_color_10 = "#e1e1e2" - let g:terminal_color_11 = "#c4c3c5" - let g:terminal_color_12 = "#89878b" - let g:terminal_color_13 = "#4f4b51" - let g:terminal_color_14 = "#e013d0" + let g:terminal_color_9 = "#d8137f" + let g:terminal_color_10 = "#17ad98" + let g:terminal_color_11 = "#dc8a0e" + let g:terminal_color_12 = "#775dff" + let g:terminal_color_13 = "#aa17e6" + let g:terminal_color_14 = "#149bda" let g:terminal_color_15 = "#322d34" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-unikitty-light" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-woodland.vim b/colors/base16-woodland.vim index fb226a2..4754b9b 100644 --- a/colors/base16-woodland.vim +++ b/colors/base16-woodland.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "231e18" -let s:gui01 = "302b25" -let s:gui02 = "48413a" -let s:gui03 = "9d8b70" -let s:gui04 = "b4a490" -let s:gui05 = "cabcb1" -let s:gui06 = "d7c8bc" -let s:gui07 = "e4d4c8" -let s:gui08 = "d35c5c" -let s:gui09 = "ca7f32" -let s:gui0A = "e0ac16" -let s:gui0B = "b7ba53" -let s:gui0C = "6eb958" -let s:gui0D = "88a4d3" -let s:gui0E = "bb90e2" -let s:gui0F = "b49368" +let s:gui00 = "231e18" +let g:base16_gui00 = "231e18" +let s:gui01 = "302b25" +let g:base16_gui01 = "302b25" +let s:gui02 = "48413a" +let g:base16_gui02 = "48413a" +let s:gui03 = "9d8b70" +let g:base16_gui03 = "9d8b70" +let s:gui04 = "b4a490" +let g:base16_gui04 = "b4a490" +let s:gui05 = "cabcb1" +let g:base16_gui05 = "cabcb1" +let s:gui06 = "d7c8bc" +let g:base16_gui06 = "d7c8bc" +let s:gui07 = "e4d4c8" +let g:base16_gui07 = "e4d4c8" +let s:gui08 = "d35c5c" +let g:base16_gui08 = "d35c5c" +let s:gui09 = "ca7f32" +let g:base16_gui09 = "ca7f32" +let s:gui0A = "e0ac16" +let g:base16_gui0A = "e0ac16" +let s:gui0B = "b7ba53" +let g:base16_gui0B = "b7ba53" +let s:gui0C = "6eb958" +let g:base16_gui0C = "6eb958" +let s:gui0D = "88a4d3" +let g:base16_gui0D = "88a4d3" +let s:gui0E = "bb90e2" +let g:base16_gui0E = "bb90e2" +let s:gui0F = "b49368" +let g:base16_gui0F = "b49368" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#6eb958" let g:terminal_color_7 = "#cabcb1" let g:terminal_color_8 = "#9d8b70" - let g:terminal_color_9 = "#ca7f32" - let g:terminal_color_10 = "#302b25" - let g:terminal_color_11 = "#48413a" - let g:terminal_color_12 = "#b4a490" - let g:terminal_color_13 = "#d7c8bc" - let g:terminal_color_14 = "#b49368" + let g:terminal_color_9 = "#d35c5c" + let g:terminal_color_10 = "#b7ba53" + let g:terminal_color_11 = "#e0ac16" + let g:terminal_color_12 = "#88a4d3" + let g:terminal_color_13 = "#bb90e2" + let g:terminal_color_14 = "#6eb958" let g:terminal_color_15 = "#e4d4c8" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-woodland" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-xcode-dusk.vim b/colors/base16-xcode-dusk.vim index b73b74e..1b85d56 100644 --- a/colors/base16-xcode-dusk.vim +++ b/colors/base16-xcode-dusk.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "282B35" -let s:gui01 = "3D4048" -let s:gui02 = "53555D" -let s:gui03 = "686A71" -let s:gui04 = "7E8086" -let s:gui05 = "939599" -let s:gui06 = "A9AAAE" -let s:gui07 = "BEBFC2" -let s:gui08 = "B21889" -let s:gui09 = "786DC5" -let s:gui0A = "438288" -let s:gui0B = "DF0002" -let s:gui0C = "00A0BE" -let s:gui0D = "790EAD" -let s:gui0E = "B21889" -let s:gui0F = "C77C48" +let s:gui00 = "282B35" +let g:base16_gui00 = "282B35" +let s:gui01 = "3D4048" +let g:base16_gui01 = "3D4048" +let s:gui02 = "53555D" +let g:base16_gui02 = "53555D" +let s:gui03 = "686A71" +let g:base16_gui03 = "686A71" +let s:gui04 = "7E8086" +let g:base16_gui04 = "7E8086" +let s:gui05 = "939599" +let g:base16_gui05 = "939599" +let s:gui06 = "A9AAAE" +let g:base16_gui06 = "A9AAAE" +let s:gui07 = "BEBFC2" +let g:base16_gui07 = "BEBFC2" +let s:gui08 = "B21889" +let g:base16_gui08 = "B21889" +let s:gui09 = "786DC5" +let g:base16_gui09 = "786DC5" +let s:gui0A = "438288" +let g:base16_gui0A = "438288" +let s:gui0B = "DF0002" +let g:base16_gui0B = "DF0002" +let s:gui0C = "00A0BE" +let g:base16_gui0C = "00A0BE" +let s:gui0D = "790EAD" +let g:base16_gui0D = "790EAD" +let s:gui0E = "B21889" +let g:base16_gui0E = "B21889" +let s:gui0F = "C77C48" +let g:base16_gui0F = "C77C48" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#00A0BE" let g:terminal_color_7 = "#939599" let g:terminal_color_8 = "#686A71" - let g:terminal_color_9 = "#786DC5" - let g:terminal_color_10 = "#3D4048" - let g:terminal_color_11 = "#53555D" - let g:terminal_color_12 = "#7E8086" - let g:terminal_color_13 = "#A9AAAE" - let g:terminal_color_14 = "#C77C48" + let g:terminal_color_9 = "#B21889" + let g:terminal_color_10 = "#DF0002" + let g:terminal_color_11 = "#438288" + let g:terminal_color_12 = "#790EAD" + let g:terminal_color_13 = "#B21889" + let g:terminal_color_14 = "#00A0BE" let g:terminal_color_15 = "#BEBFC2" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-xcode-dusk" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi diff --git a/colors/base16-zenburn.vim b/colors/base16-zenburn.vim index 442fbb5..0f7d144 100644 --- a/colors/base16-zenburn.vim +++ b/colors/base16-zenburn.vim @@ -15,48 +15,86 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "3f3f3f" -let s:gui01 = "404040" -let s:gui02 = "606060" -let s:gui03 = "4f4f4f" -let s:gui04 = "808080" -let s:gui05 = "dcdccc" -let s:gui06 = "c0c0c0" -let s:gui07 = "ffffff" -let s:gui08 = "dca3a3" -let s:gui09 = "dfaf8f" -let s:gui0A = "e0cf9f" -let s:gui0B = "5f7f5f" -let s:gui0C = "93e0e3" -let s:gui0D = "7cb8bb" -let s:gui0E = "dc8cc3" -let s:gui0F = "000000" +let s:gui00 = "3f3f3f" +let g:base16_gui00 = "3f3f3f" +let s:gui01 = "404040" +let g:base16_gui01 = "404040" +let s:gui02 = "606060" +let g:base16_gui02 = "606060" +let s:gui03 = "4f4f4f" +let g:base16_gui03 = "4f4f4f" +let s:gui04 = "808080" +let g:base16_gui04 = "808080" +let s:gui05 = "dcdccc" +let g:base16_gui05 = "dcdccc" +let s:gui06 = "c0c0c0" +let g:base16_gui06 = "c0c0c0" +let s:gui07 = "ffffff" +let g:base16_gui07 = "ffffff" +let s:gui08 = "dca3a3" +let g:base16_gui08 = "dca3a3" +let s:gui09 = "dfaf8f" +let g:base16_gui09 = "dfaf8f" +let s:gui0A = "e0cf9f" +let g:base16_gui0A = "e0cf9f" +let s:gui0B = "5f7f5f" +let g:base16_gui0B = "5f7f5f" +let s:gui0C = "93e0e3" +let g:base16_gui0C = "93e0e3" +let s:gui0D = "7cb8bb" +let g:base16_gui0D = "7cb8bb" +let s:gui0E = "dc8cc3" +let g:base16_gui0E = "dc8cc3" +let s:gui0F = "000000" +let g:base16_gui0F = "000000" " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" endif " Neovim terminal colours @@ -70,15 +108,15 @@ if has("nvim") let g:terminal_color_6 = "#93e0e3" let g:terminal_color_7 = "#dcdccc" let g:terminal_color_8 = "#4f4f4f" - let g:terminal_color_9 = "#dfaf8f" - let g:terminal_color_10 = "#404040" - let g:terminal_color_11 = "#606060" - let g:terminal_color_12 = "#808080" - let g:terminal_color_13 = "#c0c0c0" - let g:terminal_color_14 = "#000000" + let g:terminal_color_9 = "#dca3a3" + let g:terminal_color_10 = "#5f7f5f" + let g:terminal_color_11 = "#e0cf9f" + let g:terminal_color_12 = "#7cb8bb" + let g:terminal_color_13 = "#dc8cc3" + let g:terminal_color_14 = "#93e0e3" let g:terminal_color_15 = "#ffffff" let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 @@ -91,7 +129,7 @@ syntax reset let g:colors_name = "base16-zenburn" " Highlighting function -fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -110,6 +148,11 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guisp != "" exec "hi " . a:group . " guisp=#" . a:guisp endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) endfun " Vim editor colors @@ -130,6 +173,7 @@ call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "") call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") @@ -322,6 +366,18 @@ call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + " Remove functions delf <sid>hi |