From 8698140aa454813a52cfeb153aa14f3f40a1b314 Mon Sep 17 00:00:00 2001 From: Chris Kempson Date: Tue, 28 Jun 2016 11:04:16 +0100 Subject: Updates colors --- colors/base16-3024.vim | 347 ++++++++++++++----------------- colors/base16-apathy.vim | 347 ++++++++++++++----------------- colors/base16-ashes.vim | 347 ++++++++++++++----------------- colors/base16-atelier-cave.vim | 271 ++++++++++++++++++++++++ colors/base16-atelier-dune.vim | 271 ++++++++++++++++++++++++ colors/base16-atelier-estuary.vim | 271 ++++++++++++++++++++++++ colors/base16-atelier-forest.vim | 271 ++++++++++++++++++++++++ colors/base16-atelier-heath.vim | 271 ++++++++++++++++++++++++ colors/base16-atelier-lakeside.vim | 271 ++++++++++++++++++++++++ colors/base16-atelier-plateau.vim | 271 ++++++++++++++++++++++++ colors/base16-atelier-savanna.vim | 271 ++++++++++++++++++++++++ colors/base16-atelier-seaside.vim | 271 ++++++++++++++++++++++++ colors/base16-atelier-sulphurpool.vim | 271 ++++++++++++++++++++++++ colors/base16-atelierdune.vim | 304 --------------------------- colors/base16-atelierforest.vim | 304 --------------------------- colors/base16-atelierheath.vim | 304 --------------------------- colors/base16-atelierlakeside.vim | 304 --------------------------- colors/base16-atelierseaside.vim | 304 --------------------------- colors/base16-bespin.vim | 347 ++++++++++++++----------------- colors/base16-brewer.vim | 347 ++++++++++++++----------------- colors/base16-bright.vim | 347 ++++++++++++++----------------- colors/base16-chalk.vim | 347 ++++++++++++++----------------- colors/base16-codeschool.vim | 347 ++++++++++++++----------------- colors/base16-colors.vim | 347 ++++++++++++++----------------- colors/base16-darktooth.vim | 271 ++++++++++++++++++++++++ colors/base16-default-dark.vim | 2 - colors/base16-default-light.vim | 2 - colors/base16-default.vim | 70 +------ colors/base16-eighties.vim | 2 - colors/base16-embers.vim | 347 ++++++++++++++----------------- colors/base16-flat.vim | 347 ++++++++++++++----------------- colors/base16-google.vim | 347 ++++++++++++++----------------- colors/base16-grayscale.vim | 347 ++++++++++++++----------------- colors/base16-green-screen.vim | 2 - colors/base16-greenscreen.vim | 304 --------------------------- colors/base16-harmonic16.vim | 347 ++++++++++++++----------------- colors/base16-hopscotch.vim | 271 ++++++++++++++++++++++++ colors/base16-ir-black.vim | 271 ++++++++++++++++++++++++ colors/base16-isotope.vim | 347 ++++++++++++++----------------- colors/base16-london-tube.vim | 271 ++++++++++++++++++++++++ colors/base16-londontube.vim | 304 --------------------------- colors/base16-macintosh.vim | 271 ++++++++++++++++++++++++ colors/base16-marrakesh.vim | 347 ++++++++++++++----------------- colors/base16-mocha.vim | 2 - colors/base16-monokai.vim | 347 ++++++++++++++----------------- colors/base16-ocean.vim | 2 - colors/base16-oceanicnext.vim | 271 ++++++++++++++++++++++++ colors/base16-paraiso.vim | 347 ++++++++++++++----------------- colors/base16-phd.vim | 271 ++++++++++++++++++++++++ colors/base16-pico.vim | 271 ++++++++++++++++++++++++ colors/base16-pop.vim | 376 ++++++++++++++++++---------------- colors/base16-railscasts.vim | 347 ++++++++++++++----------------- colors/base16-seti-ui.vim | 271 ++++++++++++++++++++++++ colors/base16-shapeshifter.vim | 347 ++++++++++++++----------------- colors/base16-solar-flare.vim | 271 ++++++++++++++++++++++++ colors/base16-solarized.vim | 347 ++++++++++++++----------------- colors/base16-spacemacs.vim | 271 ++++++++++++++++++++++++ colors/base16-summerfruit.vim | 347 ++++++++++++++----------------- colors/base16-tomorrow-day.vim | 2 - colors/base16-tomorrow-night.vim | 2 - colors/base16-tomorrow.vim | 347 ++++++++++++++----------------- colors/base16-twilight.vim | 347 ++++++++++++++----------------- 62 files changed, 9664 insertions(+), 6945 deletions(-) create mode 100644 colors/base16-atelier-cave.vim create mode 100644 colors/base16-atelier-dune.vim create mode 100644 colors/base16-atelier-estuary.vim create mode 100644 colors/base16-atelier-forest.vim create mode 100644 colors/base16-atelier-heath.vim create mode 100644 colors/base16-atelier-lakeside.vim create mode 100644 colors/base16-atelier-plateau.vim create mode 100644 colors/base16-atelier-savanna.vim create mode 100644 colors/base16-atelier-seaside.vim create mode 100644 colors/base16-atelier-sulphurpool.vim delete mode 100644 colors/base16-atelierdune.vim delete mode 100644 colors/base16-atelierforest.vim delete mode 100644 colors/base16-atelierheath.vim delete mode 100644 colors/base16-atelierlakeside.vim delete mode 100644 colors/base16-atelierseaside.vim create mode 100644 colors/base16-darktooth.vim delete mode 100644 colors/base16-greenscreen.vim create mode 100644 colors/base16-hopscotch.vim create mode 100644 colors/base16-ir-black.vim create mode 100644 colors/base16-london-tube.vim delete mode 100644 colors/base16-londontube.vim create mode 100644 colors/base16-macintosh.vim create mode 100644 colors/base16-oceanicnext.vim create mode 100644 colors/base16-phd.vim create mode 100644 colors/base16-pico.vim create mode 100644 colors/base16-seti-ui.vim create mode 100644 colors/base16-solar-flare.vim create mode 100644 colors/base16-spacemacs.vim (limited to 'colors') diff --git a/colors/base16-3024.vim b/colors/base16-3024.vim index f6923f0..c7ba802 100644 --- a/colors/base16-3024.vim +++ b/colors/base16-3024.vim @@ -1,5 +1,6 @@ -" Base16 3024 (https://github.com/chriskempson/base16) -" Scheme: Jan T. Sott (http://github.com/idleberg) +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" 3024 scheme by Jan T. Sott (http://github.com/idleberg) " This enables the coresponding base16-shell script to run so that " :colorscheme works in terminals supported by base16-shell scripts @@ -62,243 +63,209 @@ syntax reset let g:colors_name = "base16-3024" " Highlighting function -fun hi(group, guifg, guibg, ctermfg, ctermbg, attr) +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) + exec "hi " . a:group . " guifg=#" . a:guifg endif if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) + exec "hi " . a:group . " guibg=#" . a:guibg endif if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) + exec "hi " . a:group . " ctermfg=" . a:ctermfg endif if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) + exec "hi " . a:group . " ctermbg=" . a:ctermbg endif if a:attr != "" exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr endif -endfun - -" Return GUI color for light/dark variants -fun s:gui(color) - if &background == "dark" - return a:color - endif - - if a:color == s:gui00 - return s:gui07 - elseif a:color == s:gui01 - return s:gui06 - elseif a:color == s:gui02 - return s:gui05 - elseif a:color == s:gui03 - return s:gui04 - elseif a:color == s:gui04 - return s:gui03 - elseif a:color == s:gui05 - return s:gui02 - elseif a:color == s:gui06 - return s:gui01 - elseif a:color == s:gui07 - return s:gui00 - endif - - return a:color -endfun - -" Return terminal color for light/dark variants -fun s:cterm(color) - if &background == "dark" - return a:color - endif - - if a:color == s:cterm00 - return s:cterm07 - elseif a:color == s:cterm01 - return s:cterm06 - elseif a:color == s:cterm02 - return s:cterm05 - elseif a:color == s:cterm03 - return s:cterm04 - elseif a:color == s:cterm04 - return s:cterm03 - elseif a:color == s:cterm05 - return s:cterm02 - elseif a:color == s:cterm06 - return s:cterm01 - elseif a:color == s:cterm07 - return s:cterm00 + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp endif - - return a:color endfun " Vim editor colors -call hi("Bold", "", "", "", "", "bold") -call hi("Debug", s:gui08, "", s:cterm08, "", "") -call hi("Directory", s:gui0D, "", s:cterm0D, "", "") -call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("Exception", s:gui08, "", s:cterm08, "", "") -call hi("FoldColumn", "", s:gui01, "", s:cterm01, "") -call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none") -call hi("Italic", "", "", "", "", "none") -call hi("Macro", s:gui08, "", s:cterm08, "", "") -call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "") -call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("Question", s:gui0D, "", s:cterm0D, "", "") -call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("TooLong", s:gui08, "", s:cterm08, "", "") -call hi("Underlined", s:gui08, "", s:cterm08, "", "") -call hi("Visual", "", s:gui02, "", s:cterm02, "") -call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") -call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") -call hi("WildMenu", s:gui08, "", s:cterm08, "", "") -call hi("Title", s:gui0D, "", s:cterm0D, "", "none") -call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") -call hi("NonText", s:gui03, "", s:cterm03, "", "") -call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") -call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none") -call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLine", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") -call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "") -call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") " Standard syntax highlighting -call hi("Boolean", s:gui09, "", s:cterm09, "", "") -call hi("Character", s:gui08, "", s:cterm08, "", "") -call hi("Comment", s:gui03, "", s:cterm03, "", "") -call hi("Conditional", s:gui0E, "", s:cterm0E, "", "") -call hi("Constant", s:gui09, "", s:cterm09, "", "") -call hi("Define", s:gui0E, "", s:cterm0E, "", "none") -call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("Float", s:gui09, "", s:cterm09, "", "") -call hi("Function", s:gui0D, "", s:cterm0D, "", "") -call hi("Identifier", s:gui08, "", s:cterm08, "", "none") -call hi("Include", s:gui0D, "", s:cterm0D, "", "") -call hi("Keyword", s:gui0E, "", s:cterm0E, "", "") -call hi("Label", s:gui0A, "", s:cterm0A, "", "") -call hi("Number", s:gui09, "", s:cterm09, "", "") -call hi("Operator", s:gui05, "", s:cterm05, "", "none") -call hi("PreProc", s:gui0A, "", s:cterm0A, "", "") -call hi("Repeat", s:gui0A, "", s:cterm0A, "", "") -call hi("Special", s:gui0C, "", s:cterm0C, "", "") -call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "") -call hi("Statement", s:gui08, "", s:cterm08, "", "") -call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") -call hi("String", s:gui0B, "", s:cterm0B, "", "") -call hi("Structure", s:gui0E, "", s:cterm0E, "", "") -call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") -call hi("Type", s:gui0A, "", s:cterm0A, "", "none") -call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") " C highlighting -call hi("cOperator", s:gui0C, "", s:cterm0C, "", "") -call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "") +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") " CSS highlighting -call hi("cssBraces", s:gui05, "", s:cterm05, "", "") -call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "") -call hi("cssColor", s:gui0C, "", s:cterm0C, "", "") +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") " Git highlighting -call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") -call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + " GitGutter highlighting -call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "") +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") " HTML highlighting -call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "") -call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "") -call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "") -call hi("htmlTag", s:gui05, "", s:cterm05, "", "") +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") " JavaScript highlighting -call hi("javaScript", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "") +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") " Markdown highlighting -call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") " NERDTree highlighting -call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") -call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") " PHP highlighting -call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "") -call hi("phpComparison", s:gui05, "", s:cterm05, "", "") -call hi("phpParent", s:gui05, "", s:cterm05, "", "") +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting -call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "") -call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "") +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting -call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") -call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "") -call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "") -call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "") +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") " SASS highlighting -call hi("sassidChar", s:gui08, "", s:cterm08, "", "") -call hi("sassClassChar", s:gui09, "", s:cterm09, "", "") -call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "") +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") " Spelling highlighting -call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) " Remove functions delf hi -delf gui -delf cterm " Remove color variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F -unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-apathy.vim b/colors/base16-apathy.vim index b0b6f37..60ac41a 100644 --- a/colors/base16-apathy.vim +++ b/colors/base16-apathy.vim @@ -1,5 +1,6 @@ -" Base16 Apathy (https://github.com/chriskempson/base16) -" Scheme: Jannik Siebert (https://github.com/janniks) +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Apathy scheme by Jannik Siebert (https://github.com/janniks) " This enables the coresponding base16-shell script to run so that " :colorscheme works in terminals supported by base16-shell scripts @@ -62,243 +63,209 @@ syntax reset let g:colors_name = "base16-apathy" " Highlighting function -fun hi(group, guifg, guibg, ctermfg, ctermbg, attr) +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) + exec "hi " . a:group . " guifg=#" . a:guifg endif if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) + exec "hi " . a:group . " guibg=#" . a:guibg endif if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) + exec "hi " . a:group . " ctermfg=" . a:ctermfg endif if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) + exec "hi " . a:group . " ctermbg=" . a:ctermbg endif if a:attr != "" exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr endif -endfun - -" Return GUI color for light/dark variants -fun s:gui(color) - if &background == "dark" - return a:color - endif - - if a:color == s:gui00 - return s:gui07 - elseif a:color == s:gui01 - return s:gui06 - elseif a:color == s:gui02 - return s:gui05 - elseif a:color == s:gui03 - return s:gui04 - elseif a:color == s:gui04 - return s:gui03 - elseif a:color == s:gui05 - return s:gui02 - elseif a:color == s:gui06 - return s:gui01 - elseif a:color == s:gui07 - return s:gui00 - endif - - return a:color -endfun - -" Return terminal color for light/dark variants -fun s:cterm(color) - if &background == "dark" - return a:color - endif - - if a:color == s:cterm00 - return s:cterm07 - elseif a:color == s:cterm01 - return s:cterm06 - elseif a:color == s:cterm02 - return s:cterm05 - elseif a:color == s:cterm03 - return s:cterm04 - elseif a:color == s:cterm04 - return s:cterm03 - elseif a:color == s:cterm05 - return s:cterm02 - elseif a:color == s:cterm06 - return s:cterm01 - elseif a:color == s:cterm07 - return s:cterm00 + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp endif - - return a:color endfun " Vim editor colors -call hi("Bold", "", "", "", "", "bold") -call hi("Debug", s:gui08, "", s:cterm08, "", "") -call hi("Directory", s:gui0D, "", s:cterm0D, "", "") -call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("Exception", s:gui08, "", s:cterm08, "", "") -call hi("FoldColumn", "", s:gui01, "", s:cterm01, "") -call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none") -call hi("Italic", "", "", "", "", "none") -call hi("Macro", s:gui08, "", s:cterm08, "", "") -call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "") -call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("Question", s:gui0D, "", s:cterm0D, "", "") -call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("TooLong", s:gui08, "", s:cterm08, "", "") -call hi("Underlined", s:gui08, "", s:cterm08, "", "") -call hi("Visual", "", s:gui02, "", s:cterm02, "") -call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") -call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") -call hi("WildMenu", s:gui08, "", s:cterm08, "", "") -call hi("Title", s:gui0D, "", s:cterm0D, "", "none") -call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") -call hi("NonText", s:gui03, "", s:cterm03, "", "") -call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") -call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none") -call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLine", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") -call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "") -call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") " Standard syntax highlighting -call hi("Boolean", s:gui09, "", s:cterm09, "", "") -call hi("Character", s:gui08, "", s:cterm08, "", "") -call hi("Comment", s:gui03, "", s:cterm03, "", "") -call hi("Conditional", s:gui0E, "", s:cterm0E, "", "") -call hi("Constant", s:gui09, "", s:cterm09, "", "") -call hi("Define", s:gui0E, "", s:cterm0E, "", "none") -call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("Float", s:gui09, "", s:cterm09, "", "") -call hi("Function", s:gui0D, "", s:cterm0D, "", "") -call hi("Identifier", s:gui08, "", s:cterm08, "", "none") -call hi("Include", s:gui0D, "", s:cterm0D, "", "") -call hi("Keyword", s:gui0E, "", s:cterm0E, "", "") -call hi("Label", s:gui0A, "", s:cterm0A, "", "") -call hi("Number", s:gui09, "", s:cterm09, "", "") -call hi("Operator", s:gui05, "", s:cterm05, "", "none") -call hi("PreProc", s:gui0A, "", s:cterm0A, "", "") -call hi("Repeat", s:gui0A, "", s:cterm0A, "", "") -call hi("Special", s:gui0C, "", s:cterm0C, "", "") -call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "") -call hi("Statement", s:gui08, "", s:cterm08, "", "") -call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") -call hi("String", s:gui0B, "", s:cterm0B, "", "") -call hi("Structure", s:gui0E, "", s:cterm0E, "", "") -call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") -call hi("Type", s:gui0A, "", s:cterm0A, "", "none") -call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") " C highlighting -call hi("cOperator", s:gui0C, "", s:cterm0C, "", "") -call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "") +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") " CSS highlighting -call hi("cssBraces", s:gui05, "", s:cterm05, "", "") -call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "") -call hi("cssColor", s:gui0C, "", s:cterm0C, "", "") +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") " Git highlighting -call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") -call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + " GitGutter highlighting -call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "") +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") " HTML highlighting -call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "") -call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "") -call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "") -call hi("htmlTag", s:gui05, "", s:cterm05, "", "") +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") " JavaScript highlighting -call hi("javaScript", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "") +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") " Markdown highlighting -call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") " NERDTree highlighting -call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") -call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") " PHP highlighting -call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "") -call hi("phpComparison", s:gui05, "", s:cterm05, "", "") -call hi("phpParent", s:gui05, "", s:cterm05, "", "") +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting -call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "") -call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "") +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting -call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") -call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "") -call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "") -call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "") +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") " SASS highlighting -call hi("sassidChar", s:gui08, "", s:cterm08, "", "") -call hi("sassClassChar", s:gui09, "", s:cterm09, "", "") -call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "") +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") " Spelling highlighting -call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) " Remove functions delf hi -delf gui -delf cterm " Remove color variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F -unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-ashes.vim b/colors/base16-ashes.vim index 686f2d9..b14fbbf 100644 --- a/colors/base16-ashes.vim +++ b/colors/base16-ashes.vim @@ -1,5 +1,6 @@ -" Base16 Ashes (https://github.com/chriskempson/base16) -" Scheme: Jannik Siebert (https://github.com/janniks) +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Ashes scheme by Jannik Siebert (https://github.com/janniks) " This enables the coresponding base16-shell script to run so that " :colorscheme works in terminals supported by base16-shell scripts @@ -62,243 +63,209 @@ syntax reset let g:colors_name = "base16-ashes" " Highlighting function -fun hi(group, guifg, guibg, ctermfg, ctermbg, attr) +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) + exec "hi " . a:group . " guifg=#" . a:guifg endif if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) + exec "hi " . a:group . " guibg=#" . a:guibg endif if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) + exec "hi " . a:group . " ctermfg=" . a:ctermfg endif if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) + exec "hi " . a:group . " ctermbg=" . a:ctermbg endif if a:attr != "" exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr endif -endfun - -" Return GUI color for light/dark variants -fun s:gui(color) - if &background == "dark" - return a:color - endif - - if a:color == s:gui00 - return s:gui07 - elseif a:color == s:gui01 - return s:gui06 - elseif a:color == s:gui02 - return s:gui05 - elseif a:color == s:gui03 - return s:gui04 - elseif a:color == s:gui04 - return s:gui03 - elseif a:color == s:gui05 - return s:gui02 - elseif a:color == s:gui06 - return s:gui01 - elseif a:color == s:gui07 - return s:gui00 - endif - - return a:color -endfun - -" Return terminal color for light/dark variants -fun s:cterm(color) - if &background == "dark" - return a:color - endif - - if a:color == s:cterm00 - return s:cterm07 - elseif a:color == s:cterm01 - return s:cterm06 - elseif a:color == s:cterm02 - return s:cterm05 - elseif a:color == s:cterm03 - return s:cterm04 - elseif a:color == s:cterm04 - return s:cterm03 - elseif a:color == s:cterm05 - return s:cterm02 - elseif a:color == s:cterm06 - return s:cterm01 - elseif a:color == s:cterm07 - return s:cterm00 + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp endif - - return a:color endfun " Vim editor colors -call hi("Bold", "", "", "", "", "bold") -call hi("Debug", s:gui08, "", s:cterm08, "", "") -call hi("Directory", s:gui0D, "", s:cterm0D, "", "") -call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("Exception", s:gui08, "", s:cterm08, "", "") -call hi("FoldColumn", "", s:gui01, "", s:cterm01, "") -call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none") -call hi("Italic", "", "", "", "", "none") -call hi("Macro", s:gui08, "", s:cterm08, "", "") -call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "") -call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("Question", s:gui0D, "", s:cterm0D, "", "") -call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("TooLong", s:gui08, "", s:cterm08, "", "") -call hi("Underlined", s:gui08, "", s:cterm08, "", "") -call hi("Visual", "", s:gui02, "", s:cterm02, "") -call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") -call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") -call hi("WildMenu", s:gui08, "", s:cterm08, "", "") -call hi("Title", s:gui0D, "", s:cterm0D, "", "none") -call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") -call hi("NonText", s:gui03, "", s:cterm03, "", "") -call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") -call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none") -call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLine", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") -call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "") -call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") " Standard syntax highlighting -call hi("Boolean", s:gui09, "", s:cterm09, "", "") -call hi("Character", s:gui08, "", s:cterm08, "", "") -call hi("Comment", s:gui03, "", s:cterm03, "", "") -call hi("Conditional", s:gui0E, "", s:cterm0E, "", "") -call hi("Constant", s:gui09, "", s:cterm09, "", "") -call hi("Define", s:gui0E, "", s:cterm0E, "", "none") -call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("Float", s:gui09, "", s:cterm09, "", "") -call hi("Function", s:gui0D, "", s:cterm0D, "", "") -call hi("Identifier", s:gui08, "", s:cterm08, "", "none") -call hi("Include", s:gui0D, "", s:cterm0D, "", "") -call hi("Keyword", s:gui0E, "", s:cterm0E, "", "") -call hi("Label", s:gui0A, "", s:cterm0A, "", "") -call hi("Number", s:gui09, "", s:cterm09, "", "") -call hi("Operator", s:gui05, "", s:cterm05, "", "none") -call hi("PreProc", s:gui0A, "", s:cterm0A, "", "") -call hi("Repeat", s:gui0A, "", s:cterm0A, "", "") -call hi("Special", s:gui0C, "", s:cterm0C, "", "") -call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "") -call hi("Statement", s:gui08, "", s:cterm08, "", "") -call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") -call hi("String", s:gui0B, "", s:cterm0B, "", "") -call hi("Structure", s:gui0E, "", s:cterm0E, "", "") -call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") -call hi("Type", s:gui0A, "", s:cterm0A, "", "none") -call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") " C highlighting -call hi("cOperator", s:gui0C, "", s:cterm0C, "", "") -call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "") +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") " CSS highlighting -call hi("cssBraces", s:gui05, "", s:cterm05, "", "") -call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "") -call hi("cssColor", s:gui0C, "", s:cterm0C, "", "") +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") " Git highlighting -call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") -call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + " GitGutter highlighting -call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "") +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") " HTML highlighting -call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "") -call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "") -call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "") -call hi("htmlTag", s:gui05, "", s:cterm05, "", "") +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") " JavaScript highlighting -call hi("javaScript", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "") +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") " Markdown highlighting -call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") " NERDTree highlighting -call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") -call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") " PHP highlighting -call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "") -call hi("phpComparison", s:gui05, "", s:cterm05, "", "") -call hi("phpParent", s:gui05, "", s:cterm05, "", "") +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting -call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "") -call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "") +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting -call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") -call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "") -call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "") -call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "") +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") " SASS highlighting -call hi("sassidChar", s:gui08, "", s:cterm08, "", "") -call hi("sassClassChar", s:gui09, "", s:cterm09, "", "") -call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "") +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") " Spelling highlighting -call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) " Remove functions delf hi -delf gui -delf cterm " Remove color variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F -unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-atelier-cave.vim b/colors/base16-atelier-cave.vim new file mode 100644 index 0000000..9fecb95 --- /dev/null +++ b/colors/base16-atelier-cave.vim @@ -0,0 +1,271 @@ +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Atelier Cave scheme by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/cave) + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has('gui_running') + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelier-cave.".&background.".sh" + endif +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" + +" 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" +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" +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" +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-atelier-cave" + +" Highlighting function +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if a:attr != "" + exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + endif + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp + endif +endfun + +" Vim editor colors +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + +" GitGutter highlighting +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") + +" Python highlighting +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) + +" Remove functions +delf hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-atelier-dune.vim b/colors/base16-atelier-dune.vim new file mode 100644 index 0000000..148d3df --- /dev/null +++ b/colors/base16-atelier-dune.vim @@ -0,0 +1,271 @@ +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Atelier Dune scheme by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/dune) + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has('gui_running') + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelier-dune.".&background.".sh" + endif +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" + +" 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" +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" +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" +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-atelier-dune" + +" Highlighting function +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if a:attr != "" + exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + endif + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp + endif +endfun + +" Vim editor colors +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + +" GitGutter highlighting +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") + +" Python highlighting +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) + +" Remove functions +delf hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-atelier-estuary.vim b/colors/base16-atelier-estuary.vim new file mode 100644 index 0000000..de5788c --- /dev/null +++ b/colors/base16-atelier-estuary.vim @@ -0,0 +1,271 @@ +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Atelier Estuary scheme by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/estuary) + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has('gui_running') + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelier-estuary.".&background.".sh" + endif +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" + +" 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" +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" +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" +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-atelier-estuary" + +" Highlighting function +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if a:attr != "" + exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + endif + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp + endif +endfun + +" Vim editor colors +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + +" GitGutter highlighting +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") + +" Python highlighting +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) + +" Remove functions +delf hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-atelier-forest.vim b/colors/base16-atelier-forest.vim new file mode 100644 index 0000000..ca4ee9a --- /dev/null +++ b/colors/base16-atelier-forest.vim @@ -0,0 +1,271 @@ +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Atelier Forest scheme by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/forest) + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has('gui_running') + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelier-forest.".&background.".sh" + endif +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" + +" 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" +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" +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" +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-atelier-forest" + +" Highlighting function +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if a:attr != "" + exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + endif + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp + endif +endfun + +" Vim editor colors +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + +" GitGutter highlighting +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") + +" Python highlighting +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) + +" Remove functions +delf hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-atelier-heath.vim b/colors/base16-atelier-heath.vim new file mode 100644 index 0000000..879e4db --- /dev/null +++ b/colors/base16-atelier-heath.vim @@ -0,0 +1,271 @@ +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Atelier Heath scheme by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/heath) + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has('gui_running') + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelier-heath.".&background.".sh" + endif +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" + +" 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" +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" +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" +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-atelier-heath" + +" Highlighting function +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if a:attr != "" + exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + endif + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp + endif +endfun + +" Vim editor colors +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + +" GitGutter highlighting +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") + +" Python highlighting +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) + +" Remove functions +delf hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-atelier-lakeside.vim b/colors/base16-atelier-lakeside.vim new file mode 100644 index 0000000..e9816e1 --- /dev/null +++ b/colors/base16-atelier-lakeside.vim @@ -0,0 +1,271 @@ +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Atelier Lakeside scheme by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/lakeside/) + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has('gui_running') + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelier-lakeside.".&background.".sh" + endif +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" + +" 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" +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" +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" +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-atelier-lakeside" + +" Highlighting function +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if a:attr != "" + exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + endif + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp + endif +endfun + +" Vim editor colors +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + +" GitGutter highlighting +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") + +" Python highlighting +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) + +" Remove functions +delf hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-atelier-plateau.vim b/colors/base16-atelier-plateau.vim new file mode 100644 index 0000000..d7d7f16 --- /dev/null +++ b/colors/base16-atelier-plateau.vim @@ -0,0 +1,271 @@ +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Atelier Plateau scheme by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/plateau) + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has('gui_running') + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelier-plateau.".&background.".sh" + endif +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" + +" 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" +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" +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" +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-atelier-plateau" + +" Highlighting function +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if a:attr != "" + exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + endif + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp + endif +endfun + +" Vim editor colors +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + +" GitGutter highlighting +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") + +" Python highlighting +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) + +" Remove functions +delf hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-atelier-savanna.vim b/colors/base16-atelier-savanna.vim new file mode 100644 index 0000000..2f52dce --- /dev/null +++ b/colors/base16-atelier-savanna.vim @@ -0,0 +1,271 @@ +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Atelier Savanna scheme by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/savanna) + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has('gui_running') + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelier-savanna.".&background.".sh" + endif +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" + +" 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" +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" +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" +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-atelier-savanna" + +" Highlighting function +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if a:attr != "" + exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + endif + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp + endif +endfun + +" Vim editor colors +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + +" GitGutter highlighting +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") + +" Python highlighting +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) + +" Remove functions +delf hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-atelier-seaside.vim b/colors/base16-atelier-seaside.vim new file mode 100644 index 0000000..e3d86ba --- /dev/null +++ b/colors/base16-atelier-seaside.vim @@ -0,0 +1,271 @@ +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Atelier Seaside scheme by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/seaside/) + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has('gui_running') + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelier-seaside.".&background.".sh" + endif +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" + +" 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" +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" +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" +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-atelier-seaside" + +" Highlighting function +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if a:attr != "" + exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + endif + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp + endif +endfun + +" Vim editor colors +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + +" GitGutter highlighting +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") + +" Python highlighting +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) + +" Remove functions +delf hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-atelier-sulphurpool.vim b/colors/base16-atelier-sulphurpool.vim new file mode 100644 index 0000000..e84487e --- /dev/null +++ b/colors/base16-atelier-sulphurpool.vim @@ -0,0 +1,271 @@ +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Atelier Sulphurpool scheme by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/sulphurpool) + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has('gui_running') + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelier-sulphurpool.".&background.".sh" + endif +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" + +" 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" +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" +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" +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-atelier-sulphurpool" + +" Highlighting function +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if a:attr != "" + exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + endif + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp + endif +endfun + +" Vim editor colors +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + +" GitGutter highlighting +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") + +" Python highlighting +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) + +" Remove functions +delf hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-atelierdune.vim b/colors/base16-atelierdune.vim deleted file mode 100644 index b720ccf..0000000 --- a/colors/base16-atelierdune.vim +++ /dev/null @@ -1,304 +0,0 @@ -" Base16 Atelier Dune (https://github.com/chriskempson/base16) -" Scheme: Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/dune) - -" This enables the coresponding base16-shell script to run so that -" :colorscheme works in terminals supported by base16-shell scripts -" User must set this variable in .vimrc -" let g:base16_shell_path=base16-builder/output/shell/ -if !has('gui_running') - if exists("g:base16_shell_path") - execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelierdune.".&background.".sh" - endif -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 = "cfb017" -let s:gui0B = "60ac39" -let s:gui0C = "1fad83" -let s:gui0D = "6684e1" -let s:gui0E = "b854d4" -let s: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" -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" -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" -endif - -" Theme setup -hi clear -syntax reset -let g:colors_name = "base16-atelierdune" - -" Highlighting function -fun hi(group, guifg, guibg, ctermfg, ctermbg, attr) - if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) - endif - if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) - endif - if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) - endif - if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) - endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr - endif -endfun - -" Return GUI color for light/dark variants -fun s:gui(color) - if &background == "dark" - return a:color - endif - - if a:color == s:gui00 - return s:gui07 - elseif a:color == s:gui01 - return s:gui06 - elseif a:color == s:gui02 - return s:gui05 - elseif a:color == s:gui03 - return s:gui04 - elseif a:color == s:gui04 - return s:gui03 - elseif a:color == s:gui05 - return s:gui02 - elseif a:color == s:gui06 - return s:gui01 - elseif a:color == s:gui07 - return s:gui00 - endif - - return a:color -endfun - -" Return terminal color for light/dark variants -fun s:cterm(color) - if &background == "dark" - return a:color - endif - - if a:color == s:cterm00 - return s:cterm07 - elseif a:color == s:cterm01 - return s:cterm06 - elseif a:color == s:cterm02 - return s:cterm05 - elseif a:color == s:cterm03 - return s:cterm04 - elseif a:color == s:cterm04 - return s:cterm03 - elseif a:color == s:cterm05 - return s:cterm02 - elseif a:color == s:cterm06 - return s:cterm01 - elseif a:color == s:cterm07 - return s:cterm00 - endif - - return a:color -endfun - -" Vim editor colors -call hi("Bold", "", "", "", "", "bold") -call hi("Debug", s:gui08, "", s:cterm08, "", "") -call hi("Directory", s:gui0D, "", s:cterm0D, "", "") -call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("Exception", s:gui08, "", s:cterm08, "", "") -call hi("FoldColumn", "", s:gui01, "", s:cterm01, "") -call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none") -call hi("Italic", "", "", "", "", "none") -call hi("Macro", s:gui08, "", s:cterm08, "", "") -call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "") -call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("Question", s:gui0D, "", s:cterm0D, "", "") -call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("TooLong", s:gui08, "", s:cterm08, "", "") -call hi("Underlined", s:gui08, "", s:cterm08, "", "") -call hi("Visual", "", s:gui02, "", s:cterm02, "") -call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") -call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") -call hi("WildMenu", s:gui08, "", s:cterm08, "", "") -call hi("Title", s:gui0D, "", s:cterm0D, "", "none") -call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") -call hi("NonText", s:gui03, "", s:cterm03, "", "") -call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") -call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none") -call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLine", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") -call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "") -call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") - -" Standard syntax highlighting -call hi("Boolean", s:gui09, "", s:cterm09, "", "") -call hi("Character", s:gui08, "", s:cterm08, "", "") -call hi("Comment", s:gui03, "", s:cterm03, "", "") -call hi("Conditional", s:gui0E, "", s:cterm0E, "", "") -call hi("Constant", s:gui09, "", s:cterm09, "", "") -call hi("Define", s:gui0E, "", s:cterm0E, "", "none") -call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("Float", s:gui09, "", s:cterm09, "", "") -call hi("Function", s:gui0D, "", s:cterm0D, "", "") -call hi("Identifier", s:gui08, "", s:cterm08, "", "none") -call hi("Include", s:gui0D, "", s:cterm0D, "", "") -call hi("Keyword", s:gui0E, "", s:cterm0E, "", "") -call hi("Label", s:gui0A, "", s:cterm0A, "", "") -call hi("Number", s:gui09, "", s:cterm09, "", "") -call hi("Operator", s:gui05, "", s:cterm05, "", "none") -call hi("PreProc", s:gui0A, "", s:cterm0A, "", "") -call hi("Repeat", s:gui0A, "", s:cterm0A, "", "") -call hi("Special", s:gui0C, "", s:cterm0C, "", "") -call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "") -call hi("Statement", s:gui08, "", s:cterm08, "", "") -call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") -call hi("String", s:gui0B, "", s:cterm0B, "", "") -call hi("Structure", s:gui0E, "", s:cterm0E, "", "") -call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") -call hi("Type", s:gui0A, "", s:cterm0A, "", "none") -call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") - -" C highlighting -call hi("cOperator", s:gui0C, "", s:cterm0C, "", "") -call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "") - -" CSS highlighting -call hi("cssBraces", s:gui05, "", s:cterm05, "", "") -call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "") -call hi("cssColor", s:gui0C, "", s:cterm0C, "", "") - -" Diff highlighting -call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") - -" Git highlighting -call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") -call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - -" GitGutter highlighting -call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "") - -" HTML highlighting -call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "") -call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "") -call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "") -call hi("htmlTag", s:gui05, "", s:cterm05, "", "") - -" JavaScript highlighting -call hi("javaScript", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "") - -" Markdown highlighting -call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") - -" NERDTree highlighting -call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") -call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") - -" PHP highlighting -call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "") -call hi("phpComparison", s:gui05, "", s:cterm05, "", "") -call hi("phpParent", s:gui05, "", s:cterm05, "", "") - -" Python highlighting -call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "") -call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "") - -" Ruby highlighting -call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") -call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "") -call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "") -call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "") - -" SASS highlighting -call hi("sassidChar", s:gui08, "", s:cterm08, "", "") -call hi("sassClassChar", s:gui09, "", s:cterm09, "", "") -call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "") - -" Signify highlighting -call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") - -" Spelling highlighting -call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") - -" Remove functions -delf hi -delf gui -delf cterm - -" Remove color variables -unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F -unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F diff --git a/colors/base16-atelierforest.vim b/colors/base16-atelierforest.vim deleted file mode 100644 index f05686c..0000000 --- a/colors/base16-atelierforest.vim +++ /dev/null @@ -1,304 +0,0 @@ -" Base16 Atelier Forest (https://github.com/chriskempson/base16) -" Scheme: Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/forest) - -" This enables the coresponding base16-shell script to run so that -" :colorscheme works in terminals supported by base16-shell scripts -" User must set this variable in .vimrc -" let g:base16_shell_path=base16-builder/output/shell/ -if !has('gui_running') - if exists("g:base16_shell_path") - execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelierforest.".&background.".sh" - endif -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 = "d5911a" -let s:gui0B = "5ab738" -let s:gui0C = "00ad9c" -let s:gui0D = "407ee7" -let s:gui0E = "6666ea" -let s: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" -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" -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" -endif - -" Theme setup -hi clear -syntax reset -let g:colors_name = "base16-atelierforest" - -" Highlighting function -fun hi(group, guifg, guibg, ctermfg, ctermbg, attr) - if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) - endif - if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) - endif - if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) - endif - if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) - endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr - endif -endfun - -" Return GUI color for light/dark variants -fun s:gui(color) - if &background == "dark" - return a:color - endif - - if a:color == s:gui00 - return s:gui07 - elseif a:color == s:gui01 - return s:gui06 - elseif a:color == s:gui02 - return s:gui05 - elseif a:color == s:gui03 - return s:gui04 - elseif a:color == s:gui04 - return s:gui03 - elseif a:color == s:gui05 - return s:gui02 - elseif a:color == s:gui06 - return s:gui01 - elseif a:color == s:gui07 - return s:gui00 - endif - - return a:color -endfun - -" Return terminal color for light/dark variants -fun s:cterm(color) - if &background == "dark" - return a:color - endif - - if a:color == s:cterm00 - return s:cterm07 - elseif a:color == s:cterm01 - return s:cterm06 - elseif a:color == s:cterm02 - return s:cterm05 - elseif a:color == s:cterm03 - return s:cterm04 - elseif a:color == s:cterm04 - return s:cterm03 - elseif a:color == s:cterm05 - return s:cterm02 - elseif a:color == s:cterm06 - return s:cterm01 - elseif a:color == s:cterm07 - return s:cterm00 - endif - - return a:color -endfun - -" Vim editor colors -call hi("Bold", "", "", "", "", "bold") -call hi("Debug", s:gui08, "", s:cterm08, "", "") -call hi("Directory", s:gui0D, "", s:cterm0D, "", "") -call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("Exception", s:gui08, "", s:cterm08, "", "") -call hi("FoldColumn", "", s:gui01, "", s:cterm01, "") -call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none") -call hi("Italic", "", "", "", "", "none") -call hi("Macro", s:gui08, "", s:cterm08, "", "") -call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "") -call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("Question", s:gui0D, "", s:cterm0D, "", "") -call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("TooLong", s:gui08, "", s:cterm08, "", "") -call hi("Underlined", s:gui08, "", s:cterm08, "", "") -call hi("Visual", "", s:gui02, "", s:cterm02, "") -call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") -call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") -call hi("WildMenu", s:gui08, "", s:cterm08, "", "") -call hi("Title", s:gui0D, "", s:cterm0D, "", "none") -call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") -call hi("NonText", s:gui03, "", s:cterm03, "", "") -call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") -call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none") -call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLine", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") -call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "") -call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") - -" Standard syntax highlighting -call hi("Boolean", s:gui09, "", s:cterm09, "", "") -call hi("Character", s:gui08, "", s:cterm08, "", "") -call hi("Comment", s:gui03, "", s:cterm03, "", "") -call hi("Conditional", s:gui0E, "", s:cterm0E, "", "") -call hi("Constant", s:gui09, "", s:cterm09, "", "") -call hi("Define", s:gui0E, "", s:cterm0E, "", "none") -call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("Float", s:gui09, "", s:cterm09, "", "") -call hi("Function", s:gui0D, "", s:cterm0D, "", "") -call hi("Identifier", s:gui08, "", s:cterm08, "", "none") -call hi("Include", s:gui0D, "", s:cterm0D, "", "") -call hi("Keyword", s:gui0E, "", s:cterm0E, "", "") -call hi("Label", s:gui0A, "", s:cterm0A, "", "") -call hi("Number", s:gui09, "", s:cterm09, "", "") -call hi("Operator", s:gui05, "", s:cterm05, "", "none") -call hi("PreProc", s:gui0A, "", s:cterm0A, "", "") -call hi("Repeat", s:gui0A, "", s:cterm0A, "", "") -call hi("Special", s:gui0C, "", s:cterm0C, "", "") -call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "") -call hi("Statement", s:gui08, "", s:cterm08, "", "") -call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") -call hi("String", s:gui0B, "", s:cterm0B, "", "") -call hi("Structure", s:gui0E, "", s:cterm0E, "", "") -call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") -call hi("Type", s:gui0A, "", s:cterm0A, "", "none") -call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") - -" C highlighting -call hi("cOperator", s:gui0C, "", s:cterm0C, "", "") -call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "") - -" CSS highlighting -call hi("cssBraces", s:gui05, "", s:cterm05, "", "") -call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "") -call hi("cssColor", s:gui0C, "", s:cterm0C, "", "") - -" Diff highlighting -call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") - -" Git highlighting -call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") -call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - -" GitGutter highlighting -call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "") - -" HTML highlighting -call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "") -call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "") -call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "") -call hi("htmlTag", s:gui05, "", s:cterm05, "", "") - -" JavaScript highlighting -call hi("javaScript", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "") - -" Markdown highlighting -call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") - -" NERDTree highlighting -call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") -call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") - -" PHP highlighting -call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "") -call hi("phpComparison", s:gui05, "", s:cterm05, "", "") -call hi("phpParent", s:gui05, "", s:cterm05, "", "") - -" Python highlighting -call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "") -call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "") - -" Ruby highlighting -call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") -call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "") -call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "") -call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "") - -" SASS highlighting -call hi("sassidChar", s:gui08, "", s:cterm08, "", "") -call hi("sassClassChar", s:gui09, "", s:cterm09, "", "") -call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "") - -" Signify highlighting -call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") - -" Spelling highlighting -call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") - -" Remove functions -delf hi -delf gui -delf cterm - -" Remove color variables -unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F -unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F diff --git a/colors/base16-atelierheath.vim b/colors/base16-atelierheath.vim deleted file mode 100644 index 1777043..0000000 --- a/colors/base16-atelierheath.vim +++ /dev/null @@ -1,304 +0,0 @@ -" Base16 Atelier Heath (https://github.com/chriskempson/base16) -" Scheme: Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/heath) - -" This enables the coresponding base16-shell script to run so that -" :colorscheme works in terminals supported by base16-shell scripts -" User must set this variable in .vimrc -" let g:base16_shell_path=base16-builder/output/shell/ -if !has('gui_running') - if exists("g:base16_shell_path") - execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelierheath.".&background.".sh" - endif -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 = "379a37" -let s:gui0C = "159393" -let s:gui0D = "516aec" -let s:gui0E = "7b59c0" -let s: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" -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" -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" -endif - -" Theme setup -hi clear -syntax reset -let g:colors_name = "base16-atelierheath" - -" Highlighting function -fun hi(group, guifg, guibg, ctermfg, ctermbg, attr) - if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) - endif - if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) - endif - if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) - endif - if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) - endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr - endif -endfun - -" Return GUI color for light/dark variants -fun s:gui(color) - if &background == "dark" - return a:color - endif - - if a:color == s:gui00 - return s:gui07 - elseif a:color == s:gui01 - return s:gui06 - elseif a:color == s:gui02 - return s:gui05 - elseif a:color == s:gui03 - return s:gui04 - elseif a:color == s:gui04 - return s:gui03 - elseif a:color == s:gui05 - return s:gui02 - elseif a:color == s:gui06 - return s:gui01 - elseif a:color == s:gui07 - return s:gui00 - endif - - return a:color -endfun - -" Return terminal color for light/dark variants -fun s:cterm(color) - if &background == "dark" - return a:color - endif - - if a:color == s:cterm00 - return s:cterm07 - elseif a:color == s:cterm01 - return s:cterm06 - elseif a:color == s:cterm02 - return s:cterm05 - elseif a:color == s:cterm03 - return s:cterm04 - elseif a:color == s:cterm04 - return s:cterm03 - elseif a:color == s:cterm05 - return s:cterm02 - elseif a:color == s:cterm06 - return s:cterm01 - elseif a:color == s:cterm07 - return s:cterm00 - endif - - return a:color -endfun - -" Vim editor colors -call hi("Bold", "", "", "", "", "bold") -call hi("Debug", s:gui08, "", s:cterm08, "", "") -call hi("Directory", s:gui0D, "", s:cterm0D, "", "") -call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("Exception", s:gui08, "", s:cterm08, "", "") -call hi("FoldColumn", "", s:gui01, "", s:cterm01, "") -call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none") -call hi("Italic", "", "", "", "", "none") -call hi("Macro", s:gui08, "", s:cterm08, "", "") -call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "") -call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("Question", s:gui0D, "", s:cterm0D, "", "") -call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("TooLong", s:gui08, "", s:cterm08, "", "") -call hi("Underlined", s:gui08, "", s:cterm08, "", "") -call hi("Visual", "", s:gui02, "", s:cterm02, "") -call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") -call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") -call hi("WildMenu", s:gui08, "", s:cterm08, "", "") -call hi("Title", s:gui0D, "", s:cterm0D, "", "none") -call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") -call hi("NonText", s:gui03, "", s:cterm03, "", "") -call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") -call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none") -call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLine", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") -call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "") -call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") - -" Standard syntax highlighting -call hi("Boolean", s:gui09, "", s:cterm09, "", "") -call hi("Character", s:gui08, "", s:cterm08, "", "") -call hi("Comment", s:gui03, "", s:cterm03, "", "") -call hi("Conditional", s:gui0E, "", s:cterm0E, "", "") -call hi("Constant", s:gui09, "", s:cterm09, "", "") -call hi("Define", s:gui0E, "", s:cterm0E, "", "none") -call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("Float", s:gui09, "", s:cterm09, "", "") -call hi("Function", s:gui0D, "", s:cterm0D, "", "") -call hi("Identifier", s:gui08, "", s:cterm08, "", "none") -call hi("Include", s:gui0D, "", s:cterm0D, "", "") -call hi("Keyword", s:gui0E, "", s:cterm0E, "", "") -call hi("Label", s:gui0A, "", s:cterm0A, "", "") -call hi("Number", s:gui09, "", s:cterm09, "", "") -call hi("Operator", s:gui05, "", s:cterm05, "", "none") -call hi("PreProc", s:gui0A, "", s:cterm0A, "", "") -call hi("Repeat", s:gui0A, "", s:cterm0A, "", "") -call hi("Special", s:gui0C, "", s:cterm0C, "", "") -call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "") -call hi("Statement", s:gui08, "", s:cterm08, "", "") -call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") -call hi("String", s:gui0B, "", s:cterm0B, "", "") -call hi("Structure", s:gui0E, "", s:cterm0E, "", "") -call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") -call hi("Type", s:gui0A, "", s:cterm0A, "", "none") -call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") - -" C highlighting -call hi("cOperator", s:gui0C, "", s:cterm0C, "", "") -call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "") - -" CSS highlighting -call hi("cssBraces", s:gui05, "", s:cterm05, "", "") -call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "") -call hi("cssColor", s:gui0C, "", s:cterm0C, "", "") - -" Diff highlighting -call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") - -" Git highlighting -call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") -call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - -" GitGutter highlighting -call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "") - -" HTML highlighting -call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "") -call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "") -call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "") -call hi("htmlTag", s:gui05, "", s:cterm05, "", "") - -" JavaScript highlighting -call hi("javaScript", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "") - -" Markdown highlighting -call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") - -" NERDTree highlighting -call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") -call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") - -" PHP highlighting -call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "") -call hi("phpComparison", s:gui05, "", s:cterm05, "", "") -call hi("phpParent", s:gui05, "", s:cterm05, "", "") - -" Python highlighting -call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "") -call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "") - -" Ruby highlighting -call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") -call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "") -call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "") -call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "") - -" SASS highlighting -call hi("sassidChar", s:gui08, "", s:cterm08, "", "") -call hi("sassClassChar", s:gui09, "", s:cterm09, "", "") -call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "") - -" Signify highlighting -call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") - -" Spelling highlighting -call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") - -" Remove functions -delf hi -delf gui -delf cterm - -" Remove color variables -unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F -unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F diff --git a/colors/base16-atelierlakeside.vim b/colors/base16-atelierlakeside.vim deleted file mode 100644 index 692659d..0000000 --- a/colors/base16-atelierlakeside.vim +++ /dev/null @@ -1,304 +0,0 @@ -" Base16 Atelier Lakeside (https://github.com/chriskempson/base16) -" Scheme: Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/lakeside/) - -" This enables the coresponding base16-shell script to run so that -" :colorscheme works in terminals supported by base16-shell scripts -" User must set this variable in .vimrc -" let g:base16_shell_path=base16-builder/output/shell/ -if !has('gui_running') - if exists("g:base16_shell_path") - execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelierlakeside.".&background.".sh" - endif -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 = "5d5db1" -let s: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" -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" -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" -endif - -" Theme setup -hi clear -syntax reset -let g:colors_name = "base16-atelierlakeside" - -" Highlighting function -fun hi(group, guifg, guibg, ctermfg, ctermbg, attr) - if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) - endif - if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) - endif - if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) - endif - if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) - endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr - endif -endfun - -" Return GUI color for light/dark variants -fun s:gui(color) - if &background == "dark" - return a:color - endif - - if a:color == s:gui00 - return s:gui07 - elseif a:color == s:gui01 - return s:gui06 - elseif a:color == s:gui02 - return s:gui05 - elseif a:color == s:gui03 - return s:gui04 - elseif a:color == s:gui04 - return s:gui03 - elseif a:color == s:gui05 - return s:gui02 - elseif a:color == s:gui06 - return s:gui01 - elseif a:color == s:gui07 - return s:gui00 - endif - - return a:color -endfun - -" Return terminal color for light/dark variants -fun s:cterm(color) - if &background == "dark" - return a:color - endif - - if a:color == s:cterm00 - return s:cterm07 - elseif a:color == s:cterm01 - return s:cterm06 - elseif a:color == s:cterm02 - return s:cterm05 - elseif a:color == s:cterm03 - return s:cterm04 - elseif a:color == s:cterm04 - return s:cterm03 - elseif a:color == s:cterm05 - return s:cterm02 - elseif a:color == s:cterm06 - return s:cterm01 - elseif a:color == s:cterm07 - return s:cterm00 - endif - - return a:color -endfun - -" Vim editor colors -call hi("Bold", "", "", "", "", "bold") -call hi("Debug", s:gui08, "", s:cterm08, "", "") -call hi("Directory", s:gui0D, "", s:cterm0D, "", "") -call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("Exception", s:gui08, "", s:cterm08, "", "") -call hi("FoldColumn", "", s:gui01, "", s:cterm01, "") -call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none") -call hi("Italic", "", "", "", "", "none") -call hi("Macro", s:gui08, "", s:cterm08, "", "") -call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "") -call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("Question", s:gui0D, "", s:cterm0D, "", "") -call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("TooLong", s:gui08, "", s:cterm08, "", "") -call hi("Underlined", s:gui08, "", s:cterm08, "", "") -call hi("Visual", "", s:gui02, "", s:cterm02, "") -call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") -call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") -call hi("WildMenu", s:gui08, "", s:cterm08, "", "") -call hi("Title", s:gui0D, "", s:cterm0D, "", "none") -call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") -call hi("NonText", s:gui03, "", s:cterm03, "", "") -call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") -call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none") -call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLine", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") -call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "") -call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") - -" Standard syntax highlighting -call hi("Boolean", s:gui09, "", s:cterm09, "", "") -call hi("Character", s:gui08, "", s:cterm08, "", "") -call hi("Comment", s:gui03, "", s:cterm03, "", "") -call hi("Conditional", s:gui0E, "", s:cterm0E, "", "") -call hi("Constant", s:gui09, "", s:cterm09, "", "") -call hi("Define", s:gui0E, "", s:cterm0E, "", "none") -call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("Float", s:gui09, "", s:cterm09, "", "") -call hi("Function", s:gui0D, "", s:cterm0D, "", "") -call hi("Identifier", s:gui08, "", s:cterm08, "", "none") -call hi("Include", s:gui0D, "", s:cterm0D, "", "") -call hi("Keyword", s:gui0E, "", s:cterm0E, "", "") -call hi("Label", s:gui0A, "", s:cterm0A, "", "") -call hi("Number", s:gui09, "", s:cterm09, "", "") -call hi("Operator", s:gui05, "", s:cterm05, "", "none") -call hi("PreProc", s:gui0A, "", s:cterm0A, "", "") -call hi("Repeat", s:gui0A, "", s:cterm0A, "", "") -call hi("Special", s:gui0C, "", s:cterm0C, "", "") -call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "") -call hi("Statement", s:gui08, "", s:cterm08, "", "") -call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") -call hi("String", s:gui0B, "", s:cterm0B, "", "") -call hi("Structure", s:gui0E, "", s:cterm0E, "", "") -call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") -call hi("Type", s:gui0A, "", s:cterm0A, "", "none") -call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") - -" C highlighting -call hi("cOperator", s:gui0C, "", s:cterm0C, "", "") -call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "") - -" CSS highlighting -call hi("cssBraces", s:gui05, "", s:cterm05, "", "") -call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "") -call hi("cssColor", s:gui0C, "", s:cterm0C, "", "") - -" Diff highlighting -call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") - -" Git highlighting -call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") -call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - -" GitGutter highlighting -call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "") - -" HTML highlighting -call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "") -call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "") -call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "") -call hi("htmlTag", s:gui05, "", s:cterm05, "", "") - -" JavaScript highlighting -call hi("javaScript", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "") - -" Markdown highlighting -call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") - -" NERDTree highlighting -call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") -call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") - -" PHP highlighting -call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "") -call hi("phpComparison", s:gui05, "", s:cterm05, "", "") -call hi("phpParent", s:gui05, "", s:cterm05, "", "") - -" Python highlighting -call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "") -call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "") - -" Ruby highlighting -call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") -call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "") -call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "") -call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "") - -" SASS highlighting -call hi("sassidChar", s:gui08, "", s:cterm08, "", "") -call hi("sassClassChar", s:gui09, "", s:cterm09, "", "") -call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "") - -" Signify highlighting -call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") - -" Spelling highlighting -call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") - -" Remove functions -delf hi -delf gui -delf cterm - -" Remove color variables -unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F -unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F diff --git a/colors/base16-atelierseaside.vim b/colors/base16-atelierseaside.vim deleted file mode 100644 index e0ea42f..0000000 --- a/colors/base16-atelierseaside.vim +++ /dev/null @@ -1,304 +0,0 @@ -" Base16 Atelier Seaside (https://github.com/chriskempson/base16) -" Scheme: Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/seaside/) - -" This enables the coresponding base16-shell script to run so that -" :colorscheme works in terminals supported by base16-shell scripts -" User must set this variable in .vimrc -" let g:base16_shell_path=base16-builder/output/shell/ -if !has('gui_running') - if exists("g:base16_shell_path") - execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelierseaside.".&background.".sh" - endif -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 = "f0fff0" -let s:gui08 = "e6193c" -let s:gui09 = "87711d" -let s:gui0A = "c3c322" -let s:gui0B = "29a329" -let s:gui0C = "1999b3" -let s:gui0D = "3d62f5" -let s:gui0E = "ad2bee" -let s: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" -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" -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" -endif - -" Theme setup -hi clear -syntax reset -let g:colors_name = "base16-atelierseaside" - -" Highlighting function -fun hi(group, guifg, guibg, ctermfg, ctermbg, attr) - if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) - endif - if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) - endif - if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) - endif - if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) - endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr - endif -endfun - -" Return GUI color for light/dark variants -fun s:gui(color) - if &background == "dark" - return a:color - endif - - if a:color == s:gui00 - return s:gui07 - elseif a:color == s:gui01 - return s:gui06 - elseif a:color == s:gui02 - return s:gui05 - elseif a:color == s:gui03 - return s:gui04 - elseif a:color == s:gui04 - return s:gui03 - elseif a:color == s:gui05 - return s:gui02 - elseif a:color == s:gui06 - return s:gui01 - elseif a:color == s:gui07 - return s:gui00 - endif - - return a:color -endfun - -" Return terminal color for light/dark variants -fun s:cterm(color) - if &background == "dark" - return a:color - endif - - if a:color == s:cterm00 - return s:cterm07 - elseif a:color == s:cterm01 - return s:cterm06 - elseif a:color == s:cterm02 - return s:cterm05 - elseif a:color == s:cterm03 - return s:cterm04 - elseif a:color == s:cterm04 - return s:cterm03 - elseif a:color == s:cterm05 - return s:cterm02 - elseif a:color == s:cterm06 - return s:cterm01 - elseif a:color == s:cterm07 - return s:cterm00 - endif - - return a:color -endfun - -" Vim editor colors -call hi("Bold", "", "", "", "", "bold") -call hi("Debug", s:gui08, "", s:cterm08, "", "") -call hi("Directory", s:gui0D, "", s:cterm0D, "", "") -call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("Exception", s:gui08, "", s:cterm08, "", "") -call hi("FoldColumn", "", s:gui01, "", s:cterm01, "") -call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none") -call hi("Italic", "", "", "", "", "none") -call hi("Macro", s:gui08, "", s:cterm08, "", "") -call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "") -call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("Question", s:gui0D, "", s:cterm0D, "", "") -call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("TooLong", s:gui08, "", s:cterm08, "", "") -call hi("Underlined", s:gui08, "", s:cterm08, "", "") -call hi("Visual", "", s:gui02, "", s:cterm02, "") -call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") -call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") -call hi("WildMenu", s:gui08, "", s:cterm08, "", "") -call hi("Title", s:gui0D, "", s:cterm0D, "", "none") -call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") -call hi("NonText", s:gui03, "", s:cterm03, "", "") -call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") -call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none") -call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLine", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") -call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "") -call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") - -" Standard syntax highlighting -call hi("Boolean", s:gui09, "", s:cterm09, "", "") -call hi("Character", s:gui08, "", s:cterm08, "", "") -call hi("Comment", s:gui03, "", s:cterm03, "", "") -call hi("Conditional", s:gui0E, "", s:cterm0E, "", "") -call hi("Constant", s:gui09, "", s:cterm09, "", "") -call hi("Define", s:gui0E, "", s:cterm0E, "", "none") -call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("Float", s:gui09, "", s:cterm09, "", "") -call hi("Function", s:gui0D, "", s:cterm0D, "", "") -call hi("Identifier", s:gui08, "", s:cterm08, "", "none") -call hi("Include", s:gui0D, "", s:cterm0D, "", "") -call hi("Keyword", s:gui0E, "", s:cterm0E, "", "") -call hi("Label", s:gui0A, "", s:cterm0A, "", "") -call hi("Number", s:gui09, "", s:cterm09, "", "") -call hi("Operator", s:gui05, "", s:cterm05, "", "none") -call hi("PreProc", s:gui0A, "", s:cterm0A, "", "") -call hi("Repeat", s:gui0A, "", s:cterm0A, "", "") -call hi("Special", s:gui0C, "", s:cterm0C, "", "") -call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "") -call hi("Statement", s:gui08, "", s:cterm08, "", "") -call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") -call hi("String", s:gui0B, "", s:cterm0B, "", "") -call hi("Structure", s:gui0E, "", s:cterm0E, "", "") -call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") -call hi("Type", s:gui0A, "", s:cterm0A, "", "none") -call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") - -" C highlighting -call hi("cOperator", s:gui0C, "", s:cterm0C, "", "") -call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "") - -" CSS highlighting -call hi("cssBraces", s:gui05, "", s:cterm05, "", "") -call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "") -call hi("cssColor", s:gui0C, "", s:cterm0C, "", "") - -" Diff highlighting -call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") - -" Git highlighting -call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") -call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - -" GitGutter highlighting -call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "") - -" HTML highlighting -call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "") -call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "") -call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "") -call hi("htmlTag", s:gui05, "", s:cterm05, "", "") - -" JavaScript highlighting -call hi("javaScript", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "") - -" Markdown highlighting -call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") - -" NERDTree highlighting -call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") -call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") - -" PHP highlighting -call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "") -call hi("phpComparison", s:gui05, "", s:cterm05, "", "") -call hi("phpParent", s:gui05, "", s:cterm05, "", "") - -" Python highlighting -call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "") -call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "") - -" Ruby highlighting -call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") -call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "") -call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "") -call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "") - -" SASS highlighting -call hi("sassidChar", s:gui08, "", s:cterm08, "", "") -call hi("sassClassChar", s:gui09, "", s:cterm09, "", "") -call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "") - -" Signify highlighting -call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") - -" Spelling highlighting -call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") - -" Remove functions -delf hi -delf gui -delf cterm - -" Remove color variables -unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F -unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F diff --git a/colors/base16-bespin.vim b/colors/base16-bespin.vim index 5a6cb45..329d389 100644 --- a/colors/base16-bespin.vim +++ b/colors/base16-bespin.vim @@ -1,5 +1,6 @@ -" Base16 Bespin (https://github.com/chriskempson/base16) -" Scheme: Jan T. Sott +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Bespin scheme by Jan T. Sott " This enables the coresponding base16-shell script to run so that " :colorscheme works in terminals supported by base16-shell scripts @@ -62,243 +63,209 @@ syntax reset let g:colors_name = "base16-bespin" " Highlighting function -fun hi(group, guifg, guibg, ctermfg, ctermbg, attr) +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) + exec "hi " . a:group . " guifg=#" . a:guifg endif if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) + exec "hi " . a:group . " guibg=#" . a:guibg endif if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) + exec "hi " . a:group . " ctermfg=" . a:ctermfg endif if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) + exec "hi " . a:group . " ctermbg=" . a:ctermbg endif if a:attr != "" exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr endif -endfun - -" Return GUI color for light/dark variants -fun s:gui(color) - if &background == "dark" - return a:color - endif - - if a:color == s:gui00 - return s:gui07 - elseif a:color == s:gui01 - return s:gui06 - elseif a:color == s:gui02 - return s:gui05 - elseif a:color == s:gui03 - return s:gui04 - elseif a:color == s:gui04 - return s:gui03 - elseif a:color == s:gui05 - return s:gui02 - elseif a:color == s:gui06 - return s:gui01 - elseif a:color == s:gui07 - return s:gui00 - endif - - return a:color -endfun - -" Return terminal color for light/dark variants -fun s:cterm(color) - if &background == "dark" - return a:color - endif - - if a:color == s:cterm00 - return s:cterm07 - elseif a:color == s:cterm01 - return s:cterm06 - elseif a:color == s:cterm02 - return s:cterm05 - elseif a:color == s:cterm03 - return s:cterm04 - elseif a:color == s:cterm04 - return s:cterm03 - elseif a:color == s:cterm05 - return s:cterm02 - elseif a:color == s:cterm06 - return s:cterm01 - elseif a:color == s:cterm07 - return s:cterm00 + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp endif - - return a:color endfun " Vim editor colors -call hi("Bold", "", "", "", "", "bold") -call hi("Debug", s:gui08, "", s:cterm08, "", "") -call hi("Directory", s:gui0D, "", s:cterm0D, "", "") -call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("Exception", s:gui08, "", s:cterm08, "", "") -call hi("FoldColumn", "", s:gui01, "", s:cterm01, "") -call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none") -call hi("Italic", "", "", "", "", "none") -call hi("Macro", s:gui08, "", s:cterm08, "", "") -call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "") -call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("Question", s:gui0D, "", s:cterm0D, "", "") -call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("TooLong", s:gui08, "", s:cterm08, "", "") -call hi("Underlined", s:gui08, "", s:cterm08, "", "") -call hi("Visual", "", s:gui02, "", s:cterm02, "") -call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") -call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") -call hi("WildMenu", s:gui08, "", s:cterm08, "", "") -call hi("Title", s:gui0D, "", s:cterm0D, "", "none") -call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") -call hi("NonText", s:gui03, "", s:cterm03, "", "") -call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") -call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none") -call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLine", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") -call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "") -call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") " Standard syntax highlighting -call hi("Boolean", s:gui09, "", s:cterm09, "", "") -call hi("Character", s:gui08, "", s:cterm08, "", "") -call hi("Comment", s:gui03, "", s:cterm03, "", "") -call hi("Conditional", s:gui0E, "", s:cterm0E, "", "") -call hi("Constant", s:gui09, "", s:cterm09, "", "") -call hi("Define", s:gui0E, "", s:cterm0E, "", "none") -call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("Float", s:gui09, "", s:cterm09, "", "") -call hi("Function", s:gui0D, "", s:cterm0D, "", "") -call hi("Identifier", s:gui08, "", s:cterm08, "", "none") -call hi("Include", s:gui0D, "", s:cterm0D, "", "") -call hi("Keyword", s:gui0E, "", s:cterm0E, "", "") -call hi("Label", s:gui0A, "", s:cterm0A, "", "") -call hi("Number", s:gui09, "", s:cterm09, "", "") -call hi("Operator", s:gui05, "", s:cterm05, "", "none") -call hi("PreProc", s:gui0A, "", s:cterm0A, "", "") -call hi("Repeat", s:gui0A, "", s:cterm0A, "", "") -call hi("Special", s:gui0C, "", s:cterm0C, "", "") -call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "") -call hi("Statement", s:gui08, "", s:cterm08, "", "") -call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") -call hi("String", s:gui0B, "", s:cterm0B, "", "") -call hi("Structure", s:gui0E, "", s:cterm0E, "", "") -call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") -call hi("Type", s:gui0A, "", s:cterm0A, "", "none") -call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") " C highlighting -call hi("cOperator", s:gui0C, "", s:cterm0C, "", "") -call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "") +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") " CSS highlighting -call hi("cssBraces", s:gui05, "", s:cterm05, "", "") -call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "") -call hi("cssColor", s:gui0C, "", s:cterm0C, "", "") +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") " Git highlighting -call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") -call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + " GitGutter highlighting -call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "") +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") " HTML highlighting -call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "") -call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "") -call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "") -call hi("htmlTag", s:gui05, "", s:cterm05, "", "") +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") " JavaScript highlighting -call hi("javaScript", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "") +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") " Markdown highlighting -call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") " NERDTree highlighting -call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") -call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") " PHP highlighting -call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "") -call hi("phpComparison", s:gui05, "", s:cterm05, "", "") -call hi("phpParent", s:gui05, "", s:cterm05, "", "") +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting -call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "") -call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "") +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting -call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") -call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "") -call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "") -call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "") +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") " SASS highlighting -call hi("sassidChar", s:gui08, "", s:cterm08, "", "") -call hi("sassClassChar", s:gui09, "", s:cterm09, "", "") -call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "") +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") " Spelling highlighting -call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) " Remove functions delf hi -delf gui -delf cterm " Remove color variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F -unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-brewer.vim b/colors/base16-brewer.vim index 28b5aae..ce2f719 100644 --- a/colors/base16-brewer.vim +++ b/colors/base16-brewer.vim @@ -1,5 +1,6 @@ -" Base16 Brewer (https://github.com/chriskempson/base16) -" Scheme: Timothée Poisot (http://github.com/tpoisot) +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Brewer scheme by Timothée Poisot (http://github.com/tpoisot) " This enables the coresponding base16-shell script to run so that " :colorscheme works in terminals supported by base16-shell scripts @@ -62,243 +63,209 @@ syntax reset let g:colors_name = "base16-brewer" " Highlighting function -fun hi(group, guifg, guibg, ctermfg, ctermbg, attr) +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) + exec "hi " . a:group . " guifg=#" . a:guifg endif if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) + exec "hi " . a:group . " guibg=#" . a:guibg endif if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) + exec "hi " . a:group . " ctermfg=" . a:ctermfg endif if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) + exec "hi " . a:group . " ctermbg=" . a:ctermbg endif if a:attr != "" exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr endif -endfun - -" Return GUI color for light/dark variants -fun s:gui(color) - if &background == "dark" - return a:color - endif - - if a:color == s:gui00 - return s:gui07 - elseif a:color == s:gui01 - return s:gui06 - elseif a:color == s:gui02 - return s:gui05 - elseif a:color == s:gui03 - return s:gui04 - elseif a:color == s:gui04 - return s:gui03 - elseif a:color == s:gui05 - return s:gui02 - elseif a:color == s:gui06 - return s:gui01 - elseif a:color == s:gui07 - return s:gui00 - endif - - return a:color -endfun - -" Return terminal color for light/dark variants -fun s:cterm(color) - if &background == "dark" - return a:color - endif - - if a:color == s:cterm00 - return s:cterm07 - elseif a:color == s:cterm01 - return s:cterm06 - elseif a:color == s:cterm02 - return s:cterm05 - elseif a:color == s:cterm03 - return s:cterm04 - elseif a:color == s:cterm04 - return s:cterm03 - elseif a:color == s:cterm05 - return s:cterm02 - elseif a:color == s:cterm06 - return s:cterm01 - elseif a:color == s:cterm07 - return s:cterm00 + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp endif - - return a:color endfun " Vim editor colors -call hi("Bold", "", "", "", "", "bold") -call hi("Debug", s:gui08, "", s:cterm08, "", "") -call hi("Directory", s:gui0D, "", s:cterm0D, "", "") -call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("Exception", s:gui08, "", s:cterm08, "", "") -call hi("FoldColumn", "", s:gui01, "", s:cterm01, "") -call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none") -call hi("Italic", "", "", "", "", "none") -call hi("Macro", s:gui08, "", s:cterm08, "", "") -call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "") -call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("Question", s:gui0D, "", s:cterm0D, "", "") -call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("TooLong", s:gui08, "", s:cterm08, "", "") -call hi("Underlined", s:gui08, "", s:cterm08, "", "") -call hi("Visual", "", s:gui02, "", s:cterm02, "") -call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") -call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") -call hi("WildMenu", s:gui08, "", s:cterm08, "", "") -call hi("Title", s:gui0D, "", s:cterm0D, "", "none") -call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") -call hi("NonText", s:gui03, "", s:cterm03, "", "") -call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") -call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none") -call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLine", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") -call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "") -call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") " Standard syntax highlighting -call hi("Boolean", s:gui09, "", s:cterm09, "", "") -call hi("Character", s:gui08, "", s:cterm08, "", "") -call hi("Comment", s:gui03, "", s:cterm03, "", "") -call hi("Conditional", s:gui0E, "", s:cterm0E, "", "") -call hi("Constant", s:gui09, "", s:cterm09, "", "") -call hi("Define", s:gui0E, "", s:cterm0E, "", "none") -call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("Float", s:gui09, "", s:cterm09, "", "") -call hi("Function", s:gui0D, "", s:cterm0D, "", "") -call hi("Identifier", s:gui08, "", s:cterm08, "", "none") -call hi("Include", s:gui0D, "", s:cterm0D, "", "") -call hi("Keyword", s:gui0E, "", s:cterm0E, "", "") -call hi("Label", s:gui0A, "", s:cterm0A, "", "") -call hi("Number", s:gui09, "", s:cterm09, "", "") -call hi("Operator", s:gui05, "", s:cterm05, "", "none") -call hi("PreProc", s:gui0A, "", s:cterm0A, "", "") -call hi("Repeat", s:gui0A, "", s:cterm0A, "", "") -call hi("Special", s:gui0C, "", s:cterm0C, "", "") -call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "") -call hi("Statement", s:gui08, "", s:cterm08, "", "") -call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") -call hi("String", s:gui0B, "", s:cterm0B, "", "") -call hi("Structure", s:gui0E, "", s:cterm0E, "", "") -call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") -call hi("Type", s:gui0A, "", s:cterm0A, "", "none") -call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") " C highlighting -call hi("cOperator", s:gui0C, "", s:cterm0C, "", "") -call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "") +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") " CSS highlighting -call hi("cssBraces", s:gui05, "", s:cterm05, "", "") -call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "") -call hi("cssColor", s:gui0C, "", s:cterm0C, "", "") +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") " Git highlighting -call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") -call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + " GitGutter highlighting -call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "") +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") " HTML highlighting -call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "") -call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "") -call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "") -call hi("htmlTag", s:gui05, "", s:cterm05, "", "") +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") " JavaScript highlighting -call hi("javaScript", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "") +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") " Markdown highlighting -call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") " NERDTree highlighting -call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") -call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") " PHP highlighting -call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "") -call hi("phpComparison", s:gui05, "", s:cterm05, "", "") -call hi("phpParent", s:gui05, "", s:cterm05, "", "") +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting -call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "") -call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "") +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting -call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") -call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "") -call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "") -call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "") +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") " SASS highlighting -call hi("sassidChar", s:gui08, "", s:cterm08, "", "") -call hi("sassClassChar", s:gui09, "", s:cterm09, "", "") -call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "") +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") " Spelling highlighting -call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) " Remove functions delf hi -delf gui -delf cterm " Remove color variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F -unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-bright.vim b/colors/base16-bright.vim index 8016d01..8796db6 100644 --- a/colors/base16-bright.vim +++ b/colors/base16-bright.vim @@ -1,5 +1,6 @@ -" Base16 Bright (https://github.com/chriskempson/base16) -" Scheme: Chris Kempson (http://chriskempson.com) +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Bright scheme by Chris Kempson (http://chriskempson.com) " This enables the coresponding base16-shell script to run so that " :colorscheme works in terminals supported by base16-shell scripts @@ -62,243 +63,209 @@ syntax reset let g:colors_name = "base16-bright" " Highlighting function -fun hi(group, guifg, guibg, ctermfg, ctermbg, attr) +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) + exec "hi " . a:group . " guifg=#" . a:guifg endif if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) + exec "hi " . a:group . " guibg=#" . a:guibg endif if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) + exec "hi " . a:group . " ctermfg=" . a:ctermfg endif if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) + exec "hi " . a:group . " ctermbg=" . a:ctermbg endif if a:attr != "" exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr endif -endfun - -" Return GUI color for light/dark variants -fun s:gui(color) - if &background == "dark" - return a:color - endif - - if a:color == s:gui00 - return s:gui07 - elseif a:color == s:gui01 - return s:gui06 - elseif a:color == s:gui02 - return s:gui05 - elseif a:color == s:gui03 - return s:gui04 - elseif a:color == s:gui04 - return s:gui03 - elseif a:color == s:gui05 - return s:gui02 - elseif a:color == s:gui06 - return s:gui01 - elseif a:color == s:gui07 - return s:gui00 - endif - - return a:color -endfun - -" Return terminal color for light/dark variants -fun s:cterm(color) - if &background == "dark" - return a:color - endif - - if a:color == s:cterm00 - return s:cterm07 - elseif a:color == s:cterm01 - return s:cterm06 - elseif a:color == s:cterm02 - return s:cterm05 - elseif a:color == s:cterm03 - return s:cterm04 - elseif a:color == s:cterm04 - return s:cterm03 - elseif a:color == s:cterm05 - return s:cterm02 - elseif a:color == s:cterm06 - return s:cterm01 - elseif a:color == s:cterm07 - return s:cterm00 + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp endif - - return a:color endfun " Vim editor colors -call hi("Bold", "", "", "", "", "bold") -call hi("Debug", s:gui08, "", s:cterm08, "", "") -call hi("Directory", s:gui0D, "", s:cterm0D, "", "") -call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("Exception", s:gui08, "", s:cterm08, "", "") -call hi("FoldColumn", "", s:gui01, "", s:cterm01, "") -call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none") -call hi("Italic", "", "", "", "", "none") -call hi("Macro", s:gui08, "", s:cterm08, "", "") -call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "") -call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("Question", s:gui0D, "", s:cterm0D, "", "") -call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("TooLong", s:gui08, "", s:cterm08, "", "") -call hi("Underlined", s:gui08, "", s:cterm08, "", "") -call hi("Visual", "", s:gui02, "", s:cterm02, "") -call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") -call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") -call hi("WildMenu", s:gui08, "", s:cterm08, "", "") -call hi("Title", s:gui0D, "", s:cterm0D, "", "none") -call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") -call hi("NonText", s:gui03, "", s:cterm03, "", "") -call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") -call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none") -call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLine", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") -call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "") -call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") " Standard syntax highlighting -call hi("Boolean", s:gui09, "", s:cterm09, "", "") -call hi("Character", s:gui08, "", s:cterm08, "", "") -call hi("Comment", s:gui03, "", s:cterm03, "", "") -call hi("Conditional", s:gui0E, "", s:cterm0E, "", "") -call hi("Constant", s:gui09, "", s:cterm09, "", "") -call hi("Define", s:gui0E, "", s:cterm0E, "", "none") -call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("Float", s:gui09, "", s:cterm09, "", "") -call hi("Function", s:gui0D, "", s:cterm0D, "", "") -call hi("Identifier", s:gui08, "", s:cterm08, "", "none") -call hi("Include", s:gui0D, "", s:cterm0D, "", "") -call hi("Keyword", s:gui0E, "", s:cterm0E, "", "") -call hi("Label", s:gui0A, "", s:cterm0A, "", "") -call hi("Number", s:gui09, "", s:cterm09, "", "") -call hi("Operator", s:gui05, "", s:cterm05, "", "none") -call hi("PreProc", s:gui0A, "", s:cterm0A, "", "") -call hi("Repeat", s:gui0A, "", s:cterm0A, "", "") -call hi("Special", s:gui0C, "", s:cterm0C, "", "") -call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "") -call hi("Statement", s:gui08, "", s:cterm08, "", "") -call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") -call hi("String", s:gui0B, "", s:cterm0B, "", "") -call hi("Structure", s:gui0E, "", s:cterm0E, "", "") -call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") -call hi("Type", s:gui0A, "", s:cterm0A, "", "none") -call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") " C highlighting -call hi("cOperator", s:gui0C, "", s:cterm0C, "", "") -call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "") +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") " CSS highlighting -call hi("cssBraces", s:gui05, "", s:cterm05, "", "") -call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "") -call hi("cssColor", s:gui0C, "", s:cterm0C, "", "") +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") " Git highlighting -call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") -call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + " GitGutter highlighting -call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "") +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") " HTML highlighting -call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "") -call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "") -call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "") -call hi("htmlTag", s:gui05, "", s:cterm05, "", "") +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") " JavaScript highlighting -call hi("javaScript", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "") +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") " Markdown highlighting -call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") " NERDTree highlighting -call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") -call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") " PHP highlighting -call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "") -call hi("phpComparison", s:gui05, "", s:cterm05, "", "") -call hi("phpParent", s:gui05, "", s:cterm05, "", "") +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting -call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "") -call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "") +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting -call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") -call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "") -call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "") -call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "") +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") " SASS highlighting -call hi("sassidChar", s:gui08, "", s:cterm08, "", "") -call hi("sassClassChar", s:gui09, "", s:cterm09, "", "") -call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "") +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") " Spelling highlighting -call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) " Remove functions delf hi -delf gui -delf cterm " Remove color variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F -unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-chalk.vim b/colors/base16-chalk.vim index 03e7e83..ed14dfc 100644 --- a/colors/base16-chalk.vim +++ b/colors/base16-chalk.vim @@ -1,5 +1,6 @@ -" Base16 Chalk (https://github.com/chriskempson/base16) -" Scheme: Chris Kempson (http://chriskempson.com) +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Chalk scheme by Chris Kempson (http://chriskempson.com) " This enables the coresponding base16-shell script to run so that " :colorscheme works in terminals supported by base16-shell scripts @@ -62,243 +63,209 @@ syntax reset let g:colors_name = "base16-chalk" " Highlighting function -fun hi(group, guifg, guibg, ctermfg, ctermbg, attr) +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) + exec "hi " . a:group . " guifg=#" . a:guifg endif if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) + exec "hi " . a:group . " guibg=#" . a:guibg endif if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) + exec "hi " . a:group . " ctermfg=" . a:ctermfg endif if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) + exec "hi " . a:group . " ctermbg=" . a:ctermbg endif if a:attr != "" exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr endif -endfun - -" Return GUI color for light/dark variants -fun s:gui(color) - if &background == "dark" - return a:color - endif - - if a:color == s:gui00 - return s:gui07 - elseif a:color == s:gui01 - return s:gui06 - elseif a:color == s:gui02 - return s:gui05 - elseif a:color == s:gui03 - return s:gui04 - elseif a:color == s:gui04 - return s:gui03 - elseif a:color == s:gui05 - return s:gui02 - elseif a:color == s:gui06 - return s:gui01 - elseif a:color == s:gui07 - return s:gui00 - endif - - return a:color -endfun - -" Return terminal color for light/dark variants -fun s:cterm(color) - if &background == "dark" - return a:color - endif - - if a:color == s:cterm00 - return s:cterm07 - elseif a:color == s:cterm01 - return s:cterm06 - elseif a:color == s:cterm02 - return s:cterm05 - elseif a:color == s:cterm03 - return s:cterm04 - elseif a:color == s:cterm04 - return s:cterm03 - elseif a:color == s:cterm05 - return s:cterm02 - elseif a:color == s:cterm06 - return s:cterm01 - elseif a:color == s:cterm07 - return s:cterm00 + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp endif - - return a:color endfun " Vim editor colors -call hi("Bold", "", "", "", "", "bold") -call hi("Debug", s:gui08, "", s:cterm08, "", "") -call hi("Directory", s:gui0D, "", s:cterm0D, "", "") -call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("Exception", s:gui08, "", s:cterm08, "", "") -call hi("FoldColumn", "", s:gui01, "", s:cterm01, "") -call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none") -call hi("Italic", "", "", "", "", "none") -call hi("Macro", s:gui08, "", s:cterm08, "", "") -call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "") -call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("Question", s:gui0D, "", s:cterm0D, "", "") -call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("TooLong", s:gui08, "", s:cterm08, "", "") -call hi("Underlined", s:gui08, "", s:cterm08, "", "") -call hi("Visual", "", s:gui02, "", s:cterm02, "") -call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") -call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") -call hi("WildMenu", s:gui08, "", s:cterm08, "", "") -call hi("Title", s:gui0D, "", s:cterm0D, "", "none") -call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") -call hi("NonText", s:gui03, "", s:cterm03, "", "") -call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") -call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none") -call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLine", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") -call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "") -call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") " Standard syntax highlighting -call hi("Boolean", s:gui09, "", s:cterm09, "", "") -call hi("Character", s:gui08, "", s:cterm08, "", "") -call hi("Comment", s:gui03, "", s:cterm03, "", "") -call hi("Conditional", s:gui0E, "", s:cterm0E, "", "") -call hi("Constant", s:gui09, "", s:cterm09, "", "") -call hi("Define", s:gui0E, "", s:cterm0E, "", "none") -call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("Float", s:gui09, "", s:cterm09, "", "") -call hi("Function", s:gui0D, "", s:cterm0D, "", "") -call hi("Identifier", s:gui08, "", s:cterm08, "", "none") -call hi("Include", s:gui0D, "", s:cterm0D, "", "") -call hi("Keyword", s:gui0E, "", s:cterm0E, "", "") -call hi("Label", s:gui0A, "", s:cterm0A, "", "") -call hi("Number", s:gui09, "", s:cterm09, "", "") -call hi("Operator", s:gui05, "", s:cterm05, "", "none") -call hi("PreProc", s:gui0A, "", s:cterm0A, "", "") -call hi("Repeat", s:gui0A, "", s:cterm0A, "", "") -call hi("Special", s:gui0C, "", s:cterm0C, "", "") -call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "") -call hi("Statement", s:gui08, "", s:cterm08, "", "") -call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") -call hi("String", s:gui0B, "", s:cterm0B, "", "") -call hi("Structure", s:gui0E, "", s:cterm0E, "", "") -call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") -call hi("Type", s:gui0A, "", s:cterm0A, "", "none") -call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") " C highlighting -call hi("cOperator", s:gui0C, "", s:cterm0C, "", "") -call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "") +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") " CSS highlighting -call hi("cssBraces", s:gui05, "", s:cterm05, "", "") -call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "") -call hi("cssColor", s:gui0C, "", s:cterm0C, "", "") +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") " Git highlighting -call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") -call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + " GitGutter highlighting -call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "") +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") " HTML highlighting -call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "") -call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "") -call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "") -call hi("htmlTag", s:gui05, "", s:cterm05, "", "") +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") " JavaScript highlighting -call hi("javaScript", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "") +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") " Markdown highlighting -call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") " NERDTree highlighting -call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") -call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") " PHP highlighting -call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "") -call hi("phpComparison", s:gui05, "", s:cterm05, "", "") -call hi("phpParent", s:gui05, "", s:cterm05, "", "") +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting -call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "") -call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "") +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting -call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") -call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "") -call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "") -call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "") +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") " SASS highlighting -call hi("sassidChar", s:gui08, "", s:cterm08, "", "") -call hi("sassClassChar", s:gui09, "", s:cterm09, "", "") -call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "") +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") " Spelling highlighting -call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) " Remove functions delf hi -delf gui -delf cterm " Remove color variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F -unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-codeschool.vim b/colors/base16-codeschool.vim index aabf257..54f5a03 100644 --- a/colors/base16-codeschool.vim +++ b/colors/base16-codeschool.vim @@ -1,5 +1,6 @@ -" Base16 Codeschool (https://github.com/chriskempson/base16) -" Scheme: brettof86 +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Codeschool scheme by brettof86 " This enables the coresponding base16-shell script to run so that " :colorscheme works in terminals supported by base16-shell scripts @@ -62,243 +63,209 @@ syntax reset let g:colors_name = "base16-codeschool" " Highlighting function -fun hi(group, guifg, guibg, ctermfg, ctermbg, attr) +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) + exec "hi " . a:group . " guifg=#" . a:guifg endif if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) + exec "hi " . a:group . " guibg=#" . a:guibg endif if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) + exec "hi " . a:group . " ctermfg=" . a:ctermfg endif if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) + exec "hi " . a:group . " ctermbg=" . a:ctermbg endif if a:attr != "" exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr endif -endfun - -" Return GUI color for light/dark variants -fun s:gui(color) - if &background == "dark" - return a:color - endif - - if a:color == s:gui00 - return s:gui07 - elseif a:color == s:gui01 - return s:gui06 - elseif a:color == s:gui02 - return s:gui05 - elseif a:color == s:gui03 - return s:gui04 - elseif a:color == s:gui04 - return s:gui03 - elseif a:color == s:gui05 - return s:gui02 - elseif a:color == s:gui06 - return s:gui01 - elseif a:color == s:gui07 - return s:gui00 - endif - - return a:color -endfun - -" Return terminal color for light/dark variants -fun s:cterm(color) - if &background == "dark" - return a:color - endif - - if a:color == s:cterm00 - return s:cterm07 - elseif a:color == s:cterm01 - return s:cterm06 - elseif a:color == s:cterm02 - return s:cterm05 - elseif a:color == s:cterm03 - return s:cterm04 - elseif a:color == s:cterm04 - return s:cterm03 - elseif a:color == s:cterm05 - return s:cterm02 - elseif a:color == s:cterm06 - return s:cterm01 - elseif a:color == s:cterm07 - return s:cterm00 + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp endif - - return a:color endfun " Vim editor colors -call hi("Bold", "", "", "", "", "bold") -call hi("Debug", s:gui08, "", s:cterm08, "", "") -call hi("Directory", s:gui0D, "", s:cterm0D, "", "") -call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("Exception", s:gui08, "", s:cterm08, "", "") -call hi("FoldColumn", "", s:gui01, "", s:cterm01, "") -call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none") -call hi("Italic", "", "", "", "", "none") -call hi("Macro", s:gui08, "", s:cterm08, "", "") -call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "") -call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("Question", s:gui0D, "", s:cterm0D, "", "") -call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("TooLong", s:gui08, "", s:cterm08, "", "") -call hi("Underlined", s:gui08, "", s:cterm08, "", "") -call hi("Visual", "", s:gui02, "", s:cterm02, "") -call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") -call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") -call hi("WildMenu", s:gui08, "", s:cterm08, "", "") -call hi("Title", s:gui0D, "", s:cterm0D, "", "none") -call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") -call hi("NonText", s:gui03, "", s:cterm03, "", "") -call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") -call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none") -call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLine", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") -call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "") -call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") " Standard syntax highlighting -call hi("Boolean", s:gui09, "", s:cterm09, "", "") -call hi("Character", s:gui08, "", s:cterm08, "", "") -call hi("Comment", s:gui03, "", s:cterm03, "", "") -call hi("Conditional", s:gui0E, "", s:cterm0E, "", "") -call hi("Constant", s:gui09, "", s:cterm09, "", "") -call hi("Define", s:gui0E, "", s:cterm0E, "", "none") -call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("Float", s:gui09, "", s:cterm09, "", "") -call hi("Function", s:gui0D, "", s:cterm0D, "", "") -call hi("Identifier", s:gui08, "", s:cterm08, "", "none") -call hi("Include", s:gui0D, "", s:cterm0D, "", "") -call hi("Keyword", s:gui0E, "", s:cterm0E, "", "") -call hi("Label", s:gui0A, "", s:cterm0A, "", "") -call hi("Number", s:gui09, "", s:cterm09, "", "") -call hi("Operator", s:gui05, "", s:cterm05, "", "none") -call hi("PreProc", s:gui0A, "", s:cterm0A, "", "") -call hi("Repeat", s:gui0A, "", s:cterm0A, "", "") -call hi("Special", s:gui0C, "", s:cterm0C, "", "") -call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "") -call hi("Statement", s:gui08, "", s:cterm08, "", "") -call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") -call hi("String", s:gui0B, "", s:cterm0B, "", "") -call hi("Structure", s:gui0E, "", s:cterm0E, "", "") -call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") -call hi("Type", s:gui0A, "", s:cterm0A, "", "none") -call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") " C highlighting -call hi("cOperator", s:gui0C, "", s:cterm0C, "", "") -call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "") +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") " CSS highlighting -call hi("cssBraces", s:gui05, "", s:cterm05, "", "") -call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "") -call hi("cssColor", s:gui0C, "", s:cterm0C, "", "") +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") " Git highlighting -call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") -call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + " GitGutter highlighting -call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "") +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") " HTML highlighting -call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "") -call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "") -call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "") -call hi("htmlTag", s:gui05, "", s:cterm05, "", "") +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") " JavaScript highlighting -call hi("javaScript", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "") +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") " Markdown highlighting -call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") " NERDTree highlighting -call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") -call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") " PHP highlighting -call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "") -call hi("phpComparison", s:gui05, "", s:cterm05, "", "") -call hi("phpParent", s:gui05, "", s:cterm05, "", "") +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting -call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "") -call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "") +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting -call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") -call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "") -call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "") -call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "") +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") " SASS highlighting -call hi("sassidChar", s:gui08, "", s:cterm08, "", "") -call hi("sassClassChar", s:gui09, "", s:cterm09, "", "") -call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "") +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") " Spelling highlighting -call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) " Remove functions delf hi -delf gui -delf cterm " Remove color variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F -unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-colors.vim b/colors/base16-colors.vim index 3f2af41..dc0e96f 100644 --- a/colors/base16-colors.vim +++ b/colors/base16-colors.vim @@ -1,5 +1,6 @@ -" Base16 Colors (https://github.com/chriskempson/base16) -" Scheme: mrmrs (http://clrs.cc) +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Colors scheme by mrmrs (http://clrs.cc) " This enables the coresponding base16-shell script to run so that " :colorscheme works in terminals supported by base16-shell scripts @@ -62,243 +63,209 @@ syntax reset let g:colors_name = "base16-colors" " Highlighting function -fun hi(group, guifg, guibg, ctermfg, ctermbg, attr) +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) + exec "hi " . a:group . " guifg=#" . a:guifg endif if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) + exec "hi " . a:group . " guibg=#" . a:guibg endif if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) + exec "hi " . a:group . " ctermfg=" . a:ctermfg endif if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) + exec "hi " . a:group . " ctermbg=" . a:ctermbg endif if a:attr != "" exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr endif -endfun - -" Return GUI color for light/dark variants -fun s:gui(color) - if &background == "dark" - return a:color - endif - - if a:color == s:gui00 - return s:gui07 - elseif a:color == s:gui01 - return s:gui06 - elseif a:color == s:gui02 - return s:gui05 - elseif a:color == s:gui03 - return s:gui04 - elseif a:color == s:gui04 - return s:gui03 - elseif a:color == s:gui05 - return s:gui02 - elseif a:color == s:gui06 - return s:gui01 - elseif a:color == s:gui07 - return s:gui00 - endif - - return a:color -endfun - -" Return terminal color for light/dark variants -fun s:cterm(color) - if &background == "dark" - return a:color - endif - - if a:color == s:cterm00 - return s:cterm07 - elseif a:color == s:cterm01 - return s:cterm06 - elseif a:color == s:cterm02 - return s:cterm05 - elseif a:color == s:cterm03 - return s:cterm04 - elseif a:color == s:cterm04 - return s:cterm03 - elseif a:color == s:cterm05 - return s:cterm02 - elseif a:color == s:cterm06 - return s:cterm01 - elseif a:color == s:cterm07 - return s:cterm00 + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp endif - - return a:color endfun " Vim editor colors -call hi("Bold", "", "", "", "", "bold") -call hi("Debug", s:gui08, "", s:cterm08, "", "") -call hi("Directory", s:gui0D, "", s:cterm0D, "", "") -call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("Exception", s:gui08, "", s:cterm08, "", "") -call hi("FoldColumn", "", s:gui01, "", s:cterm01, "") -call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none") -call hi("Italic", "", "", "", "", "none") -call hi("Macro", s:gui08, "", s:cterm08, "", "") -call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "") -call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("Question", s:gui0D, "", s:cterm0D, "", "") -call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("TooLong", s:gui08, "", s:cterm08, "", "") -call hi("Underlined", s:gui08, "", s:cterm08, "", "") -call hi("Visual", "", s:gui02, "", s:cterm02, "") -call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") -call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") -call hi("WildMenu", s:gui08, "", s:cterm08, "", "") -call hi("Title", s:gui0D, "", s:cterm0D, "", "none") -call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") -call hi("NonText", s:gui03, "", s:cterm03, "", "") -call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") -call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none") -call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLine", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") -call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "") -call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") " Standard syntax highlighting -call hi("Boolean", s:gui09, "", s:cterm09, "", "") -call hi("Character", s:gui08, "", s:cterm08, "", "") -call hi("Comment", s:gui03, "", s:cterm03, "", "") -call hi("Conditional", s:gui0E, "", s:cterm0E, "", "") -call hi("Constant", s:gui09, "", s:cterm09, "", "") -call hi("Define", s:gui0E, "", s:cterm0E, "", "none") -call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("Float", s:gui09, "", s:cterm09, "", "") -call hi("Function", s:gui0D, "", s:cterm0D, "", "") -call hi("Identifier", s:gui08, "", s:cterm08, "", "none") -call hi("Include", s:gui0D, "", s:cterm0D, "", "") -call hi("Keyword", s:gui0E, "", s:cterm0E, "", "") -call hi("Label", s:gui0A, "", s:cterm0A, "", "") -call hi("Number", s:gui09, "", s:cterm09, "", "") -call hi("Operator", s:gui05, "", s:cterm05, "", "none") -call hi("PreProc", s:gui0A, "", s:cterm0A, "", "") -call hi("Repeat", s:gui0A, "", s:cterm0A, "", "") -call hi("Special", s:gui0C, "", s:cterm0C, "", "") -call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "") -call hi("Statement", s:gui08, "", s:cterm08, "", "") -call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") -call hi("String", s:gui0B, "", s:cterm0B, "", "") -call hi("Structure", s:gui0E, "", s:cterm0E, "", "") -call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") -call hi("Type", s:gui0A, "", s:cterm0A, "", "none") -call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") " C highlighting -call hi("cOperator", s:gui0C, "", s:cterm0C, "", "") -call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "") +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") " CSS highlighting -call hi("cssBraces", s:gui05, "", s:cterm05, "", "") -call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "") -call hi("cssColor", s:gui0C, "", s:cterm0C, "", "") +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") " Git highlighting -call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") -call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + " GitGutter highlighting -call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "") +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") " HTML highlighting -call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "") -call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "") -call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "") -call hi("htmlTag", s:gui05, "", s:cterm05, "", "") +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") " JavaScript highlighting -call hi("javaScript", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "") +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") " Markdown highlighting -call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") " NERDTree highlighting -call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") -call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") " PHP highlighting -call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "") -call hi("phpComparison", s:gui05, "", s:cterm05, "", "") -call hi("phpParent", s:gui05, "", s:cterm05, "", "") +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting -call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "") -call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "") +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting -call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") -call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "") -call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "") -call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "") +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") " SASS highlighting -call hi("sassidChar", s:gui08, "", s:cterm08, "", "") -call hi("sassClassChar", s:gui09, "", s:cterm09, "", "") -call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "") +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") " Spelling highlighting -call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) " Remove functions delf hi -delf gui -delf cterm " Remove color variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F -unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-darktooth.vim b/colors/base16-darktooth.vim new file mode 100644 index 0000000..509a3ed --- /dev/null +++ b/colors/base16-darktooth.vim @@ -0,0 +1,271 @@ +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Darktooth scheme by Jason Milkins (https://github.com/jasonm23) + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has('gui_running') + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-darktooth.".&background.".sh" + endif +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" + +" 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" +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" +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" +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-darktooth" + +" Highlighting function +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if a:attr != "" + exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + endif + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp + endif +endfun + +" Vim editor colors +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + +" GitGutter highlighting +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") + +" Python highlighting +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) + +" Remove functions +delf hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-default-dark.vim b/colors/base16-default-dark.vim index 5302a10..e3d0bcf 100644 --- a/colors/base16-default-dark.vim +++ b/colors/base16-default-dark.vim @@ -265,8 +265,6 @@ call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) " Remove functions delf hi -delf gui -delf cterm " Remove color variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F diff --git a/colors/base16-default-light.vim b/colors/base16-default-light.vim index d236886..038ec12 100644 --- a/colors/base16-default-light.vim +++ b/colors/base16-default-light.vim @@ -265,8 +265,6 @@ call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) " Remove functions delf hi -delf gui -delf cterm " Remove color variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F diff --git a/colors/base16-default.vim b/colors/base16-default.vim index 13c3ed7..2863c46 100644 --- a/colors/base16-default.vim +++ b/colors/base16-default.vim @@ -1,6 +1,6 @@ -" base16-vim-default (https://github.com/chriskempson/base16-vim) -" Template: Chris Kempson (http://chriskempson.com) -" Scheme: Default by Chris Kempson (http://chriskempson.com) +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Default scheme by Chris Kempson (http://chriskempson.com) " This enables the coresponding base16-shell script to run so that " :colorscheme works in terminals supported by base16-shell scripts @@ -65,16 +65,16 @@ let g:colors_name = "base16-default" " Highlighting function fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) + exec "hi " . a:group . " guifg=#" . a:guifg endif if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) + exec "hi " . a:group . " guibg=#" . a:guibg endif if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) + exec "hi " . a:group . " ctermfg=" . a:ctermfg endif if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) + exec "hi " . a:group . " ctermbg=" . a:ctermbg endif if a:attr != "" exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr @@ -84,60 +84,6 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endif endfun -" Return GUI color for light/dark variants -fun s:gui(color) - if &background == "dark" - return a:color - endif - - if a:color == s:gui00 - return s:gui07 - elseif a:color == s:gui01 - return s:gui06 - elseif a:color == s:gui02 - return s:gui05 - elseif a:color == s:gui03 - return s:gui04 - elseif a:color == s:gui04 - return s:gui03 - elseif a:color == s:gui05 - return s:gui02 - elseif a:color == s:gui06 - return s:gui01 - elseif a:color == s:gui07 - return s:gui00 - endif - - return a:color -endfun - -" Return terminal color for light/dark variants -fun s:cterm(color) - if &background == "dark" - return a:color - endif - - if a:color == s:cterm00 - return s:cterm07 - elseif a:color == s:cterm01 - return s:cterm06 - elseif a:color == s:cterm02 - return s:cterm05 - elseif a:color == s:cterm03 - return s:cterm04 - elseif a:color == s:cterm04 - return s:cterm03 - elseif a:color == s:cterm05 - return s:cterm02 - elseif a:color == s:cterm06 - return s:cterm01 - elseif a:color == s:cterm07 - return s:cterm00 - endif - - return a:color -endfun - " Vim editor colors call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") @@ -319,8 +265,6 @@ call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) " Remove functions delf hi -delf gui -delf cterm " Remove color variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F diff --git a/colors/base16-eighties.vim b/colors/base16-eighties.vim index edd4aaa..d971c4e 100644 --- a/colors/base16-eighties.vim +++ b/colors/base16-eighties.vim @@ -265,8 +265,6 @@ call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) " Remove functions delf hi -delf gui -delf cterm " Remove color variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F diff --git a/colors/base16-embers.vim b/colors/base16-embers.vim index 69964dc..79016ed 100644 --- a/colors/base16-embers.vim +++ b/colors/base16-embers.vim @@ -1,5 +1,6 @@ -" Base16 Embers (https://github.com/chriskempson/base16) -" Scheme: Jannik Siebert (https://github.com/janniks) +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Embers scheme by Jannik Siebert (https://github.com/janniks) " This enables the coresponding base16-shell script to run so that " :colorscheme works in terminals supported by base16-shell scripts @@ -62,243 +63,209 @@ syntax reset let g:colors_name = "base16-embers" " Highlighting function -fun hi(group, guifg, guibg, ctermfg, ctermbg, attr) +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) + exec "hi " . a:group . " guifg=#" . a:guifg endif if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) + exec "hi " . a:group . " guibg=#" . a:guibg endif if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) + exec "hi " . a:group . " ctermfg=" . a:ctermfg endif if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) + exec "hi " . a:group . " ctermbg=" . a:ctermbg endif if a:attr != "" exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr endif -endfun - -" Return GUI color for light/dark variants -fun s:gui(color) - if &background == "dark" - return a:color - endif - - if a:color == s:gui00 - return s:gui07 - elseif a:color == s:gui01 - return s:gui06 - elseif a:color == s:gui02 - return s:gui05 - elseif a:color == s:gui03 - return s:gui04 - elseif a:color == s:gui04 - return s:gui03 - elseif a:color == s:gui05 - return s:gui02 - elseif a:color == s:gui06 - return s:gui01 - elseif a:color == s:gui07 - return s:gui00 - endif - - return a:color -endfun - -" Return terminal color for light/dark variants -fun s:cterm(color) - if &background == "dark" - return a:color - endif - - if a:color == s:cterm00 - return s:cterm07 - elseif a:color == s:cterm01 - return s:cterm06 - elseif a:color == s:cterm02 - return s:cterm05 - elseif a:color == s:cterm03 - return s:cterm04 - elseif a:color == s:cterm04 - return s:cterm03 - elseif a:color == s:cterm05 - return s:cterm02 - elseif a:color == s:cterm06 - return s:cterm01 - elseif a:color == s:cterm07 - return s:cterm00 + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp endif - - return a:color endfun " Vim editor colors -call hi("Bold", "", "", "", "", "bold") -call hi("Debug", s:gui08, "", s:cterm08, "", "") -call hi("Directory", s:gui0D, "", s:cterm0D, "", "") -call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("Exception", s:gui08, "", s:cterm08, "", "") -call hi("FoldColumn", "", s:gui01, "", s:cterm01, "") -call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none") -call hi("Italic", "", "", "", "", "none") -call hi("Macro", s:gui08, "", s:cterm08, "", "") -call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "") -call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("Question", s:gui0D, "", s:cterm0D, "", "") -call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("TooLong", s:gui08, "", s:cterm08, "", "") -call hi("Underlined", s:gui08, "", s:cterm08, "", "") -call hi("Visual", "", s:gui02, "", s:cterm02, "") -call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") -call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") -call hi("WildMenu", s:gui08, "", s:cterm08, "", "") -call hi("Title", s:gui0D, "", s:cterm0D, "", "none") -call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") -call hi("NonText", s:gui03, "", s:cterm03, "", "") -call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") -call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none") -call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLine", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") -call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "") -call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") " Standard syntax highlighting -call hi("Boolean", s:gui09, "", s:cterm09, "", "") -call hi("Character", s:gui08, "", s:cterm08, "", "") -call hi("Comment", s:gui03, "", s:cterm03, "", "") -call hi("Conditional", s:gui0E, "", s:cterm0E, "", "") -call hi("Constant", s:gui09, "", s:cterm09, "", "") -call hi("Define", s:gui0E, "", s:cterm0E, "", "none") -call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("Float", s:gui09, "", s:cterm09, "", "") -call hi("Function", s:gui0D, "", s:cterm0D, "", "") -call hi("Identifier", s:gui08, "", s:cterm08, "", "none") -call hi("Include", s:gui0D, "", s:cterm0D, "", "") -call hi("Keyword", s:gui0E, "", s:cterm0E, "", "") -call hi("Label", s:gui0A, "", s:cterm0A, "", "") -call hi("Number", s:gui09, "", s:cterm09, "", "") -call hi("Operator", s:gui05, "", s:cterm05, "", "none") -call hi("PreProc", s:gui0A, "", s:cterm0A, "", "") -call hi("Repeat", s:gui0A, "", s:cterm0A, "", "") -call hi("Special", s:gui0C, "", s:cterm0C, "", "") -call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "") -call hi("Statement", s:gui08, "", s:cterm08, "", "") -call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") -call hi("String", s:gui0B, "", s:cterm0B, "", "") -call hi("Structure", s:gui0E, "", s:cterm0E, "", "") -call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") -call hi("Type", s:gui0A, "", s:cterm0A, "", "none") -call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") " C highlighting -call hi("cOperator", s:gui0C, "", s:cterm0C, "", "") -call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "") +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") " CSS highlighting -call hi("cssBraces", s:gui05, "", s:cterm05, "", "") -call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "") -call hi("cssColor", s:gui0C, "", s:cterm0C, "", "") +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") " Git highlighting -call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") -call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + " GitGutter highlighting -call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "") +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") " HTML highlighting -call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "") -call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "") -call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "") -call hi("htmlTag", s:gui05, "", s:cterm05, "", "") +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") " JavaScript highlighting -call hi("javaScript", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "") +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") " Markdown highlighting -call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") " NERDTree highlighting -call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") -call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") " PHP highlighting -call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "") -call hi("phpComparison", s:gui05, "", s:cterm05, "", "") -call hi("phpParent", s:gui05, "", s:cterm05, "", "") +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting -call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "") -call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "") +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting -call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") -call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "") -call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "") -call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "") +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") " SASS highlighting -call hi("sassidChar", s:gui08, "", s:cterm08, "", "") -call hi("sassClassChar", s:gui09, "", s:cterm09, "", "") -call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "") +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") " Spelling highlighting -call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) " Remove functions delf hi -delf gui -delf cterm " Remove color variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F -unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-flat.vim b/colors/base16-flat.vim index 9132a63..b61f0ad 100644 --- a/colors/base16-flat.vim +++ b/colors/base16-flat.vim @@ -1,5 +1,6 @@ -" Base16 Flat (https://github.com/chriskempson/base16) -" Scheme: Chris Kempson (http://chriskempson.com) +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Flat scheme by Chris Kempson (http://chriskempson.com) " This enables the coresponding base16-shell script to run so that " :colorscheme works in terminals supported by base16-shell scripts @@ -62,243 +63,209 @@ syntax reset let g:colors_name = "base16-flat" " Highlighting function -fun hi(group, guifg, guibg, ctermfg, ctermbg, attr) +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) + exec "hi " . a:group . " guifg=#" . a:guifg endif if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) + exec "hi " . a:group . " guibg=#" . a:guibg endif if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) + exec "hi " . a:group . " ctermfg=" . a:ctermfg endif if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) + exec "hi " . a:group . " ctermbg=" . a:ctermbg endif if a:attr != "" exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr endif -endfun - -" Return GUI color for light/dark variants -fun s:gui(color) - if &background == "dark" - return a:color - endif - - if a:color == s:gui00 - return s:gui07 - elseif a:color == s:gui01 - return s:gui06 - elseif a:color == s:gui02 - return s:gui05 - elseif a:color == s:gui03 - return s:gui04 - elseif a:color == s:gui04 - return s:gui03 - elseif a:color == s:gui05 - return s:gui02 - elseif a:color == s:gui06 - return s:gui01 - elseif a:color == s:gui07 - return s:gui00 - endif - - return a:color -endfun - -" Return terminal color for light/dark variants -fun s:cterm(color) - if &background == "dark" - return a:color - endif - - if a:color == s:cterm00 - return s:cterm07 - elseif a:color == s:cterm01 - return s:cterm06 - elseif a:color == s:cterm02 - return s:cterm05 - elseif a:color == s:cterm03 - return s:cterm04 - elseif a:color == s:cterm04 - return s:cterm03 - elseif a:color == s:cterm05 - return s:cterm02 - elseif a:color == s:cterm06 - return s:cterm01 - elseif a:color == s:cterm07 - return s:cterm00 + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp endif - - return a:color endfun " Vim editor colors -call hi("Bold", "", "", "", "", "bold") -call hi("Debug", s:gui08, "", s:cterm08, "", "") -call hi("Directory", s:gui0D, "", s:cterm0D, "", "") -call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("Exception", s:gui08, "", s:cterm08, "", "") -call hi("FoldColumn", "", s:gui01, "", s:cterm01, "") -call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none") -call hi("Italic", "", "", "", "", "none") -call hi("Macro", s:gui08, "", s:cterm08, "", "") -call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "") -call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("Question", s:gui0D, "", s:cterm0D, "", "") -call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("TooLong", s:gui08, "", s:cterm08, "", "") -call hi("Underlined", s:gui08, "", s:cterm08, "", "") -call hi("Visual", "", s:gui02, "", s:cterm02, "") -call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") -call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") -call hi("WildMenu", s:gui08, "", s:cterm08, "", "") -call hi("Title", s:gui0D, "", s:cterm0D, "", "none") -call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") -call hi("NonText", s:gui03, "", s:cterm03, "", "") -call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") -call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none") -call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLine", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") -call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "") -call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") " Standard syntax highlighting -call hi("Boolean", s:gui09, "", s:cterm09, "", "") -call hi("Character", s:gui08, "", s:cterm08, "", "") -call hi("Comment", s:gui03, "", s:cterm03, "", "") -call hi("Conditional", s:gui0E, "", s:cterm0E, "", "") -call hi("Constant", s:gui09, "", s:cterm09, "", "") -call hi("Define", s:gui0E, "", s:cterm0E, "", "none") -call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("Float", s:gui09, "", s:cterm09, "", "") -call hi("Function", s:gui0D, "", s:cterm0D, "", "") -call hi("Identifier", s:gui08, "", s:cterm08, "", "none") -call hi("Include", s:gui0D, "", s:cterm0D, "", "") -call hi("Keyword", s:gui0E, "", s:cterm0E, "", "") -call hi("Label", s:gui0A, "", s:cterm0A, "", "") -call hi("Number", s:gui09, "", s:cterm09, "", "") -call hi("Operator", s:gui05, "", s:cterm05, "", "none") -call hi("PreProc", s:gui0A, "", s:cterm0A, "", "") -call hi("Repeat", s:gui0A, "", s:cterm0A, "", "") -call hi("Special", s:gui0C, "", s:cterm0C, "", "") -call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "") -call hi("Statement", s:gui08, "", s:cterm08, "", "") -call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") -call hi("String", s:gui0B, "", s:cterm0B, "", "") -call hi("Structure", s:gui0E, "", s:cterm0E, "", "") -call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") -call hi("Type", s:gui0A, "", s:cterm0A, "", "none") -call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") " C highlighting -call hi("cOperator", s:gui0C, "", s:cterm0C, "", "") -call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "") +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") " CSS highlighting -call hi("cssBraces", s:gui05, "", s:cterm05, "", "") -call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "") -call hi("cssColor", s:gui0C, "", s:cterm0C, "", "") +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") " Git highlighting -call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") -call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + " GitGutter highlighting -call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "") +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") " HTML highlighting -call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "") -call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "") -call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "") -call hi("htmlTag", s:gui05, "", s:cterm05, "", "") +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") " JavaScript highlighting -call hi("javaScript", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "") +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") " Markdown highlighting -call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") " NERDTree highlighting -call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") -call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") " PHP highlighting -call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "") -call hi("phpComparison", s:gui05, "", s:cterm05, "", "") -call hi("phpParent", s:gui05, "", s:cterm05, "", "") +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting -call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "") -call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "") +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting -call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") -call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "") -call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "") -call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "") +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") " SASS highlighting -call hi("sassidChar", s:gui08, "", s:cterm08, "", "") -call hi("sassClassChar", s:gui09, "", s:cterm09, "", "") -call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "") +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") " Spelling highlighting -call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) " Remove functions delf hi -delf gui -delf cterm " Remove color variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F -unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-google.vim b/colors/base16-google.vim index cc7f23b..5fe4e11 100644 --- a/colors/base16-google.vim +++ b/colors/base16-google.vim @@ -1,5 +1,6 @@ -" Base16 Google (https://github.com/chriskempson/base16) -" Scheme: Seth Wright (http://sethawright.com) +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Google scheme by Seth Wright (http://sethawright.com) " This enables the coresponding base16-shell script to run so that " :colorscheme works in terminals supported by base16-shell scripts @@ -62,243 +63,209 @@ syntax reset let g:colors_name = "base16-google" " Highlighting function -fun hi(group, guifg, guibg, ctermfg, ctermbg, attr) +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) + exec "hi " . a:group . " guifg=#" . a:guifg endif if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) + exec "hi " . a:group . " guibg=#" . a:guibg endif if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) + exec "hi " . a:group . " ctermfg=" . a:ctermfg endif if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) + exec "hi " . a:group . " ctermbg=" . a:ctermbg endif if a:attr != "" exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr endif -endfun - -" Return GUI color for light/dark variants -fun s:gui(color) - if &background == "dark" - return a:color - endif - - if a:color == s:gui00 - return s:gui07 - elseif a:color == s:gui01 - return s:gui06 - elseif a:color == s:gui02 - return s:gui05 - elseif a:color == s:gui03 - return s:gui04 - elseif a:color == s:gui04 - return s:gui03 - elseif a:color == s:gui05 - return s:gui02 - elseif a:color == s:gui06 - return s:gui01 - elseif a:color == s:gui07 - return s:gui00 - endif - - return a:color -endfun - -" Return terminal color for light/dark variants -fun s:cterm(color) - if &background == "dark" - return a:color - endif - - if a:color == s:cterm00 - return s:cterm07 - elseif a:color == s:cterm01 - return s:cterm06 - elseif a:color == s:cterm02 - return s:cterm05 - elseif a:color == s:cterm03 - return s:cterm04 - elseif a:color == s:cterm04 - return s:cterm03 - elseif a:color == s:cterm05 - return s:cterm02 - elseif a:color == s:cterm06 - return s:cterm01 - elseif a:color == s:cterm07 - return s:cterm00 + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp endif - - return a:color endfun " Vim editor colors -call hi("Bold", "", "", "", "", "bold") -call hi("Debug", s:gui08, "", s:cterm08, "", "") -call hi("Directory", s:gui0D, "", s:cterm0D, "", "") -call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("Exception", s:gui08, "", s:cterm08, "", "") -call hi("FoldColumn", "", s:gui01, "", s:cterm01, "") -call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none") -call hi("Italic", "", "", "", "", "none") -call hi("Macro", s:gui08, "", s:cterm08, "", "") -call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "") -call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("Question", s:gui0D, "", s:cterm0D, "", "") -call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("TooLong", s:gui08, "", s:cterm08, "", "") -call hi("Underlined", s:gui08, "", s:cterm08, "", "") -call hi("Visual", "", s:gui02, "", s:cterm02, "") -call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") -call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") -call hi("WildMenu", s:gui08, "", s:cterm08, "", "") -call hi("Title", s:gui0D, "", s:cterm0D, "", "none") -call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") -call hi("NonText", s:gui03, "", s:cterm03, "", "") -call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") -call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none") -call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLine", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") -call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "") -call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") " Standard syntax highlighting -call hi("Boolean", s:gui09, "", s:cterm09, "", "") -call hi("Character", s:gui08, "", s:cterm08, "", "") -call hi("Comment", s:gui03, "", s:cterm03, "", "") -call hi("Conditional", s:gui0E, "", s:cterm0E, "", "") -call hi("Constant", s:gui09, "", s:cterm09, "", "") -call hi("Define", s:gui0E, "", s:cterm0E, "", "none") -call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("Float", s:gui09, "", s:cterm09, "", "") -call hi("Function", s:gui0D, "", s:cterm0D, "", "") -call hi("Identifier", s:gui08, "", s:cterm08, "", "none") -call hi("Include", s:gui0D, "", s:cterm0D, "", "") -call hi("Keyword", s:gui0E, "", s:cterm0E, "", "") -call hi("Label", s:gui0A, "", s:cterm0A, "", "") -call hi("Number", s:gui09, "", s:cterm09, "", "") -call hi("Operator", s:gui05, "", s:cterm05, "", "none") -call hi("PreProc", s:gui0A, "", s:cterm0A, "", "") -call hi("Repeat", s:gui0A, "", s:cterm0A, "", "") -call hi("Special", s:gui0C, "", s:cterm0C, "", "") -call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "") -call hi("Statement", s:gui08, "", s:cterm08, "", "") -call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") -call hi("String", s:gui0B, "", s:cterm0B, "", "") -call hi("Structure", s:gui0E, "", s:cterm0E, "", "") -call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") -call hi("Type", s:gui0A, "", s:cterm0A, "", "none") -call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") " C highlighting -call hi("cOperator", s:gui0C, "", s:cterm0C, "", "") -call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "") +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") " CSS highlighting -call hi("cssBraces", s:gui05, "", s:cterm05, "", "") -call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "") -call hi("cssColor", s:gui0C, "", s:cterm0C, "", "") +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") " Git highlighting -call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") -call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + " GitGutter highlighting -call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "") +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") " HTML highlighting -call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "") -call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "") -call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "") -call hi("htmlTag", s:gui05, "", s:cterm05, "", "") +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") " JavaScript highlighting -call hi("javaScript", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "") +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") " Markdown highlighting -call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") " NERDTree highlighting -call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") -call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") " PHP highlighting -call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "") -call hi("phpComparison", s:gui05, "", s:cterm05, "", "") -call hi("phpParent", s:gui05, "", s:cterm05, "", "") +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting -call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "") -call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "") +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting -call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") -call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "") -call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "") -call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "") +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") " SASS highlighting -call hi("sassidChar", s:gui08, "", s:cterm08, "", "") -call hi("sassClassChar", s:gui09, "", s:cterm09, "", "") -call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "") +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") " Spelling highlighting -call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) " Remove functions delf hi -delf gui -delf cterm " Remove color variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F -unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-grayscale.vim b/colors/base16-grayscale.vim index 0e33604..1800a61 100644 --- a/colors/base16-grayscale.vim +++ b/colors/base16-grayscale.vim @@ -1,5 +1,6 @@ -" Base16 Grayscale (https://github.com/chriskempson/base16) -" Scheme: Alexandre Gavioli (https://github.com/Alexx2/) +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Grayscale scheme by Alexandre Gavioli (https://github.com/Alexx2/) " This enables the coresponding base16-shell script to run so that " :colorscheme works in terminals supported by base16-shell scripts @@ -62,243 +63,209 @@ syntax reset let g:colors_name = "base16-grayscale" " Highlighting function -fun hi(group, guifg, guibg, ctermfg, ctermbg, attr) +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) + exec "hi " . a:group . " guifg=#" . a:guifg endif if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) + exec "hi " . a:group . " guibg=#" . a:guibg endif if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) + exec "hi " . a:group . " ctermfg=" . a:ctermfg endif if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) + exec "hi " . a:group . " ctermbg=" . a:ctermbg endif if a:attr != "" exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr endif -endfun - -" Return GUI color for light/dark variants -fun s:gui(color) - if &background == "dark" - return a:color - endif - - if a:color == s:gui00 - return s:gui07 - elseif a:color == s:gui01 - return s:gui06 - elseif a:color == s:gui02 - return s:gui05 - elseif a:color == s:gui03 - return s:gui04 - elseif a:color == s:gui04 - return s:gui03 - elseif a:color == s:gui05 - return s:gui02 - elseif a:color == s:gui06 - return s:gui01 - elseif a:color == s:gui07 - return s:gui00 - endif - - return a:color -endfun - -" Return terminal color for light/dark variants -fun s:cterm(color) - if &background == "dark" - return a:color - endif - - if a:color == s:cterm00 - return s:cterm07 - elseif a:color == s:cterm01 - return s:cterm06 - elseif a:color == s:cterm02 - return s:cterm05 - elseif a:color == s:cterm03 - return s:cterm04 - elseif a:color == s:cterm04 - return s:cterm03 - elseif a:color == s:cterm05 - return s:cterm02 - elseif a:color == s:cterm06 - return s:cterm01 - elseif a:color == s:cterm07 - return s:cterm00 + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp endif - - return a:color endfun " Vim editor colors -call hi("Bold", "", "", "", "", "bold") -call hi("Debug", s:gui08, "", s:cterm08, "", "") -call hi("Directory", s:gui0D, "", s:cterm0D, "", "") -call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("Exception", s:gui08, "", s:cterm08, "", "") -call hi("FoldColumn", "", s:gui01, "", s:cterm01, "") -call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none") -call hi("Italic", "", "", "", "", "none") -call hi("Macro", s:gui08, "", s:cterm08, "", "") -call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "") -call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("Question", s:gui0D, "", s:cterm0D, "", "") -call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("TooLong", s:gui08, "", s:cterm08, "", "") -call hi("Underlined", s:gui08, "", s:cterm08, "", "") -call hi("Visual", "", s:gui02, "", s:cterm02, "") -call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") -call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") -call hi("WildMenu", s:gui08, "", s:cterm08, "", "") -call hi("Title", s:gui0D, "", s:cterm0D, "", "none") -call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") -call hi("NonText", s:gui03, "", s:cterm03, "", "") -call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") -call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none") -call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLine", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") -call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "") -call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") " Standard syntax highlighting -call hi("Boolean", s:gui09, "", s:cterm09, "", "") -call hi("Character", s:gui08, "", s:cterm08, "", "") -call hi("Comment", s:gui03, "", s:cterm03, "", "") -call hi("Conditional", s:gui0E, "", s:cterm0E, "", "") -call hi("Constant", s:gui09, "", s:cterm09, "", "") -call hi("Define", s:gui0E, "", s:cterm0E, "", "none") -call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("Float", s:gui09, "", s:cterm09, "", "") -call hi("Function", s:gui0D, "", s:cterm0D, "", "") -call hi("Identifier", s:gui08, "", s:cterm08, "", "none") -call hi("Include", s:gui0D, "", s:cterm0D, "", "") -call hi("Keyword", s:gui0E, "", s:cterm0E, "", "") -call hi("Label", s:gui0A, "", s:cterm0A, "", "") -call hi("Number", s:gui09, "", s:cterm09, "", "") -call hi("Operator", s:gui05, "", s:cterm05, "", "none") -call hi("PreProc", s:gui0A, "", s:cterm0A, "", "") -call hi("Repeat", s:gui0A, "", s:cterm0A, "", "") -call hi("Special", s:gui0C, "", s:cterm0C, "", "") -call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "") -call hi("Statement", s:gui08, "", s:cterm08, "", "") -call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") -call hi("String", s:gui0B, "", s:cterm0B, "", "") -call hi("Structure", s:gui0E, "", s:cterm0E, "", "") -call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") -call hi("Type", s:gui0A, "", s:cterm0A, "", "none") -call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") " C highlighting -call hi("cOperator", s:gui0C, "", s:cterm0C, "", "") -call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "") +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") " CSS highlighting -call hi("cssBraces", s:gui05, "", s:cterm05, "", "") -call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "") -call hi("cssColor", s:gui0C, "", s:cterm0C, "", "") +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") " Git highlighting -call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") -call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + " GitGutter highlighting -call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "") +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") " HTML highlighting -call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "") -call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "") -call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "") -call hi("htmlTag", s:gui05, "", s:cterm05, "", "") +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") " JavaScript highlighting -call hi("javaScript", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "") +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") " Markdown highlighting -call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") " NERDTree highlighting -call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") -call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") " PHP highlighting -call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "") -call hi("phpComparison", s:gui05, "", s:cterm05, "", "") -call hi("phpParent", s:gui05, "", s:cterm05, "", "") +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting -call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "") -call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "") +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting -call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") -call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "") -call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "") -call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "") +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") " SASS highlighting -call hi("sassidChar", s:gui08, "", s:cterm08, "", "") -call hi("sassClassChar", s:gui09, "", s:cterm09, "", "") -call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "") +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") " Spelling highlighting -call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) " Remove functions delf hi -delf gui -delf cterm " Remove color variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F -unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-green-screen.vim b/colors/base16-green-screen.vim index 8487697..85f8af5 100644 --- a/colors/base16-green-screen.vim +++ b/colors/base16-green-screen.vim @@ -265,8 +265,6 @@ call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) " Remove functions delf hi -delf gui -delf cterm " Remove color variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F diff --git a/colors/base16-greenscreen.vim b/colors/base16-greenscreen.vim deleted file mode 100644 index 1ea4334..0000000 --- a/colors/base16-greenscreen.vim +++ /dev/null @@ -1,304 +0,0 @@ -" Base16 Green Screen (https://github.com/chriskempson/base16) -" Scheme: Chris Kempson (http://chriskempson.com) - -" This enables the coresponding base16-shell script to run so that -" :colorscheme works in terminals supported by base16-shell scripts -" User must set this variable in .vimrc -" let g:base16_shell_path=base16-builder/output/shell/ -if !has('gui_running') - if exists("g:base16_shell_path") - execute "silent !/bin/sh ".g:base16_shell_path."/base16-greenscreen.".&background.".sh" - endif -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" - -" 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" -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" -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" -endif - -" Theme setup -hi clear -syntax reset -let g:colors_name = "base16-greenscreen" - -" Highlighting function -fun hi(group, guifg, guibg, ctermfg, ctermbg, attr) - if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) - endif - if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) - endif - if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) - endif - if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) - endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr - endif -endfun - -" Return GUI color for light/dark variants -fun s:gui(color) - if &background == "dark" - return a:color - endif - - if a:color == s:gui00 - return s:gui07 - elseif a:color == s:gui01 - return s:gui06 - elseif a:color == s:gui02 - return s:gui05 - elseif a:color == s:gui03 - return s:gui04 - elseif a:color == s:gui04 - return s:gui03 - elseif a:color == s:gui05 - return s:gui02 - elseif a:color == s:gui06 - return s:gui01 - elseif a:color == s:gui07 - return s:gui00 - endif - - return a:color -endfun - -" Return terminal color for light/dark variants -fun s:cterm(color) - if &background == "dark" - return a:color - endif - - if a:color == s:cterm00 - return s:cterm07 - elseif a:color == s:cterm01 - return s:cterm06 - elseif a:color == s:cterm02 - return s:cterm05 - elseif a:color == s:cterm03 - return s:cterm04 - elseif a:color == s:cterm04 - return s:cterm03 - elseif a:color == s:cterm05 - return s:cterm02 - elseif a:color == s:cterm06 - return s:cterm01 - elseif a:color == s:cterm07 - return s:cterm00 - endif - - return a:color -endfun - -" Vim editor colors -call hi("Bold", "", "", "", "", "bold") -call hi("Debug", s:gui08, "", s:cterm08, "", "") -call hi("Directory", s:gui0D, "", s:cterm0D, "", "") -call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("Exception", s:gui08, "", s:cterm08, "", "") -call hi("FoldColumn", "", s:gui01, "", s:cterm01, "") -call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none") -call hi("Italic", "", "", "", "", "none") -call hi("Macro", s:gui08, "", s:cterm08, "", "") -call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "") -call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("Question", s:gui0D, "", s:cterm0D, "", "") -call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("TooLong", s:gui08, "", s:cterm08, "", "") -call hi("Underlined", s:gui08, "", s:cterm08, "", "") -call hi("Visual", "", s:gui02, "", s:cterm02, "") -call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") -call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") -call hi("WildMenu", s:gui08, "", s:cterm08, "", "") -call hi("Title", s:gui0D, "", s:cterm0D, "", "none") -call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") -call hi("NonText", s:gui03, "", s:cterm03, "", "") -call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") -call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none") -call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLine", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") -call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "") -call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") - -" Standard syntax highlighting -call hi("Boolean", s:gui09, "", s:cterm09, "", "") -call hi("Character", s:gui08, "", s:cterm08, "", "") -call hi("Comment", s:gui03, "", s:cterm03, "", "") -call hi("Conditional", s:gui0E, "", s:cterm0E, "", "") -call hi("Constant", s:gui09, "", s:cterm09, "", "") -call hi("Define", s:gui0E, "", s:cterm0E, "", "none") -call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("Float", s:gui09, "", s:cterm09, "", "") -call hi("Function", s:gui0D, "", s:cterm0D, "", "") -call hi("Identifier", s:gui08, "", s:cterm08, "", "none") -call hi("Include", s:gui0D, "", s:cterm0D, "", "") -call hi("Keyword", s:gui0E, "", s:cterm0E, "", "") -call hi("Label", s:gui0A, "", s:cterm0A, "", "") -call hi("Number", s:gui09, "", s:cterm09, "", "") -call hi("Operator", s:gui05, "", s:cterm05, "", "none") -call hi("PreProc", s:gui0A, "", s:cterm0A, "", "") -call hi("Repeat", s:gui0A, "", s:cterm0A, "", "") -call hi("Special", s:gui0C, "", s:cterm0C, "", "") -call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "") -call hi("Statement", s:gui08, "", s:cterm08, "", "") -call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") -call hi("String", s:gui0B, "", s:cterm0B, "", "") -call hi("Structure", s:gui0E, "", s:cterm0E, "", "") -call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") -call hi("Type", s:gui0A, "", s:cterm0A, "", "none") -call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") - -" C highlighting -call hi("cOperator", s:gui0C, "", s:cterm0C, "", "") -call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "") - -" CSS highlighting -call hi("cssBraces", s:gui05, "", s:cterm05, "", "") -call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "") -call hi("cssColor", s:gui0C, "", s:cterm0C, "", "") - -" Diff highlighting -call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") - -" Git highlighting -call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") -call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - -" GitGutter highlighting -call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "") - -" HTML highlighting -call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "") -call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "") -call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "") -call hi("htmlTag", s:gui05, "", s:cterm05, "", "") - -" JavaScript highlighting -call hi("javaScript", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "") - -" Markdown highlighting -call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") - -" NERDTree highlighting -call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") -call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") - -" PHP highlighting -call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "") -call hi("phpComparison", s:gui05, "", s:cterm05, "", "") -call hi("phpParent", s:gui05, "", s:cterm05, "", "") - -" Python highlighting -call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "") -call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "") - -" Ruby highlighting -call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") -call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "") -call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "") -call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "") - -" SASS highlighting -call hi("sassidChar", s:gui08, "", s:cterm08, "", "") -call hi("sassClassChar", s:gui09, "", s:cterm09, "", "") -call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "") - -" Signify highlighting -call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") - -" Spelling highlighting -call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") - -" Remove functions -delf hi -delf gui -delf cterm - -" Remove color variables -unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F -unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F diff --git a/colors/base16-harmonic16.vim b/colors/base16-harmonic16.vim index 8fc6d22..8d7b997 100644 --- a/colors/base16-harmonic16.vim +++ b/colors/base16-harmonic16.vim @@ -1,5 +1,6 @@ -" Base16 harmonic16 (https://github.com/chriskempson/base16) -" Scheme: Jannik Siebert (https://github.com/janniks) +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" harmonic16 scheme by Jannik Siebert (https://github.com/janniks) " This enables the coresponding base16-shell script to run so that " :colorscheme works in terminals supported by base16-shell scripts @@ -62,243 +63,209 @@ syntax reset let g:colors_name = "base16-harmonic16" " Highlighting function -fun hi(group, guifg, guibg, ctermfg, ctermbg, attr) +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) + exec "hi " . a:group . " guifg=#" . a:guifg endif if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) + exec "hi " . a:group . " guibg=#" . a:guibg endif if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) + exec "hi " . a:group . " ctermfg=" . a:ctermfg endif if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) + exec "hi " . a:group . " ctermbg=" . a:ctermbg endif if a:attr != "" exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr endif -endfun - -" Return GUI color for light/dark variants -fun s:gui(color) - if &background == "dark" - return a:color - endif - - if a:color == s:gui00 - return s:gui07 - elseif a:color == s:gui01 - return s:gui06 - elseif a:color == s:gui02 - return s:gui05 - elseif a:color == s:gui03 - return s:gui04 - elseif a:color == s:gui04 - return s:gui03 - elseif a:color == s:gui05 - return s:gui02 - elseif a:color == s:gui06 - return s:gui01 - elseif a:color == s:gui07 - return s:gui00 - endif - - return a:color -endfun - -" Return terminal color for light/dark variants -fun s:cterm(color) - if &background == "dark" - return a:color - endif - - if a:color == s:cterm00 - return s:cterm07 - elseif a:color == s:cterm01 - return s:cterm06 - elseif a:color == s:cterm02 - return s:cterm05 - elseif a:color == s:cterm03 - return s:cterm04 - elseif a:color == s:cterm04 - return s:cterm03 - elseif a:color == s:cterm05 - return s:cterm02 - elseif a:color == s:cterm06 - return s:cterm01 - elseif a:color == s:cterm07 - return s:cterm00 + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp endif - - return a:color endfun " Vim editor colors -call hi("Bold", "", "", "", "", "bold") -call hi("Debug", s:gui08, "", s:cterm08, "", "") -call hi("Directory", s:gui0D, "", s:cterm0D, "", "") -call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("Exception", s:gui08, "", s:cterm08, "", "") -call hi("FoldColumn", "", s:gui01, "", s:cterm01, "") -call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none") -call hi("Italic", "", "", "", "", "none") -call hi("Macro", s:gui08, "", s:cterm08, "", "") -call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "") -call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("Question", s:gui0D, "", s:cterm0D, "", "") -call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("TooLong", s:gui08, "", s:cterm08, "", "") -call hi("Underlined", s:gui08, "", s:cterm08, "", "") -call hi("Visual", "", s:gui02, "", s:cterm02, "") -call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") -call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") -call hi("WildMenu", s:gui08, "", s:cterm08, "", "") -call hi("Title", s:gui0D, "", s:cterm0D, "", "none") -call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") -call hi("NonText", s:gui03, "", s:cterm03, "", "") -call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") -call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none") -call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLine", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") -call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "") -call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") " Standard syntax highlighting -call hi("Boolean", s:gui09, "", s:cterm09, "", "") -call hi("Character", s:gui08, "", s:cterm08, "", "") -call hi("Comment", s:gui03, "", s:cterm03, "", "") -call hi("Conditional", s:gui0E, "", s:cterm0E, "", "") -call hi("Constant", s:gui09, "", s:cterm09, "", "") -call hi("Define", s:gui0E, "", s:cterm0E, "", "none") -call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("Float", s:gui09, "", s:cterm09, "", "") -call hi("Function", s:gui0D, "", s:cterm0D, "", "") -call hi("Identifier", s:gui08, "", s:cterm08, "", "none") -call hi("Include", s:gui0D, "", s:cterm0D, "", "") -call hi("Keyword", s:gui0E, "", s:cterm0E, "", "") -call hi("Label", s:gui0A, "", s:cterm0A, "", "") -call hi("Number", s:gui09, "", s:cterm09, "", "") -call hi("Operator", s:gui05, "", s:cterm05, "", "none") -call hi("PreProc", s:gui0A, "", s:cterm0A, "", "") -call hi("Repeat", s:gui0A, "", s:cterm0A, "", "") -call hi("Special", s:gui0C, "", s:cterm0C, "", "") -call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "") -call hi("Statement", s:gui08, "", s:cterm08, "", "") -call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") -call hi("String", s:gui0B, "", s:cterm0B, "", "") -call hi("Structure", s:gui0E, "", s:cterm0E, "", "") -call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") -call hi("Type", s:gui0A, "", s:cterm0A, "", "none") -call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") " C highlighting -call hi("cOperator", s:gui0C, "", s:cterm0C, "", "") -call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "") +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") " CSS highlighting -call hi("cssBraces", s:gui05, "", s:cterm05, "", "") -call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "") -call hi("cssColor", s:gui0C, "", s:cterm0C, "", "") +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") " Git highlighting -call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") -call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + " GitGutter highlighting -call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "") +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") " HTML highlighting -call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "") -call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "") -call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "") -call hi("htmlTag", s:gui05, "", s:cterm05, "", "") +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") " JavaScript highlighting -call hi("javaScript", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "") +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") " Markdown highlighting -call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") " NERDTree highlighting -call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") -call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") " PHP highlighting -call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "") -call hi("phpComparison", s:gui05, "", s:cterm05, "", "") -call hi("phpParent", s:gui05, "", s:cterm05, "", "") +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting -call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "") -call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "") +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting -call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") -call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "") -call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "") -call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "") +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") " SASS highlighting -call hi("sassidChar", s:gui08, "", s:cterm08, "", "") -call hi("sassClassChar", s:gui09, "", s:cterm09, "", "") -call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "") +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") " Spelling highlighting -call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) " Remove functions delf hi -delf gui -delf cterm " Remove color variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F -unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-hopscotch.vim b/colors/base16-hopscotch.vim new file mode 100644 index 0000000..33ab800 --- /dev/null +++ b/colors/base16-hopscotch.vim @@ -0,0 +1,271 @@ +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Hopscotch scheme by Jan T. Sott + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has('gui_running') + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-hopscotch.".&background.".sh" + endif +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" + +" 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" +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" +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" +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-hopscotch" + +" Highlighting function +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if a:attr != "" + exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + endif + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp + endif +endfun + +" Vim editor colors +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + +" GitGutter highlighting +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") + +" Python highlighting +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) + +" Remove functions +delf hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-ir-black.vim b/colors/base16-ir-black.vim new file mode 100644 index 0000000..0a50073 --- /dev/null +++ b/colors/base16-ir-black.vim @@ -0,0 +1,271 @@ +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" IR Black scheme by Timothée Poisot (http://timotheepoisot.fr) + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has('gui_running') + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-ir-black.".&background.".sh" + endif +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" + +" 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" +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" +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" +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-ir-black" + +" Highlighting function +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if a:attr != "" + exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + endif + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp + endif +endfun + +" Vim editor colors +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + +" GitGutter highlighting +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") + +" Python highlighting +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) + +" Remove functions +delf hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-isotope.vim b/colors/base16-isotope.vim index f1a519d..c37f642 100644 --- a/colors/base16-isotope.vim +++ b/colors/base16-isotope.vim @@ -1,5 +1,6 @@ -" Base16 Isotope (https://github.com/chriskempson/base16) -" Scheme: Jan T. Sott +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Isotope scheme by Jan T. Sott " This enables the coresponding base16-shell script to run so that " :colorscheme works in terminals supported by base16-shell scripts @@ -62,243 +63,209 @@ syntax reset let g:colors_name = "base16-isotope" " Highlighting function -fun hi(group, guifg, guibg, ctermfg, ctermbg, attr) +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) + exec "hi " . a:group . " guifg=#" . a:guifg endif if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) + exec "hi " . a:group . " guibg=#" . a:guibg endif if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) + exec "hi " . a:group . " ctermfg=" . a:ctermfg endif if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) + exec "hi " . a:group . " ctermbg=" . a:ctermbg endif if a:attr != "" exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr endif -endfun - -" Return GUI color for light/dark variants -fun s:gui(color) - if &background == "dark" - return a:color - endif - - if a:color == s:gui00 - return s:gui07 - elseif a:color == s:gui01 - return s:gui06 - elseif a:color == s:gui02 - return s:gui05 - elseif a:color == s:gui03 - return s:gui04 - elseif a:color == s:gui04 - return s:gui03 - elseif a:color == s:gui05 - return s:gui02 - elseif a:color == s:gui06 - return s:gui01 - elseif a:color == s:gui07 - return s:gui00 - endif - - return a:color -endfun - -" Return terminal color for light/dark variants -fun s:cterm(color) - if &background == "dark" - return a:color - endif - - if a:color == s:cterm00 - return s:cterm07 - elseif a:color == s:cterm01 - return s:cterm06 - elseif a:color == s:cterm02 - return s:cterm05 - elseif a:color == s:cterm03 - return s:cterm04 - elseif a:color == s:cterm04 - return s:cterm03 - elseif a:color == s:cterm05 - return s:cterm02 - elseif a:color == s:cterm06 - return s:cterm01 - elseif a:color == s:cterm07 - return s:cterm00 + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp endif - - return a:color endfun " Vim editor colors -call hi("Bold", "", "", "", "", "bold") -call hi("Debug", s:gui08, "", s:cterm08, "", "") -call hi("Directory", s:gui0D, "", s:cterm0D, "", "") -call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("Exception", s:gui08, "", s:cterm08, "", "") -call hi("FoldColumn", "", s:gui01, "", s:cterm01, "") -call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none") -call hi("Italic", "", "", "", "", "none") -call hi("Macro", s:gui08, "", s:cterm08, "", "") -call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "") -call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("Question", s:gui0D, "", s:cterm0D, "", "") -call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("TooLong", s:gui08, "", s:cterm08, "", "") -call hi("Underlined", s:gui08, "", s:cterm08, "", "") -call hi("Visual", "", s:gui02, "", s:cterm02, "") -call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") -call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") -call hi("WildMenu", s:gui08, "", s:cterm08, "", "") -call hi("Title", s:gui0D, "", s:cterm0D, "", "none") -call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") -call hi("NonText", s:gui03, "", s:cterm03, "", "") -call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") -call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none") -call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLine", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") -call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "") -call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") " Standard syntax highlighting -call hi("Boolean", s:gui09, "", s:cterm09, "", "") -call hi("Character", s:gui08, "", s:cterm08, "", "") -call hi("Comment", s:gui03, "", s:cterm03, "", "") -call hi("Conditional", s:gui0E, "", s:cterm0E, "", "") -call hi("Constant", s:gui09, "", s:cterm09, "", "") -call hi("Define", s:gui0E, "", s:cterm0E, "", "none") -call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("Float", s:gui09, "", s:cterm09, "", "") -call hi("Function", s:gui0D, "", s:cterm0D, "", "") -call hi("Identifier", s:gui08, "", s:cterm08, "", "none") -call hi("Include", s:gui0D, "", s:cterm0D, "", "") -call hi("Keyword", s:gui0E, "", s:cterm0E, "", "") -call hi("Label", s:gui0A, "", s:cterm0A, "", "") -call hi("Number", s:gui09, "", s:cterm09, "", "") -call hi("Operator", s:gui05, "", s:cterm05, "", "none") -call hi("PreProc", s:gui0A, "", s:cterm0A, "", "") -call hi("Repeat", s:gui0A, "", s:cterm0A, "", "") -call hi("Special", s:gui0C, "", s:cterm0C, "", "") -call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "") -call hi("Statement", s:gui08, "", s:cterm08, "", "") -call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") -call hi("String", s:gui0B, "", s:cterm0B, "", "") -call hi("Structure", s:gui0E, "", s:cterm0E, "", "") -call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") -call hi("Type", s:gui0A, "", s:cterm0A, "", "none") -call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") " C highlighting -call hi("cOperator", s:gui0C, "", s:cterm0C, "", "") -call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "") +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") " CSS highlighting -call hi("cssBraces", s:gui05, "", s:cterm05, "", "") -call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "") -call hi("cssColor", s:gui0C, "", s:cterm0C, "", "") +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") " Git highlighting -call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") -call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + " GitGutter highlighting -call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "") +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") " HTML highlighting -call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "") -call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "") -call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "") -call hi("htmlTag", s:gui05, "", s:cterm05, "", "") +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") " JavaScript highlighting -call hi("javaScript", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "") +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") " Markdown highlighting -call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") " NERDTree highlighting -call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") -call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") " PHP highlighting -call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "") -call hi("phpComparison", s:gui05, "", s:cterm05, "", "") -call hi("phpParent", s:gui05, "", s:cterm05, "", "") +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting -call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "") -call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "") +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting -call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") -call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "") -call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "") -call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "") +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") " SASS highlighting -call hi("sassidChar", s:gui08, "", s:cterm08, "", "") -call hi("sassClassChar", s:gui09, "", s:cterm09, "", "") -call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "") +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") " Spelling highlighting -call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) " Remove functions delf hi -delf gui -delf cterm " Remove color variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F -unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-london-tube.vim b/colors/base16-london-tube.vim new file mode 100644 index 0000000..f8a72a3 --- /dev/null +++ b/colors/base16-london-tube.vim @@ -0,0 +1,271 @@ +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" London Tube scheme by Jan T. Sott + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has('gui_running') + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-london-tube.".&background.".sh" + endif +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" + +" 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" +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" +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" +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-london-tube" + +" Highlighting function +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if a:attr != "" + exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + endif + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp + endif +endfun + +" Vim editor colors +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + +" GitGutter highlighting +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") + +" Python highlighting +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) + +" Remove functions +delf hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-londontube.vim b/colors/base16-londontube.vim deleted file mode 100644 index 5ef9185..0000000 --- a/colors/base16-londontube.vim +++ /dev/null @@ -1,304 +0,0 @@ -" Base16 London Tube (https://github.com/chriskempson/base16) -" Scheme: Jan T. Sott - -" This enables the coresponding base16-shell script to run so that -" :colorscheme works in terminals supported by base16-shell scripts -" User must set this variable in .vimrc -" let g:base16_shell_path=base16-builder/output/shell/ -if !has('gui_running') - if exists("g:base16_shell_path") - execute "silent !/bin/sh ".g:base16_shell_path."/base16-londontube.".&background.".sh" - endif -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" - -" 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" -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" -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" -endif - -" Theme setup -hi clear -syntax reset -let g:colors_name = "base16-londontube" - -" Highlighting function -fun hi(group, guifg, guibg, ctermfg, ctermbg, attr) - if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) - endif - if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) - endif - if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) - endif - if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) - endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr - endif -endfun - -" Return GUI color for light/dark variants -fun s:gui(color) - if &background == "dark" - return a:color - endif - - if a:color == s:gui00 - return s:gui07 - elseif a:color == s:gui01 - return s:gui06 - elseif a:color == s:gui02 - return s:gui05 - elseif a:color == s:gui03 - return s:gui04 - elseif a:color == s:gui04 - return s:gui03 - elseif a:color == s:gui05 - return s:gui02 - elseif a:color == s:gui06 - return s:gui01 - elseif a:color == s:gui07 - return s:gui00 - endif - - return a:color -endfun - -" Return terminal color for light/dark variants -fun s:cterm(color) - if &background == "dark" - return a:color - endif - - if a:color == s:cterm00 - return s:cterm07 - elseif a:color == s:cterm01 - return s:cterm06 - elseif a:color == s:cterm02 - return s:cterm05 - elseif a:color == s:cterm03 - return s:cterm04 - elseif a:color == s:cterm04 - return s:cterm03 - elseif a:color == s:cterm05 - return s:cterm02 - elseif a:color == s:cterm06 - return s:cterm01 - elseif a:color == s:cterm07 - return s:cterm00 - endif - - return a:color -endfun - -" Vim editor colors -call hi("Bold", "", "", "", "", "bold") -call hi("Debug", s:gui08, "", s:cterm08, "", "") -call hi("Directory", s:gui0D, "", s:cterm0D, "", "") -call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("Exception", s:gui08, "", s:cterm08, "", "") -call hi("FoldColumn", "", s:gui01, "", s:cterm01, "") -call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none") -call hi("Italic", "", "", "", "", "none") -call hi("Macro", s:gui08, "", s:cterm08, "", "") -call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "") -call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("Question", s:gui0D, "", s:cterm0D, "", "") -call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("TooLong", s:gui08, "", s:cterm08, "", "") -call hi("Underlined", s:gui08, "", s:cterm08, "", "") -call hi("Visual", "", s:gui02, "", s:cterm02, "") -call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") -call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") -call hi("WildMenu", s:gui08, "", s:cterm08, "", "") -call hi("Title", s:gui0D, "", s:cterm0D, "", "none") -call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") -call hi("NonText", s:gui03, "", s:cterm03, "", "") -call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") -call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none") -call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLine", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") -call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "") -call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") - -" Standard syntax highlighting -call hi("Boolean", s:gui09, "", s:cterm09, "", "") -call hi("Character", s:gui08, "", s:cterm08, "", "") -call hi("Comment", s:gui03, "", s:cterm03, "", "") -call hi("Conditional", s:gui0E, "", s:cterm0E, "", "") -call hi("Constant", s:gui09, "", s:cterm09, "", "") -call hi("Define", s:gui0E, "", s:cterm0E, "", "none") -call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("Float", s:gui09, "", s:cterm09, "", "") -call hi("Function", s:gui0D, "", s:cterm0D, "", "") -call hi("Identifier", s:gui08, "", s:cterm08, "", "none") -call hi("Include", s:gui0D, "", s:cterm0D, "", "") -call hi("Keyword", s:gui0E, "", s:cterm0E, "", "") -call hi("Label", s:gui0A, "", s:cterm0A, "", "") -call hi("Number", s:gui09, "", s:cterm09, "", "") -call hi("Operator", s:gui05, "", s:cterm05, "", "none") -call hi("PreProc", s:gui0A, "", s:cterm0A, "", "") -call hi("Repeat", s:gui0A, "", s:cterm0A, "", "") -call hi("Special", s:gui0C, "", s:cterm0C, "", "") -call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "") -call hi("Statement", s:gui08, "", s:cterm08, "", "") -call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") -call hi("String", s:gui0B, "", s:cterm0B, "", "") -call hi("Structure", s:gui0E, "", s:cterm0E, "", "") -call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") -call hi("Type", s:gui0A, "", s:cterm0A, "", "none") -call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") - -" C highlighting -call hi("cOperator", s:gui0C, "", s:cterm0C, "", "") -call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "") - -" CSS highlighting -call hi("cssBraces", s:gui05, "", s:cterm05, "", "") -call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "") -call hi("cssColor", s:gui0C, "", s:cterm0C, "", "") - -" Diff highlighting -call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") - -" Git highlighting -call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") -call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - -" GitGutter highlighting -call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "") - -" HTML highlighting -call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "") -call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "") -call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "") -call hi("htmlTag", s:gui05, "", s:cterm05, "", "") - -" JavaScript highlighting -call hi("javaScript", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "") - -" Markdown highlighting -call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") - -" NERDTree highlighting -call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") -call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") - -" PHP highlighting -call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "") -call hi("phpComparison", s:gui05, "", s:cterm05, "", "") -call hi("phpParent", s:gui05, "", s:cterm05, "", "") - -" Python highlighting -call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "") -call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "") - -" Ruby highlighting -call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") -call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "") -call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "") -call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "") - -" SASS highlighting -call hi("sassidChar", s:gui08, "", s:cterm08, "", "") -call hi("sassClassChar", s:gui09, "", s:cterm09, "", "") -call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "") - -" Signify highlighting -call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") - -" Spelling highlighting -call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") - -" Remove functions -delf hi -delf gui -delf cterm - -" Remove color variables -unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F -unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F diff --git a/colors/base16-macintosh.vim b/colors/base16-macintosh.vim new file mode 100644 index 0000000..c32f7e3 --- /dev/null +++ b/colors/base16-macintosh.vim @@ -0,0 +1,271 @@ +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Macintosh scheme by Rebecca Bettencourt (http://www.kreativekorp.com) + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has('gui_running') + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-macintosh.".&background.".sh" + endif +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" + +" 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" +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" +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" +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-macintosh" + +" Highlighting function +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if a:attr != "" + exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + endif + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp + endif +endfun + +" Vim editor colors +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + +" GitGutter highlighting +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") + +" Python highlighting +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) + +" Remove functions +delf hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-marrakesh.vim b/colors/base16-marrakesh.vim index 0668f9e..efc1444 100644 --- a/colors/base16-marrakesh.vim +++ b/colors/base16-marrakesh.vim @@ -1,5 +1,6 @@ -" Base16 Marrakesh (https://github.com/chriskempson/base16) -" Scheme: Alexandre Gavioli (http://github.com/Alexx2/) +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Marrakesh scheme by Alexandre Gavioli (http://github.com/Alexx2/) " This enables the coresponding base16-shell script to run so that " :colorscheme works in terminals supported by base16-shell scripts @@ -62,243 +63,209 @@ syntax reset let g:colors_name = "base16-marrakesh" " Highlighting function -fun hi(group, guifg, guibg, ctermfg, ctermbg, attr) +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) + exec "hi " . a:group . " guifg=#" . a:guifg endif if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) + exec "hi " . a:group . " guibg=#" . a:guibg endif if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) + exec "hi " . a:group . " ctermfg=" . a:ctermfg endif if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) + exec "hi " . a:group . " ctermbg=" . a:ctermbg endif if a:attr != "" exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr endif -endfun - -" Return GUI color for light/dark variants -fun s:gui(color) - if &background == "dark" - return a:color - endif - - if a:color == s:gui00 - return s:gui07 - elseif a:color == s:gui01 - return s:gui06 - elseif a:color == s:gui02 - return s:gui05 - elseif a:color == s:gui03 - return s:gui04 - elseif a:color == s:gui04 - return s:gui03 - elseif a:color == s:gui05 - return s:gui02 - elseif a:color == s:gui06 - return s:gui01 - elseif a:color == s:gui07 - return s:gui00 - endif - - return a:color -endfun - -" Return terminal color for light/dark variants -fun s:cterm(color) - if &background == "dark" - return a:color - endif - - if a:color == s:cterm00 - return s:cterm07 - elseif a:color == s:cterm01 - return s:cterm06 - elseif a:color == s:cterm02 - return s:cterm05 - elseif a:color == s:cterm03 - return s:cterm04 - elseif a:color == s:cterm04 - return s:cterm03 - elseif a:color == s:cterm05 - return s:cterm02 - elseif a:color == s:cterm06 - return s:cterm01 - elseif a:color == s:cterm07 - return s:cterm00 + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp endif - - return a:color endfun " Vim editor colors -call hi("Bold", "", "", "", "", "bold") -call hi("Debug", s:gui08, "", s:cterm08, "", "") -call hi("Directory", s:gui0D, "", s:cterm0D, "", "") -call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("Exception", s:gui08, "", s:cterm08, "", "") -call hi("FoldColumn", "", s:gui01, "", s:cterm01, "") -call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none") -call hi("Italic", "", "", "", "", "none") -call hi("Macro", s:gui08, "", s:cterm08, "", "") -call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "") -call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("Question", s:gui0D, "", s:cterm0D, "", "") -call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("TooLong", s:gui08, "", s:cterm08, "", "") -call hi("Underlined", s:gui08, "", s:cterm08, "", "") -call hi("Visual", "", s:gui02, "", s:cterm02, "") -call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") -call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") -call hi("WildMenu", s:gui08, "", s:cterm08, "", "") -call hi("Title", s:gui0D, "", s:cterm0D, "", "none") -call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") -call hi("NonText", s:gui03, "", s:cterm03, "", "") -call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") -call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none") -call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLine", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") -call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "") -call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") " Standard syntax highlighting -call hi("Boolean", s:gui09, "", s:cterm09, "", "") -call hi("Character", s:gui08, "", s:cterm08, "", "") -call hi("Comment", s:gui03, "", s:cterm03, "", "") -call hi("Conditional", s:gui0E, "", s:cterm0E, "", "") -call hi("Constant", s:gui09, "", s:cterm09, "", "") -call hi("Define", s:gui0E, "", s:cterm0E, "", "none") -call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("Float", s:gui09, "", s:cterm09, "", "") -call hi("Function", s:gui0D, "", s:cterm0D, "", "") -call hi("Identifier", s:gui08, "", s:cterm08, "", "none") -call hi("Include", s:gui0D, "", s:cterm0D, "", "") -call hi("Keyword", s:gui0E, "", s:cterm0E, "", "") -call hi("Label", s:gui0A, "", s:cterm0A, "", "") -call hi("Number", s:gui09, "", s:cterm09, "", "") -call hi("Operator", s:gui05, "", s:cterm05, "", "none") -call hi("PreProc", s:gui0A, "", s:cterm0A, "", "") -call hi("Repeat", s:gui0A, "", s:cterm0A, "", "") -call hi("Special", s:gui0C, "", s:cterm0C, "", "") -call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "") -call hi("Statement", s:gui08, "", s:cterm08, "", "") -call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") -call hi("String", s:gui0B, "", s:cterm0B, "", "") -call hi("Structure", s:gui0E, "", s:cterm0E, "", "") -call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") -call hi("Type", s:gui0A, "", s:cterm0A, "", "none") -call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") " C highlighting -call hi("cOperator", s:gui0C, "", s:cterm0C, "", "") -call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "") +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") " CSS highlighting -call hi("cssBraces", s:gui05, "", s:cterm05, "", "") -call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "") -call hi("cssColor", s:gui0C, "", s:cterm0C, "", "") +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") " Git highlighting -call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") -call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + " GitGutter highlighting -call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "") +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") " HTML highlighting -call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "") -call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "") -call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "") -call hi("htmlTag", s:gui05, "", s:cterm05, "", "") +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") " JavaScript highlighting -call hi("javaScript", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "") +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") " Markdown highlighting -call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") " NERDTree highlighting -call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") -call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") " PHP highlighting -call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "") -call hi("phpComparison", s:gui05, "", s:cterm05, "", "") -call hi("phpParent", s:gui05, "", s:cterm05, "", "") +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting -call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "") -call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "") +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting -call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") -call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "") -call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "") -call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "") +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") " SASS highlighting -call hi("sassidChar", s:gui08, "", s:cterm08, "", "") -call hi("sassClassChar", s:gui09, "", s:cterm09, "", "") -call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "") +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") " Spelling highlighting -call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) " Remove functions delf hi -delf gui -delf cterm " Remove color variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F -unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-mocha.vim b/colors/base16-mocha.vim index 664f68d..1d7e961 100644 --- a/colors/base16-mocha.vim +++ b/colors/base16-mocha.vim @@ -265,8 +265,6 @@ call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) " Remove functions delf hi -delf gui -delf cterm " Remove color variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F diff --git a/colors/base16-monokai.vim b/colors/base16-monokai.vim index f1f0b37..298e576 100644 --- a/colors/base16-monokai.vim +++ b/colors/base16-monokai.vim @@ -1,5 +1,6 @@ -" Base16 Monokai (https://github.com/chriskempson/base16) -" Scheme: Wimer Hazenberg (http://www.monokai.nl) +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Monokai scheme by Wimer Hazenberg (http://www.monokai.nl) " This enables the coresponding base16-shell script to run so that " :colorscheme works in terminals supported by base16-shell scripts @@ -62,243 +63,209 @@ syntax reset let g:colors_name = "base16-monokai" " Highlighting function -fun hi(group, guifg, guibg, ctermfg, ctermbg, attr) +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) + exec "hi " . a:group . " guifg=#" . a:guifg endif if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) + exec "hi " . a:group . " guibg=#" . a:guibg endif if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) + exec "hi " . a:group . " ctermfg=" . a:ctermfg endif if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) + exec "hi " . a:group . " ctermbg=" . a:ctermbg endif if a:attr != "" exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr endif -endfun - -" Return GUI color for light/dark variants -fun s:gui(color) - if &background == "dark" - return a:color - endif - - if a:color == s:gui00 - return s:gui07 - elseif a:color == s:gui01 - return s:gui06 - elseif a:color == s:gui02 - return s:gui05 - elseif a:color == s:gui03 - return s:gui04 - elseif a:color == s:gui04 - return s:gui03 - elseif a:color == s:gui05 - return s:gui02 - elseif a:color == s:gui06 - return s:gui01 - elseif a:color == s:gui07 - return s:gui00 - endif - - return a:color -endfun - -" Return terminal color for light/dark variants -fun s:cterm(color) - if &background == "dark" - return a:color - endif - - if a:color == s:cterm00 - return s:cterm07 - elseif a:color == s:cterm01 - return s:cterm06 - elseif a:color == s:cterm02 - return s:cterm05 - elseif a:color == s:cterm03 - return s:cterm04 - elseif a:color == s:cterm04 - return s:cterm03 - elseif a:color == s:cterm05 - return s:cterm02 - elseif a:color == s:cterm06 - return s:cterm01 - elseif a:color == s:cterm07 - return s:cterm00 + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp endif - - return a:color endfun " Vim editor colors -call hi("Bold", "", "", "", "", "bold") -call hi("Debug", s:gui08, "", s:cterm08, "", "") -call hi("Directory", s:gui0D, "", s:cterm0D, "", "") -call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("Exception", s:gui08, "", s:cterm08, "", "") -call hi("FoldColumn", "", s:gui01, "", s:cterm01, "") -call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none") -call hi("Italic", "", "", "", "", "none") -call hi("Macro", s:gui08, "", s:cterm08, "", "") -call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "") -call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("Question", s:gui0D, "", s:cterm0D, "", "") -call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("TooLong", s:gui08, "", s:cterm08, "", "") -call hi("Underlined", s:gui08, "", s:cterm08, "", "") -call hi("Visual", "", s:gui02, "", s:cterm02, "") -call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") -call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") -call hi("WildMenu", s:gui08, "", s:cterm08, "", "") -call hi("Title", s:gui0D, "", s:cterm0D, "", "none") -call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") -call hi("NonText", s:gui03, "", s:cterm03, "", "") -call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") -call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none") -call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLine", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") -call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "") -call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") " Standard syntax highlighting -call hi("Boolean", s:gui09, "", s:cterm09, "", "") -call hi("Character", s:gui08, "", s:cterm08, "", "") -call hi("Comment", s:gui03, "", s:cterm03, "", "") -call hi("Conditional", s:gui0E, "", s:cterm0E, "", "") -call hi("Constant", s:gui09, "", s:cterm09, "", "") -call hi("Define", s:gui0E, "", s:cterm0E, "", "none") -call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("Float", s:gui09, "", s:cterm09, "", "") -call hi("Function", s:gui0D, "", s:cterm0D, "", "") -call hi("Identifier", s:gui08, "", s:cterm08, "", "none") -call hi("Include", s:gui0D, "", s:cterm0D, "", "") -call hi("Keyword", s:gui0E, "", s:cterm0E, "", "") -call hi("Label", s:gui0A, "", s:cterm0A, "", "") -call hi("Number", s:gui09, "", s:cterm09, "", "") -call hi("Operator", s:gui05, "", s:cterm05, "", "none") -call hi("PreProc", s:gui0A, "", s:cterm0A, "", "") -call hi("Repeat", s:gui0A, "", s:cterm0A, "", "") -call hi("Special", s:gui0C, "", s:cterm0C, "", "") -call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "") -call hi("Statement", s:gui08, "", s:cterm08, "", "") -call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") -call hi("String", s:gui0B, "", s:cterm0B, "", "") -call hi("Structure", s:gui0E, "", s:cterm0E, "", "") -call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") -call hi("Type", s:gui0A, "", s:cterm0A, "", "none") -call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") " C highlighting -call hi("cOperator", s:gui0C, "", s:cterm0C, "", "") -call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "") +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") " CSS highlighting -call hi("cssBraces", s:gui05, "", s:cterm05, "", "") -call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "") -call hi("cssColor", s:gui0C, "", s:cterm0C, "", "") +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") " Git highlighting -call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") -call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + " GitGutter highlighting -call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "") +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") " HTML highlighting -call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "") -call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "") -call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "") -call hi("htmlTag", s:gui05, "", s:cterm05, "", "") +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") " JavaScript highlighting -call hi("javaScript", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "") +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") " Markdown highlighting -call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") " NERDTree highlighting -call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") -call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") " PHP highlighting -call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "") -call hi("phpComparison", s:gui05, "", s:cterm05, "", "") -call hi("phpParent", s:gui05, "", s:cterm05, "", "") +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting -call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "") -call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "") +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting -call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") -call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "") -call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "") -call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "") +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") " SASS highlighting -call hi("sassidChar", s:gui08, "", s:cterm08, "", "") -call hi("sassClassChar", s:gui09, "", s:cterm09, "", "") -call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "") +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") " Spelling highlighting -call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) " Remove functions delf hi -delf gui -delf cterm " Remove color variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F -unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-ocean.vim b/colors/base16-ocean.vim index 05cbd6e..b7dac02 100644 --- a/colors/base16-ocean.vim +++ b/colors/base16-ocean.vim @@ -265,8 +265,6 @@ call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) " Remove functions delf hi -delf gui -delf cterm " Remove color variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F diff --git a/colors/base16-oceanicnext.vim b/colors/base16-oceanicnext.vim new file mode 100644 index 0000000..7dddf13 --- /dev/null +++ b/colors/base16-oceanicnext.vim @@ -0,0 +1,271 @@ +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" OceanicNext scheme by https://github.com/voronianski/oceanic-next-color-scheme + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has('gui_running') + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-oceanicnext.".&background.".sh" + endif +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" + +" 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" +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" +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" +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-oceanicnext" + +" Highlighting function +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if a:attr != "" + exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + endif + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp + endif +endfun + +" Vim editor colors +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + +" GitGutter highlighting +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") + +" Python highlighting +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) + +" Remove functions +delf hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-paraiso.vim b/colors/base16-paraiso.vim index 3c518d5..92a394c 100644 --- a/colors/base16-paraiso.vim +++ b/colors/base16-paraiso.vim @@ -1,5 +1,6 @@ -" Base16 Paraiso (https://github.com/chriskempson/base16) -" Scheme: Jan T. Sott +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Paraiso scheme by Jan T. Sott " This enables the coresponding base16-shell script to run so that " :colorscheme works in terminals supported by base16-shell scripts @@ -62,243 +63,209 @@ syntax reset let g:colors_name = "base16-paraiso" " Highlighting function -fun hi(group, guifg, guibg, ctermfg, ctermbg, attr) +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) + exec "hi " . a:group . " guifg=#" . a:guifg endif if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) + exec "hi " . a:group . " guibg=#" . a:guibg endif if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) + exec "hi " . a:group . " ctermfg=" . a:ctermfg endif if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) + exec "hi " . a:group . " ctermbg=" . a:ctermbg endif if a:attr != "" exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr endif -endfun - -" Return GUI color for light/dark variants -fun s:gui(color) - if &background == "dark" - return a:color - endif - - if a:color == s:gui00 - return s:gui07 - elseif a:color == s:gui01 - return s:gui06 - elseif a:color == s:gui02 - return s:gui05 - elseif a:color == s:gui03 - return s:gui04 - elseif a:color == s:gui04 - return s:gui03 - elseif a:color == s:gui05 - return s:gui02 - elseif a:color == s:gui06 - return s:gui01 - elseif a:color == s:gui07 - return s:gui00 - endif - - return a:color -endfun - -" Return terminal color for light/dark variants -fun s:cterm(color) - if &background == "dark" - return a:color - endif - - if a:color == s:cterm00 - return s:cterm07 - elseif a:color == s:cterm01 - return s:cterm06 - elseif a:color == s:cterm02 - return s:cterm05 - elseif a:color == s:cterm03 - return s:cterm04 - elseif a:color == s:cterm04 - return s:cterm03 - elseif a:color == s:cterm05 - return s:cterm02 - elseif a:color == s:cterm06 - return s:cterm01 - elseif a:color == s:cterm07 - return s:cterm00 + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp endif - - return a:color endfun " Vim editor colors -call hi("Bold", "", "", "", "", "bold") -call hi("Debug", s:gui08, "", s:cterm08, "", "") -call hi("Directory", s:gui0D, "", s:cterm0D, "", "") -call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("Exception", s:gui08, "", s:cterm08, "", "") -call hi("FoldColumn", "", s:gui01, "", s:cterm01, "") -call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none") -call hi("Italic", "", "", "", "", "none") -call hi("Macro", s:gui08, "", s:cterm08, "", "") -call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "") -call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("Question", s:gui0D, "", s:cterm0D, "", "") -call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("TooLong", s:gui08, "", s:cterm08, "", "") -call hi("Underlined", s:gui08, "", s:cterm08, "", "") -call hi("Visual", "", s:gui02, "", s:cterm02, "") -call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") -call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") -call hi("WildMenu", s:gui08, "", s:cterm08, "", "") -call hi("Title", s:gui0D, "", s:cterm0D, "", "none") -call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") -call hi("NonText", s:gui03, "", s:cterm03, "", "") -call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") -call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none") -call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLine", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") -call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "") -call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") " Standard syntax highlighting -call hi("Boolean", s:gui09, "", s:cterm09, "", "") -call hi("Character", s:gui08, "", s:cterm08, "", "") -call hi("Comment", s:gui03, "", s:cterm03, "", "") -call hi("Conditional", s:gui0E, "", s:cterm0E, "", "") -call hi("Constant", s:gui09, "", s:cterm09, "", "") -call hi("Define", s:gui0E, "", s:cterm0E, "", "none") -call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("Float", s:gui09, "", s:cterm09, "", "") -call hi("Function", s:gui0D, "", s:cterm0D, "", "") -call hi("Identifier", s:gui08, "", s:cterm08, "", "none") -call hi("Include", s:gui0D, "", s:cterm0D, "", "") -call hi("Keyword", s:gui0E, "", s:cterm0E, "", "") -call hi("Label", s:gui0A, "", s:cterm0A, "", "") -call hi("Number", s:gui09, "", s:cterm09, "", "") -call hi("Operator", s:gui05, "", s:cterm05, "", "none") -call hi("PreProc", s:gui0A, "", s:cterm0A, "", "") -call hi("Repeat", s:gui0A, "", s:cterm0A, "", "") -call hi("Special", s:gui0C, "", s:cterm0C, "", "") -call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "") -call hi("Statement", s:gui08, "", s:cterm08, "", "") -call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") -call hi("String", s:gui0B, "", s:cterm0B, "", "") -call hi("Structure", s:gui0E, "", s:cterm0E, "", "") -call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") -call hi("Type", s:gui0A, "", s:cterm0A, "", "none") -call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") " C highlighting -call hi("cOperator", s:gui0C, "", s:cterm0C, "", "") -call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "") +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") " CSS highlighting -call hi("cssBraces", s:gui05, "", s:cterm05, "", "") -call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "") -call hi("cssColor", s:gui0C, "", s:cterm0C, "", "") +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") " Git highlighting -call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") -call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + " GitGutter highlighting -call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "") +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") " HTML highlighting -call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "") -call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "") -call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "") -call hi("htmlTag", s:gui05, "", s:cterm05, "", "") +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") " JavaScript highlighting -call hi("javaScript", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "") +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") " Markdown highlighting -call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") " NERDTree highlighting -call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") -call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") " PHP highlighting -call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "") -call hi("phpComparison", s:gui05, "", s:cterm05, "", "") -call hi("phpParent", s:gui05, "", s:cterm05, "", "") +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting -call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "") -call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "") +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting -call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") -call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "") -call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "") -call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "") +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") " SASS highlighting -call hi("sassidChar", s:gui08, "", s:cterm08, "", "") -call hi("sassClassChar", s:gui09, "", s:cterm09, "", "") -call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "") +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") " Spelling highlighting -call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) " Remove functions delf hi -delf gui -delf cterm " Remove color variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F -unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-phd.vim b/colors/base16-phd.vim new file mode 100644 index 0000000..c108c2a --- /dev/null +++ b/colors/base16-phd.vim @@ -0,0 +1,271 @@ +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" PhD scheme by Hennig Hasemann (http://leetless.de/vim.html) + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has('gui_running') + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-phd.".&background.".sh" + endif +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" + +" 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" +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" +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" +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-phd" + +" Highlighting function +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if a:attr != "" + exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + endif + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp + endif +endfun + +" Vim editor colors +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + +" GitGutter highlighting +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") + +" Python highlighting +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) + +" Remove functions +delf hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-pico.vim b/colors/base16-pico.vim new file mode 100644 index 0000000..bc3be1c --- /dev/null +++ b/colors/base16-pico.vim @@ -0,0 +1,271 @@ +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Pico scheme by PICO-8 (http://www.lexaloffle.com/pico-8.php) + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has('gui_running') + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-pico.".&background.".sh" + endif +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" + +" 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" +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" +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" +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-pico" + +" Highlighting function +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if a:attr != "" + exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + endif + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp + endif +endfun + +" Vim editor colors +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + +" GitGutter highlighting +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") + +" Python highlighting +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) + +" Remove functions +delf hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-pop.vim b/colors/base16-pop.vim index 5766375..8825df6 100644 --- a/colors/base16-pop.vim +++ b/colors/base16-pop.vim @@ -1,7 +1,18 @@ -" Base16 Pop (https://github.com/chriskempson/base16) -" Scheme: Chris Kempson (http://chriskempson.com) +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Pop scheme by Chris Kempson (http://chriskempson.com) -" GUI Base16 Color Definitions +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has('gui_running') + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-pop.".&background.".sh" + endif +endif + +" GUI color definitions let s:gui00 = "000000" let s:gui01 = "202020" let s:gui02 = "303030" @@ -19,7 +30,7 @@ let s:gui0D = "0e5a94" let s:gui0E = "b31e8d" let s:gui0F = "7a2d00" -" Terminal Base16 Color Definitions +" Terminal color definitions let s:cterm00 = "00" let s:cterm03 = "08" let s:cterm05 = "07" @@ -46,13 +57,13 @@ else let s:cterm0F = "14" endif -" Theme Setup +" Theme setup hi clear syntax reset let g:colors_name = "base16-pop" " Highlighting function -fun! hi(group, guifg, guibg, ctermfg, ctermbg, attr) +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -68,184 +79,193 @@ fun! hi(group, guifg, guibg, ctermfg, ctermbg, attr) if a:attr != "" exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr endif + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp + endif endfun -" Vim Editor Colors -call hi("Bold", "", "", "", "", "bold") -call hi("Debug", s:gui08, "", s:cterm08, "", "") -call hi("Directory", s:gui0D, "", s:cterm0D, "", "") -call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("Exception", s:gui08, "", s:cterm08, "", "") -call hi("FoldColumn", "", s:gui01, "", s:cterm01, "") -call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("IncSearch", s:gui0A, "", s:cterm0A, "", "") -call hi("Italic", "", "", "", "", "none") -call hi("Macro", s:gui08, "", s:cterm08, "", "") -call hi("MatchParen", s:gui03, s:gui00, s:cterm03, s:cterm00, "reverse") -call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("Question", s:gui0A, "", s:cterm0A, "", "") -call hi("Search", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "reverse") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("TooLong", s:gui08, "", s:cterm08, "", "") -call hi("Underlined", s:gui08, "", s:cterm08, "", "") -call hi("Visual", "", s:gui02, "", s:cterm02, "") -call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") -call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") -call hi("WildMenu", s:gui08, "", s:cterm08, "", "") -call hi("Title", s:gui0D, "", s:cterm0D, "", "none") - -if &background == "dark" - call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") - call hi("NonText", s:gui03, "", s:cterm03, "", "") - call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") - call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") - call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") - call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") - call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") - call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") - call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none") - call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none") - call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none") - call hi("CursorLine", "", s:gui01, "", s:cterm01, "none") - call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") - call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") - call hi("PMenuSel", s:gui04, s:gui01, s:cterm04, s:cterm01, "reverse") - call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") - call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") - call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") -else - call hi("Cursor", s:gui00, s:gui02, s:cterm00, s:cterm02, "") - call hi("NonText", s:gui05, "", s:cterm05, "", "") - call hi("Normal", s:gui02, s:gui07, s:cterm02, s:cterm05, "") - call hi("LineNr", s:gui04, s:gui06, s:cterm04, s:cterm06, "") - call hi("SignColumn", s:gui04, s:gui06, s:cterm04, s:cterm06, "") - call hi("SpecialKey", s:gui05, "", s:cterm05, "", "") - call hi("StatusLine", s:gui04, s:gui06, s:cterm04, s:cterm06, "none") - call hi("StatusLineNC", s:gui04, s:gui06, s:cterm04, s:cterm06, "none") - call hi("VertSplit", s:gui05, s:gui05, s:cterm05, s:cterm05, "none") - call hi("ColorColumn", "", s:gui06, "", s:cterm06, "none") - call hi("CursorColumn", "", s:gui06, "", s:cterm06, "none") - call hi("CursorLine", "", s:gui06, "", s:cterm06, "none") - call hi("CursorLineNr", s:gui04, s:gui06, s:cterm04, s:cterm06, "") - call hi("PMenu", s:gui05, s:gui03, s:cterm05, s:cterm03, "none") - call hi("PMenuSel", s:gui05, s:gui03, s:cterm05, s:cterm03, "reverse") - call hi("TabLine", s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse") - call hi("TabLineFill", s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse") - call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "reverse") -endif +" Vim editor colors +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") -" Standard Syntax Highlighting -call hi("Boolean", s:gui09, "", s:cterm09, "", "") -call hi("Character", s:gui08, "", s:cterm08, "", "") -call hi("Comment", s:gui03, "", s:cterm03, "", "") -call hi("Conditional", s:gui0E, "", s:cterm0E, "", "") -call hi("Constant", s:gui09, "", s:cterm09, "", "") -call hi("Define", s:gui0E, "", s:cterm0E, "", "none") -call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("Float", s:gui09, "", s:cterm09, "", "") -call hi("Function", s:gui0D, "", s:cterm0D, "", "") -call hi("Identifier", s:gui08, "", s:cterm08, "", "none") -call hi("Include", s:gui0D, "", s:cterm0D, "", "") -call hi("Keyword", s:gui0E, "", s:cterm0E, "", "") -call hi("Label", s:gui0A, "", s:cterm0A, "", "") -call hi("Number", s:gui09, "", s:cterm09, "", "") -call hi("Operator", s:gui05, "", s:cterm05, "", "none") -call hi("PreProc", s:gui0A, "", s:cterm0A, "", "") -call hi("Repeat", s:gui0A, "", s:cterm0A, "", "") -call hi("Special", s:gui0C, "", s:cterm0C, "", "") -call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "") -call hi("Statement", s:gui08, "", s:cterm08, "", "") -call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") -call hi("String", s:gui0B, "", s:cterm0B, "", "") -call hi("Structure", s:gui0E, "", s:cterm0E, "", "") -call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") -call hi("Type", s:gui09, "", s:cterm09, "", "none") -call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") - -" Spelling Highlighting -call hi("SpellBad", "", s:gui00, "", s:cterm08, "") -call hi("SpellLocal", "", s:gui00, "", s:cterm0D, "") -"call hi("SpellCap", s:gui00, s:gui08, s:cterm00, s:cterm08, "") -"call hi("SpellRare", s:gui00, s:gui08, s:cterm00, s:cterm08, "") - -" Additional Diff Highlighting -call hi("DiffAdd", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffChange", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("DiffDelete", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("DiffText", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") - -" Ruby Highlighting -call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") -call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "") -call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "") -call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "") - -" PHP Highlighting -call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "") -call hi("phpComparison", s:gui05, "", s:cterm05, "", "") -call hi("phpParent", s:gui05, "", s:cterm05, "", "") - -" HTML Highlighting -call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "") -call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "") -call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "") -call hi("htmlTag", s:gui05, "", s:cterm05, "", "") - -" CSS Highlighting -call hi("cssBraces", s:gui05, "", s:cterm05, "", "") -call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "") -call hi("cssColor", s:gui0C, "", s:cterm0C, "", "") - -" SASS Highlighting -call hi("sassIdChar", s:gui08, "", s:cterm08, "", "") -call hi("sassClassChar", s:gui09, "", s:cterm09, "", "") -call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "") - -" JavaScript Highlighting -call hi("javaScript", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "") - -" Markdown Highlighting -call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") - -" Git Highlighting -call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") -call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - -" GitGutter Highlighting -if &background == "dark" - call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") - call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") - call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -else - call hi("GitGutterAdd", s:gui0B, s:gui06, s:cterm0B, s:cterm06, "") - call hi("GitGutterChange", s:gui0D, s:gui06, s:cterm0D, s:cterm06, "") - call hi("GitGutterDelete", s:gui08, s:gui06, s:cterm08, s:cterm06, "") -endif +" Standard syntax highlighting +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + +" GitGutter highlighting +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") + +" Python highlighting +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") +" Signify highlighting +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -" GitGutter Highlighting -call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") -call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") +" Spelling highlighting +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) -" remove highlighting function +" Remove functions delf hi -" Remove Colour Variables +" Remove color variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F -unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-railscasts.vim b/colors/base16-railscasts.vim index c315f3a..11669ca 100644 --- a/colors/base16-railscasts.vim +++ b/colors/base16-railscasts.vim @@ -1,5 +1,6 @@ -" Base16 Railscasts (https://github.com/chriskempson/base16) -" Scheme: Ryan Bates (http://railscasts.com) +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Railscasts scheme by Ryan Bates (http://railscasts.com) " This enables the coresponding base16-shell script to run so that " :colorscheme works in terminals supported by base16-shell scripts @@ -62,243 +63,209 @@ syntax reset let g:colors_name = "base16-railscasts" " Highlighting function -fun hi(group, guifg, guibg, ctermfg, ctermbg, attr) +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) + exec "hi " . a:group . " guifg=#" . a:guifg endif if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) + exec "hi " . a:group . " guibg=#" . a:guibg endif if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) + exec "hi " . a:group . " ctermfg=" . a:ctermfg endif if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) + exec "hi " . a:group . " ctermbg=" . a:ctermbg endif if a:attr != "" exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr endif -endfun - -" Return GUI color for light/dark variants -fun s:gui(color) - if &background == "dark" - return a:color - endif - - if a:color == s:gui00 - return s:gui07 - elseif a:color == s:gui01 - return s:gui06 - elseif a:color == s:gui02 - return s:gui05 - elseif a:color == s:gui03 - return s:gui04 - elseif a:color == s:gui04 - return s:gui03 - elseif a:color == s:gui05 - return s:gui02 - elseif a:color == s:gui06 - return s:gui01 - elseif a:color == s:gui07 - return s:gui00 - endif - - return a:color -endfun - -" Return terminal color for light/dark variants -fun s:cterm(color) - if &background == "dark" - return a:color - endif - - if a:color == s:cterm00 - return s:cterm07 - elseif a:color == s:cterm01 - return s:cterm06 - elseif a:color == s:cterm02 - return s:cterm05 - elseif a:color == s:cterm03 - return s:cterm04 - elseif a:color == s:cterm04 - return s:cterm03 - elseif a:color == s:cterm05 - return s:cterm02 - elseif a:color == s:cterm06 - return s:cterm01 - elseif a:color == s:cterm07 - return s:cterm00 + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp endif - - return a:color endfun " Vim editor colors -call hi("Bold", "", "", "", "", "bold") -call hi("Debug", s:gui08, "", s:cterm08, "", "") -call hi("Directory", s:gui0D, "", s:cterm0D, "", "") -call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("Exception", s:gui08, "", s:cterm08, "", "") -call hi("FoldColumn", "", s:gui01, "", s:cterm01, "") -call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none") -call hi("Italic", "", "", "", "", "none") -call hi("Macro", s:gui08, "", s:cterm08, "", "") -call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "") -call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("Question", s:gui0D, "", s:cterm0D, "", "") -call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("TooLong", s:gui08, "", s:cterm08, "", "") -call hi("Underlined", s:gui08, "", s:cterm08, "", "") -call hi("Visual", "", s:gui02, "", s:cterm02, "") -call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") -call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") -call hi("WildMenu", s:gui08, "", s:cterm08, "", "") -call hi("Title", s:gui0D, "", s:cterm0D, "", "none") -call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") -call hi("NonText", s:gui03, "", s:cterm03, "", "") -call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") -call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none") -call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLine", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") -call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "") -call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") " Standard syntax highlighting -call hi("Boolean", s:gui09, "", s:cterm09, "", "") -call hi("Character", s:gui08, "", s:cterm08, "", "") -call hi("Comment", s:gui03, "", s:cterm03, "", "") -call hi("Conditional", s:gui0E, "", s:cterm0E, "", "") -call hi("Constant", s:gui09, "", s:cterm09, "", "") -call hi("Define", s:gui0E, "", s:cterm0E, "", "none") -call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("Float", s:gui09, "", s:cterm09, "", "") -call hi("Function", s:gui0D, "", s:cterm0D, "", "") -call hi("Identifier", s:gui08, "", s:cterm08, "", "none") -call hi("Include", s:gui0D, "", s:cterm0D, "", "") -call hi("Keyword", s:gui0E, "", s:cterm0E, "", "") -call hi("Label", s:gui0A, "", s:cterm0A, "", "") -call hi("Number", s:gui09, "", s:cterm09, "", "") -call hi("Operator", s:gui05, "", s:cterm05, "", "none") -call hi("PreProc", s:gui0A, "", s:cterm0A, "", "") -call hi("Repeat", s:gui0A, "", s:cterm0A, "", "") -call hi("Special", s:gui0C, "", s:cterm0C, "", "") -call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "") -call hi("Statement", s:gui08, "", s:cterm08, "", "") -call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") -call hi("String", s:gui0B, "", s:cterm0B, "", "") -call hi("Structure", s:gui0E, "", s:cterm0E, "", "") -call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") -call hi("Type", s:gui0A, "", s:cterm0A, "", "none") -call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") " C highlighting -call hi("cOperator", s:gui0C, "", s:cterm0C, "", "") -call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "") +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") " CSS highlighting -call hi("cssBraces", s:gui05, "", s:cterm05, "", "") -call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "") -call hi("cssColor", s:gui0C, "", s:cterm0C, "", "") +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") " Git highlighting -call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") -call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + " GitGutter highlighting -call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "") +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") " HTML highlighting -call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "") -call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "") -call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "") -call hi("htmlTag", s:gui05, "", s:cterm05, "", "") +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") " JavaScript highlighting -call hi("javaScript", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "") +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") " Markdown highlighting -call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") " NERDTree highlighting -call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") -call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") " PHP highlighting -call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "") -call hi("phpComparison", s:gui05, "", s:cterm05, "", "") -call hi("phpParent", s:gui05, "", s:cterm05, "", "") +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting -call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "") -call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "") +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting -call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") -call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "") -call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "") -call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "") +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") " SASS highlighting -call hi("sassidChar", s:gui08, "", s:cterm08, "", "") -call hi("sassClassChar", s:gui09, "", s:cterm09, "", "") -call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "") +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") " Spelling highlighting -call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) " Remove functions delf hi -delf gui -delf cterm " Remove color variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F -unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-seti-ui.vim b/colors/base16-seti-ui.vim new file mode 100644 index 0000000..6dfa251 --- /dev/null +++ b/colors/base16-seti-ui.vim @@ -0,0 +1,271 @@ +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Seti UI scheme by + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has('gui_running') + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-seti-ui.".&background.".sh" + endif +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" + +" 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" +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" +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" +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-seti-ui" + +" Highlighting function +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if a:attr != "" + exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + endif + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp + endif +endfun + +" Vim editor colors +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + +" GitGutter highlighting +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") + +" Python highlighting +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) + +" Remove functions +delf hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-shapeshifter.vim b/colors/base16-shapeshifter.vim index d6fb5f2..4cc4a06 100644 --- a/colors/base16-shapeshifter.vim +++ b/colors/base16-shapeshifter.vim @@ -1,5 +1,6 @@ -" Base16 shapeshifter (https://github.com/chriskempson/base16) -" Scheme: Tyler Benziger (http://tybenz.com) +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" shapeshifter scheme by Tyler Benziger (http://tybenz.com) " This enables the coresponding base16-shell script to run so that " :colorscheme works in terminals supported by base16-shell scripts @@ -62,243 +63,209 @@ syntax reset let g:colors_name = "base16-shapeshifter" " Highlighting function -fun hi(group, guifg, guibg, ctermfg, ctermbg, attr) +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) + exec "hi " . a:group . " guifg=#" . a:guifg endif if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) + exec "hi " . a:group . " guibg=#" . a:guibg endif if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) + exec "hi " . a:group . " ctermfg=" . a:ctermfg endif if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) + exec "hi " . a:group . " ctermbg=" . a:ctermbg endif if a:attr != "" exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr endif -endfun - -" Return GUI color for light/dark variants -fun s:gui(color) - if &background == "dark" - return a:color - endif - - if a:color == s:gui00 - return s:gui07 - elseif a:color == s:gui01 - return s:gui06 - elseif a:color == s:gui02 - return s:gui05 - elseif a:color == s:gui03 - return s:gui04 - elseif a:color == s:gui04 - return s:gui03 - elseif a:color == s:gui05 - return s:gui02 - elseif a:color == s:gui06 - return s:gui01 - elseif a:color == s:gui07 - return s:gui00 - endif - - return a:color -endfun - -" Return terminal color for light/dark variants -fun s:cterm(color) - if &background == "dark" - return a:color - endif - - if a:color == s:cterm00 - return s:cterm07 - elseif a:color == s:cterm01 - return s:cterm06 - elseif a:color == s:cterm02 - return s:cterm05 - elseif a:color == s:cterm03 - return s:cterm04 - elseif a:color == s:cterm04 - return s:cterm03 - elseif a:color == s:cterm05 - return s:cterm02 - elseif a:color == s:cterm06 - return s:cterm01 - elseif a:color == s:cterm07 - return s:cterm00 + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp endif - - return a:color endfun " Vim editor colors -call hi("Bold", "", "", "", "", "bold") -call hi("Debug", s:gui08, "", s:cterm08, "", "") -call hi("Directory", s:gui0D, "", s:cterm0D, "", "") -call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("Exception", s:gui08, "", s:cterm08, "", "") -call hi("FoldColumn", "", s:gui01, "", s:cterm01, "") -call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none") -call hi("Italic", "", "", "", "", "none") -call hi("Macro", s:gui08, "", s:cterm08, "", "") -call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "") -call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("Question", s:gui0D, "", s:cterm0D, "", "") -call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("TooLong", s:gui08, "", s:cterm08, "", "") -call hi("Underlined", s:gui08, "", s:cterm08, "", "") -call hi("Visual", "", s:gui02, "", s:cterm02, "") -call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") -call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") -call hi("WildMenu", s:gui08, "", s:cterm08, "", "") -call hi("Title", s:gui0D, "", s:cterm0D, "", "none") -call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") -call hi("NonText", s:gui03, "", s:cterm03, "", "") -call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") -call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none") -call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLine", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") -call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "") -call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") " Standard syntax highlighting -call hi("Boolean", s:gui09, "", s:cterm09, "", "") -call hi("Character", s:gui08, "", s:cterm08, "", "") -call hi("Comment", s:gui03, "", s:cterm03, "", "") -call hi("Conditional", s:gui0E, "", s:cterm0E, "", "") -call hi("Constant", s:gui09, "", s:cterm09, "", "") -call hi("Define", s:gui0E, "", s:cterm0E, "", "none") -call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("Float", s:gui09, "", s:cterm09, "", "") -call hi("Function", s:gui0D, "", s:cterm0D, "", "") -call hi("Identifier", s:gui08, "", s:cterm08, "", "none") -call hi("Include", s:gui0D, "", s:cterm0D, "", "") -call hi("Keyword", s:gui0E, "", s:cterm0E, "", "") -call hi("Label", s:gui0A, "", s:cterm0A, "", "") -call hi("Number", s:gui09, "", s:cterm09, "", "") -call hi("Operator", s:gui05, "", s:cterm05, "", "none") -call hi("PreProc", s:gui0A, "", s:cterm0A, "", "") -call hi("Repeat", s:gui0A, "", s:cterm0A, "", "") -call hi("Special", s:gui0C, "", s:cterm0C, "", "") -call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "") -call hi("Statement", s:gui08, "", s:cterm08, "", "") -call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") -call hi("String", s:gui0B, "", s:cterm0B, "", "") -call hi("Structure", s:gui0E, "", s:cterm0E, "", "") -call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") -call hi("Type", s:gui0A, "", s:cterm0A, "", "none") -call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") " C highlighting -call hi("cOperator", s:gui0C, "", s:cterm0C, "", "") -call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "") +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") " CSS highlighting -call hi("cssBraces", s:gui05, "", s:cterm05, "", "") -call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "") -call hi("cssColor", s:gui0C, "", s:cterm0C, "", "") +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") " Git highlighting -call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") -call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + " GitGutter highlighting -call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "") +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") " HTML highlighting -call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "") -call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "") -call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "") -call hi("htmlTag", s:gui05, "", s:cterm05, "", "") +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") " JavaScript highlighting -call hi("javaScript", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "") +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") " Markdown highlighting -call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") " NERDTree highlighting -call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") -call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") " PHP highlighting -call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "") -call hi("phpComparison", s:gui05, "", s:cterm05, "", "") -call hi("phpParent", s:gui05, "", s:cterm05, "", "") +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting -call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "") -call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "") +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting -call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") -call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "") -call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "") -call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "") +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") " SASS highlighting -call hi("sassidChar", s:gui08, "", s:cterm08, "", "") -call hi("sassClassChar", s:gui09, "", s:cterm09, "", "") -call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "") +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") " Spelling highlighting -call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) " Remove functions delf hi -delf gui -delf cterm " Remove color variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F -unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-solar-flare.vim b/colors/base16-solar-flare.vim new file mode 100644 index 0000000..54f6e8b --- /dev/null +++ b/colors/base16-solar-flare.vim @@ -0,0 +1,271 @@ +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Solar Flare scheme by Chuck Harmston (https://chuck.harmston.ch) + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has('gui_running') + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-solar-flare.".&background.".sh" + endif +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" + +" 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" +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" +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" +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-solar-flare" + +" Highlighting function +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if a:attr != "" + exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + endif + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp + endif +endfun + +" Vim editor colors +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + +" GitGutter highlighting +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") + +" Python highlighting +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) + +" Remove functions +delf hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-solarized.vim b/colors/base16-solarized.vim index 22c181f..6194e7b 100644 --- a/colors/base16-solarized.vim +++ b/colors/base16-solarized.vim @@ -1,5 +1,6 @@ -" Base16 Solarized (https://github.com/chriskempson/base16) -" Scheme: Ethan Schoonover (http://ethanschoonover.com/solarized) +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Solarized scheme by Ethan Schoonover (http://ethanschoonover.com/solarized) " This enables the coresponding base16-shell script to run so that " :colorscheme works in terminals supported by base16-shell scripts @@ -62,243 +63,209 @@ syntax reset let g:colors_name = "base16-solarized" " Highlighting function -fun hi(group, guifg, guibg, ctermfg, ctermbg, attr) +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) + exec "hi " . a:group . " guifg=#" . a:guifg endif if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) + exec "hi " . a:group . " guibg=#" . a:guibg endif if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) + exec "hi " . a:group . " ctermfg=" . a:ctermfg endif if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) + exec "hi " . a:group . " ctermbg=" . a:ctermbg endif if a:attr != "" exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr endif -endfun - -" Return GUI color for light/dark variants -fun s:gui(color) - if &background == "dark" - return a:color - endif - - if a:color == s:gui00 - return s:gui07 - elseif a:color == s:gui01 - return s:gui06 - elseif a:color == s:gui02 - return s:gui05 - elseif a:color == s:gui03 - return s:gui04 - elseif a:color == s:gui04 - return s:gui03 - elseif a:color == s:gui05 - return s:gui02 - elseif a:color == s:gui06 - return s:gui01 - elseif a:color == s:gui07 - return s:gui00 - endif - - return a:color -endfun - -" Return terminal color for light/dark variants -fun s:cterm(color) - if &background == "dark" - return a:color - endif - - if a:color == s:cterm00 - return s:cterm07 - elseif a:color == s:cterm01 - return s:cterm06 - elseif a:color == s:cterm02 - return s:cterm05 - elseif a:color == s:cterm03 - return s:cterm04 - elseif a:color == s:cterm04 - return s:cterm03 - elseif a:color == s:cterm05 - return s:cterm02 - elseif a:color == s:cterm06 - return s:cterm01 - elseif a:color == s:cterm07 - return s:cterm00 + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp endif - - return a:color endfun " Vim editor colors -call hi("Bold", "", "", "", "", "bold") -call hi("Debug", s:gui08, "", s:cterm08, "", "") -call hi("Directory", s:gui0D, "", s:cterm0D, "", "") -call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("Exception", s:gui08, "", s:cterm08, "", "") -call hi("FoldColumn", "", s:gui01, "", s:cterm01, "") -call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none") -call hi("Italic", "", "", "", "", "none") -call hi("Macro", s:gui08, "", s:cterm08, "", "") -call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "") -call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("Question", s:gui0D, "", s:cterm0D, "", "") -call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("TooLong", s:gui08, "", s:cterm08, "", "") -call hi("Underlined", s:gui08, "", s:cterm08, "", "") -call hi("Visual", "", s:gui02, "", s:cterm02, "") -call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") -call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") -call hi("WildMenu", s:gui08, "", s:cterm08, "", "") -call hi("Title", s:gui0D, "", s:cterm0D, "", "none") -call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") -call hi("NonText", s:gui03, "", s:cterm03, "", "") -call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") -call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none") -call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLine", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") -call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "") -call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") " Standard syntax highlighting -call hi("Boolean", s:gui09, "", s:cterm09, "", "") -call hi("Character", s:gui08, "", s:cterm08, "", "") -call hi("Comment", s:gui03, "", s:cterm03, "", "") -call hi("Conditional", s:gui0E, "", s:cterm0E, "", "") -call hi("Constant", s:gui09, "", s:cterm09, "", "") -call hi("Define", s:gui0E, "", s:cterm0E, "", "none") -call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("Float", s:gui09, "", s:cterm09, "", "") -call hi("Function", s:gui0D, "", s:cterm0D, "", "") -call hi("Identifier", s:gui08, "", s:cterm08, "", "none") -call hi("Include", s:gui0D, "", s:cterm0D, "", "") -call hi("Keyword", s:gui0E, "", s:cterm0E, "", "") -call hi("Label", s:gui0A, "", s:cterm0A, "", "") -call hi("Number", s:gui09, "", s:cterm09, "", "") -call hi("Operator", s:gui05, "", s:cterm05, "", "none") -call hi("PreProc", s:gui0A, "", s:cterm0A, "", "") -call hi("Repeat", s:gui0A, "", s:cterm0A, "", "") -call hi("Special", s:gui0C, "", s:cterm0C, "", "") -call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "") -call hi("Statement", s:gui08, "", s:cterm08, "", "") -call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") -call hi("String", s:gui0B, "", s:cterm0B, "", "") -call hi("Structure", s:gui0E, "", s:cterm0E, "", "") -call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") -call hi("Type", s:gui0A, "", s:cterm0A, "", "none") -call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") " C highlighting -call hi("cOperator", s:gui0C, "", s:cterm0C, "", "") -call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "") +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") " CSS highlighting -call hi("cssBraces", s:gui05, "", s:cterm05, "", "") -call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "") -call hi("cssColor", s:gui0C, "", s:cterm0C, "", "") +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") " Git highlighting -call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") -call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + " GitGutter highlighting -call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "") +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") " HTML highlighting -call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "") -call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "") -call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "") -call hi("htmlTag", s:gui05, "", s:cterm05, "", "") +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") " JavaScript highlighting -call hi("javaScript", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "") +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") " Markdown highlighting -call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") " NERDTree highlighting -call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") -call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") " PHP highlighting -call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "") -call hi("phpComparison", s:gui05, "", s:cterm05, "", "") -call hi("phpParent", s:gui05, "", s:cterm05, "", "") +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting -call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "") -call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "") +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting -call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") -call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "") -call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "") -call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "") +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") " SASS highlighting -call hi("sassidChar", s:gui08, "", s:cterm08, "", "") -call hi("sassClassChar", s:gui09, "", s:cterm09, "", "") -call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "") +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") " Spelling highlighting -call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) " Remove functions delf hi -delf gui -delf cterm " Remove color variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F -unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-spacemacs.vim b/colors/base16-spacemacs.vim new file mode 100644 index 0000000..03549fa --- /dev/null +++ b/colors/base16-spacemacs.vim @@ -0,0 +1,271 @@ +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Spacemacs scheme by Nasser Alshammari (https://github.com/nashamri/spacemacs-theme) + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has('gui_running') + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-spacemacs.".&background.".sh" + endif +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" + +" 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" +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" +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" +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-spacemacs" + +" Highlighting function +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if a:attr != "" + exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + endif + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp + endif +endfun + +" Vim editor colors +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + +" GitGutter highlighting +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") + +" Python highlighting +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) + +" Remove functions +delf hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-summerfruit.vim b/colors/base16-summerfruit.vim index 2d84295..1d3ba99 100644 --- a/colors/base16-summerfruit.vim +++ b/colors/base16-summerfruit.vim @@ -1,5 +1,6 @@ -" Base16 Summerfruit (https://github.com/chriskempson/base16) -" Scheme: Christopher Corley (http://cscorley.github.io/) +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Summerfruit scheme by Christopher Corley (http://cscorley.github.io/) " This enables the coresponding base16-shell script to run so that " :colorscheme works in terminals supported by base16-shell scripts @@ -62,243 +63,209 @@ syntax reset let g:colors_name = "base16-summerfruit" " Highlighting function -fun hi(group, guifg, guibg, ctermfg, ctermbg, attr) +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) + exec "hi " . a:group . " guifg=#" . a:guifg endif if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) + exec "hi " . a:group . " guibg=#" . a:guibg endif if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) + exec "hi " . a:group . " ctermfg=" . a:ctermfg endif if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) + exec "hi " . a:group . " ctermbg=" . a:ctermbg endif if a:attr != "" exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr endif -endfun - -" Return GUI color for light/dark variants -fun s:gui(color) - if &background == "dark" - return a:color - endif - - if a:color == s:gui00 - return s:gui07 - elseif a:color == s:gui01 - return s:gui06 - elseif a:color == s:gui02 - return s:gui05 - elseif a:color == s:gui03 - return s:gui04 - elseif a:color == s:gui04 - return s:gui03 - elseif a:color == s:gui05 - return s:gui02 - elseif a:color == s:gui06 - return s:gui01 - elseif a:color == s:gui07 - return s:gui00 - endif - - return a:color -endfun - -" Return terminal color for light/dark variants -fun s:cterm(color) - if &background == "dark" - return a:color - endif - - if a:color == s:cterm00 - return s:cterm07 - elseif a:color == s:cterm01 - return s:cterm06 - elseif a:color == s:cterm02 - return s:cterm05 - elseif a:color == s:cterm03 - return s:cterm04 - elseif a:color == s:cterm04 - return s:cterm03 - elseif a:color == s:cterm05 - return s:cterm02 - elseif a:color == s:cterm06 - return s:cterm01 - elseif a:color == s:cterm07 - return s:cterm00 + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp endif - - return a:color endfun " Vim editor colors -call hi("Bold", "", "", "", "", "bold") -call hi("Debug", s:gui08, "", s:cterm08, "", "") -call hi("Directory", s:gui0D, "", s:cterm0D, "", "") -call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("Exception", s:gui08, "", s:cterm08, "", "") -call hi("FoldColumn", "", s:gui01, "", s:cterm01, "") -call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none") -call hi("Italic", "", "", "", "", "none") -call hi("Macro", s:gui08, "", s:cterm08, "", "") -call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "") -call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("Question", s:gui0D, "", s:cterm0D, "", "") -call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("TooLong", s:gui08, "", s:cterm08, "", "") -call hi("Underlined", s:gui08, "", s:cterm08, "", "") -call hi("Visual", "", s:gui02, "", s:cterm02, "") -call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") -call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") -call hi("WildMenu", s:gui08, "", s:cterm08, "", "") -call hi("Title", s:gui0D, "", s:cterm0D, "", "none") -call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") -call hi("NonText", s:gui03, "", s:cterm03, "", "") -call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") -call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none") -call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLine", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") -call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "") -call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") " Standard syntax highlighting -call hi("Boolean", s:gui09, "", s:cterm09, "", "") -call hi("Character", s:gui08, "", s:cterm08, "", "") -call hi("Comment", s:gui03, "", s:cterm03, "", "") -call hi("Conditional", s:gui0E, "", s:cterm0E, "", "") -call hi("Constant", s:gui09, "", s:cterm09, "", "") -call hi("Define", s:gui0E, "", s:cterm0E, "", "none") -call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("Float", s:gui09, "", s:cterm09, "", "") -call hi("Function", s:gui0D, "", s:cterm0D, "", "") -call hi("Identifier", s:gui08, "", s:cterm08, "", "none") -call hi("Include", s:gui0D, "", s:cterm0D, "", "") -call hi("Keyword", s:gui0E, "", s:cterm0E, "", "") -call hi("Label", s:gui0A, "", s:cterm0A, "", "") -call hi("Number", s:gui09, "", s:cterm09, "", "") -call hi("Operator", s:gui05, "", s:cterm05, "", "none") -call hi("PreProc", s:gui0A, "", s:cterm0A, "", "") -call hi("Repeat", s:gui0A, "", s:cterm0A, "", "") -call hi("Special", s:gui0C, "", s:cterm0C, "", "") -call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "") -call hi("Statement", s:gui08, "", s:cterm08, "", "") -call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") -call hi("String", s:gui0B, "", s:cterm0B, "", "") -call hi("Structure", s:gui0E, "", s:cterm0E, "", "") -call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") -call hi("Type", s:gui0A, "", s:cterm0A, "", "none") -call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") " C highlighting -call hi("cOperator", s:gui0C, "", s:cterm0C, "", "") -call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "") +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") " CSS highlighting -call hi("cssBraces", s:gui05, "", s:cterm05, "", "") -call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "") -call hi("cssColor", s:gui0C, "", s:cterm0C, "", "") +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") " Git highlighting -call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") -call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + " GitGutter highlighting -call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "") +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") " HTML highlighting -call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "") -call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "") -call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "") -call hi("htmlTag", s:gui05, "", s:cterm05, "", "") +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") " JavaScript highlighting -call hi("javaScript", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "") +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") " Markdown highlighting -call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") " NERDTree highlighting -call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") -call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") " PHP highlighting -call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "") -call hi("phpComparison", s:gui05, "", s:cterm05, "", "") -call hi("phpParent", s:gui05, "", s:cterm05, "", "") +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting -call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "") -call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "") +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting -call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") -call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "") -call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "") -call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "") +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") " SASS highlighting -call hi("sassidChar", s:gui08, "", s:cterm08, "", "") -call hi("sassClassChar", s:gui09, "", s:cterm09, "", "") -call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "") +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") " Spelling highlighting -call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) " Remove functions delf hi -delf gui -delf cterm " Remove color variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F -unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-tomorrow-day.vim b/colors/base16-tomorrow-day.vim index ed4ee07..8042d3e 100644 --- a/colors/base16-tomorrow-day.vim +++ b/colors/base16-tomorrow-day.vim @@ -265,8 +265,6 @@ call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) " Remove functions delf hi -delf gui -delf cterm " Remove color variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F diff --git a/colors/base16-tomorrow-night.vim b/colors/base16-tomorrow-night.vim index a724856..8a5a362 100644 --- a/colors/base16-tomorrow-night.vim +++ b/colors/base16-tomorrow-night.vim @@ -265,8 +265,6 @@ call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) " Remove functions delf hi -delf gui -delf cterm " Remove color variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F diff --git a/colors/base16-tomorrow.vim b/colors/base16-tomorrow.vim index eed938e..1c3b03f 100644 --- a/colors/base16-tomorrow.vim +++ b/colors/base16-tomorrow.vim @@ -1,5 +1,6 @@ -" Base16 Tomorrow (https://github.com/chriskempson/base16) -" Scheme: Chris Kempson (http://chriskempson.com) +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Tomorrow scheme by Chris Kempson (http://chriskempson.com) " This enables the coresponding base16-shell script to run so that " :colorscheme works in terminals supported by base16-shell scripts @@ -62,243 +63,209 @@ syntax reset let g:colors_name = "base16-tomorrow" " Highlighting function -fun hi(group, guifg, guibg, ctermfg, ctermbg, attr) +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) + exec "hi " . a:group . " guifg=#" . a:guifg endif if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) + exec "hi " . a:group . " guibg=#" . a:guibg endif if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) + exec "hi " . a:group . " ctermfg=" . a:ctermfg endif if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) + exec "hi " . a:group . " ctermbg=" . a:ctermbg endif if a:attr != "" exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr endif -endfun - -" Return GUI color for light/dark variants -fun s:gui(color) - if &background == "dark" - return a:color - endif - - if a:color == s:gui00 - return s:gui07 - elseif a:color == s:gui01 - return s:gui06 - elseif a:color == s:gui02 - return s:gui05 - elseif a:color == s:gui03 - return s:gui04 - elseif a:color == s:gui04 - return s:gui03 - elseif a:color == s:gui05 - return s:gui02 - elseif a:color == s:gui06 - return s:gui01 - elseif a:color == s:gui07 - return s:gui00 - endif - - return a:color -endfun - -" Return terminal color for light/dark variants -fun s:cterm(color) - if &background == "dark" - return a:color - endif - - if a:color == s:cterm00 - return s:cterm07 - elseif a:color == s:cterm01 - return s:cterm06 - elseif a:color == s:cterm02 - return s:cterm05 - elseif a:color == s:cterm03 - return s:cterm04 - elseif a:color == s:cterm04 - return s:cterm03 - elseif a:color == s:cterm05 - return s:cterm02 - elseif a:color == s:cterm06 - return s:cterm01 - elseif a:color == s:cterm07 - return s:cterm00 + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp endif - - return a:color endfun " Vim editor colors -call hi("Bold", "", "", "", "", "bold") -call hi("Debug", s:gui08, "", s:cterm08, "", "") -call hi("Directory", s:gui0D, "", s:cterm0D, "", "") -call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("Exception", s:gui08, "", s:cterm08, "", "") -call hi("FoldColumn", "", s:gui01, "", s:cterm01, "") -call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none") -call hi("Italic", "", "", "", "", "none") -call hi("Macro", s:gui08, "", s:cterm08, "", "") -call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "") -call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("Question", s:gui0D, "", s:cterm0D, "", "") -call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("TooLong", s:gui08, "", s:cterm08, "", "") -call hi("Underlined", s:gui08, "", s:cterm08, "", "") -call hi("Visual", "", s:gui02, "", s:cterm02, "") -call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") -call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") -call hi("WildMenu", s:gui08, "", s:cterm08, "", "") -call hi("Title", s:gui0D, "", s:cterm0D, "", "none") -call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") -call hi("NonText", s:gui03, "", s:cterm03, "", "") -call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") -call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none") -call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLine", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") -call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "") -call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") " Standard syntax highlighting -call hi("Boolean", s:gui09, "", s:cterm09, "", "") -call hi("Character", s:gui08, "", s:cterm08, "", "") -call hi("Comment", s:gui03, "", s:cterm03, "", "") -call hi("Conditional", s:gui0E, "", s:cterm0E, "", "") -call hi("Constant", s:gui09, "", s:cterm09, "", "") -call hi("Define", s:gui0E, "", s:cterm0E, "", "none") -call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("Float", s:gui09, "", s:cterm09, "", "") -call hi("Function", s:gui0D, "", s:cterm0D, "", "") -call hi("Identifier", s:gui08, "", s:cterm08, "", "none") -call hi("Include", s:gui0D, "", s:cterm0D, "", "") -call hi("Keyword", s:gui0E, "", s:cterm0E, "", "") -call hi("Label", s:gui0A, "", s:cterm0A, "", "") -call hi("Number", s:gui09, "", s:cterm09, "", "") -call hi("Operator", s:gui05, "", s:cterm05, "", "none") -call hi("PreProc", s:gui0A, "", s:cterm0A, "", "") -call hi("Repeat", s:gui0A, "", s:cterm0A, "", "") -call hi("Special", s:gui0C, "", s:cterm0C, "", "") -call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "") -call hi("Statement", s:gui08, "", s:cterm08, "", "") -call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") -call hi("String", s:gui0B, "", s:cterm0B, "", "") -call hi("Structure", s:gui0E, "", s:cterm0E, "", "") -call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") -call hi("Type", s:gui0A, "", s:cterm0A, "", "none") -call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") " C highlighting -call hi("cOperator", s:gui0C, "", s:cterm0C, "", "") -call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "") +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") " CSS highlighting -call hi("cssBraces", s:gui05, "", s:cterm05, "", "") -call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "") -call hi("cssColor", s:gui0C, "", s:cterm0C, "", "") +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") " Git highlighting -call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") -call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + " GitGutter highlighting -call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "") +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") " HTML highlighting -call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "") -call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "") -call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "") -call hi("htmlTag", s:gui05, "", s:cterm05, "", "") +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") " JavaScript highlighting -call hi("javaScript", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "") +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") " Markdown highlighting -call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") " NERDTree highlighting -call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") -call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") " PHP highlighting -call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "") -call hi("phpComparison", s:gui05, "", s:cterm05, "", "") -call hi("phpParent", s:gui05, "", s:cterm05, "", "") +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting -call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "") -call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "") +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting -call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") -call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "") -call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "") -call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "") +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") " SASS highlighting -call hi("sassidChar", s:gui08, "", s:cterm08, "", "") -call hi("sassClassChar", s:gui09, "", s:cterm09, "", "") -call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "") +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") " Spelling highlighting -call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) " Remove functions delf hi -delf gui -delf cterm " Remove color variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F -unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file diff --git a/colors/base16-twilight.vim b/colors/base16-twilight.vim index 8017213..58942a7 100644 --- a/colors/base16-twilight.vim +++ b/colors/base16-twilight.vim @@ -1,5 +1,6 @@ -" Base16 Twilight (https://github.com/chriskempson/base16) -" Scheme: David Hart (http://hart-dev.com) +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Twilight scheme by David Hart (http://hart-dev.com) " This enables the coresponding base16-shell script to run so that " :colorscheme works in terminals supported by base16-shell scripts @@ -62,243 +63,209 @@ syntax reset let g:colors_name = "base16-twilight" " Highlighting function -fun hi(group, guifg, guibg, ctermfg, ctermbg, attr) +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) + exec "hi " . a:group . " guifg=#" . a:guifg endif if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) + exec "hi " . a:group . " guibg=#" . a:guibg endif if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) + exec "hi " . a:group . " ctermfg=" . a:ctermfg endif if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) + exec "hi " . a:group . " ctermbg=" . a:ctermbg endif if a:attr != "" exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr endif -endfun - -" Return GUI color for light/dark variants -fun s:gui(color) - if &background == "dark" - return a:color - endif - - if a:color == s:gui00 - return s:gui07 - elseif a:color == s:gui01 - return s:gui06 - elseif a:color == s:gui02 - return s:gui05 - elseif a:color == s:gui03 - return s:gui04 - elseif a:color == s:gui04 - return s:gui03 - elseif a:color == s:gui05 - return s:gui02 - elseif a:color == s:gui06 - return s:gui01 - elseif a:color == s:gui07 - return s:gui00 - endif - - return a:color -endfun - -" Return terminal color for light/dark variants -fun s:cterm(color) - if &background == "dark" - return a:color - endif - - if a:color == s:cterm00 - return s:cterm07 - elseif a:color == s:cterm01 - return s:cterm06 - elseif a:color == s:cterm02 - return s:cterm05 - elseif a:color == s:cterm03 - return s:cterm04 - elseif a:color == s:cterm04 - return s:cterm03 - elseif a:color == s:cterm05 - return s:cterm02 - elseif a:color == s:cterm06 - return s:cterm01 - elseif a:color == s:cterm07 - return s:cterm00 + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp endif - - return a:color endfun " Vim editor colors -call hi("Bold", "", "", "", "", "bold") -call hi("Debug", s:gui08, "", s:cterm08, "", "") -call hi("Directory", s:gui0D, "", s:cterm0D, "", "") -call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("Exception", s:gui08, "", s:cterm08, "", "") -call hi("FoldColumn", "", s:gui01, "", s:cterm01, "") -call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none") -call hi("Italic", "", "", "", "", "none") -call hi("Macro", s:gui08, "", s:cterm08, "", "") -call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "") -call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("Question", s:gui0D, "", s:cterm0D, "", "") -call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("TooLong", s:gui08, "", s:cterm08, "", "") -call hi("Underlined", s:gui08, "", s:cterm08, "", "") -call hi("Visual", "", s:gui02, "", s:cterm02, "") -call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") -call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") -call hi("WildMenu", s:gui08, "", s:cterm08, "", "") -call hi("Title", s:gui0D, "", s:cterm0D, "", "none") -call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") -call hi("NonText", s:gui03, "", s:cterm03, "", "") -call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") -call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none") -call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLine", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") -call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "") -call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") +call hi("Bold", "", "", "", "", "bold", "") +call hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call hi("Italic", "", "", "", "", "none", "") +call hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") " Standard syntax highlighting -call hi("Boolean", s:gui09, "", s:cterm09, "", "") -call hi("Character", s:gui08, "", s:cterm08, "", "") -call hi("Comment", s:gui03, "", s:cterm03, "", "") -call hi("Conditional", s:gui0E, "", s:cterm0E, "", "") -call hi("Constant", s:gui09, "", s:cterm09, "", "") -call hi("Define", s:gui0E, "", s:cterm0E, "", "none") -call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("Float", s:gui09, "", s:cterm09, "", "") -call hi("Function", s:gui0D, "", s:cterm0D, "", "") -call hi("Identifier", s:gui08, "", s:cterm08, "", "none") -call hi("Include", s:gui0D, "", s:cterm0D, "", "") -call hi("Keyword", s:gui0E, "", s:cterm0E, "", "") -call hi("Label", s:gui0A, "", s:cterm0A, "", "") -call hi("Number", s:gui09, "", s:cterm09, "", "") -call hi("Operator", s:gui05, "", s:cterm05, "", "none") -call hi("PreProc", s:gui0A, "", s:cterm0A, "", "") -call hi("Repeat", s:gui0A, "", s:cterm0A, "", "") -call hi("Special", s:gui0C, "", s:cterm0C, "", "") -call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "") -call hi("Statement", s:gui08, "", s:cterm08, "", "") -call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") -call hi("String", s:gui0B, "", s:cterm0B, "", "") -call hi("Structure", s:gui0E, "", s:cterm0E, "", "") -call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") -call hi("Type", s:gui0A, "", s:cterm0A, "", "none") -call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") +call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") " C highlighting -call hi("cOperator", s:gui0C, "", s:cterm0C, "", "") -call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "") +call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csType", s:gui08, "", s:cterm08, "", "", "") +call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") " CSS highlighting -call hi("cssBraces", s:gui05, "", s:cterm05, "", "") -call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "") -call hi("cssColor", s:gui0C, "", s:cterm0C, "", "") +call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") " Git highlighting -call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") -call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "") + " GitGutter highlighting -call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "") +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") " HTML highlighting -call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "") -call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "") -call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "") -call hi("htmlTag", s:gui05, "", s:cterm05, "", "") +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") " JavaScript highlighting -call hi("javaScript", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "") +call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") + +" Mail highlighting +call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") " Markdown highlighting -call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") " NERDTree highlighting -call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") -call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") " PHP highlighting -call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "") -call hi("phpComparison", s:gui05, "", s:cterm05, "", "") -call hi("phpParent", s:gui05, "", s:cterm05, "", "") +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting -call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "") -call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "") +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting -call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") -call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "") -call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "") -call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "") +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") " SASS highlighting -call hi("sassidChar", s:gui08, "", s:cterm08, "", "") -call hi("sassClassChar", s:gui09, "", s:cterm09, "", "") -call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "") +call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") " Spelling highlighting -call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) " Remove functions delf hi -delf gui -delf cterm " Remove color variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F -unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file -- cgit v1.2.3