diff options
90 files changed, 2040 insertions, 109 deletions
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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>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 <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("Bold", "", "", "", "", "bold", "") +call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") +call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call <sid>hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call <sid>hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Character", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call <sid>hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Float", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call <sid>hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csType", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call <sid>hi("gitcommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("gitcommitSummary", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") +call <sid>hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") + +" GitGutter highlighting +call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") +" pangloss/vim-javascript highlighting +call <sid>hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsThis", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") + +" Mail highlighting +call <sid>hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") + +" Python highlighting +call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) + +" Remove functions +delf <sid>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 <sid>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 <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("Bold", "", "", "", "", "bold", "") +call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") +call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call <sid>hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call <sid>hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Character", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call <sid>hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Float", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call <sid>hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csType", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call <sid>hi("gitcommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("gitcommitSummary", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") +call <sid>hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") + +" GitGutter highlighting +call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") +" pangloss/vim-javascript highlighting +call <sid>hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsThis", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") + +" Mail highlighting +call <sid>hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") + +" Python highlighting +call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) + +" Remove functions +delf <sid>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 <sid>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 <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("Bold", "", "", "", "", "bold", "") +call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") +call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call <sid>hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call <sid>hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Character", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call <sid>hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Float", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call <sid>hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csType", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call <sid>hi("gitcommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("gitcommitSummary", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") +call <sid>hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") + +" GitGutter highlighting +call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") +" pangloss/vim-javascript highlighting +call <sid>hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsThis", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") + +" Mail highlighting +call <sid>hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") + +" Python highlighting +call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) + +" Remove functions +delf <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>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 <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("Bold", "", "", "", "", "bold", "") +call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") +call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call <sid>hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call <sid>hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Character", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call <sid>hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Float", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call <sid>hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csType", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call <sid>hi("gitcommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("gitcommitSummary", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") +call <sid>hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") + +" GitGutter highlighting +call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") +" pangloss/vim-javascript highlighting +call <sid>hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsThis", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") + +" Mail highlighting +call <sid>hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") + +" Python highlighting +call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) + +" Remove functions +delf <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-greenscreen.vim b/colors/base16-green-screen.vim index 7fcba02..b87ea97 100644 --- a/colors/base16-greenscreen.vim +++ b/colors/base16-green-screen.vim @@ -10,7 +10,7 @@ " 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" + execute "silent !/bin/sh ".g:base16_shell_path."/base16-green-screen.sh" endif endif @@ -88,7 +88,7 @@ endif " Theme setup hi clear syntax reset -let g:colors_name = "base16-greenscreen" +let g:colors_name = "base16-green-screen" " Highlighting function fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) @@ -113,6 +113,7 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") 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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-harmonic-dark.vim b/colors/base16-harmonic16-dark.vim index 88d60a0..5524dd4 100644 --- a/colors/base16-harmonic-dark.vim +++ b/colors/base16-harmonic16-dark.vim @@ -10,7 +10,7 @@ " 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" + execute "silent !/bin/sh ".g:base16_shell_path."/base16-harmonic16-dark.sh" endif endif @@ -88,7 +88,7 @@ endif " Theme setup hi clear syntax reset -let g:colors_name = "base16-harmonic-dark" +let g:colors_name = "base16-harmonic16-dark" " Highlighting function fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) @@ -113,6 +113,7 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-harmonic-light.vim b/colors/base16-harmonic16-light.vim index c453de9..abd5e38 100644 --- a/colors/base16-harmonic-light.vim +++ b/colors/base16-harmonic16-light.vim @@ -10,7 +10,7 @@ " 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" + execute "silent !/bin/sh ".g:base16_shell_path."/base16-harmonic16-light.sh" endif endif @@ -88,7 +88,7 @@ endif " Theme setup hi clear syntax reset -let g:colors_name = "base16-harmonic-light" +let g:colors_name = "base16-harmonic16-light" " Highlighting function fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) @@ -113,6 +113,7 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") 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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-irblack.vim b/colors/base16-ir-black.vim index 6ae7a14..d09a643 100644 --- a/colors/base16-irblack.vim +++ b/colors/base16-ir-black.vim @@ -10,7 +10,7 @@ " 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" + execute "silent !/bin/sh ".g:base16_shell_path."/base16-ir-black.sh" endif endif @@ -88,7 +88,7 @@ endif " Theme setup hi clear syntax reset -let g:colors_name = "base16-irblack" +let g:colors_name = "base16-ir-black" " Highlighting function fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) @@ -113,6 +113,7 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") 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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-tube.vim b/colors/base16-london-tube.vim index 8313f6f..04e3675 100644 --- a/colors/base16-tube.vim +++ b/colors/base16-london-tube.vim @@ -10,7 +10,7 @@ " 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" + execute "silent !/bin/sh ".g:base16_shell_path."/base16-london-tube.sh" endif endif @@ -88,7 +88,7 @@ endif " Theme setup hi clear syntax reset -let g:colors_name = "base16-tube" +let g:colors_name = "base16-london-tube" " Highlighting function fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) @@ -113,6 +113,7 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") 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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -114,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -124,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -266,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>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 <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("Bold", "", "", "", "", "bold", "") +call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") +call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "") +call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call <sid>hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") +call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") +call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call <sid>hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Character", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call <sid>hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Float", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call <sid>hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csType", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call <sid>hi("gitcommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("gitcommitSummary", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") +call <sid>hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") + +" GitGutter highlighting +call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") +" pangloss/vim-javascript highlighting +call <sid>hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsThis", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") + +" Mail highlighting +call <sid>hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") + +" Python highlighting +call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E) + +" Remove functions +delf <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-seti.vim b/colors/base16-seti-ui.vim index 0c59846..96a2b15 100644 --- a/colors/base16-seti.vim +++ b/colors/base16-seti-ui.vim @@ -10,7 +10,7 @@ " 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" + execute "silent !/bin/sh ".g:base16_shell_path."/base16-seti-ui.sh" endif endif @@ -88,7 +88,7 @@ endif " Theme setup hi clear syntax reset -let g:colors_name = "base16-seti" +let g:colors_name = "base16-seti-ui" " Highlighting function fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) @@ -113,6 +113,7 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") 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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") diff --git a/colors/base16-solarflare.vim b/colors/base16-solar-flare.vim index dbcaa0f..bbecc77 100644 --- a/colors/base16-solarflare.vim +++ b/colors/base16-solar-flare.vim @@ -10,7 +10,7 @@ " 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" + execute "silent !/bin/sh ".g:base16_shell_path."/base16-solar-flare.sh" endif endif @@ -88,7 +88,7 @@ endif " Theme setup hi clear syntax reset -let g:colors_name = "base16-solarflare" +let g:colors_name = "base16-solar-flare" " Highlighting function fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) @@ -113,6 +113,7 @@ fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") 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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") 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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>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 <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endfun " Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("Bold", "", "", "", "", "bold", "") call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") @@ -140,7 +141,6 @@ call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") @@ -150,6 +150,7 @@ call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -292,6 +293,8 @@ call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") " Ruby highlighting call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") |