From 17f0a4b4994350233e6ac0a58c5f164b373439c1 Mon Sep 17 00:00:00 2001 From: Chris Kempson Date: Mon, 3 Jul 2017 14:03:21 +0100 Subject: Supports QuickFixLine plus scheme updates --- colors/base16-3024.vim | 5 +- colors/base16-apathy.vim | 5 +- colors/base16-ashes.vim | 5 +- colors/base16-atelier-cave-light.vim | 7 +- colors/base16-atelier-cave.vim | 5 +- colors/base16-atelier-dune-light.vim | 7 +- colors/base16-atelier-dune.vim | 5 +- colors/base16-atelier-estuary-light.vim | 7 +- colors/base16-atelier-estuary.vim | 5 +- colors/base16-atelier-forest-light.vim | 7 +- colors/base16-atelier-forest.vim | 5 +- colors/base16-atelier-heath-light.vim | 7 +- colors/base16-atelier-heath.vim | 5 +- colors/base16-atelier-lakeside-light.vim | 7 +- colors/base16-atelier-lakeside.vim | 5 +- colors/base16-atelier-plateau-light.vim | 7 +- colors/base16-atelier-plateau.vim | 5 +- colors/base16-atelier-savanna-light.vim | 7 +- colors/base16-atelier-savanna.vim | 5 +- colors/base16-atelier-seaside-light.vim | 7 +- colors/base16-atelier-seaside.vim | 5 +- colors/base16-atelier-sulphurpool-light.vim | 7 +- colors/base16-atelier-sulphurpool.vim | 5 +- colors/base16-bespin.vim | 5 +- colors/base16-brewer.vim | 5 +- colors/base16-bright.vim | 5 +- colors/base16-chalk.vim | 5 +- colors/base16-circus.vim | 330 ++++++++++++++++++++++++++++ colors/base16-classic-dark.vim | 330 ++++++++++++++++++++++++++++ colors/base16-classic-light.vim | 330 ++++++++++++++++++++++++++++ colors/base16-codeschool.vim | 5 +- colors/base16-cupcake.vim | 5 +- colors/base16-cupertino.vim | 330 ++++++++++++++++++++++++++++ colors/base16-darktooth.vim | 5 +- colors/base16-default-dark.vim | 5 +- colors/base16-default-light.vim | 5 +- colors/base16-dracula.vim | 5 +- colors/base16-eighties.vim | 5 +- colors/base16-embers.vim | 5 +- colors/base16-flat.vim | 5 +- colors/base16-github.vim | 5 +- colors/base16-google-dark.vim | 5 +- colors/base16-google-light.vim | 5 +- colors/base16-grayscale-dark.vim | 5 +- colors/base16-grayscale-light.vim | 5 +- colors/base16-green-screen.vim | 330 ++++++++++++++++++++++++++++ colors/base16-greenscreen.vim | 327 --------------------------- colors/base16-gruvbox-dark-hard.vim | 5 +- colors/base16-gruvbox-dark-medium.vim | 5 +- colors/base16-gruvbox-dark-pale.vim | 5 +- colors/base16-gruvbox-dark-soft.vim | 5 +- colors/base16-gruvbox-light-hard.vim | 5 +- colors/base16-gruvbox-light-medium.vim | 5 +- colors/base16-gruvbox-light-soft.vim | 5 +- colors/base16-harmonic-dark.vim | 327 --------------------------- colors/base16-harmonic-light.vim | 327 --------------------------- colors/base16-harmonic16-dark.vim | 330 ++++++++++++++++++++++++++++ colors/base16-harmonic16-light.vim | 330 ++++++++++++++++++++++++++++ colors/base16-hopscotch.vim | 5 +- colors/base16-ir-black.vim | 330 ++++++++++++++++++++++++++++ colors/base16-irblack.vim | 327 --------------------------- colors/base16-isotope.vim | 5 +- colors/base16-london-tube.vim | 330 ++++++++++++++++++++++++++++ colors/base16-macintosh.vim | 5 +- colors/base16-marrakesh.vim | 5 +- colors/base16-materia.vim | 31 ++- colors/base16-mexico-light.vim | 5 +- colors/base16-mocha.vim | 5 +- colors/base16-monokai.vim | 5 +- colors/base16-nord.vim | 5 +- colors/base16-ocean.vim | 5 +- colors/base16-oceanicnext.vim | 5 +- colors/base16-one-light.vim | 330 ++++++++++++++++++++++++++++ colors/base16-onedark.vim | 5 +- colors/base16-paraiso.vim | 5 +- colors/base16-phd.vim | 5 +- colors/base16-pico.vim | 5 +- colors/base16-pop.vim | 5 +- colors/base16-railscasts.vim | 5 +- colors/base16-rebecca.vim | 5 +- colors/base16-seti-ui.vim | 330 ++++++++++++++++++++++++++++ colors/base16-seti.vim | 327 --------------------------- colors/base16-shapeshifter.vim | 5 +- colors/base16-solar-flare.vim | 330 ++++++++++++++++++++++++++++ colors/base16-solarflare.vim | 327 --------------------------- colors/base16-solarized-dark.vim | 5 +- colors/base16-solarized-light.vim | 5 +- colors/base16-spacemacs.vim | 5 +- colors/base16-summerfruit-dark.vim | 5 +- colors/base16-summerfruit-light.vim | 5 +- colors/base16-tomorrow-night.vim | 5 +- colors/base16-tomorrow.vim | 5 +- colors/base16-tube.vim | 327 --------------------------- colors/base16-twilight.vim | 5 +- colors/base16-unikitty-dark.vim | 5 +- colors/base16-unikitty-light.vim | 5 +- colors/base16-woodland.vim | 5 +- 97 files changed, 4308 insertions(+), 2377 deletions(-) create mode 100644 colors/base16-circus.vim create mode 100644 colors/base16-classic-dark.vim create mode 100644 colors/base16-classic-light.vim create mode 100644 colors/base16-cupertino.vim create mode 100644 colors/base16-green-screen.vim delete mode 100644 colors/base16-greenscreen.vim delete mode 100644 colors/base16-harmonic-dark.vim delete mode 100644 colors/base16-harmonic-light.vim create mode 100644 colors/base16-harmonic16-dark.vim create mode 100644 colors/base16-harmonic16-light.vim create mode 100644 colors/base16-ir-black.vim delete mode 100644 colors/base16-irblack.vim create mode 100644 colors/base16-london-tube.vim create mode 100644 colors/base16-one-light.vim create mode 100644 colors/base16-seti-ui.vim delete mode 100644 colors/base16-seti.vim create mode 100644 colors/base16-solar-flare.vim delete mode 100644 colors/base16-solarflare.vim delete mode 100644 colors/base16-tube.vim diff --git a/colors/base16-3024.vim b/colors/base16-3024.vim index d4fc814..eb15f7d 100644 --- a/colors/base16-3024.vim +++ b/colors/base16-3024.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-apathy.vim b/colors/base16-apathy.vim index 96aff01..c528dcd 100644 --- a/colors/base16-apathy.vim +++ b/colors/base16-apathy.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-ashes.vim b/colors/base16-ashes.vim index 89cc2f3..5f6888b 100644 --- a/colors/base16-ashes.vim +++ b/colors/base16-ashes.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-atelier-cave-light.vim b/colors/base16-atelier-cave-light.vim index 9e62230..1f78dad 100644 --- a/colors/base16-atelier-cave-light.vim +++ b/colors/base16-atelier-cave-light.vim @@ -2,7 +2,7 @@ " base16-vim (https://github.com/chriskempson/base16-vim) " by Chris Kempson (http://chriskempson.com) -" Atelier Cave scheme by Bram de Haan (http://atelierbramdehaan.nl) +" Atelier Cave Light scheme by Bram de Haan (http://atelierbramdehaan.nl) " This enables the coresponding base16-shell script to run so that " :colorscheme works in terminals supported by base16-shell scripts @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-atelier-cave.vim b/colors/base16-atelier-cave.vim index 2fca9f1..4958c33 100644 --- a/colors/base16-atelier-cave.vim +++ b/colors/base16-atelier-cave.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-atelier-dune-light.vim b/colors/base16-atelier-dune-light.vim index a12272f..8ab0ffb 100644 --- a/colors/base16-atelier-dune-light.vim +++ b/colors/base16-atelier-dune-light.vim @@ -2,7 +2,7 @@ " base16-vim (https://github.com/chriskempson/base16-vim) " by Chris Kempson (http://chriskempson.com) -" Atelier Dune scheme by Bram de Haan (http://atelierbramdehaan.nl) +" Atelier Dune Light scheme by Bram de Haan (http://atelierbramdehaan.nl) " This enables the coresponding base16-shell script to run so that " :colorscheme works in terminals supported by base16-shell scripts @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-atelier-dune.vim b/colors/base16-atelier-dune.vim index c6a7485..113cbbe 100644 --- a/colors/base16-atelier-dune.vim +++ b/colors/base16-atelier-dune.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-atelier-estuary-light.vim b/colors/base16-atelier-estuary-light.vim index 41c52bb..c3bf07e 100644 --- a/colors/base16-atelier-estuary-light.vim +++ b/colors/base16-atelier-estuary-light.vim @@ -2,7 +2,7 @@ " base16-vim (https://github.com/chriskempson/base16-vim) " by Chris Kempson (http://chriskempson.com) -" Atelier Estuary scheme by Bram de Haan (http://atelierbramdehaan.nl) +" Atelier Estuary Light scheme by Bram de Haan (http://atelierbramdehaan.nl) " This enables the coresponding base16-shell script to run so that " :colorscheme works in terminals supported by base16-shell scripts @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-atelier-estuary.vim b/colors/base16-atelier-estuary.vim index 4bb8df8..1397a9f 100644 --- a/colors/base16-atelier-estuary.vim +++ b/colors/base16-atelier-estuary.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-atelier-forest-light.vim b/colors/base16-atelier-forest-light.vim index 559ba54..5ee7f35 100644 --- a/colors/base16-atelier-forest-light.vim +++ b/colors/base16-atelier-forest-light.vim @@ -2,7 +2,7 @@ " base16-vim (https://github.com/chriskempson/base16-vim) " by Chris Kempson (http://chriskempson.com) -" Atelier Forest scheme by Bram de Haan (http://atelierbramdehaan.nl) +" Atelier Forest Light scheme by Bram de Haan (http://atelierbramdehaan.nl) " This enables the coresponding base16-shell script to run so that " :colorscheme works in terminals supported by base16-shell scripts @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-atelier-forest.vim b/colors/base16-atelier-forest.vim index 5930123..6a760dd 100644 --- a/colors/base16-atelier-forest.vim +++ b/colors/base16-atelier-forest.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-atelier-heath-light.vim b/colors/base16-atelier-heath-light.vim index 61c60ee..adf8552 100644 --- a/colors/base16-atelier-heath-light.vim +++ b/colors/base16-atelier-heath-light.vim @@ -2,7 +2,7 @@ " base16-vim (https://github.com/chriskempson/base16-vim) " by Chris Kempson (http://chriskempson.com) -" Atelier Heath scheme by Bram de Haan (http://atelierbramdehaan.nl) +" Atelier Heath Light scheme by Bram de Haan (http://atelierbramdehaan.nl) " This enables the coresponding base16-shell script to run so that " :colorscheme works in terminals supported by base16-shell scripts @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-atelier-heath.vim b/colors/base16-atelier-heath.vim index 1e946d7..f1c3879 100644 --- a/colors/base16-atelier-heath.vim +++ b/colors/base16-atelier-heath.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-atelier-lakeside-light.vim b/colors/base16-atelier-lakeside-light.vim index cc0084e..0202409 100644 --- a/colors/base16-atelier-lakeside-light.vim +++ b/colors/base16-atelier-lakeside-light.vim @@ -2,7 +2,7 @@ " base16-vim (https://github.com/chriskempson/base16-vim) " by Chris Kempson (http://chriskempson.com) -" Atelier Lakeside scheme by Bram de Haan (http://atelierbramdehaan.nl) +" Atelier Lakeside Light scheme by Bram de Haan (http://atelierbramdehaan.nl) " This enables the coresponding base16-shell script to run so that " :colorscheme works in terminals supported by base16-shell scripts @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-atelier-lakeside.vim b/colors/base16-atelier-lakeside.vim index d21be79..6acd4e1 100644 --- a/colors/base16-atelier-lakeside.vim +++ b/colors/base16-atelier-lakeside.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-atelier-plateau-light.vim b/colors/base16-atelier-plateau-light.vim index 4532ba3..e6bd690 100644 --- a/colors/base16-atelier-plateau-light.vim +++ b/colors/base16-atelier-plateau-light.vim @@ -2,7 +2,7 @@ " base16-vim (https://github.com/chriskempson/base16-vim) " by Chris Kempson (http://chriskempson.com) -" Atelier Plateau scheme by Bram de Haan (http://atelierbramdehaan.nl) +" Atelier Plateau Light scheme by Bram de Haan (http://atelierbramdehaan.nl) " This enables the coresponding base16-shell script to run so that " :colorscheme works in terminals supported by base16-shell scripts @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-atelier-plateau.vim b/colors/base16-atelier-plateau.vim index 5bbd80c..783a23d 100644 --- a/colors/base16-atelier-plateau.vim +++ b/colors/base16-atelier-plateau.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-atelier-savanna-light.vim b/colors/base16-atelier-savanna-light.vim index 8f3ca62..2e4eb61 100644 --- a/colors/base16-atelier-savanna-light.vim +++ b/colors/base16-atelier-savanna-light.vim @@ -2,7 +2,7 @@ " base16-vim (https://github.com/chriskempson/base16-vim) " by Chris Kempson (http://chriskempson.com) -" Atelier Savanna scheme by Bram de Haan (http://atelierbramdehaan.nl) +" Atelier Savanna Light scheme by Bram de Haan (http://atelierbramdehaan.nl) " This enables the coresponding base16-shell script to run so that " :colorscheme works in terminals supported by base16-shell scripts @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-atelier-savanna.vim b/colors/base16-atelier-savanna.vim index 9f54bd9..fdaca8a 100644 --- a/colors/base16-atelier-savanna.vim +++ b/colors/base16-atelier-savanna.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-atelier-seaside-light.vim b/colors/base16-atelier-seaside-light.vim index dcfd1b0..61429df 100644 --- a/colors/base16-atelier-seaside-light.vim +++ b/colors/base16-atelier-seaside-light.vim @@ -2,7 +2,7 @@ " base16-vim (https://github.com/chriskempson/base16-vim) " by Chris Kempson (http://chriskempson.com) -" Atelier Seaside scheme by Bram de Haan (http://atelierbramdehaan.nl) +" Atelier Seaside Light scheme by Bram de Haan (http://atelierbramdehaan.nl) " This enables the coresponding base16-shell script to run so that " :colorscheme works in terminals supported by base16-shell scripts @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-atelier-seaside.vim b/colors/base16-atelier-seaside.vim index 291922f..8534887 100644 --- a/colors/base16-atelier-seaside.vim +++ b/colors/base16-atelier-seaside.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-atelier-sulphurpool-light.vim b/colors/base16-atelier-sulphurpool-light.vim index 82ce6d2..b00a0ee 100644 --- a/colors/base16-atelier-sulphurpool-light.vim +++ b/colors/base16-atelier-sulphurpool-light.vim @@ -2,7 +2,7 @@ " base16-vim (https://github.com/chriskempson/base16-vim) " by Chris Kempson (http://chriskempson.com) -" Atelier Sulphurpool scheme by Bram de Haan (http://atelierbramdehaan.nl) +" Atelier Sulphurpool Light scheme by Bram de Haan (http://atelierbramdehaan.nl) " This enables the coresponding base16-shell script to run so that " :colorscheme works in terminals supported by base16-shell scripts @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-atelier-sulphurpool.vim b/colors/base16-atelier-sulphurpool.vim index 59764cb..dd2b29a 100644 --- a/colors/base16-atelier-sulphurpool.vim +++ b/colors/base16-atelier-sulphurpool.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-bespin.vim b/colors/base16-bespin.vim index 903ba91..e644664 100644 --- a/colors/base16-bespin.vim +++ b/colors/base16-bespin.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-brewer.vim b/colors/base16-brewer.vim index 147fbc3..bc3930e 100644 --- a/colors/base16-brewer.vim +++ b/colors/base16-brewer.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-bright.vim b/colors/base16-bright.vim index 8aa5fcc..c229e28 100644 --- a/colors/base16-bright.vim +++ b/colors/base16-bright.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-chalk.vim b/colors/base16-chalk.vim index daab7be..ea34090 100644 --- a/colors/base16-chalk.vim +++ b/colors/base16-chalk.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-circus.vim b/colors/base16-circus.vim new file mode 100644 index 0000000..d170e93 --- /dev/null +++ b/colors/base16-circus.vim @@ -0,0 +1,330 @@ +" vi:syntax=vim + +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Circus scheme by Stephan Boyer (https://github.com/stepchowfun) and Esther Wang (https://github.com/ewang12) + +" 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-circus.sh" + endif +endif + +" GUI color definitions +let s:gui00 = "191919" +let s:gui01 = "202020" +let s:gui02 = "303030" +let s:gui03 = "5f5a60" +let s:gui04 = "505050" +let s:gui05 = "a7a7a7" +let s:gui06 = "808080" +let s:gui07 = "ffffff" +let s:gui08 = "dc657d" +let s:gui09 = "4bb1a7" +let s:gui0A = "c3ba63" +let s:gui0B = "84b97c" +let s:gui0C = "4bb1a7" +let s:gui0D = "639ee4" +let s:gui0E = "b888e2" +let s:gui0F = "b888e2" + +" 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 + +" Neovim terminal colours +if has("nvim") + let g:terminal_color_0 = "#191919" + let g:terminal_color_1 = "#dc657d" + let g:terminal_color_2 = "#84b97c" + let g:terminal_color_3 = "#c3ba63" + let g:terminal_color_4 = "#639ee4" + let g:terminal_color_5 = "#b888e2" + let g:terminal_color_6 = "#4bb1a7" + let g:terminal_color_7 = "#a7a7a7" + let g:terminal_color_8 = "#5f5a60" + let g:terminal_color_9 = "#4bb1a7" + let g:terminal_color_10 = "#202020" + let g:terminal_color_11 = "#303030" + let g:terminal_color_12 = "#505050" + let g:terminal_color_13 = "#808080" + let g:terminal_color_14 = "#b888e2" + let g:terminal_color_15 = "#ffffff" + let g:terminal_color_background = g:terminal_color_0 + let g:terminal_color_foreground = g:terminal_color_7 + if &background == "light" + let g:terminal_color_background = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_2 + endif +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-circus" + +" 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("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +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:gui03, "", 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("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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") +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, "", "", "") +call hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") +call hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") +call hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") +call hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") +call hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") +call hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") +call hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") +call hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") +call hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") + +" 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, "", "", "") +" pangloss/vim-javascript highlighting +call hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsThis", s:gui08, "", s:cterm08, "", "", "") +call hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") +call hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") + +" 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, "", "", "") +call hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +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 diff --git a/colors/base16-classic-dark.vim b/colors/base16-classic-dark.vim new file mode 100644 index 0000000..846c26f --- /dev/null +++ b/colors/base16-classic-dark.vim @@ -0,0 +1,330 @@ +" vi:syntax=vim + +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Classic Dark scheme by Jason Heeris (http://heeris.id.au) + +" 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-classic-dark.sh" + endif +endif + +" GUI color definitions +let s:gui00 = "151515" +let s:gui01 = "202020" +let s:gui02 = "303030" +let s:gui03 = "505050" +let s:gui04 = "B0B0B0" +let s:gui05 = "D0D0D0" +let s:gui06 = "E0E0E0" +let s:gui07 = "F5F5F5" +let s:gui08 = "AC4142" +let s:gui09 = "D28445" +let s:gui0A = "F4BF75" +let s:gui0B = "90A959" +let s:gui0C = "75B5AA" +let s:gui0D = "6A9FB5" +let s:gui0E = "AA759F" +let s:gui0F = "8F5536" + +" 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 + +" Neovim terminal colours +if has("nvim") + let g:terminal_color_0 = "#151515" + let g:terminal_color_1 = "#AC4142" + let g:terminal_color_2 = "#90A959" + let g:terminal_color_3 = "#F4BF75" + let g:terminal_color_4 = "#6A9FB5" + let g:terminal_color_5 = "#AA759F" + let g:terminal_color_6 = "#75B5AA" + let g:terminal_color_7 = "#D0D0D0" + let g:terminal_color_8 = "#505050" + let g:terminal_color_9 = "#D28445" + let g:terminal_color_10 = "#202020" + let g:terminal_color_11 = "#303030" + let g:terminal_color_12 = "#B0B0B0" + let g:terminal_color_13 = "#E0E0E0" + let g:terminal_color_14 = "#8F5536" + let g:terminal_color_15 = "#F5F5F5" + let g:terminal_color_background = g:terminal_color_0 + let g:terminal_color_foreground = g:terminal_color_7 + if &background == "light" + let g:terminal_color_background = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_2 + endif +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-classic-dark" + +" 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("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +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:gui03, "", 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("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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") +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, "", "", "") +call hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") +call hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") +call hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") +call hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") +call hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") +call hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") +call hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") +call hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") +call hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") + +" 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, "", "", "") +" pangloss/vim-javascript highlighting +call hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsThis", s:gui08, "", s:cterm08, "", "", "") +call hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") +call hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") + +" 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, "", "", "") +call hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +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 diff --git a/colors/base16-classic-light.vim b/colors/base16-classic-light.vim new file mode 100644 index 0000000..491a951 --- /dev/null +++ b/colors/base16-classic-light.vim @@ -0,0 +1,330 @@ +" vi:syntax=vim + +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Classic Light scheme by Jason Heeris (http://heeris.id.au) + +" 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-classic-light.sh" + endif +endif + +" GUI color definitions +let s:gui00 = "F5F5F5" +let s:gui01 = "E0E0E0" +let s:gui02 = "D0D0D0" +let s:gui03 = "B0B0B0" +let s:gui04 = "505050" +let s:gui05 = "303030" +let s:gui06 = "202020" +let s:gui07 = "151515" +let s:gui08 = "AC4142" +let s:gui09 = "D28445" +let s:gui0A = "F4BF75" +let s:gui0B = "90A959" +let s:gui0C = "75B5AA" +let s:gui0D = "6A9FB5" +let s:gui0E = "AA759F" +let s:gui0F = "8F5536" + +" 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 + +" Neovim terminal colours +if has("nvim") + let g:terminal_color_0 = "#F5F5F5" + let g:terminal_color_1 = "#AC4142" + let g:terminal_color_2 = "#90A959" + let g:terminal_color_3 = "#F4BF75" + let g:terminal_color_4 = "#6A9FB5" + let g:terminal_color_5 = "#AA759F" + let g:terminal_color_6 = "#75B5AA" + let g:terminal_color_7 = "#303030" + let g:terminal_color_8 = "#B0B0B0" + let g:terminal_color_9 = "#D28445" + let g:terminal_color_10 = "#E0E0E0" + let g:terminal_color_11 = "#D0D0D0" + let g:terminal_color_12 = "#505050" + let g:terminal_color_13 = "#202020" + let g:terminal_color_14 = "#8F5536" + let g:terminal_color_15 = "#151515" + let g:terminal_color_background = g:terminal_color_0 + let g:terminal_color_foreground = g:terminal_color_7 + if &background == "light" + let g:terminal_color_background = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_2 + endif +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-classic-light" + +" 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("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +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:gui03, "", 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("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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") +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, "", "", "") +call hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") +call hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") +call hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") +call hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") +call hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") +call hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") +call hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") +call hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") +call hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") + +" 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, "", "", "") +" pangloss/vim-javascript highlighting +call hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsThis", s:gui08, "", s:cterm08, "", "", "") +call hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") +call hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") + +" 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, "", "", "") +call hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +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 diff --git a/colors/base16-codeschool.vim b/colors/base16-codeschool.vim index fc4af66..8b5ecd9 100644 --- a/colors/base16-codeschool.vim +++ b/colors/base16-codeschool.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-cupcake.vim b/colors/base16-cupcake.vim index c6072d8..f5ff2ed 100644 --- a/colors/base16-cupcake.vim +++ b/colors/base16-cupcake.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-cupertino.vim b/colors/base16-cupertino.vim new file mode 100644 index 0000000..820055b --- /dev/null +++ b/colors/base16-cupertino.vim @@ -0,0 +1,330 @@ +" vi:syntax=vim + +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Cupertino scheme by Defman21 + +" 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-cupertino.sh" + endif +endif + +" GUI color definitions +let s:gui00 = "ffffff" +let s:gui01 = "c0c0c0" +let s:gui02 = "c0c0c0" +let s:gui03 = "808080" +let s:gui04 = "808080" +let s:gui05 = "404040" +let s:gui06 = "404040" +let s:gui07 = "5e5e5e" +let s:gui08 = "c41a15" +let s:gui09 = "eb8500" +let s:gui0A = "826b28" +let s:gui0B = "007400" +let s:gui0C = "318495" +let s:gui0D = "0000ff" +let s:gui0E = "a90d91" +let s:gui0F = "826b28" + +" 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 + +" Neovim terminal colours +if has("nvim") + let g:terminal_color_0 = "#ffffff" + let g:terminal_color_1 = "#c41a15" + let g:terminal_color_2 = "#007400" + let g:terminal_color_3 = "#826b28" + let g:terminal_color_4 = "#0000ff" + let g:terminal_color_5 = "#a90d91" + let g:terminal_color_6 = "#318495" + let g:terminal_color_7 = "#404040" + let g:terminal_color_8 = "#808080" + let g:terminal_color_9 = "#eb8500" + let g:terminal_color_10 = "#c0c0c0" + let g:terminal_color_11 = "#c0c0c0" + let g:terminal_color_12 = "#808080" + let g:terminal_color_13 = "#404040" + let g:terminal_color_14 = "#826b28" + let g:terminal_color_15 = "#5e5e5e" + let g:terminal_color_background = g:terminal_color_0 + let g:terminal_color_foreground = g:terminal_color_7 + if &background == "light" + let g:terminal_color_background = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_2 + endif +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-cupertino" + +" 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("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +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:gui03, "", 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("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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") +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, "", "", "") +call hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") +call hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") +call hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") +call hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") +call hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") +call hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") +call hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") +call hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") +call hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") + +" 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, "", "", "") +" pangloss/vim-javascript highlighting +call hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsThis", s:gui08, "", s:cterm08, "", "", "") +call hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") +call hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") + +" 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, "", "", "") +call hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +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 diff --git a/colors/base16-darktooth.vim b/colors/base16-darktooth.vim index aeaac35..8a3afbf 100644 --- a/colors/base16-darktooth.vim +++ b/colors/base16-darktooth.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-default-dark.vim b/colors/base16-default-dark.vim index 5d25900..5462ce0 100644 --- a/colors/base16-default-dark.vim +++ b/colors/base16-default-dark.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-default-light.vim b/colors/base16-default-light.vim index 124473c..0e58bc7 100644 --- a/colors/base16-default-light.vim +++ b/colors/base16-default-light.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-dracula.vim b/colors/base16-dracula.vim index 676373e..b862806 100644 --- a/colors/base16-dracula.vim +++ b/colors/base16-dracula.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-eighties.vim b/colors/base16-eighties.vim index 4bff7e2..d563f5b 100644 --- a/colors/base16-eighties.vim +++ b/colors/base16-eighties.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-embers.vim b/colors/base16-embers.vim index 2cf4b9b..a6acb34 100644 --- a/colors/base16-embers.vim +++ b/colors/base16-embers.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-flat.vim b/colors/base16-flat.vim index bb59972..d93c0a1 100644 --- a/colors/base16-flat.vim +++ b/colors/base16-flat.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-github.vim b/colors/base16-github.vim index 264d738..42bdbe8 100644 --- a/colors/base16-github.vim +++ b/colors/base16-github.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-google-dark.vim b/colors/base16-google-dark.vim index 483b66d..5fb120b 100644 --- a/colors/base16-google-dark.vim +++ b/colors/base16-google-dark.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-google-light.vim b/colors/base16-google-light.vim index d9f298d..486ab02 100644 --- a/colors/base16-google-light.vim +++ b/colors/base16-google-light.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-grayscale-dark.vim b/colors/base16-grayscale-dark.vim index 0821062..25b9bef 100644 --- a/colors/base16-grayscale-dark.vim +++ b/colors/base16-grayscale-dark.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-grayscale-light.vim b/colors/base16-grayscale-light.vim index 6cb60e3..17cd3b1 100644 --- a/colors/base16-grayscale-light.vim +++ b/colors/base16-grayscale-light.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-green-screen.vim b/colors/base16-green-screen.vim new file mode 100644 index 0000000..b87ea97 --- /dev/null +++ b/colors/base16-green-screen.vim @@ -0,0 +1,330 @@ +" vi:syntax=vim + +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Green Screen 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 +" 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-green-screen.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 + +" Neovim terminal colours +if has("nvim") + let g:terminal_color_0 = "#001100" + let g:terminal_color_1 = "#007700" + let g:terminal_color_2 = "#00bb00" + let g:terminal_color_3 = "#007700" + let g:terminal_color_4 = "#009900" + let g:terminal_color_5 = "#00bb00" + let g:terminal_color_6 = "#005500" + let g:terminal_color_7 = "#00bb00" + let g:terminal_color_8 = "#007700" + let g:terminal_color_9 = "#009900" + let g:terminal_color_10 = "#003300" + let g:terminal_color_11 = "#005500" + let g:terminal_color_12 = "#009900" + let g:terminal_color_13 = "#00dd00" + let g:terminal_color_14 = "#005500" + let g:terminal_color_15 = "#00ff00" + let g:terminal_color_background = g:terminal_color_0 + let g:terminal_color_foreground = g:terminal_color_7 + if &background == "light" + let g:terminal_color_background = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_2 + endif +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-green-screen" + +" 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("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +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:gui03, "", 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("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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") +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, "", "", "") +call hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") +call hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") +call hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") +call hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") +call hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") +call hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") +call hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") +call hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") +call hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") + +" 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, "", "", "") +" pangloss/vim-javascript highlighting +call hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsThis", s:gui08, "", s:cterm08, "", "", "") +call hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") +call hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") + +" 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, "", "", "") +call hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +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 diff --git a/colors/base16-greenscreen.vim b/colors/base16-greenscreen.vim deleted file mode 100644 index 7fcba02..0000000 --- a/colors/base16-greenscreen.vim +++ /dev/null @@ -1,327 +0,0 @@ -" vi:syntax=vim - -" base16-vim (https://github.com/chriskempson/base16-vim) -" by Chris Kempson (http://chriskempson.com) -" Green Screen 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 -" 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.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 - -" Neovim terminal colours -if has("nvim") - let g:terminal_color_0 = "#001100" - let g:terminal_color_1 = "#007700" - let g:terminal_color_2 = "#00bb00" - let g:terminal_color_3 = "#007700" - let g:terminal_color_4 = "#009900" - let g:terminal_color_5 = "#00bb00" - let g:terminal_color_6 = "#005500" - let g:terminal_color_7 = "#00bb00" - let g:terminal_color_8 = "#007700" - let g:terminal_color_9 = "#009900" - let g:terminal_color_10 = "#003300" - let g:terminal_color_11 = "#005500" - let g:terminal_color_12 = "#009900" - let g:terminal_color_13 = "#00dd00" - let g:terminal_color_14 = "#005500" - let g:terminal_color_15 = "#00ff00" - let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 - if &background == "light" - let g:terminal_color_background = g:terminal_color_7 - let g:terminal_color_foreground = g:terminal_color_2 - endif -endif - -" Theme setup -hi clear -syntax reset -let g:colors_name = "base16-greenscreen" - -" 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:gui03, "", 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:gui04, s:gui01, s:cterm04, 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, "", "", "") -call hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") -call hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") -call hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") -call hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") -call hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") -call hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") -call hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") -call hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") -call hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") -call hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") -call hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") -call hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") -call hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") - -" 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, "", "", "") -" pangloss/vim-javascript highlighting -call hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") -call hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") -call hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") -call hi("jsThis", s:gui08, "", s:cterm08, "", "", "") -call hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") -call hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") -call hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") -call hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") -call hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") -call hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") -call hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") -call hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") -call hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") -call hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") -call hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") - -" 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("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 diff --git a/colors/base16-gruvbox-dark-hard.vim b/colors/base16-gruvbox-dark-hard.vim index e4ce2f6..52c5081 100644 --- a/colors/base16-gruvbox-dark-hard.vim +++ b/colors/base16-gruvbox-dark-hard.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-gruvbox-dark-medium.vim b/colors/base16-gruvbox-dark-medium.vim index 3926ba6..3cb6c8a 100644 --- a/colors/base16-gruvbox-dark-medium.vim +++ b/colors/base16-gruvbox-dark-medium.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-gruvbox-dark-pale.vim b/colors/base16-gruvbox-dark-pale.vim index a4839e1..2095d64 100644 --- a/colors/base16-gruvbox-dark-pale.vim +++ b/colors/base16-gruvbox-dark-pale.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-gruvbox-dark-soft.vim b/colors/base16-gruvbox-dark-soft.vim index 7311489..7de2e95 100644 --- a/colors/base16-gruvbox-dark-soft.vim +++ b/colors/base16-gruvbox-dark-soft.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-gruvbox-light-hard.vim b/colors/base16-gruvbox-light-hard.vim index 1f3d553..b7ec2d4 100644 --- a/colors/base16-gruvbox-light-hard.vim +++ b/colors/base16-gruvbox-light-hard.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-gruvbox-light-medium.vim b/colors/base16-gruvbox-light-medium.vim index 97c7e08..8dc7f72 100644 --- a/colors/base16-gruvbox-light-medium.vim +++ b/colors/base16-gruvbox-light-medium.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-gruvbox-light-soft.vim b/colors/base16-gruvbox-light-soft.vim index a9ca074..0ceedfd 100644 --- a/colors/base16-gruvbox-light-soft.vim +++ b/colors/base16-gruvbox-light-soft.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-harmonic-dark.vim b/colors/base16-harmonic-dark.vim deleted file mode 100644 index 88d60a0..0000000 --- a/colors/base16-harmonic-dark.vim +++ /dev/null @@ -1,327 +0,0 @@ -" vi:syntax=vim - -" base16-vim (https://github.com/chriskempson/base16-vim) -" by Chris Kempson (http://chriskempson.com) -" Harmonic16 Dark 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 -" 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-harmonic-dark.sh" - endif -endif - -" GUI color definitions -let s:gui00 = "0b1c2c" -let s:gui01 = "223b54" -let s:gui02 = "405c79" -let s:gui03 = "627e99" -let s:gui04 = "aabcce" -let s:gui05 = "cbd6e2" -let s:gui06 = "e5ebf1" -let s:gui07 = "f7f9fb" -let s:gui08 = "bf8b56" -let s:gui09 = "bfbf56" -let s:gui0A = "8bbf56" -let s:gui0B = "56bf8b" -let s:gui0C = "568bbf" -let s:gui0D = "8b56bf" -let s:gui0E = "bf568b" -let s:gui0F = "bf5656" - -" 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 - -" Neovim terminal colours -if has("nvim") - let g:terminal_color_0 = "#0b1c2c" - let g:terminal_color_1 = "#bf8b56" - let g:terminal_color_2 = "#56bf8b" - let g:terminal_color_3 = "#8bbf56" - let g:terminal_color_4 = "#8b56bf" - let g:terminal_color_5 = "#bf568b" - let g:terminal_color_6 = "#568bbf" - let g:terminal_color_7 = "#cbd6e2" - let g:terminal_color_8 = "#627e99" - let g:terminal_color_9 = "#bfbf56" - let g:terminal_color_10 = "#223b54" - let g:terminal_color_11 = "#405c79" - let g:terminal_color_12 = "#aabcce" - let g:terminal_color_13 = "#e5ebf1" - let g:terminal_color_14 = "#bf5656" - let g:terminal_color_15 = "#f7f9fb" - let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 - if &background == "light" - let g:terminal_color_background = g:terminal_color_7 - let g:terminal_color_foreground = g:terminal_color_2 - endif -endif - -" Theme setup -hi clear -syntax reset -let g:colors_name = "base16-harmonic-dark" - -" 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:gui03, "", 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:gui04, s:gui01, s:cterm04, 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, "", "", "") -call hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") -call hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") -call hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") -call hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") -call hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") -call hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") -call hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") -call hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") -call hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") -call hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") -call hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") -call hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") -call hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") - -" 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, "", "", "") -" pangloss/vim-javascript highlighting -call hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") -call hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") -call hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") -call hi("jsThis", s:gui08, "", s:cterm08, "", "", "") -call hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") -call hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") -call hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") -call hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") -call hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") -call hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") -call hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") -call hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") -call hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") -call hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") -call hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") - -" 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("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 diff --git a/colors/base16-harmonic-light.vim b/colors/base16-harmonic-light.vim deleted file mode 100644 index c453de9..0000000 --- a/colors/base16-harmonic-light.vim +++ /dev/null @@ -1,327 +0,0 @@ -" vi:syntax=vim - -" base16-vim (https://github.com/chriskempson/base16-vim) -" by Chris Kempson (http://chriskempson.com) -" Harmonic16 Light 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 -" 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-harmonic-light.sh" - endif -endif - -" GUI color definitions -let s:gui00 = "f7f9fb" -let s:gui01 = "e5ebf1" -let s:gui02 = "cbd6e2" -let s:gui03 = "aabcce" -let s:gui04 = "627e99" -let s:gui05 = "405c79" -let s:gui06 = "223b54" -let s:gui07 = "0b1c2c" -let s:gui08 = "bf8b56" -let s:gui09 = "bfbf56" -let s:gui0A = "8bbf56" -let s:gui0B = "56bf8b" -let s:gui0C = "568bbf" -let s:gui0D = "8b56bf" -let s:gui0E = "bf568b" -let s:gui0F = "bf5656" - -" 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 - -" Neovim terminal colours -if has("nvim") - let g:terminal_color_0 = "#f7f9fb" - let g:terminal_color_1 = "#bf8b56" - let g:terminal_color_2 = "#56bf8b" - let g:terminal_color_3 = "#8bbf56" - let g:terminal_color_4 = "#8b56bf" - let g:terminal_color_5 = "#bf568b" - let g:terminal_color_6 = "#568bbf" - let g:terminal_color_7 = "#405c79" - let g:terminal_color_8 = "#aabcce" - let g:terminal_color_9 = "#bfbf56" - let g:terminal_color_10 = "#e5ebf1" - let g:terminal_color_11 = "#cbd6e2" - let g:terminal_color_12 = "#627e99" - let g:terminal_color_13 = "#223b54" - let g:terminal_color_14 = "#bf5656" - let g:terminal_color_15 = "#0b1c2c" - let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 - if &background == "light" - let g:terminal_color_background = g:terminal_color_7 - let g:terminal_color_foreground = g:terminal_color_2 - endif -endif - -" Theme setup -hi clear -syntax reset -let g:colors_name = "base16-harmonic-light" - -" 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:gui03, "", 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:gui04, s:gui01, s:cterm04, 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, "", "", "") -call hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") -call hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") -call hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") -call hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") -call hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") -call hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") -call hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") -call hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") -call hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") -call hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") -call hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") -call hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") -call hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") - -" 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, "", "", "") -" pangloss/vim-javascript highlighting -call hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") -call hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") -call hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") -call hi("jsThis", s:gui08, "", s:cterm08, "", "", "") -call hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") -call hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") -call hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") -call hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") -call hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") -call hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") -call hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") -call hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") -call hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") -call hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") -call hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") - -" 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("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 diff --git a/colors/base16-harmonic16-dark.vim b/colors/base16-harmonic16-dark.vim new file mode 100644 index 0000000..5524dd4 --- /dev/null +++ b/colors/base16-harmonic16-dark.vim @@ -0,0 +1,330 @@ +" vi:syntax=vim + +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Harmonic16 Dark 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 +" 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-harmonic16-dark.sh" + endif +endif + +" GUI color definitions +let s:gui00 = "0b1c2c" +let s:gui01 = "223b54" +let s:gui02 = "405c79" +let s:gui03 = "627e99" +let s:gui04 = "aabcce" +let s:gui05 = "cbd6e2" +let s:gui06 = "e5ebf1" +let s:gui07 = "f7f9fb" +let s:gui08 = "bf8b56" +let s:gui09 = "bfbf56" +let s:gui0A = "8bbf56" +let s:gui0B = "56bf8b" +let s:gui0C = "568bbf" +let s:gui0D = "8b56bf" +let s:gui0E = "bf568b" +let s:gui0F = "bf5656" + +" 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 + +" Neovim terminal colours +if has("nvim") + let g:terminal_color_0 = "#0b1c2c" + let g:terminal_color_1 = "#bf8b56" + let g:terminal_color_2 = "#56bf8b" + let g:terminal_color_3 = "#8bbf56" + let g:terminal_color_4 = "#8b56bf" + let g:terminal_color_5 = "#bf568b" + let g:terminal_color_6 = "#568bbf" + let g:terminal_color_7 = "#cbd6e2" + let g:terminal_color_8 = "#627e99" + let g:terminal_color_9 = "#bfbf56" + let g:terminal_color_10 = "#223b54" + let g:terminal_color_11 = "#405c79" + let g:terminal_color_12 = "#aabcce" + let g:terminal_color_13 = "#e5ebf1" + let g:terminal_color_14 = "#bf5656" + let g:terminal_color_15 = "#f7f9fb" + let g:terminal_color_background = g:terminal_color_0 + let g:terminal_color_foreground = g:terminal_color_7 + if &background == "light" + let g:terminal_color_background = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_2 + endif +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-harmonic16-dark" + +" 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("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +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:gui03, "", 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("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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") +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, "", "", "") +call hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") +call hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") +call hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") +call hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") +call hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") +call hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") +call hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") +call hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") +call hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") + +" 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, "", "", "") +" pangloss/vim-javascript highlighting +call hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsThis", s:gui08, "", s:cterm08, "", "", "") +call hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") +call hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") + +" 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, "", "", "") +call hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +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 diff --git a/colors/base16-harmonic16-light.vim b/colors/base16-harmonic16-light.vim new file mode 100644 index 0000000..abd5e38 --- /dev/null +++ b/colors/base16-harmonic16-light.vim @@ -0,0 +1,330 @@ +" vi:syntax=vim + +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Harmonic16 Light 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 +" 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-harmonic16-light.sh" + endif +endif + +" GUI color definitions +let s:gui00 = "f7f9fb" +let s:gui01 = "e5ebf1" +let s:gui02 = "cbd6e2" +let s:gui03 = "aabcce" +let s:gui04 = "627e99" +let s:gui05 = "405c79" +let s:gui06 = "223b54" +let s:gui07 = "0b1c2c" +let s:gui08 = "bf8b56" +let s:gui09 = "bfbf56" +let s:gui0A = "8bbf56" +let s:gui0B = "56bf8b" +let s:gui0C = "568bbf" +let s:gui0D = "8b56bf" +let s:gui0E = "bf568b" +let s:gui0F = "bf5656" + +" 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 + +" Neovim terminal colours +if has("nvim") + let g:terminal_color_0 = "#f7f9fb" + let g:terminal_color_1 = "#bf8b56" + let g:terminal_color_2 = "#56bf8b" + let g:terminal_color_3 = "#8bbf56" + let g:terminal_color_4 = "#8b56bf" + let g:terminal_color_5 = "#bf568b" + let g:terminal_color_6 = "#568bbf" + let g:terminal_color_7 = "#405c79" + let g:terminal_color_8 = "#aabcce" + let g:terminal_color_9 = "#bfbf56" + let g:terminal_color_10 = "#e5ebf1" + let g:terminal_color_11 = "#cbd6e2" + let g:terminal_color_12 = "#627e99" + let g:terminal_color_13 = "#223b54" + let g:terminal_color_14 = "#bf5656" + let g:terminal_color_15 = "#0b1c2c" + let g:terminal_color_background = g:terminal_color_0 + let g:terminal_color_foreground = g:terminal_color_7 + if &background == "light" + let g:terminal_color_background = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_2 + endif +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-harmonic16-light" + +" 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("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +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:gui03, "", 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("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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") +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, "", "", "") +call hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") +call hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") +call hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") +call hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") +call hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") +call hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") +call hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") +call hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") +call hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") + +" 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, "", "", "") +" pangloss/vim-javascript highlighting +call hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsThis", s:gui08, "", s:cterm08, "", "", "") +call hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") +call hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") + +" 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, "", "", "") +call hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +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 diff --git a/colors/base16-hopscotch.vim b/colors/base16-hopscotch.vim index 53c91c8..05a54d2 100644 --- a/colors/base16-hopscotch.vim +++ b/colors/base16-hopscotch.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-ir-black.vim b/colors/base16-ir-black.vim new file mode 100644 index 0000000..d09a643 --- /dev/null +++ b/colors/base16-ir-black.vim @@ -0,0 +1,330 @@ +" vi:syntax=vim + +" 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.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 + +" Neovim terminal colours +if has("nvim") + let g:terminal_color_0 = "#000000" + let g:terminal_color_1 = "#ff6c60" + let g:terminal_color_2 = "#a8ff60" + let g:terminal_color_3 = "#ffffb6" + let g:terminal_color_4 = "#96cbfe" + let g:terminal_color_5 = "#ff73fd" + let g:terminal_color_6 = "#c6c5fe" + let g:terminal_color_7 = "#b5b3aa" + let g:terminal_color_8 = "#6c6c66" + let g:terminal_color_9 = "#e9c062" + let g:terminal_color_10 = "#242422" + let g:terminal_color_11 = "#484844" + let g:terminal_color_12 = "#918f88" + let g:terminal_color_13 = "#d9d7cc" + let g:terminal_color_14 = "#b18a3d" + let g:terminal_color_15 = "#fdfbee" + let g:terminal_color_background = g:terminal_color_0 + let g:terminal_color_foreground = g:terminal_color_7 + if &background == "light" + let g:terminal_color_background = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_2 + endif +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("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +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:gui03, "", 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("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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") +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, "", "", "") +call hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") +call hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") +call hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") +call hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") +call hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") +call hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") +call hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") +call hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") +call hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") + +" 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, "", "", "") +" pangloss/vim-javascript highlighting +call hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsThis", s:gui08, "", s:cterm08, "", "", "") +call hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") +call hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") + +" 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, "", "", "") +call hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +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 diff --git a/colors/base16-irblack.vim b/colors/base16-irblack.vim deleted file mode 100644 index 6ae7a14..0000000 --- a/colors/base16-irblack.vim +++ /dev/null @@ -1,327 +0,0 @@ -" vi:syntax=vim - -" 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-irblack.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 - -" Neovim terminal colours -if has("nvim") - let g:terminal_color_0 = "#000000" - let g:terminal_color_1 = "#ff6c60" - let g:terminal_color_2 = "#a8ff60" - let g:terminal_color_3 = "#ffffb6" - let g:terminal_color_4 = "#96cbfe" - let g:terminal_color_5 = "#ff73fd" - let g:terminal_color_6 = "#c6c5fe" - let g:terminal_color_7 = "#b5b3aa" - let g:terminal_color_8 = "#6c6c66" - let g:terminal_color_9 = "#e9c062" - let g:terminal_color_10 = "#242422" - let g:terminal_color_11 = "#484844" - let g:terminal_color_12 = "#918f88" - let g:terminal_color_13 = "#d9d7cc" - let g:terminal_color_14 = "#b18a3d" - let g:terminal_color_15 = "#fdfbee" - let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 - if &background == "light" - let g:terminal_color_background = g:terminal_color_7 - let g:terminal_color_foreground = g:terminal_color_2 - endif -endif - -" Theme setup -hi clear -syntax reset -let g:colors_name = "base16-irblack" - -" 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:gui03, "", 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:gui04, s:gui01, s:cterm04, 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, "", "", "") -call hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") -call hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") -call hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") -call hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") -call hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") -call hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") -call hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") -call hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") -call hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") -call hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") -call hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") -call hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") -call hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") - -" 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, "", "", "") -" pangloss/vim-javascript highlighting -call hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") -call hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") -call hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") -call hi("jsThis", s:gui08, "", s:cterm08, "", "", "") -call hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") -call hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") -call hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") -call hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") -call hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") -call hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") -call hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") -call hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") -call hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") -call hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") -call hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") - -" 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("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 diff --git a/colors/base16-isotope.vim b/colors/base16-isotope.vim index a9a9155..f5b9418 100644 --- a/colors/base16-isotope.vim +++ b/colors/base16-isotope.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-london-tube.vim b/colors/base16-london-tube.vim new file mode 100644 index 0000000..04e3675 --- /dev/null +++ b/colors/base16-london-tube.vim @@ -0,0 +1,330 @@ +" vi:syntax=vim + +" 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.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 + +" Neovim terminal colours +if has("nvim") + let g:terminal_color_0 = "#231f20" + let g:terminal_color_1 = "#ee2e24" + let g:terminal_color_2 = "#00853e" + let g:terminal_color_3 = "#ffd204" + let g:terminal_color_4 = "#009ddc" + let g:terminal_color_5 = "#98005d" + let g:terminal_color_6 = "#85cebc" + let g:terminal_color_7 = "#d9d8d8" + let g:terminal_color_8 = "#737171" + let g:terminal_color_9 = "#f386a1" + let g:terminal_color_10 = "#1c3f95" + let g:terminal_color_11 = "#5a5758" + let g:terminal_color_12 = "#959ca1" + let g:terminal_color_13 = "#e7e7e8" + let g:terminal_color_14 = "#b06110" + let g:terminal_color_15 = "#ffffff" + let g:terminal_color_background = g:terminal_color_0 + let g:terminal_color_foreground = g:terminal_color_7 + if &background == "light" + let g:terminal_color_background = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_2 + endif +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("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +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:gui03, "", 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("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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") +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, "", "", "") +call hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") +call hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") +call hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") +call hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") +call hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") +call hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") +call hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") +call hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") +call hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") + +" 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, "", "", "") +" pangloss/vim-javascript highlighting +call hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsThis", s:gui08, "", s:cterm08, "", "", "") +call hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") +call hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") + +" 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, "", "", "") +call hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +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 diff --git a/colors/base16-macintosh.vim b/colors/base16-macintosh.vim index 869a1fb..df98151 100644 --- a/colors/base16-macintosh.vim +++ b/colors/base16-macintosh.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-marrakesh.vim b/colors/base16-marrakesh.vim index 8e98f91..9624323 100644 --- a/colors/base16-marrakesh.vim +++ b/colors/base16-marrakesh.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-materia.vim b/colors/base16-materia.vim index e99cd2e..4b453f6 100644 --- a/colors/base16-materia.vim +++ b/colors/base16-materia.vim @@ -59,6 +59,32 @@ else let s:cterm0F = "14" endif +" Neovim terminal colours +if has("nvim") + let g:terminal_color_0 = "#263238" + let g:terminal_color_1 = "#EC5F67" + let g:terminal_color_2 = "#8BD649" + let g:terminal_color_3 = "#FFCC00" + let g:terminal_color_4 = "#89DDFF" + let g:terminal_color_5 = "#82AAFF" + let g:terminal_color_6 = "#80CBC4" + let g:terminal_color_7 = "#CDD3DE" + let g:terminal_color_8 = "#707880" + let g:terminal_color_9 = "#EA9560" + let g:terminal_color_10 = "#2C393F" + let g:terminal_color_11 = "#37474F" + let g:terminal_color_12 = "#C9CCD3" + let g:terminal_color_13 = "#D5DBE5" + let g:terminal_color_14 = "#EC5F67" + let g:terminal_color_15 = "#FFFFFF" + let g:terminal_color_background = g:terminal_color_0 + let g:terminal_color_foreground = g:terminal_color_7 + if &background == "light" + let g:terminal_color_background = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_2 + endif +endif + " Theme setup hi clear syntax reset @@ -87,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -114,7 +141,6 @@ 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", "") @@ -124,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -266,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-mexico-light.vim b/colors/base16-mexico-light.vim index 9b4317a..ea24883 100644 --- a/colors/base16-mexico-light.vim +++ b/colors/base16-mexico-light.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-mocha.vim b/colors/base16-mocha.vim index f3cf073..5b2f97b 100644 --- a/colors/base16-mocha.vim +++ b/colors/base16-mocha.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-monokai.vim b/colors/base16-monokai.vim index 9cc7dfc..8d1118f 100644 --- a/colors/base16-monokai.vim +++ b/colors/base16-monokai.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-nord.vim b/colors/base16-nord.vim index f49c0ce..72fbb09 100644 --- a/colors/base16-nord.vim +++ b/colors/base16-nord.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-ocean.vim b/colors/base16-ocean.vim index a481ef3..6d9abd9 100644 --- a/colors/base16-ocean.vim +++ b/colors/base16-ocean.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-oceanicnext.vim b/colors/base16-oceanicnext.vim index 2df8ae0..28d757e 100644 --- a/colors/base16-oceanicnext.vim +++ b/colors/base16-oceanicnext.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-one-light.vim b/colors/base16-one-light.vim new file mode 100644 index 0000000..0e3f975 --- /dev/null +++ b/colors/base16-one-light.vim @@ -0,0 +1,330 @@ +" vi:syntax=vim + +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" One Light scheme by Daniel Pfeifer (http://github.com/purpleKarrot) + +" 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-one-light.sh" + endif +endif + +" GUI color definitions +let s:gui00 = "fafafa" +let s:gui01 = "f0f0f1" +let s:gui02 = "e5e5e6" +let s:gui03 = "a0a1a7" +let s:gui04 = "696c77" +let s:gui05 = "383a42" +let s:gui06 = "202227" +let s:gui07 = "090a0b" +let s:gui08 = "ca1243" +let s:gui09 = "d75f00" +let s:gui0A = "c18401" +let s:gui0B = "50a14f" +let s:gui0C = "0184bc" +let s:gui0D = "4078f2" +let s:gui0E = "a626a4" +let s:gui0F = "986801" + +" 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 + +" Neovim terminal colours +if has("nvim") + let g:terminal_color_0 = "#fafafa" + let g:terminal_color_1 = "#ca1243" + let g:terminal_color_2 = "#50a14f" + let g:terminal_color_3 = "#c18401" + let g:terminal_color_4 = "#4078f2" + let g:terminal_color_5 = "#a626a4" + let g:terminal_color_6 = "#0184bc" + let g:terminal_color_7 = "#383a42" + let g:terminal_color_8 = "#a0a1a7" + let g:terminal_color_9 = "#d75f00" + let g:terminal_color_10 = "#f0f0f1" + let g:terminal_color_11 = "#e5e5e6" + let g:terminal_color_12 = "#696c77" + let g:terminal_color_13 = "#202227" + let g:terminal_color_14 = "#986801" + let g:terminal_color_15 = "#090a0b" + let g:terminal_color_background = g:terminal_color_0 + let g:terminal_color_foreground = g:terminal_color_7 + if &background == "light" + let g:terminal_color_background = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_2 + endif +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-one-light" + +" 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("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +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:gui03, "", 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("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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") +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, "", "", "") +call hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") +call hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") +call hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") +call hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") +call hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") +call hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") +call hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") +call hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") +call hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") + +" 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, "", "", "") +" pangloss/vim-javascript highlighting +call hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsThis", s:gui08, "", s:cterm08, "", "", "") +call hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") +call hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") + +" 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, "", "", "") +call hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +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 diff --git a/colors/base16-onedark.vim b/colors/base16-onedark.vim index c7fd141..634c49e 100644 --- a/colors/base16-onedark.vim +++ b/colors/base16-onedark.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-paraiso.vim b/colors/base16-paraiso.vim index b378ccf..2ca6fe6 100644 --- a/colors/base16-paraiso.vim +++ b/colors/base16-paraiso.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-phd.vim b/colors/base16-phd.vim index d6a728b..850dabd 100644 --- a/colors/base16-phd.vim +++ b/colors/base16-phd.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-pico.vim b/colors/base16-pico.vim index 927b8ab..3c4d87c 100644 --- a/colors/base16-pico.vim +++ b/colors/base16-pico.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-pop.vim b/colors/base16-pop.vim index 4289e2b..3177ce0 100644 --- a/colors/base16-pop.vim +++ b/colors/base16-pop.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-railscasts.vim b/colors/base16-railscasts.vim index 0cc79f7..595a13b 100644 --- a/colors/base16-railscasts.vim +++ b/colors/base16-railscasts.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-rebecca.vim b/colors/base16-rebecca.vim index 6310a93..363eec1 100644 --- a/colors/base16-rebecca.vim +++ b/colors/base16-rebecca.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-seti-ui.vim b/colors/base16-seti-ui.vim new file mode 100644 index 0000000..96a2b15 --- /dev/null +++ b/colors/base16-seti-ui.vim @@ -0,0 +1,330 @@ +" vi:syntax=vim + +" 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.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 + +" Neovim terminal colours +if has("nvim") + let g:terminal_color_0 = "#151718" + let g:terminal_color_1 = "#Cd3f45" + let g:terminal_color_2 = "#9fca56" + let g:terminal_color_3 = "#e6cd69" + let g:terminal_color_4 = "#55b5db" + let g:terminal_color_5 = "#a074c4" + let g:terminal_color_6 = "#55dbbe" + let g:terminal_color_7 = "#d6d6d6" + let g:terminal_color_8 = "#41535B" + let g:terminal_color_9 = "#db7b55" + let g:terminal_color_10 = "#8ec43d" + let g:terminal_color_11 = "#3B758C" + let g:terminal_color_12 = "#43a5d5" + let g:terminal_color_13 = "#eeeeee" + let g:terminal_color_14 = "#8a553f" + let g:terminal_color_15 = "#ffffff" + let g:terminal_color_background = g:terminal_color_0 + let g:terminal_color_foreground = g:terminal_color_7 + if &background == "light" + let g:terminal_color_background = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_2 + endif +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("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +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:gui03, "", 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("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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") +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, "", "", "") +call hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") +call hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") +call hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") +call hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") +call hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") +call hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") +call hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") +call hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") +call hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") + +" 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, "", "", "") +" pangloss/vim-javascript highlighting +call hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsThis", s:gui08, "", s:cterm08, "", "", "") +call hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") +call hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") + +" 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, "", "", "") +call hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +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 diff --git a/colors/base16-seti.vim b/colors/base16-seti.vim deleted file mode 100644 index 0c59846..0000000 --- a/colors/base16-seti.vim +++ /dev/null @@ -1,327 +0,0 @@ -" vi:syntax=vim - -" 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.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 - -" Neovim terminal colours -if has("nvim") - let g:terminal_color_0 = "#151718" - let g:terminal_color_1 = "#Cd3f45" - let g:terminal_color_2 = "#9fca56" - let g:terminal_color_3 = "#e6cd69" - let g:terminal_color_4 = "#55b5db" - let g:terminal_color_5 = "#a074c4" - let g:terminal_color_6 = "#55dbbe" - let g:terminal_color_7 = "#d6d6d6" - let g:terminal_color_8 = "#41535B" - let g:terminal_color_9 = "#db7b55" - let g:terminal_color_10 = "#8ec43d" - let g:terminal_color_11 = "#3B758C" - let g:terminal_color_12 = "#43a5d5" - let g:terminal_color_13 = "#eeeeee" - let g:terminal_color_14 = "#8a553f" - let g:terminal_color_15 = "#ffffff" - let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 - if &background == "light" - let g:terminal_color_background = g:terminal_color_7 - let g:terminal_color_foreground = g:terminal_color_2 - endif -endif - -" Theme setup -hi clear -syntax reset -let g:colors_name = "base16-seti" - -" 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:gui03, "", 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:gui04, s:gui01, s:cterm04, 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, "", "", "") -call hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") -call hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") -call hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") -call hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") -call hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") -call hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") -call hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") -call hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") -call hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") -call hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") -call hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") -call hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") -call hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") - -" 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, "", "", "") -" pangloss/vim-javascript highlighting -call hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") -call hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") -call hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") -call hi("jsThis", s:gui08, "", s:cterm08, "", "", "") -call hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") -call hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") -call hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") -call hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") -call hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") -call hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") -call hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") -call hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") -call hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") -call hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") -call hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") - -" 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("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 diff --git a/colors/base16-shapeshifter.vim b/colors/base16-shapeshifter.vim index ecb7285..b7fbb04 100644 --- a/colors/base16-shapeshifter.vim +++ b/colors/base16-shapeshifter.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-solar-flare.vim b/colors/base16-solar-flare.vim new file mode 100644 index 0000000..bbecc77 --- /dev/null +++ b/colors/base16-solar-flare.vim @@ -0,0 +1,330 @@ +" vi:syntax=vim + +" 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.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 + +" Neovim terminal colours +if has("nvim") + let g:terminal_color_0 = "#18262F" + let g:terminal_color_1 = "#EF5253" + let g:terminal_color_2 = "#7CC844" + let g:terminal_color_3 = "#E4B51C" + let g:terminal_color_4 = "#33B5E1" + let g:terminal_color_5 = "#A363D5" + let g:terminal_color_6 = "#52CBB0" + let g:terminal_color_7 = "#A6AFB8" + let g:terminal_color_8 = "#667581" + let g:terminal_color_9 = "#E66B2B" + let g:terminal_color_10 = "#222E38" + let g:terminal_color_11 = "#586875" + let g:terminal_color_12 = "#85939E" + let g:terminal_color_13 = "#E8E9ED" + let g:terminal_color_14 = "#D73C9A" + let g:terminal_color_15 = "#F5F7FA" + let g:terminal_color_background = g:terminal_color_0 + let g:terminal_color_foreground = g:terminal_color_7 + if &background == "light" + let g:terminal_color_background = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_2 + endif +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("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +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:gui03, "", 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("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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") +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, "", "", "") +call hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") +call hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") +call hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") +call hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") +call hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") +call hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") +call hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") +call hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") +call hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") +call hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") + +" 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, "", "", "") +" pangloss/vim-javascript highlighting +call hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsThis", s:gui08, "", s:cterm08, "", "", "") +call hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") +call hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") +call hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") +call hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") + +" 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, "", "", "") +call hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +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 diff --git a/colors/base16-solarflare.vim b/colors/base16-solarflare.vim deleted file mode 100644 index dbcaa0f..0000000 --- a/colors/base16-solarflare.vim +++ /dev/null @@ -1,327 +0,0 @@ -" vi:syntax=vim - -" 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-solarflare.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 - -" Neovim terminal colours -if has("nvim") - let g:terminal_color_0 = "#18262F" - let g:terminal_color_1 = "#EF5253" - let g:terminal_color_2 = "#7CC844" - let g:terminal_color_3 = "#E4B51C" - let g:terminal_color_4 = "#33B5E1" - let g:terminal_color_5 = "#A363D5" - let g:terminal_color_6 = "#52CBB0" - let g:terminal_color_7 = "#A6AFB8" - let g:terminal_color_8 = "#667581" - let g:terminal_color_9 = "#E66B2B" - let g:terminal_color_10 = "#222E38" - let g:terminal_color_11 = "#586875" - let g:terminal_color_12 = "#85939E" - let g:terminal_color_13 = "#E8E9ED" - let g:terminal_color_14 = "#D73C9A" - let g:terminal_color_15 = "#F5F7FA" - let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 - if &background == "light" - let g:terminal_color_background = g:terminal_color_7 - let g:terminal_color_foreground = g:terminal_color_2 - endif -endif - -" Theme setup -hi clear -syntax reset -let g:colors_name = "base16-solarflare" - -" 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:gui03, "", 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:gui04, s:gui01, s:cterm04, 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, "", "", "") -call hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") -call hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") -call hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") -call hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") -call hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") -call hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") -call hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") -call hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") -call hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") -call hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") -call hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") -call hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") -call hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") - -" 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, "", "", "") -" pangloss/vim-javascript highlighting -call hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") -call hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") -call hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") -call hi("jsThis", s:gui08, "", s:cterm08, "", "", "") -call hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") -call hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") -call hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") -call hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") -call hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") -call hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") -call hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") -call hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") -call hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") -call hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") -call hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") - -" 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("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 diff --git a/colors/base16-solarized-dark.vim b/colors/base16-solarized-dark.vim index ff3c81a..cf6efcb 100644 --- a/colors/base16-solarized-dark.vim +++ b/colors/base16-solarized-dark.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-solarized-light.vim b/colors/base16-solarized-light.vim index 8852523..60de69c 100644 --- a/colors/base16-solarized-light.vim +++ b/colors/base16-solarized-light.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-spacemacs.vim b/colors/base16-spacemacs.vim index 2358b2a..138be2d 100644 --- a/colors/base16-spacemacs.vim +++ b/colors/base16-spacemacs.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-summerfruit-dark.vim b/colors/base16-summerfruit-dark.vim index a0e19a9..05fcaae 100644 --- a/colors/base16-summerfruit-dark.vim +++ b/colors/base16-summerfruit-dark.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-summerfruit-light.vim b/colors/base16-summerfruit-light.vim index 8f8bc69..2235bae 100644 --- a/colors/base16-summerfruit-light.vim +++ b/colors/base16-summerfruit-light.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-tomorrow-night.vim b/colors/base16-tomorrow-night.vim index b4aba43..a1db129 100644 --- a/colors/base16-tomorrow-night.vim +++ b/colors/base16-tomorrow-night.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-tomorrow.vim b/colors/base16-tomorrow.vim index a26ab69..3225855 100644 --- a/colors/base16-tomorrow.vim +++ b/colors/base16-tomorrow.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-tube.vim b/colors/base16-tube.vim deleted file mode 100644 index 8313f6f..0000000 --- a/colors/base16-tube.vim +++ /dev/null @@ -1,327 +0,0 @@ -" vi:syntax=vim - -" 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-tube.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 - -" Neovim terminal colours -if has("nvim") - let g:terminal_color_0 = "#231f20" - let g:terminal_color_1 = "#ee2e24" - let g:terminal_color_2 = "#00853e" - let g:terminal_color_3 = "#ffd204" - let g:terminal_color_4 = "#009ddc" - let g:terminal_color_5 = "#98005d" - let g:terminal_color_6 = "#85cebc" - let g:terminal_color_7 = "#d9d8d8" - let g:terminal_color_8 = "#737171" - let g:terminal_color_9 = "#f386a1" - let g:terminal_color_10 = "#1c3f95" - let g:terminal_color_11 = "#5a5758" - let g:terminal_color_12 = "#959ca1" - let g:terminal_color_13 = "#e7e7e8" - let g:terminal_color_14 = "#b06110" - let g:terminal_color_15 = "#ffffff" - let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 - if &background == "light" - let g:terminal_color_background = g:terminal_color_7 - let g:terminal_color_foreground = g:terminal_color_2 - endif -endif - -" Theme setup -hi clear -syntax reset -let g:colors_name = "base16-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:gui03, "", 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:gui04, s:gui01, s:cterm04, 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, "", "", "") -call hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") -call hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") -call hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") -call hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") -call hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") -call hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") -call hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") -call hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") -call hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") -call hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") -call hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") -call hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") -call hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") - -" 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, "", "", "") -" pangloss/vim-javascript highlighting -call hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") -call hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") -call hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") -call hi("jsThis", s:gui08, "", s:cterm08, "", "", "") -call hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") -call hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") -call hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") -call hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") -call hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") -call hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") -call hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") -call hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") -call hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") -call hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") -call hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") - -" 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("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 diff --git a/colors/base16-twilight.vim b/colors/base16-twilight.vim index 1f54c87..811b51f 100644 --- a/colors/base16-twilight.vim +++ b/colors/base16-twilight.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-unikitty-dark.vim b/colors/base16-unikitty-dark.vim index 750e1bd..7c4ae61 100644 --- a/colors/base16-unikitty-dark.vim +++ b/colors/base16-unikitty-dark.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-unikitty-light.vim b/colors/base16-unikitty-light.vim index fe59c3f..23107c0 100644 --- a/colors/base16-unikitty-light.vim +++ b/colors/base16-unikitty-light.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-woodland.vim b/colors/base16-woodland.vim index 30ef33f..637b94d 100644 --- a/colors/base16-woodland.vim +++ b/colors/base16-woodland.vim @@ -113,6 +113,7 @@ fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call hi("Bold", "", "", "", "", "bold", "") call hi("Debug", s:gui08, "", s:cterm08, "", "", "") call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ 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", "") @@ -150,6 +150,7 @@ 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:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") 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", "") @@ -292,6 +293,8 @@ 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("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") -- cgit v1.2.3