From 5aa443597811208f5d3afbdbe9d4ead79339de58 Mon Sep 17 00:00:00 2001 From: Alex Simons Date: Tue, 5 Apr 2022 17:44:11 -0500 Subject: [PATCH] v78.0-1.0.0 - [The Boys] (#33) --- CHANGELOG.md | 17 + autoload/genos.vim | 41 +++ autoload/hinata_shoyo.vim | 41 +++ autoload/nakano_nino.vim | 4 +- autoload/ram.vim | 2 +- autoload/raphtalia.vim | 2 +- autoload/rem.vim | 2 +- autoload/rimiru_tempest.vim | 41 +++ autoload/rory_mercury.vim | 14 +- autoload/yukihira_soma.vim | 41 +++ autoload/yukinoshita_yukino.vim | 2 +- .../shoyo/dark/shoyo.dark.vim.definition.json | 7 + .../genos/dark/genos.dark.vim.definition.json | 7 + .../soma/dark/soma.dark.vim.definition.json | 7 + .../dark/rimiru.dark.vim.definition.json | 7 + buildSrc/package.json | 2 +- buildSrc/yarn.lock | 8 +- colors/genos.vim | 311 ++++++++++++++++++ colors/hinata_shoyo.vim | 311 ++++++++++++++++++ colors/rimiru_tempest.vim | 311 ++++++++++++++++++ colors/yukihira_soma.vim | 311 ++++++++++++++++++ package.json | 2 +- 22 files changed, 1472 insertions(+), 19 deletions(-) create mode 100644 autoload/genos.vim create mode 100644 autoload/hinata_shoyo.vim create mode 100644 autoload/rimiru_tempest.vim create mode 100644 autoload/yukihira_soma.vim create mode 100644 buildSrc/assets/themes/haikyu/shoyo/dark/shoyo.dark.vim.definition.json create mode 100644 buildSrc/assets/themes/onePunch/genos/dark/genos.dark.vim.definition.json create mode 100644 buildSrc/assets/themes/shokugeki/soma/dark/soma.dark.vim.definition.json create mode 100644 buildSrc/assets/themes/slime/rimiru/dark/rimiru.dark.vim.definition.json create mode 100644 colors/genos.vim create mode 100644 colors/hinata_shoyo.vim create mode 100644 colors/rimiru_tempest.vim create mode 100644 colors/yukihira_soma.vim diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c6e832..0bed408 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,23 @@ Changelog --- +# 78.0-1.0.6 [The Boys] + +I'm trying to bring in a bit of inclusion. + +**4 New Dark Themes!** + +- I can already hear you now, "Rimiru Tempest, from 'That Time I Got Reincarnated as a Slime', is not a boy. They are the best genderless slime, get your facts correct." Yeah well....shut up. +- Next, is one of the S ranked heroes in the 'One Punch Man' universe, Genos. +- After that, is the smug smile of Yukihira Soma from Shokugeki no Soma. +- Lastly, I am going to be honest, I haven't seen Haikyu. I just wanted a Indigo & Orange based theme. So here is Hinata Shoyo. + +![v78 Bois](https://doki.assets.unthrottled.io/misc/v78_bois.png) + +### Other Stuff + +- Updated some of Rory, Ram, & Rem's syntax highlighting colors to be more usable. + # 74.1-1.0.0 [Synapse break. Vanishment, this world!] **4 New Dark Themes!** diff --git a/autoload/genos.vim b/autoload/genos.vim new file mode 100644 index 0000000..b2d6323 --- /dev/null +++ b/autoload/genos.vim @@ -0,0 +1,41 @@ + + +let s:colors = { + \ "comments": { "gui": "#918561", "cterm": "101", "cterm16": "1" }, + \ "constantColor": { "gui": "#EA7777", "cterm": "174", "cterm16": "1" }, + \ "foregroundColorEditor": { "gui": "#F8F8F2", "cterm": "255", "cterm16": "1" }, + \ "htmlTagColor": { "gui": "#FCA3C8", "cterm": "218", "cterm16": "1" }, + \ "editorAccentColor": { "gui": "#8dff4b", "cterm": "119", "cterm16": "1" }, + \ "classNameColor": { "gui": "#B39CFF", "cterm": "147", "cterm16": "1" }, + \ "keywordColor": { "gui": "#8ACAFF", "cterm": "117", "cterm16": "1" }, + \ "keyColor": { "gui": "#FFE35C", "cterm": "221", "cterm16": "1" }, + \ "errorColor": { "gui": "#ff2525", "cterm": "196", "cterm16": "1" }, + \ "headerColor": { "gui": "#252627", "cterm": "235", "cterm16": "1" }, + \ "accentColor": { "gui": "#ddc7a1", "cterm": "187", "cterm16": "1" }, + \ "infoForeground": { "gui": "#ad9e6e", "cterm": "143", "cterm16": "1" }, + \ "unusedColor": { "gui": "#788189", "cterm": "244", "cterm16": "1" }, + \ "diffModified": { "gui": "#204874", "cterm": "24", "cterm16": "1" }, + \ "diffInserted": { "gui": "#244E13", "cterm": "235", "cterm16": "1" }, + \ "diffDeleted": { "gui": "#40474E", "cterm": "238", "cterm16": "1" }, + \ "codeBlock": { "gui": "#463e33", "cterm": "237", "cterm16": "1" }, + \ "caretRow": { "gui": "#3f4143", "cterm": "238", "cterm16": "1" }, + \ "textEditorBackground": { "gui": "#313234", "cterm": "236", "cterm16": "1" }, + \ "terminalAnsiRed": { "gui": "#E356A7", "cterm": "169", "cterm16": "1" }, + \ "terminalAnsiBlue": { "gui": "#9B6BDF", "cterm": "98", "cterm16": "1" }, + \ "terminalAnsiCyan": { "gui": "#75D7EC", "cterm": "117", "cterm16": "1" }, + \ "terminalAnsiGreen": { "gui": "#42E66C", "cterm": "77", "cterm16": "1" }, + \ "terminalAnsiMagenta": { "gui": "#E64747", "cterm": "167", "cterm16": "1" }, + \ "terminalAnsiYellow": { "gui": "#EFA554", "cterm": "215", "cterm16": "1" }, + \ "lineNumberColor": { "gui": "#80755d", "cterm": "101", "cterm16": "1" }, + \ "lightEditorColor": { "gui": "#393b3d", "cterm": "237", "cterm16": "1" }, + \ "searchForeground": { "gui": "#fefefe", "cterm": "231", "cterm16": "1" }, + \ "searchBackground": { "gui": "#9A561A", "cterm": "94", "cterm16": "1" }, + \ "selectionForeground": { "gui": "#fbfbfb", "cterm": "231", "cterm16": "1" }, + \ "selectionBackground": { "gui": "#605d51", "cterm": "59", "cterm16": "1" }, + \ "foldedTextBackground": { "gui": "#27282a", "cterm": "235", "cterm16": "1" }, + \ "stringColor": { "gui": "#FF984B", "cterm": "209", "cterm16": "1" } + \} + +function! genos#GetColors() + return s:colors +endfunction \ No newline at end of file diff --git a/autoload/hinata_shoyo.vim b/autoload/hinata_shoyo.vim new file mode 100644 index 0000000..6c364a7 --- /dev/null +++ b/autoload/hinata_shoyo.vim @@ -0,0 +1,41 @@ + + +let s:colors = { + \ "comments": { "gui": "#6b6c80", "cterm": "242", "cterm16": "1" }, + \ "constantColor": { "gui": "#ec9cb2", "cterm": "217", "cterm16": "1" }, + \ "foregroundColorEditor": { "gui": "#F8F8F2", "cterm": "255", "cterm16": "1" }, + \ "htmlTagColor": { "gui": "#F8932B", "cterm": "208", "cterm16": "1" }, + \ "editorAccentColor": { "gui": "#49FF51", "cterm": "83", "cterm16": "1" }, + \ "classNameColor": { "gui": "#61ead9", "cterm": "80", "cterm16": "1" }, + \ "keywordColor": { "gui": "#ab77ff", "cterm": "141", "cterm16": "1" }, + \ "keyColor": { "gui": "#84D0FF", "cterm": "117", "cterm16": "1" }, + \ "errorColor": { "gui": "#ff5555", "cterm": "203", "cterm16": "1" }, + \ "headerColor": { "gui": "#24203c", "cterm": "235", "cterm16": "1" }, + \ "accentColor": { "gui": "#f58d02", "cterm": "208", "cterm16": "1" }, + \ "infoForeground": { "gui": "#ba804b", "cterm": "137", "cterm16": "1" }, + \ "unusedColor": { "gui": "#545c5b", "cterm": "240", "cterm16": "1" }, + \ "diffModified": { "gui": "#223861", "cterm": "237", "cterm16": "1" }, + \ "diffInserted": { "gui": "#1F3924", "cterm": "235", "cterm16": "1" }, + \ "diffDeleted": { "gui": "#353539", "cterm": "237", "cterm16": "1" }, + \ "codeBlock": { "gui": "#3f2b35", "cterm": "236", "cterm16": "1" }, + \ "caretRow": { "gui": "#2c2847", "cterm": "236", "cterm16": "1" }, + \ "textEditorBackground": { "gui": "#201c37", "cterm": "234", "cterm16": "1" }, + \ "terminalAnsiRed": { "gui": "#E356A7", "cterm": "169", "cterm16": "1" }, + \ "terminalAnsiBlue": { "gui": "#9B6BDF", "cterm": "98", "cterm16": "1" }, + \ "terminalAnsiCyan": { "gui": "#75D7EC", "cterm": "117", "cterm16": "1" }, + \ "terminalAnsiGreen": { "gui": "#42E66C", "cterm": "77", "cterm16": "1" }, + \ "terminalAnsiMagenta": { "gui": "#E64747", "cterm": "167", "cterm16": "1" }, + \ "terminalAnsiYellow": { "gui": "#EFA554", "cterm": "215", "cterm16": "1" }, + \ "lineNumberColor": { "gui": "#55596c", "cterm": "240", "cterm16": "1" }, + \ "lightEditorColor": { "gui": "#272341", "cterm": "235", "cterm16": "1" }, + \ "searchForeground": { "gui": "#fbfbfb", "cterm": "231", "cterm16": "1" }, + \ "searchBackground": { "gui": "#195A80", "cterm": "24", "cterm16": "1" }, + \ "selectionForeground": { "gui": "#fbfbfb", "cterm": "231", "cterm16": "1" }, + \ "selectionBackground": { "gui": "#6a473d", "cterm": "238", "cterm16": "1" }, + \ "foldedTextBackground": { "gui": "#2c2847", "cterm": "236", "cterm16": "1" }, + \ "stringColor": { "gui": "#FFC32F", "cterm": "214", "cterm16": "1" } + \} + +function! hinata_shoyo#GetColors() + return s:colors +endfunction \ No newline at end of file diff --git a/autoload/nakano_nino.vim b/autoload/nakano_nino.vim index 1188f48..e9750c5 100644 --- a/autoload/nakano_nino.vim +++ b/autoload/nakano_nino.vim @@ -10,7 +10,7 @@ let s:colors = { \ "keywordColor": { "gui": "#7ceec8", "cterm": "122", "cterm16": "1" }, \ "keyColor": { "gui": "#68c4ee", "cterm": "81", "cterm16": "1" }, \ "errorColor": { "gui": "#ff2525", "cterm": "196", "cterm16": "1" }, - \ "headerColor": { "gui": "#221c22", "cterm": "234", "cterm16": "1" }, + \ "headerColor": { "gui": "#1f1a1f", "cterm": "234", "cterm16": "1" }, \ "accentColor": { "gui": "#d45575", "cterm": "168", "cterm16": "1" }, \ "infoForeground": { "gui": "#ab8d9f", "cterm": "139", "cterm16": "1" }, \ "unusedColor": { "gui": "#72737A", "cterm": "243", "cterm16": "1" }, @@ -19,7 +19,7 @@ let s:colors = { \ "diffDeleted": { "gui": "#262626", "cterm": "235", "cterm16": "1" }, \ "codeBlock": { "gui": "#232024", "cterm": "235", "cterm16": "1" }, \ "caretRow": { "gui": "#272328", "cterm": "235", "cterm16": "1" }, - \ "textEditorBackground": { "gui": "#1f1b20", "cterm": "234", "cterm16": "1" }, + \ "textEditorBackground": { "gui": "#1c191d", "cterm": "234", "cterm16": "1" }, \ "terminalAnsiRed": { "gui": "#E356A7", "cterm": "169", "cterm16": "1" }, \ "terminalAnsiBlue": { "gui": "#9B6BDF", "cterm": "98", "cterm16": "1" }, \ "terminalAnsiCyan": { "gui": "#75D7EC", "cterm": "117", "cterm16": "1" }, diff --git a/autoload/ram.vim b/autoload/ram.vim index 1e6bee8..c36cb9a 100644 --- a/autoload/ram.vim +++ b/autoload/ram.vim @@ -8,7 +8,7 @@ let s:colors = { \ "editorAccentColor": { "gui": "#e88def", "cterm": "177", "cterm16": "1" }, \ "classNameColor": { "gui": "#FBFF90", "cterm": "228", "cterm16": "1" }, \ "keywordColor": { "gui": "#ef57bf", "cterm": "205", "cterm16": "1" }, - \ "keyColor": { "gui": "#986DEA", "cterm": "98", "cterm16": "1" }, + \ "keyColor": { "gui": "#9d8df6", "cterm": "141", "cterm16": "1" }, \ "errorColor": { "gui": "#ff5555", "cterm": "203", "cterm16": "1" }, \ "headerColor": { "gui": "#2b252b", "cterm": "235", "cterm16": "1" }, \ "accentColor": { "gui": "#e594bf", "cterm": "175", "cterm16": "1" }, diff --git a/autoload/raphtalia.vim b/autoload/raphtalia.vim index 5c8ceed..b1417f7 100644 --- a/autoload/raphtalia.vim +++ b/autoload/raphtalia.vim @@ -11,7 +11,7 @@ let s:colors = { \ "keyColor": { "gui": "#fd9144", "cterm": "209", "cterm16": "1" }, \ "errorColor": { "gui": "#ff2525", "cterm": "196", "cterm16": "1" }, \ "headerColor": { "gui": "#1c140f", "cterm": "233", "cterm16": "1" }, - \ "accentColor": { "gui": "#823a3b", "cterm": "237", "cterm16": "1" }, + \ "accentColor": { "gui": "#8a3c3d", "cterm": "95", "cterm16": "1" }, \ "infoForeground": { "gui": "#bfb38c", "cterm": "144", "cterm16": "1" }, \ "unusedColor": { "gui": "#606867", "cterm": "241", "cterm16": "1" }, \ "diffModified": { "gui": "#1B3A47", "cterm": "237", "cterm16": "1" }, diff --git a/autoload/rem.vim b/autoload/rem.vim index d70c9a9..8a8a47a 100644 --- a/autoload/rem.vim +++ b/autoload/rem.vim @@ -8,7 +8,7 @@ let s:colors = { \ "editorAccentColor": { "gui": "#8dc6ef", "cterm": "117", "cterm16": "1" }, \ "classNameColor": { "gui": "#FBFF90", "cterm": "228", "cterm16": "1" }, \ "keywordColor": { "gui": "#6893f3", "cterm": "69", "cterm16": "1" }, - \ "keyColor": { "gui": "#986DEA", "cterm": "98", "cterm16": "1" }, + \ "keyColor": { "gui": "#9d8df6", "cterm": "141", "cterm16": "1" }, \ "errorColor": { "gui": "#ff5555", "cterm": "203", "cterm16": "1" }, \ "headerColor": { "gui": "#25262b", "cterm": "235", "cterm16": "1" }, \ "accentColor": { "gui": "#578CDA", "cterm": "68", "cterm16": "1" }, diff --git a/autoload/rimiru_tempest.vim b/autoload/rimiru_tempest.vim new file mode 100644 index 0000000..a2fa1cf --- /dev/null +++ b/autoload/rimiru_tempest.vim @@ -0,0 +1,41 @@ + + +let s:colors = { + \ "comments": { "gui": "#716B78", "cterm": "242", "cterm16": "1" }, + \ "constantColor": { "gui": "#9CA2FF", "cterm": "147", "cterm16": "1" }, + \ "foregroundColorEditor": { "gui": "#F8F8F2", "cterm": "255", "cterm16": "1" }, + \ "htmlTagColor": { "gui": "#77BBFF", "cterm": "111", "cterm16": "1" }, + \ "editorAccentColor": { "gui": "#FDEA25", "cterm": "220", "cterm16": "1" }, + \ "classNameColor": { "gui": "#FFA38F", "cterm": "216", "cterm16": "1" }, + \ "keywordColor": { "gui": "#5FFF9F", "cterm": "85", "cterm16": "1" }, + \ "keyColor": { "gui": "#FF96FD", "cterm": "213", "cterm16": "1" }, + \ "errorColor": { "gui": "#ff2525", "cterm": "196", "cterm16": "1" }, + \ "headerColor": { "gui": "#211c22", "cterm": "234", "cterm16": "1" }, + \ "accentColor": { "gui": "#d7cf8b", "cterm": "186", "cterm16": "1" }, + \ "infoForeground": { "gui": "#b0a17f", "cterm": "144", "cterm16": "1" }, + \ "unusedColor": { "gui": "#545c5b", "cterm": "240", "cterm16": "1" }, + \ "diffModified": { "gui": "#1F4966", "cterm": "23", "cterm16": "1" }, + \ "diffInserted": { "gui": "#1E3425", "cterm": "235", "cterm16": "1" }, + \ "diffDeleted": { "gui": "#323239", "cterm": "236", "cterm16": "1" }, + \ "codeBlock": { "gui": "#2d3d55", "cterm": "237", "cterm16": "1" }, + \ "caretRow": { "gui": "#302931", "cterm": "236", "cterm16": "1" }, + \ "textEditorBackground": { "gui": "#1c171d", "cterm": "234", "cterm16": "1" }, + \ "terminalAnsiRed": { "gui": "#E356A7", "cterm": "169", "cterm16": "1" }, + \ "terminalAnsiBlue": { "gui": "#9B6BDF", "cterm": "98", "cterm16": "1" }, + \ "terminalAnsiCyan": { "gui": "#75D7EC", "cterm": "117", "cterm16": "1" }, + \ "terminalAnsiGreen": { "gui": "#42E66C", "cterm": "77", "cterm16": "1" }, + \ "terminalAnsiMagenta": { "gui": "#E64747", "cterm": "167", "cterm16": "1" }, + \ "terminalAnsiYellow": { "gui": "#EFA554", "cterm": "215", "cterm16": "1" }, + \ "lineNumberColor": { "gui": "#675a6c", "cterm": "241", "cterm16": "1" }, + \ "lightEditorColor": { "gui": "#282229", "cterm": "235", "cterm16": "1" }, + \ "searchForeground": { "gui": "#fefefe", "cterm": "231", "cterm16": "1" }, + \ "searchBackground": { "gui": "#195A80", "cterm": "24", "cterm16": "1" }, + \ "selectionForeground": { "gui": "#fefefe", "cterm": "231", "cterm16": "1" }, + \ "selectionBackground": { "gui": "#29466c", "cterm": "238", "cterm16": "1" }, + \ "foldedTextBackground": { "gui": "#302931", "cterm": "236", "cterm16": "1" }, + \ "stringColor": { "gui": "#77C2FF", "cterm": "111", "cterm16": "1" } + \} + +function! rimiru_tempest#GetColors() + return s:colors +endfunction \ No newline at end of file diff --git a/autoload/rory_mercury.vim b/autoload/rory_mercury.vim index aceadf3..9794ed4 100644 --- a/autoload/rory_mercury.vim +++ b/autoload/rory_mercury.vim @@ -1,19 +1,19 @@ let s:colors = { - \ "comments": { "gui": "#6272a4", "cterm": "61", "cterm16": "1" }, + \ "comments": { "gui": "#9A6262", "cterm": "95", "cterm16": "1" }, \ "constantColor": { "gui": "#86dbfd", "cterm": "117", "cterm16": "1" }, \ "foregroundColorEditor": { "gui": "#F8F8F2", "cterm": "255", "cterm16": "1" }, \ "htmlTagColor": { "gui": "#666f71", "cterm": "242", "cterm16": "1" }, - \ "editorAccentColor": { "gui": "#b53241", "cterm": "131", "cterm16": "1" }, + \ "editorAccentColor": { "gui": "#FF4556", "cterm": "203", "cterm16": "1" }, \ "classNameColor": { "gui": "#BD93F9", "cterm": "141", "cterm16": "1" }, \ "keywordColor": { "gui": "#e0474b", "cterm": "167", "cterm16": "1" }, - \ "keyColor": { "gui": "#6b7476", "cterm": "243", "cterm16": "1" }, - \ "errorColor": { "gui": "#ff5555", "cterm": "203", "cterm16": "1" }, + \ "keyColor": { "gui": "#7F8E90", "cterm": "245", "cterm16": "1" }, + \ "errorColor": { "gui": "#FF8484", "cterm": "210", "cterm16": "1" }, \ "headerColor": { "gui": "#18181b", "cterm": "234", "cterm16": "1" }, \ "accentColor": { "gui": "#b53241", "cterm": "131", "cterm16": "1" }, \ "infoForeground": { "gui": "#843030", "cterm": "236", "cterm16": "1" }, - \ "unusedColor": { "gui": "#3D3D42", "cterm": "237", "cterm16": "1" }, + \ "unusedColor": { "gui": "#515158", "cterm": "240", "cterm16": "1" }, \ "diffModified": { "gui": "#132940", "cterm": "235", "cterm16": "1" }, \ "diffInserted": { "gui": "#102413", "cterm": "233", "cterm16": "1" }, \ "diffDeleted": { "gui": "#232121", "cterm": "235", "cterm16": "1" }, @@ -31,9 +31,9 @@ let s:colors = { \ "searchForeground": { "gui": "#fbfbfb", "cterm": "231", "cterm16": "1" }, \ "searchBackground": { "gui": "#265579", "cterm": "24", "cterm16": "1" }, \ "selectionForeground": { "gui": "#fbfbfb", "cterm": "231", "cterm16": "1" }, - \ "selectionBackground": { "gui": "#391717", "cterm": "234", "cterm16": "1" }, + \ "selectionBackground": { "gui": "#502121", "cterm": "235", "cterm16": "1" }, \ "foldedTextBackground": { "gui": "#191813", "cterm": "233", "cterm16": "1" }, - \ "stringColor": { "gui": "#4593f5", "cterm": "69", "cterm16": "1" } + \ "stringColor": { "gui": "#58A0F8", "cterm": "75", "cterm16": "1" } \} function! rory_mercury#GetColors() diff --git a/autoload/yukihira_soma.vim b/autoload/yukihira_soma.vim new file mode 100644 index 0000000..4abcf9a --- /dev/null +++ b/autoload/yukihira_soma.vim @@ -0,0 +1,41 @@ + + +let s:colors = { + \ "comments": { "gui": "#617391", "cterm": "60", "cterm16": "1" }, + \ "constantColor": { "gui": "#FFA6E1", "cterm": "218", "cterm16": "1" }, + \ "foregroundColorEditor": { "gui": "#F8F8F2", "cterm": "255", "cterm16": "1" }, + \ "htmlTagColor": { "gui": "#B39CFF", "cterm": "147", "cterm16": "1" }, + \ "editorAccentColor": { "gui": "#EA7777", "cterm": "174", "cterm16": "1" }, + \ "classNameColor": { "gui": "#FF984B", "cterm": "209", "cterm16": "1" }, + \ "keywordColor": { "gui": "#FFEF41", "cterm": "227", "cterm16": "1" }, + \ "keyColor": { "gui": "#8ACAFF", "cterm": "117", "cterm16": "1" }, + \ "errorColor": { "gui": "#ff1717", "cterm": "196", "cterm16": "1" }, + \ "headerColor": { "gui": "#0c1c2e", "cterm": "234", "cterm16": "1" }, + \ "accentColor": { "gui": "#d13358", "cterm": "167", "cterm16": "1" }, + \ "infoForeground": { "gui": "#6e89ad", "cterm": "67", "cterm16": "1" }, + \ "unusedColor": { "gui": "#788189", "cterm": "244", "cterm16": "1" }, + \ "diffModified": { "gui": "#204874", "cterm": "24", "cterm16": "1" }, + \ "diffInserted": { "gui": "#09401D", "cterm": "234", "cterm16": "1" }, + \ "diffDeleted": { "gui": "#363B40", "cterm": "237", "cterm16": "1" }, + \ "codeBlock": { "gui": "#251a2b", "cterm": "235", "cterm16": "1" }, + \ "caretRow": { "gui": "#172c43", "cterm": "236", "cterm16": "1" }, + \ "textEditorBackground": { "gui": "#09192b", "cterm": "234", "cterm16": "1" }, + \ "terminalAnsiRed": { "gui": "#E356A7", "cterm": "169", "cterm16": "1" }, + \ "terminalAnsiBlue": { "gui": "#9B6BDF", "cterm": "98", "cterm16": "1" }, + \ "terminalAnsiCyan": { "gui": "#75D7EC", "cterm": "117", "cterm16": "1" }, + \ "terminalAnsiGreen": { "gui": "#42E66C", "cterm": "77", "cterm16": "1" }, + \ "terminalAnsiMagenta": { "gui": "#E64747", "cterm": "167", "cterm16": "1" }, + \ "terminalAnsiYellow": { "gui": "#EFA554", "cterm": "215", "cterm16": "1" }, + \ "lineNumberColor": { "gui": "#5d6c80", "cterm": "60", "cterm16": "1" }, + \ "lightEditorColor": { "gui": "#112439", "cterm": "235", "cterm16": "1" }, + \ "searchForeground": { "gui": "#fefefe", "cterm": "231", "cterm16": "1" }, + \ "searchBackground": { "gui": "#3B65B3", "cterm": "61", "cterm16": "1" }, + \ "selectionForeground": { "gui": "#fbfbfb", "cterm": "231", "cterm16": "1" }, + \ "selectionBackground": { "gui": "#4f1d27", "cterm": "235", "cterm16": "1" }, + \ "foldedTextBackground": { "gui": "#152940", "cterm": "235", "cterm16": "1" }, + \ "stringColor": { "gui": "#4BFF75", "cterm": "84", "cterm16": "1" } + \} + +function! yukihira_soma#GetColors() + return s:colors +endfunction \ No newline at end of file diff --git a/autoload/yukinoshita_yukino.vim b/autoload/yukinoshita_yukino.vim index 20d4325..e729cbc 100644 --- a/autoload/yukinoshita_yukino.vim +++ b/autoload/yukinoshita_yukino.vim @@ -13,7 +13,7 @@ let s:colors = { \ "headerColor": { "gui": "#282a2f", "cterm": "235", "cterm16": "1" }, \ "accentColor": { "gui": "#2d6382", "cterm": "24", "cterm16": "1" }, \ "infoForeground": { "gui": "#456186", "cterm": "60", "cterm16": "1" }, - \ "unusedColor": { "gui": "#3D3D42", "cterm": "237", "cterm16": "1" }, + \ "unusedColor": { "gui": "#5c5c63", "cterm": "59", "cterm16": "1" }, \ "diffModified": { "gui": "#0E2539", "cterm": "235", "cterm16": "1" }, \ "diffInserted": { "gui": "#132D14", "cterm": "233", "cterm16": "1" }, \ "diffDeleted": { "gui": "#2A2929", "cterm": "235", "cterm16": "1" }, diff --git a/buildSrc/assets/themes/haikyu/shoyo/dark/shoyo.dark.vim.definition.json b/buildSrc/assets/themes/haikyu/shoyo/dark/shoyo.dark.vim.definition.json new file mode 100644 index 0000000..4e1e913 --- /dev/null +++ b/buildSrc/assets/themes/haikyu/shoyo/dark/shoyo.dark.vim.definition.json @@ -0,0 +1,7 @@ +{ + "id": "44ed0d2d-cce8-4707-a0cf-5150e1b31c16", + "overrides": {}, + "laf": {}, + "syntax": {}, + "colors": {} +} \ No newline at end of file diff --git a/buildSrc/assets/themes/onePunch/genos/dark/genos.dark.vim.definition.json b/buildSrc/assets/themes/onePunch/genos/dark/genos.dark.vim.definition.json new file mode 100644 index 0000000..83a56a3 --- /dev/null +++ b/buildSrc/assets/themes/onePunch/genos/dark/genos.dark.vim.definition.json @@ -0,0 +1,7 @@ +{ + "id": "22d0250f-a33b-409a-9cef-22f5eb69fc3d", + "overrides": {}, + "laf": {}, + "syntax": {}, + "colors": {} +} \ No newline at end of file diff --git a/buildSrc/assets/themes/shokugeki/soma/dark/soma.dark.vim.definition.json b/buildSrc/assets/themes/shokugeki/soma/dark/soma.dark.vim.definition.json new file mode 100644 index 0000000..2276463 --- /dev/null +++ b/buildSrc/assets/themes/shokugeki/soma/dark/soma.dark.vim.definition.json @@ -0,0 +1,7 @@ +{ + "id": "fb25d871-4a7c-49f5-9426-1f7eb00c2699", + "overrides": {}, + "laf": {}, + "syntax": {}, + "colors": {} +} \ No newline at end of file diff --git a/buildSrc/assets/themes/slime/rimiru/dark/rimiru.dark.vim.definition.json b/buildSrc/assets/themes/slime/rimiru/dark/rimiru.dark.vim.definition.json new file mode 100644 index 0000000..4651b30 --- /dev/null +++ b/buildSrc/assets/themes/slime/rimiru/dark/rimiru.dark.vim.definition.json @@ -0,0 +1,7 @@ +{ + "id": "5ca2846d-31a9-40b3-8908-965dad3c127d", + "overrides": {}, + "laf": {}, + "syntax": {}, + "colors": {} +} \ No newline at end of file diff --git a/buildSrc/package.json b/buildSrc/package.json index b20e504..547aa36 100644 --- a/buildSrc/package.json +++ b/buildSrc/package.json @@ -12,7 +12,7 @@ "@types/jest": "^26.0.0", "@types/lodash": "^4.14.155", "copy-webpack-plugin": "^6.0.2", - "doki-build-source": "74.1.0", + "doki-build-source": "78.2.3", "jest": "^26.0.1", "rimraf": "^3.0.2", "ts-jest": "^26.1.0", diff --git a/buildSrc/yarn.lock b/buildSrc/yarn.lock index 840346e..3c60e45 100644 --- a/buildSrc/yarn.lock +++ b/buildSrc/yarn.lock @@ -1841,10 +1841,10 @@ dir-glob@^3.0.1: dependencies: path-type "^4.0.0" -doki-build-source@74.1.0: - version "74.1.0" - resolved "https://registry.yarnpkg.com/doki-build-source/-/doki-build-source-74.1.0.tgz#2ae6c74273de4cf3021d7a5cdbbfe4369c50439a" - integrity sha512-6CitL8Qw9LM9NqTFLNJxe5p7g1yhhE9uSUajRTwXLJisdVtMmjIIdx6Hodcwi1sxi7qBmUBMKd1JF3jlGZ61rQ== +doki-build-source@78.2.3: + version "78.2.3" + resolved "https://registry.yarnpkg.com/doki-build-source/-/doki-build-source-78.2.3.tgz#23bacab848f51d4389615a373d266575ea880c86" + integrity sha512-8DmTsQTEriYKWweb6zd0VFQOj5w/A31ScF1eRQjrQ8WdkB8zf5bTzqJ115ADWsTjwElBqY1gDIvD19K4+oPesg== domain-browser@^1.1.1: version "1.2.0" diff --git a/colors/genos.vim b/colors/genos.vim new file mode 100644 index 0000000..1da0132 --- /dev/null +++ b/colors/genos.vim @@ -0,0 +1,311 @@ +if v:version > 580 + highlight clear + if exists('syntax_on') + syntax reset + endif +endif + +let g:colors_name = 'genos' + +set t_Co=256 + +" Set to "256" for 256-color terminals, or +" set to "16" to use your terminal emulator's native colors +" (a 16-color palette for this color scheme is available; see +" < https://github.com/joshdick/ +" for more information.) +if !exists("g:genos_termcolors") + let g:genos_termcolors = 256 +endif + +" Not all terminals support italics properly. If yours does, opt-in. +if !exists("g:genos_terminal_italics") + let g:genos_terminal_italics = 0 +endif + +if !(has('termguicolors') && &termguicolors) && !has('gui_running') && &t_Co != 256 + finish +endif + +" This function is based on one from FlatColor: https://github.com/MaxSt/FlatColor/ +" Which in turn was based on one found in hemisu: https://github.com/noahfrederick/vim-hemisu/ +let s:group_colors = {} " Cache of default highlight group settings, for later reference via ` +function! s:h(group, style, ...) + if (a:0 > 0) " Will be true if we got here from + let s:highlight = s:group_colors[a:group] + for style_type in ["fg", "bg", "sp"] + if (has_key(a:style, style_type)) + let l:default_style = (has_key(s:highlight, style_type) ? copy(s:highlight[style_type]) : { "cterm16": "NONE", "cterm": "NONE", "gui": "NONE" }) + let s:highlight[style_type] = extend(l:default_style, a:style[style_type]) + endif + endfor + if (has_key(a:style, "gui")) + let s:highlight.gui = a:style.gui + endif + else + let s:highlight = a:style + let s:group_colors[a:group] = s:highlight " Cache default highlight group settings + endif + + if g:genos_terminal_italics == 0 + if has_key(s:highlight, "cterm") && s:highlight["cterm"] == "italic" + unlet s:highlight.cterm + endif + if has_key(s:highlight, "gui") && s:highlight["gui"] == "italic" + unlet s:highlight.gui + endif + endif + + if g:genos_termcolors == 16 + let l:ctermfg = (has_key(s:highlight, "fg") ? s:highlight.fg.cterm16 : "NONE") + let l:ctermbg = (has_key(s:highlight, "bg") ? s:highlight.bg.cterm16 : "NONE") + else + let l:ctermfg = (has_key(s:highlight, "fg") ? s:highlight.fg.cterm : "NONE") + let l:ctermbg = (has_key(s:highlight, "bg") ? s:highlight.bg.cterm : "NONE") + endif + + execute "highlight" a:group + \ "guifg=" (has_key(s:highlight, "fg") ? s:highlight.fg.gui : "NONE") + \ "guibg=" (has_key(s:highlight, "bg") ? s:highlight.bg.gui : "NONE") + \ "guisp=" (has_key(s:highlight, "sp") ? s:highlight.sp.gui : "NONE") + \ "gui=" (has_key(s:highlight, "gui") ? s:highlight.gui : "NONE") + \ "ctermfg=" . l:ctermfg + \ "ctermbg=" . l:ctermbg + \ "cterm=" (has_key(s:highlight, "cterm") ? s:highlight.cterm : "NONE") +endfunction + +let s:colors = genos#GetColors() " Autoloaded from the specific color theme + +" Global colors +call s:h("Comment", { "fg": s:colors.comments, "gui": "italic", "cterm": "italic" }) +call s:h("String", {"fg": s:colors.stringColor}) +call s:h("Constant", {"fg": s:colors.constantColor}) +call s:h("Identifier", {"fg": s:colors.foregroundColorEditor}) +call s:h("Function", {"fg": s:colors.classNameColor}) +call s:h("Underlined", {"fg": s:colors.keyColor}) +call s:h("Type", {"fg": s:colors.keyColor}) +call s:h("PreProc", {"fg": s:colors.keyColor}) +call s:h("StorageClass", {"fg": s:colors.keywordColor}) +call s:h("Keyword", {"fg": s:colors.keywordColor}) +call s:h("Statement", {"fg": s:colors.keywordColor}) +call s:h("SpecialChar", {"fg": s:colors.keyColor}) +call s:h("SpecialComment", {"fg": s:colors.keyColor}) +call s:h("Special", {"fg": s:colors.keyColor}) +call s:h("Operator", {"fg": s:colors.htmlTagColor}) +call s:h("foldBraces", {"fg": s:colors.foregroundColorEditor}) +call s:h("Error", {"fg": s:colors.errorColor, "gui": "underline", "cterm":"underline"}) + +" VIM Stuff +call s:h("Cursor", {"bg": s:colors.accentColor}) +call s:h("ColorColumn", {"bg": s:colors.caretRow}) +call s:h("CursorColumn", {"bg": s:colors.caretRow}) +call s:h("CursorLine", {"bg": s:colors.caretRow}) +call s:h("DiffAdd", {"bg": s:colors.diffInserted}) +call s:h("DiffChange", {"bg": s:colors.diffModified}) +call s:h("DiffDelete", {"bg": s:colors.diffDeleted}) +call s:h("DiffText", {"bg": s:colors.diffModified}) +call s:h("LineNr", {"fg": s:colors.lineNumberColor}) +call s:h("Pmenu", {"fg": s:colors.foregroundColorEditor}) +call s:h("Normal", {"fg": s:colors.foregroundColorEditor}) +call s:h("NonText", {"fg": s:colors.comments}) +call s:h("ModeMsg", {"fg": s:colors.infoForeground}) +call s:h("PmenuSbar", {"bg": s:colors.lightEditorColor}) +call s:h("PmenuThumb", {"bg": s:colors.accentColor}) +call s:h("ErrorMsg", {"bg": s:colors.errorColor}) +call s:h("VertSplit", {"fg": s:colors.lineNumberColor, "bg": s:colors.lightEditorColor}) +call s:h("StatusLine", {"fg": s:colors.foregroundColorEditor, "bg": s:colors.lightEditorColor}) +call s:h("StatusLineNc", {"fg": s:colors.lineNumberColor, "bg": s:colors.lightEditorColor}) +call s:h("Search", {"fg": s:colors.searchForeground, "bg": s:colors.searchBackground}) +call s:h("IncSearch", {"fg": s:colors.searchForeground, "bg": s:colors.searchBackground}) +call s:h("MatchParen", {"fg": s:colors.searchForeground, "bg": s:colors.searchBackground}) +call s:h("Visual", {"fg": s:colors.selectionForeground, "bg": s:colors.selectionBackground}) +call s:h("PmenuSel", {"fg": s:colors.selectionForeground, "bg": s:colors.selectionBackground}) +call s:h("Folded", {"fg": s:colors.comments, "bg": s:colors.foldedTextBackground}) + +" Git +call s:h("gitcommitHeader", { "fg": s:colors.classNameColor}) + +" Shell +call s:h("shQuote", { "fg": s:colors.stringColor}) +call s:h("shSingleQuote", { "fg": s:colors.stringColor}) +call s:h("shHereDoc", { "fg": s:colors.stringColor, "bg": s:colors.codeBlock}) +call s:h("shDoubleQuote", { "fg": s:colors.stringColor}) + +" XML +call s:h("xmlAttrib", { "fg": s:colors.editorAccentColor}) +call s:h("xmlDoctype", { "fg": s:colors.editorAccentColor}) +call s:h("xmlDocTypeKeyword", { "fg": s:colors.htmlTagColor}) +call s:h("xmlDocTypeDecl", { "fg": s:colors.htmlTagColor}) +call s:h("xmlTag", { "fg": s:colors.foregroundColorEditor}) +call s:h("xmlTagName", { "fg": s:colors.htmlTagColor}) +call s:h("xmlEntity", { "fg": s:colors.constantColor}) +call s:h("xmlEntityPunct", { "fg": s:colors.constantColor}) +call s:h("xmlCdata", { "fg": s:colors.stringColor}) +call s:h("xmlString", { "fg": s:colors.stringColor}) +call s:h("xmlCdataStart", { "fg": s:colors.keywordColor}) +call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor}) +call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor}) + +" Vim Script +call s:h("vimOption", { "fg": s:colors.keyColor}) +call s:h("vimFuncName", { "fg": s:colors.editorAccentColor}) +call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor}) +call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor}) +call s:h("vimCommand", { "fg": s:colors.keywordColor}) +call s:h("vimLet", { "fg": s:colors.keywordColor}) +call s:h("vimNotFunc", { "fg": s:colors.keywordColor}) +call s:h("vimIsCommand", { "fg": s:colors.classNameColor}) + +" HTML +call s:h("htmlTagName", { "fg": s:colors.htmlTagColor}) +call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor}) +call s:h("htmlEndTag", { "fg": s:colors.foregroundColorEditor}) +call s:h("htmlHead", { "fg": s:colors.htmlTagColor}) +call s:h("htmlSpecialTagName", { "fg": s:colors.htmlTagColor}) +call s:h("htmlArg", { "fg": s:colors.editorAccentColor, "gui": "italic", "cterm": "italic"}) +call s:h("htmlTagN", { "fg": s:colors.htmlTagColor}) +call s:h("htmlScriptTag", { "fg": s:colors.foregroundColorEditor}) +call s:h("htmlTag", { "fg": s:colors.foregroundColorEditor}) +call s:h("htmlTitle", { "fg": s:colors.stringColor}) +call s:h("htmlH1", { "fg": s:colors.stringColor }) +call s:h("htmlH2", { "fg": s:colors.stringColor }) +call s:h("htmlH3", { "fg": s:colors.stringColor }) +call s:h("htmlH4", { "fg": s:colors.stringColor }) +call s:h("htmlH5", { "fg": s:colors.stringColor }) +call s:h("htmlH6", { "fg": s:colors.stringColor }) +call s:h("htmlLink", { "fg": s:colors.keyColor }) +call s:h("htmlSpecialChar", { "fg": s:colors.keywordColor}) + +" Markdown +call s:h("markdownH1", { "fg": s:colors.classNameColor}) +call s:h("markdownH2", { "fg": s:colors.classNameColor}) +call s:h("markdownH3", { "fg": s:colors.classNameColor}) +call s:h("markdownH4", { "fg": s:colors.classNameColor}) +call s:h("markdownH5", { "fg": s:colors.classNameColor}) +call s:h("markdownH6", { "fg": s:colors.classNameColor}) +call s:h("markdownH7", { "fg": s:colors.classNameColor}) +call s:h("markdownHeadingRule", { "fg": s:colors.classNameColor}) +call s:h("markdownBoldDelimiter", { "fg": s:colors.keywordColor}) +call s:h("markdownItalicDelimiter", { "fg": s:colors.keywordColor}) +call s:h("markdownAutomaticLink", { "fg": s:colors.keyColor}) +call s:h("markdownUrl", { "fg": s:colors.keyColor}) +call s:h("markdownUrlDelimiter", { "fg": s:colors.keyColor}) +call s:h("markdownLinkDelimiter", { "fg": s:colors.keyColor}) +call s:h("markdownLinkTextDelimiter", { "fg": s:colors.editorAccentColor}) +call s:h("markdownLinkText", { "fg": s:colors.editorAccentColor}) +call s:h("markdownId", { "fg": s:colors.keyColor}) +call s:h("markdownUrlTitle", { "fg": s:colors.comments}) +call s:h("markdownCode", { "fg": s:colors.comments}) +call s:h("markdownCodeBlock", { "fg": s:colors.comments}) +call s:h("markdownBlockQuote", { "fg": s:colors.keywordColor}) +call s:h("markdownUrlTitleDelimiter", { "fg": s:colors.comments}) + +" Javascript +call s:h("jsFuncCall", { "fg": s:colors.editorAccentColor}) +call s:h("jsDecoratorFunction", { "fg": s:colors.editorAccentColor}) +call s:h("jsDecorator", { "fg": s:colors.editorAccentColor}) +call s:h("jsRegexpString", { "fg": s:colors.editorAccentColor}) +call s:h("jsStorageClass", { "fg": s:colors.keywordColor}) +call s:h("jsThis", { "fg": s:colors.keywordColor}) +call s:h("jsOperatorKeyword", { "fg": s:colors.keywordColor}) +call s:h("jsVariableDef", { "fg": s:colors.foregroundColorEditor}) +call s:h("jsFuncBlock", { "fg": s:colors.foregroundColorEditor}) +call s:h("jsParens", { "fg": s:colors.foregroundColorEditor}) +call s:h("jsBrackets", { "fg": s:colors.foregroundColorEditor}) +call s:h("jsGlobalObjects", { "fg": s:colors.constantColor}) +call s:h("jsArrowFunction", { "fg": s:colors.htmlTagColor}) +call s:h("jsFunctionArgs", { "fg": s:colors.stringColor}) +call s:h("jsFuncArgs", { "fg": s:colors.stringColor}) +call s:h("jsObjectProp", { "fg": s:colors.foregroundColorEditor, "gui": "bold", "cterm": "bold"}) +call s:h("jsObjectKey", { "fg": s:colors.foregroundColorEditor, "gui": "bold", "cterm": "bold"}) + +" JSON +call s:h("jsObjectKey", { "fg": s:colors.foregroundColorEditor, "gui": "bold", "cterm": "bold"}) +call s:h("jsonKeyword", { "fg": s:colors.foregroundColorEditor}) +call s:h("jsonQuote", { "fg": s:colors.foregroundColorEditor}) +call s:h("jsonBraces", { "fg": s:colors.foregroundColorEditor}) +call s:h("jsonNull", { "fg": s:colors.keywordColor}) +call s:h("jsonBoolean", { "fg": s:colors.keywordColor}) +call s:h("jsonStringMatch", { "fg": s:colors.stringColor}) + +" Typescript +call s:h("typescriptBraces", { "fg": s:colors.foregroundColorEditor}) +call s:h("typescriptEndColons", { "fg": s:colors.foregroundColorEditor}) +call s:h("typescriptParens", { "fg": s:colors.foregroundColorEditor}) +call s:h("typescriptDecorators", { "fg": s:colors.editorAccentColor}) +call s:h("typescriptGlobalObjects", { "fg": s:colors.classNameColor}) +call s:h("typescriptDocTags", { "fg": s:colors.keyColor}) +call s:h("typescriptDocParam", { "fg": s:colors.stringColor}) +call s:h("typescriptIdentifier", { "fg": s:colors.keywordColor}) + +" Java +call s:h("javaExternal", { "fg": s:colors.keywordColor}) +call s:h("javaAnnotation", { "fg": s:colors.editorAccentColor}) +call s:h("javaParen", { "fg": s:colors.foregroundColorEditor}) +call s:h("javaDocTags", { "fg": s:colors.keyColor}) +call s:h("javaDocParam", { "fg": s:colors.stringColor}) + +" Kotlin +call s:h("ktInclude", { "fg": s:colors.keywordColor}) +call s:h("ktDocTagParam", { "fg": s:colors.stringColor}) +call s:h("ktAnnotation", { "fg": s:colors.editorAccentColor}) +call s:h("ktExclExcl", { "fg": s:colors.htmlTagColor}) +call s:h("ktArrow", { "fg": s:colors.foregroundColorEditor}) + +" CSS +call s:h("cssBraces", { "fg": s:colors.foregroundColorEditor}) +call s:h("cssTagName", { "fg": s:colors.editorAccentColor}) +call s:h("cssFunctionName", { "fg": s:colors.classNameColor}) +call s:h("cssFunction", { "fg": s:colors.editorAccentColor}) +call s:h("cssClassName", { "fg": s:colors.classNameColor}) +call s:h("cssAttributeSelector", { "fg": s:colors.classNameColor}) +call s:h("cssAtKeyword", { "fg": s:colors.keywordColor}) +call s:h("cssProp", { "fg": s:colors.keyColor}) +call s:h("cssPseudoClassId", { "fg": s:colors.stringColor}) + +" Neovim-Specific Highlighting + +if has("nvim") + " Neovim terminal colors + "let g:terminal_color_0 = s:black.gui + let g:terminal_color_1 = s:colors.terminalAnsiMagenta.gui + let g:terminal_color_2 = s:colors.terminalAnsiGreen.gui + let g:terminal_color_3 = s:colors.terminalAnsiYellow.gui + let g:terminal_color_4 = s:colors.terminalAnsiGreen.gui + let g:terminal_color_5 = s:colors.terminalAnsiBlue.gui + let g:terminal_color_6 = s:colors.terminalAnsiCyan.gui + "let g:terminal_color_7 = s:white.gui + " let g:terminal_color_8 = s:visual_grey.gui + " let g:terminal_color_9 = s:dark_red.gui + let g:terminal_color_10 = s:colors.terminalAnsiGreen.gui " No dark version + let g:terminal_color_11 = s:colors.terminalAnsiYellow.gui + let g:terminal_color_12 = s:colors.terminalAnsiBlue.gui " No dark version + let g:terminal_color_13 = s:colors.terminalAnsiBlue.gui " No dark version + let g:terminal_color_14 = s:colors.terminalAnsiCyan.gui " No dark version + let g:terminal_color_15 = s:colors.comments.gui + let g:terminal_color_background = s:colors.textEditorBackground.gui + let g:terminal_color_foreground = s:colors.foregroundColorEditor.gui + " }}} + + " Neovim Diagnostics + call s:h("DiagnosticError", { "fg": s:colors.errorColor }) + call s:h("DiagnosticWarn", { "fg": s:colors.terminalAnsiYellow }) + call s:h("DiagnosticInfo", { "fg": s:colors.infoForeground }) + call s:h("DiagnosticHint", { "fg": s:colors.terminalAnsiCyan }) + call s:h("DiagnosticUnderlineError", { "fg": s:colors.errorColor, "gui": "underline", "cterm": "underline" }) + call s:h("DiagnosticUnderlineWarn", { "fg": s:colors.terminalAnsiYellow, "gui": "underline", "cterm": "underline" }) + call s:h("DiagnosticUnderlineInfo", { "fg": s:colors.terminalAnsiBlue, "gui": "underline", "cterm": "underline" }) + call s:h("DiagnosticUnderlineHint", { "fg": s:colors.terminalAnsiCyan, "gui": "underline", "cterm": "underline" }) + " }}} + + " Neovim LSP (for versions < 0.5.1) + hi link LspDiagnosticsDefaultError DiagnosticError + hi link LspDiagnosticsDefaultWarning DiagnosticWarn + hi link LspDiagnosticsDefaultInformation DiagnosticInfo + hi link LspDiagnosticsDefaultHint DiagnosticHint + hi link LspDiagnosticsUnderlineError DiagnosticUnderlineError + hi link LspDiagnosticsUnderlineWarning DiagnosticUnderlineWarn + hi link LspDiagnosticsUnderlineInformation DiagnosticUnderlineInfo + hi link LspDiagnosticsUnderlineHint DiagnosticUnderlineHint + " }}} +endif diff --git a/colors/hinata_shoyo.vim b/colors/hinata_shoyo.vim new file mode 100644 index 0000000..8efb1c5 --- /dev/null +++ b/colors/hinata_shoyo.vim @@ -0,0 +1,311 @@ +if v:version > 580 + highlight clear + if exists('syntax_on') + syntax reset + endif +endif + +let g:colors_name = 'hinata_shoyo' + +set t_Co=256 + +" Set to "256" for 256-color terminals, or +" set to "16" to use your terminal emulator's native colors +" (a 16-color palette for this color scheme is available; see +" < https://github.com/joshdick/ +" for more information.) +if !exists("g:hinata_shoyo_termcolors") + let g:hinata_shoyo_termcolors = 256 +endif + +" Not all terminals support italics properly. If yours does, opt-in. +if !exists("g:hinata_shoyo_terminal_italics") + let g:hinata_shoyo_terminal_italics = 0 +endif + +if !(has('termguicolors') && &termguicolors) && !has('gui_running') && &t_Co != 256 + finish +endif + +" This function is based on one from FlatColor: https://github.com/MaxSt/FlatColor/ +" Which in turn was based on one found in hemisu: https://github.com/noahfrederick/vim-hemisu/ +let s:group_colors = {} " Cache of default highlight group settings, for later reference via ` +function! s:h(group, style, ...) + if (a:0 > 0) " Will be true if we got here from + let s:highlight = s:group_colors[a:group] + for style_type in ["fg", "bg", "sp"] + if (has_key(a:style, style_type)) + let l:default_style = (has_key(s:highlight, style_type) ? copy(s:highlight[style_type]) : { "cterm16": "NONE", "cterm": "NONE", "gui": "NONE" }) + let s:highlight[style_type] = extend(l:default_style, a:style[style_type]) + endif + endfor + if (has_key(a:style, "gui")) + let s:highlight.gui = a:style.gui + endif + else + let s:highlight = a:style + let s:group_colors[a:group] = s:highlight " Cache default highlight group settings + endif + + if g:hinata_shoyo_terminal_italics == 0 + if has_key(s:highlight, "cterm") && s:highlight["cterm"] == "italic" + unlet s:highlight.cterm + endif + if has_key(s:highlight, "gui") && s:highlight["gui"] == "italic" + unlet s:highlight.gui + endif + endif + + if g:hinata_shoyo_termcolors == 16 + let l:ctermfg = (has_key(s:highlight, "fg") ? s:highlight.fg.cterm16 : "NONE") + let l:ctermbg = (has_key(s:highlight, "bg") ? s:highlight.bg.cterm16 : "NONE") + else + let l:ctermfg = (has_key(s:highlight, "fg") ? s:highlight.fg.cterm : "NONE") + let l:ctermbg = (has_key(s:highlight, "bg") ? s:highlight.bg.cterm : "NONE") + endif + + execute "highlight" a:group + \ "guifg=" (has_key(s:highlight, "fg") ? s:highlight.fg.gui : "NONE") + \ "guibg=" (has_key(s:highlight, "bg") ? s:highlight.bg.gui : "NONE") + \ "guisp=" (has_key(s:highlight, "sp") ? s:highlight.sp.gui : "NONE") + \ "gui=" (has_key(s:highlight, "gui") ? s:highlight.gui : "NONE") + \ "ctermfg=" . l:ctermfg + \ "ctermbg=" . l:ctermbg + \ "cterm=" (has_key(s:highlight, "cterm") ? s:highlight.cterm : "NONE") +endfunction + +let s:colors = hinata_shoyo#GetColors() " Autoloaded from the specific color theme + +" Global colors +call s:h("Comment", { "fg": s:colors.comments, "gui": "italic", "cterm": "italic" }) +call s:h("String", {"fg": s:colors.stringColor}) +call s:h("Constant", {"fg": s:colors.constantColor}) +call s:h("Identifier", {"fg": s:colors.foregroundColorEditor}) +call s:h("Function", {"fg": s:colors.classNameColor}) +call s:h("Underlined", {"fg": s:colors.keyColor}) +call s:h("Type", {"fg": s:colors.keyColor}) +call s:h("PreProc", {"fg": s:colors.keyColor}) +call s:h("StorageClass", {"fg": s:colors.keywordColor}) +call s:h("Keyword", {"fg": s:colors.keywordColor}) +call s:h("Statement", {"fg": s:colors.keywordColor}) +call s:h("SpecialChar", {"fg": s:colors.keyColor}) +call s:h("SpecialComment", {"fg": s:colors.keyColor}) +call s:h("Special", {"fg": s:colors.keyColor}) +call s:h("Operator", {"fg": s:colors.htmlTagColor}) +call s:h("foldBraces", {"fg": s:colors.foregroundColorEditor}) +call s:h("Error", {"fg": s:colors.errorColor, "gui": "underline", "cterm":"underline"}) + +" VIM Stuff +call s:h("Cursor", {"bg": s:colors.accentColor}) +call s:h("ColorColumn", {"bg": s:colors.caretRow}) +call s:h("CursorColumn", {"bg": s:colors.caretRow}) +call s:h("CursorLine", {"bg": s:colors.caretRow}) +call s:h("DiffAdd", {"bg": s:colors.diffInserted}) +call s:h("DiffChange", {"bg": s:colors.diffModified}) +call s:h("DiffDelete", {"bg": s:colors.diffDeleted}) +call s:h("DiffText", {"bg": s:colors.diffModified}) +call s:h("LineNr", {"fg": s:colors.lineNumberColor}) +call s:h("Pmenu", {"fg": s:colors.foregroundColorEditor}) +call s:h("Normal", {"fg": s:colors.foregroundColorEditor}) +call s:h("NonText", {"fg": s:colors.comments}) +call s:h("ModeMsg", {"fg": s:colors.infoForeground}) +call s:h("PmenuSbar", {"bg": s:colors.lightEditorColor}) +call s:h("PmenuThumb", {"bg": s:colors.accentColor}) +call s:h("ErrorMsg", {"bg": s:colors.errorColor}) +call s:h("VertSplit", {"fg": s:colors.lineNumberColor, "bg": s:colors.lightEditorColor}) +call s:h("StatusLine", {"fg": s:colors.foregroundColorEditor, "bg": s:colors.lightEditorColor}) +call s:h("StatusLineNc", {"fg": s:colors.lineNumberColor, "bg": s:colors.lightEditorColor}) +call s:h("Search", {"fg": s:colors.searchForeground, "bg": s:colors.searchBackground}) +call s:h("IncSearch", {"fg": s:colors.searchForeground, "bg": s:colors.searchBackground}) +call s:h("MatchParen", {"fg": s:colors.searchForeground, "bg": s:colors.searchBackground}) +call s:h("Visual", {"fg": s:colors.selectionForeground, "bg": s:colors.selectionBackground}) +call s:h("PmenuSel", {"fg": s:colors.selectionForeground, "bg": s:colors.selectionBackground}) +call s:h("Folded", {"fg": s:colors.comments, "bg": s:colors.foldedTextBackground}) + +" Git +call s:h("gitcommitHeader", { "fg": s:colors.classNameColor}) + +" Shell +call s:h("shQuote", { "fg": s:colors.stringColor}) +call s:h("shSingleQuote", { "fg": s:colors.stringColor}) +call s:h("shHereDoc", { "fg": s:colors.stringColor, "bg": s:colors.codeBlock}) +call s:h("shDoubleQuote", { "fg": s:colors.stringColor}) + +" XML +call s:h("xmlAttrib", { "fg": s:colors.editorAccentColor}) +call s:h("xmlDoctype", { "fg": s:colors.editorAccentColor}) +call s:h("xmlDocTypeKeyword", { "fg": s:colors.htmlTagColor}) +call s:h("xmlDocTypeDecl", { "fg": s:colors.htmlTagColor}) +call s:h("xmlTag", { "fg": s:colors.foregroundColorEditor}) +call s:h("xmlTagName", { "fg": s:colors.htmlTagColor}) +call s:h("xmlEntity", { "fg": s:colors.constantColor}) +call s:h("xmlEntityPunct", { "fg": s:colors.constantColor}) +call s:h("xmlCdata", { "fg": s:colors.stringColor}) +call s:h("xmlString", { "fg": s:colors.stringColor}) +call s:h("xmlCdataStart", { "fg": s:colors.keywordColor}) +call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor}) +call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor}) + +" Vim Script +call s:h("vimOption", { "fg": s:colors.keyColor}) +call s:h("vimFuncName", { "fg": s:colors.editorAccentColor}) +call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor}) +call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor}) +call s:h("vimCommand", { "fg": s:colors.keywordColor}) +call s:h("vimLet", { "fg": s:colors.keywordColor}) +call s:h("vimNotFunc", { "fg": s:colors.keywordColor}) +call s:h("vimIsCommand", { "fg": s:colors.classNameColor}) + +" HTML +call s:h("htmlTagName", { "fg": s:colors.htmlTagColor}) +call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor}) +call s:h("htmlEndTag", { "fg": s:colors.foregroundColorEditor}) +call s:h("htmlHead", { "fg": s:colors.htmlTagColor}) +call s:h("htmlSpecialTagName", { "fg": s:colors.htmlTagColor}) +call s:h("htmlArg", { "fg": s:colors.editorAccentColor, "gui": "italic", "cterm": "italic"}) +call s:h("htmlTagN", { "fg": s:colors.htmlTagColor}) +call s:h("htmlScriptTag", { "fg": s:colors.foregroundColorEditor}) +call s:h("htmlTag", { "fg": s:colors.foregroundColorEditor}) +call s:h("htmlTitle", { "fg": s:colors.stringColor}) +call s:h("htmlH1", { "fg": s:colors.stringColor }) +call s:h("htmlH2", { "fg": s:colors.stringColor }) +call s:h("htmlH3", { "fg": s:colors.stringColor }) +call s:h("htmlH4", { "fg": s:colors.stringColor }) +call s:h("htmlH5", { "fg": s:colors.stringColor }) +call s:h("htmlH6", { "fg": s:colors.stringColor }) +call s:h("htmlLink", { "fg": s:colors.keyColor }) +call s:h("htmlSpecialChar", { "fg": s:colors.keywordColor}) + +" Markdown +call s:h("markdownH1", { "fg": s:colors.classNameColor}) +call s:h("markdownH2", { "fg": s:colors.classNameColor}) +call s:h("markdownH3", { "fg": s:colors.classNameColor}) +call s:h("markdownH4", { "fg": s:colors.classNameColor}) +call s:h("markdownH5", { "fg": s:colors.classNameColor}) +call s:h("markdownH6", { "fg": s:colors.classNameColor}) +call s:h("markdownH7", { "fg": s:colors.classNameColor}) +call s:h("markdownHeadingRule", { "fg": s:colors.classNameColor}) +call s:h("markdownBoldDelimiter", { "fg": s:colors.keywordColor}) +call s:h("markdownItalicDelimiter", { "fg": s:colors.keywordColor}) +call s:h("markdownAutomaticLink", { "fg": s:colors.keyColor}) +call s:h("markdownUrl", { "fg": s:colors.keyColor}) +call s:h("markdownUrlDelimiter", { "fg": s:colors.keyColor}) +call s:h("markdownLinkDelimiter", { "fg": s:colors.keyColor}) +call s:h("markdownLinkTextDelimiter", { "fg": s:colors.editorAccentColor}) +call s:h("markdownLinkText", { "fg": s:colors.editorAccentColor}) +call s:h("markdownId", { "fg": s:colors.keyColor}) +call s:h("markdownUrlTitle", { "fg": s:colors.comments}) +call s:h("markdownCode", { "fg": s:colors.comments}) +call s:h("markdownCodeBlock", { "fg": s:colors.comments}) +call s:h("markdownBlockQuote", { "fg": s:colors.keywordColor}) +call s:h("markdownUrlTitleDelimiter", { "fg": s:colors.comments}) + +" Javascript +call s:h("jsFuncCall", { "fg": s:colors.editorAccentColor}) +call s:h("jsDecoratorFunction", { "fg": s:colors.editorAccentColor}) +call s:h("jsDecorator", { "fg": s:colors.editorAccentColor}) +call s:h("jsRegexpString", { "fg": s:colors.editorAccentColor}) +call s:h("jsStorageClass", { "fg": s:colors.keywordColor}) +call s:h("jsThis", { "fg": s:colors.keywordColor}) +call s:h("jsOperatorKeyword", { "fg": s:colors.keywordColor}) +call s:h("jsVariableDef", { "fg": s:colors.foregroundColorEditor}) +call s:h("jsFuncBlock", { "fg": s:colors.foregroundColorEditor}) +call s:h("jsParens", { "fg": s:colors.foregroundColorEditor}) +call s:h("jsBrackets", { "fg": s:colors.foregroundColorEditor}) +call s:h("jsGlobalObjects", { "fg": s:colors.constantColor}) +call s:h("jsArrowFunction", { "fg": s:colors.htmlTagColor}) +call s:h("jsFunctionArgs", { "fg": s:colors.stringColor}) +call s:h("jsFuncArgs", { "fg": s:colors.stringColor}) +call s:h("jsObjectProp", { "fg": s:colors.foregroundColorEditor, "gui": "bold", "cterm": "bold"}) +call s:h("jsObjectKey", { "fg": s:colors.foregroundColorEditor, "gui": "bold", "cterm": "bold"}) + +" JSON +call s:h("jsObjectKey", { "fg": s:colors.foregroundColorEditor, "gui": "bold", "cterm": "bold"}) +call s:h("jsonKeyword", { "fg": s:colors.foregroundColorEditor}) +call s:h("jsonQuote", { "fg": s:colors.foregroundColorEditor}) +call s:h("jsonBraces", { "fg": s:colors.foregroundColorEditor}) +call s:h("jsonNull", { "fg": s:colors.keywordColor}) +call s:h("jsonBoolean", { "fg": s:colors.keywordColor}) +call s:h("jsonStringMatch", { "fg": s:colors.stringColor}) + +" Typescript +call s:h("typescriptBraces", { "fg": s:colors.foregroundColorEditor}) +call s:h("typescriptEndColons", { "fg": s:colors.foregroundColorEditor}) +call s:h("typescriptParens", { "fg": s:colors.foregroundColorEditor}) +call s:h("typescriptDecorators", { "fg": s:colors.editorAccentColor}) +call s:h("typescriptGlobalObjects", { "fg": s:colors.classNameColor}) +call s:h("typescriptDocTags", { "fg": s:colors.keyColor}) +call s:h("typescriptDocParam", { "fg": s:colors.stringColor}) +call s:h("typescriptIdentifier", { "fg": s:colors.keywordColor}) + +" Java +call s:h("javaExternal", { "fg": s:colors.keywordColor}) +call s:h("javaAnnotation", { "fg": s:colors.editorAccentColor}) +call s:h("javaParen", { "fg": s:colors.foregroundColorEditor}) +call s:h("javaDocTags", { "fg": s:colors.keyColor}) +call s:h("javaDocParam", { "fg": s:colors.stringColor}) + +" Kotlin +call s:h("ktInclude", { "fg": s:colors.keywordColor}) +call s:h("ktDocTagParam", { "fg": s:colors.stringColor}) +call s:h("ktAnnotation", { "fg": s:colors.editorAccentColor}) +call s:h("ktExclExcl", { "fg": s:colors.htmlTagColor}) +call s:h("ktArrow", { "fg": s:colors.foregroundColorEditor}) + +" CSS +call s:h("cssBraces", { "fg": s:colors.foregroundColorEditor}) +call s:h("cssTagName", { "fg": s:colors.editorAccentColor}) +call s:h("cssFunctionName", { "fg": s:colors.classNameColor}) +call s:h("cssFunction", { "fg": s:colors.editorAccentColor}) +call s:h("cssClassName", { "fg": s:colors.classNameColor}) +call s:h("cssAttributeSelector", { "fg": s:colors.classNameColor}) +call s:h("cssAtKeyword", { "fg": s:colors.keywordColor}) +call s:h("cssProp", { "fg": s:colors.keyColor}) +call s:h("cssPseudoClassId", { "fg": s:colors.stringColor}) + +" Neovim-Specific Highlighting + +if has("nvim") + " Neovim terminal colors + "let g:terminal_color_0 = s:black.gui + let g:terminal_color_1 = s:colors.terminalAnsiMagenta.gui + let g:terminal_color_2 = s:colors.terminalAnsiGreen.gui + let g:terminal_color_3 = s:colors.terminalAnsiYellow.gui + let g:terminal_color_4 = s:colors.terminalAnsiGreen.gui + let g:terminal_color_5 = s:colors.terminalAnsiBlue.gui + let g:terminal_color_6 = s:colors.terminalAnsiCyan.gui + "let g:terminal_color_7 = s:white.gui + " let g:terminal_color_8 = s:visual_grey.gui + " let g:terminal_color_9 = s:dark_red.gui + let g:terminal_color_10 = s:colors.terminalAnsiGreen.gui " No dark version + let g:terminal_color_11 = s:colors.terminalAnsiYellow.gui + let g:terminal_color_12 = s:colors.terminalAnsiBlue.gui " No dark version + let g:terminal_color_13 = s:colors.terminalAnsiBlue.gui " No dark version + let g:terminal_color_14 = s:colors.terminalAnsiCyan.gui " No dark version + let g:terminal_color_15 = s:colors.comments.gui + let g:terminal_color_background = s:colors.textEditorBackground.gui + let g:terminal_color_foreground = s:colors.foregroundColorEditor.gui + " }}} + + " Neovim Diagnostics + call s:h("DiagnosticError", { "fg": s:colors.errorColor }) + call s:h("DiagnosticWarn", { "fg": s:colors.terminalAnsiYellow }) + call s:h("DiagnosticInfo", { "fg": s:colors.infoForeground }) + call s:h("DiagnosticHint", { "fg": s:colors.terminalAnsiCyan }) + call s:h("DiagnosticUnderlineError", { "fg": s:colors.errorColor, "gui": "underline", "cterm": "underline" }) + call s:h("DiagnosticUnderlineWarn", { "fg": s:colors.terminalAnsiYellow, "gui": "underline", "cterm": "underline" }) + call s:h("DiagnosticUnderlineInfo", { "fg": s:colors.terminalAnsiBlue, "gui": "underline", "cterm": "underline" }) + call s:h("DiagnosticUnderlineHint", { "fg": s:colors.terminalAnsiCyan, "gui": "underline", "cterm": "underline" }) + " }}} + + " Neovim LSP (for versions < 0.5.1) + hi link LspDiagnosticsDefaultError DiagnosticError + hi link LspDiagnosticsDefaultWarning DiagnosticWarn + hi link LspDiagnosticsDefaultInformation DiagnosticInfo + hi link LspDiagnosticsDefaultHint DiagnosticHint + hi link LspDiagnosticsUnderlineError DiagnosticUnderlineError + hi link LspDiagnosticsUnderlineWarning DiagnosticUnderlineWarn + hi link LspDiagnosticsUnderlineInformation DiagnosticUnderlineInfo + hi link LspDiagnosticsUnderlineHint DiagnosticUnderlineHint + " }}} +endif diff --git a/colors/rimiru_tempest.vim b/colors/rimiru_tempest.vim new file mode 100644 index 0000000..11ece11 --- /dev/null +++ b/colors/rimiru_tempest.vim @@ -0,0 +1,311 @@ +if v:version > 580 + highlight clear + if exists('syntax_on') + syntax reset + endif +endif + +let g:colors_name = 'rimiru_tempest' + +set t_Co=256 + +" Set to "256" for 256-color terminals, or +" set to "16" to use your terminal emulator's native colors +" (a 16-color palette for this color scheme is available; see +" < https://github.com/joshdick/ +" for more information.) +if !exists("g:rimiru_tempest_termcolors") + let g:rimiru_tempest_termcolors = 256 +endif + +" Not all terminals support italics properly. If yours does, opt-in. +if !exists("g:rimiru_tempest_terminal_italics") + let g:rimiru_tempest_terminal_italics = 0 +endif + +if !(has('termguicolors') && &termguicolors) && !has('gui_running') && &t_Co != 256 + finish +endif + +" This function is based on one from FlatColor: https://github.com/MaxSt/FlatColor/ +" Which in turn was based on one found in hemisu: https://github.com/noahfrederick/vim-hemisu/ +let s:group_colors = {} " Cache of default highlight group settings, for later reference via ` +function! s:h(group, style, ...) + if (a:0 > 0) " Will be true if we got here from + let s:highlight = s:group_colors[a:group] + for style_type in ["fg", "bg", "sp"] + if (has_key(a:style, style_type)) + let l:default_style = (has_key(s:highlight, style_type) ? copy(s:highlight[style_type]) : { "cterm16": "NONE", "cterm": "NONE", "gui": "NONE" }) + let s:highlight[style_type] = extend(l:default_style, a:style[style_type]) + endif + endfor + if (has_key(a:style, "gui")) + let s:highlight.gui = a:style.gui + endif + else + let s:highlight = a:style + let s:group_colors[a:group] = s:highlight " Cache default highlight group settings + endif + + if g:rimiru_tempest_terminal_italics == 0 + if has_key(s:highlight, "cterm") && s:highlight["cterm"] == "italic" + unlet s:highlight.cterm + endif + if has_key(s:highlight, "gui") && s:highlight["gui"] == "italic" + unlet s:highlight.gui + endif + endif + + if g:rimiru_tempest_termcolors == 16 + let l:ctermfg = (has_key(s:highlight, "fg") ? s:highlight.fg.cterm16 : "NONE") + let l:ctermbg = (has_key(s:highlight, "bg") ? s:highlight.bg.cterm16 : "NONE") + else + let l:ctermfg = (has_key(s:highlight, "fg") ? s:highlight.fg.cterm : "NONE") + let l:ctermbg = (has_key(s:highlight, "bg") ? s:highlight.bg.cterm : "NONE") + endif + + execute "highlight" a:group + \ "guifg=" (has_key(s:highlight, "fg") ? s:highlight.fg.gui : "NONE") + \ "guibg=" (has_key(s:highlight, "bg") ? s:highlight.bg.gui : "NONE") + \ "guisp=" (has_key(s:highlight, "sp") ? s:highlight.sp.gui : "NONE") + \ "gui=" (has_key(s:highlight, "gui") ? s:highlight.gui : "NONE") + \ "ctermfg=" . l:ctermfg + \ "ctermbg=" . l:ctermbg + \ "cterm=" (has_key(s:highlight, "cterm") ? s:highlight.cterm : "NONE") +endfunction + +let s:colors = rimiru_tempest#GetColors() " Autoloaded from the specific color theme + +" Global colors +call s:h("Comment", { "fg": s:colors.comments, "gui": "italic", "cterm": "italic" }) +call s:h("String", {"fg": s:colors.stringColor}) +call s:h("Constant", {"fg": s:colors.constantColor}) +call s:h("Identifier", {"fg": s:colors.foregroundColorEditor}) +call s:h("Function", {"fg": s:colors.classNameColor}) +call s:h("Underlined", {"fg": s:colors.keyColor}) +call s:h("Type", {"fg": s:colors.keyColor}) +call s:h("PreProc", {"fg": s:colors.keyColor}) +call s:h("StorageClass", {"fg": s:colors.keywordColor}) +call s:h("Keyword", {"fg": s:colors.keywordColor}) +call s:h("Statement", {"fg": s:colors.keywordColor}) +call s:h("SpecialChar", {"fg": s:colors.keyColor}) +call s:h("SpecialComment", {"fg": s:colors.keyColor}) +call s:h("Special", {"fg": s:colors.keyColor}) +call s:h("Operator", {"fg": s:colors.htmlTagColor}) +call s:h("foldBraces", {"fg": s:colors.foregroundColorEditor}) +call s:h("Error", {"fg": s:colors.errorColor, "gui": "underline", "cterm":"underline"}) + +" VIM Stuff +call s:h("Cursor", {"bg": s:colors.accentColor}) +call s:h("ColorColumn", {"bg": s:colors.caretRow}) +call s:h("CursorColumn", {"bg": s:colors.caretRow}) +call s:h("CursorLine", {"bg": s:colors.caretRow}) +call s:h("DiffAdd", {"bg": s:colors.diffInserted}) +call s:h("DiffChange", {"bg": s:colors.diffModified}) +call s:h("DiffDelete", {"bg": s:colors.diffDeleted}) +call s:h("DiffText", {"bg": s:colors.diffModified}) +call s:h("LineNr", {"fg": s:colors.lineNumberColor}) +call s:h("Pmenu", {"fg": s:colors.foregroundColorEditor}) +call s:h("Normal", {"fg": s:colors.foregroundColorEditor}) +call s:h("NonText", {"fg": s:colors.comments}) +call s:h("ModeMsg", {"fg": s:colors.infoForeground}) +call s:h("PmenuSbar", {"bg": s:colors.lightEditorColor}) +call s:h("PmenuThumb", {"bg": s:colors.accentColor}) +call s:h("ErrorMsg", {"bg": s:colors.errorColor}) +call s:h("VertSplit", {"fg": s:colors.lineNumberColor, "bg": s:colors.lightEditorColor}) +call s:h("StatusLine", {"fg": s:colors.foregroundColorEditor, "bg": s:colors.lightEditorColor}) +call s:h("StatusLineNc", {"fg": s:colors.lineNumberColor, "bg": s:colors.lightEditorColor}) +call s:h("Search", {"fg": s:colors.searchForeground, "bg": s:colors.searchBackground}) +call s:h("IncSearch", {"fg": s:colors.searchForeground, "bg": s:colors.searchBackground}) +call s:h("MatchParen", {"fg": s:colors.searchForeground, "bg": s:colors.searchBackground}) +call s:h("Visual", {"fg": s:colors.selectionForeground, "bg": s:colors.selectionBackground}) +call s:h("PmenuSel", {"fg": s:colors.selectionForeground, "bg": s:colors.selectionBackground}) +call s:h("Folded", {"fg": s:colors.comments, "bg": s:colors.foldedTextBackground}) + +" Git +call s:h("gitcommitHeader", { "fg": s:colors.classNameColor}) + +" Shell +call s:h("shQuote", { "fg": s:colors.stringColor}) +call s:h("shSingleQuote", { "fg": s:colors.stringColor}) +call s:h("shHereDoc", { "fg": s:colors.stringColor, "bg": s:colors.codeBlock}) +call s:h("shDoubleQuote", { "fg": s:colors.stringColor}) + +" XML +call s:h("xmlAttrib", { "fg": s:colors.editorAccentColor}) +call s:h("xmlDoctype", { "fg": s:colors.editorAccentColor}) +call s:h("xmlDocTypeKeyword", { "fg": s:colors.htmlTagColor}) +call s:h("xmlDocTypeDecl", { "fg": s:colors.htmlTagColor}) +call s:h("xmlTag", { "fg": s:colors.foregroundColorEditor}) +call s:h("xmlTagName", { "fg": s:colors.htmlTagColor}) +call s:h("xmlEntity", { "fg": s:colors.constantColor}) +call s:h("xmlEntityPunct", { "fg": s:colors.constantColor}) +call s:h("xmlCdata", { "fg": s:colors.stringColor}) +call s:h("xmlString", { "fg": s:colors.stringColor}) +call s:h("xmlCdataStart", { "fg": s:colors.keywordColor}) +call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor}) +call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor}) + +" Vim Script +call s:h("vimOption", { "fg": s:colors.keyColor}) +call s:h("vimFuncName", { "fg": s:colors.editorAccentColor}) +call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor}) +call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor}) +call s:h("vimCommand", { "fg": s:colors.keywordColor}) +call s:h("vimLet", { "fg": s:colors.keywordColor}) +call s:h("vimNotFunc", { "fg": s:colors.keywordColor}) +call s:h("vimIsCommand", { "fg": s:colors.classNameColor}) + +" HTML +call s:h("htmlTagName", { "fg": s:colors.htmlTagColor}) +call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor}) +call s:h("htmlEndTag", { "fg": s:colors.foregroundColorEditor}) +call s:h("htmlHead", { "fg": s:colors.htmlTagColor}) +call s:h("htmlSpecialTagName", { "fg": s:colors.htmlTagColor}) +call s:h("htmlArg", { "fg": s:colors.editorAccentColor, "gui": "italic", "cterm": "italic"}) +call s:h("htmlTagN", { "fg": s:colors.htmlTagColor}) +call s:h("htmlScriptTag", { "fg": s:colors.foregroundColorEditor}) +call s:h("htmlTag", { "fg": s:colors.foregroundColorEditor}) +call s:h("htmlTitle", { "fg": s:colors.stringColor}) +call s:h("htmlH1", { "fg": s:colors.stringColor }) +call s:h("htmlH2", { "fg": s:colors.stringColor }) +call s:h("htmlH3", { "fg": s:colors.stringColor }) +call s:h("htmlH4", { "fg": s:colors.stringColor }) +call s:h("htmlH5", { "fg": s:colors.stringColor }) +call s:h("htmlH6", { "fg": s:colors.stringColor }) +call s:h("htmlLink", { "fg": s:colors.keyColor }) +call s:h("htmlSpecialChar", { "fg": s:colors.keywordColor}) + +" Markdown +call s:h("markdownH1", { "fg": s:colors.classNameColor}) +call s:h("markdownH2", { "fg": s:colors.classNameColor}) +call s:h("markdownH3", { "fg": s:colors.classNameColor}) +call s:h("markdownH4", { "fg": s:colors.classNameColor}) +call s:h("markdownH5", { "fg": s:colors.classNameColor}) +call s:h("markdownH6", { "fg": s:colors.classNameColor}) +call s:h("markdownH7", { "fg": s:colors.classNameColor}) +call s:h("markdownHeadingRule", { "fg": s:colors.classNameColor}) +call s:h("markdownBoldDelimiter", { "fg": s:colors.keywordColor}) +call s:h("markdownItalicDelimiter", { "fg": s:colors.keywordColor}) +call s:h("markdownAutomaticLink", { "fg": s:colors.keyColor}) +call s:h("markdownUrl", { "fg": s:colors.keyColor}) +call s:h("markdownUrlDelimiter", { "fg": s:colors.keyColor}) +call s:h("markdownLinkDelimiter", { "fg": s:colors.keyColor}) +call s:h("markdownLinkTextDelimiter", { "fg": s:colors.editorAccentColor}) +call s:h("markdownLinkText", { "fg": s:colors.editorAccentColor}) +call s:h("markdownId", { "fg": s:colors.keyColor}) +call s:h("markdownUrlTitle", { "fg": s:colors.comments}) +call s:h("markdownCode", { "fg": s:colors.comments}) +call s:h("markdownCodeBlock", { "fg": s:colors.comments}) +call s:h("markdownBlockQuote", { "fg": s:colors.keywordColor}) +call s:h("markdownUrlTitleDelimiter", { "fg": s:colors.comments}) + +" Javascript +call s:h("jsFuncCall", { "fg": s:colors.editorAccentColor}) +call s:h("jsDecoratorFunction", { "fg": s:colors.editorAccentColor}) +call s:h("jsDecorator", { "fg": s:colors.editorAccentColor}) +call s:h("jsRegexpString", { "fg": s:colors.editorAccentColor}) +call s:h("jsStorageClass", { "fg": s:colors.keywordColor}) +call s:h("jsThis", { "fg": s:colors.keywordColor}) +call s:h("jsOperatorKeyword", { "fg": s:colors.keywordColor}) +call s:h("jsVariableDef", { "fg": s:colors.foregroundColorEditor}) +call s:h("jsFuncBlock", { "fg": s:colors.foregroundColorEditor}) +call s:h("jsParens", { "fg": s:colors.foregroundColorEditor}) +call s:h("jsBrackets", { "fg": s:colors.foregroundColorEditor}) +call s:h("jsGlobalObjects", { "fg": s:colors.constantColor}) +call s:h("jsArrowFunction", { "fg": s:colors.htmlTagColor}) +call s:h("jsFunctionArgs", { "fg": s:colors.stringColor}) +call s:h("jsFuncArgs", { "fg": s:colors.stringColor}) +call s:h("jsObjectProp", { "fg": s:colors.foregroundColorEditor, "gui": "bold", "cterm": "bold"}) +call s:h("jsObjectKey", { "fg": s:colors.foregroundColorEditor, "gui": "bold", "cterm": "bold"}) + +" JSON +call s:h("jsObjectKey", { "fg": s:colors.foregroundColorEditor, "gui": "bold", "cterm": "bold"}) +call s:h("jsonKeyword", { "fg": s:colors.foregroundColorEditor}) +call s:h("jsonQuote", { "fg": s:colors.foregroundColorEditor}) +call s:h("jsonBraces", { "fg": s:colors.foregroundColorEditor}) +call s:h("jsonNull", { "fg": s:colors.keywordColor}) +call s:h("jsonBoolean", { "fg": s:colors.keywordColor}) +call s:h("jsonStringMatch", { "fg": s:colors.stringColor}) + +" Typescript +call s:h("typescriptBraces", { "fg": s:colors.foregroundColorEditor}) +call s:h("typescriptEndColons", { "fg": s:colors.foregroundColorEditor}) +call s:h("typescriptParens", { "fg": s:colors.foregroundColorEditor}) +call s:h("typescriptDecorators", { "fg": s:colors.editorAccentColor}) +call s:h("typescriptGlobalObjects", { "fg": s:colors.classNameColor}) +call s:h("typescriptDocTags", { "fg": s:colors.keyColor}) +call s:h("typescriptDocParam", { "fg": s:colors.stringColor}) +call s:h("typescriptIdentifier", { "fg": s:colors.keywordColor}) + +" Java +call s:h("javaExternal", { "fg": s:colors.keywordColor}) +call s:h("javaAnnotation", { "fg": s:colors.editorAccentColor}) +call s:h("javaParen", { "fg": s:colors.foregroundColorEditor}) +call s:h("javaDocTags", { "fg": s:colors.keyColor}) +call s:h("javaDocParam", { "fg": s:colors.stringColor}) + +" Kotlin +call s:h("ktInclude", { "fg": s:colors.keywordColor}) +call s:h("ktDocTagParam", { "fg": s:colors.stringColor}) +call s:h("ktAnnotation", { "fg": s:colors.editorAccentColor}) +call s:h("ktExclExcl", { "fg": s:colors.htmlTagColor}) +call s:h("ktArrow", { "fg": s:colors.foregroundColorEditor}) + +" CSS +call s:h("cssBraces", { "fg": s:colors.foregroundColorEditor}) +call s:h("cssTagName", { "fg": s:colors.editorAccentColor}) +call s:h("cssFunctionName", { "fg": s:colors.classNameColor}) +call s:h("cssFunction", { "fg": s:colors.editorAccentColor}) +call s:h("cssClassName", { "fg": s:colors.classNameColor}) +call s:h("cssAttributeSelector", { "fg": s:colors.classNameColor}) +call s:h("cssAtKeyword", { "fg": s:colors.keywordColor}) +call s:h("cssProp", { "fg": s:colors.keyColor}) +call s:h("cssPseudoClassId", { "fg": s:colors.stringColor}) + +" Neovim-Specific Highlighting + +if has("nvim") + " Neovim terminal colors + "let g:terminal_color_0 = s:black.gui + let g:terminal_color_1 = s:colors.terminalAnsiMagenta.gui + let g:terminal_color_2 = s:colors.terminalAnsiGreen.gui + let g:terminal_color_3 = s:colors.terminalAnsiYellow.gui + let g:terminal_color_4 = s:colors.terminalAnsiGreen.gui + let g:terminal_color_5 = s:colors.terminalAnsiBlue.gui + let g:terminal_color_6 = s:colors.terminalAnsiCyan.gui + "let g:terminal_color_7 = s:white.gui + " let g:terminal_color_8 = s:visual_grey.gui + " let g:terminal_color_9 = s:dark_red.gui + let g:terminal_color_10 = s:colors.terminalAnsiGreen.gui " No dark version + let g:terminal_color_11 = s:colors.terminalAnsiYellow.gui + let g:terminal_color_12 = s:colors.terminalAnsiBlue.gui " No dark version + let g:terminal_color_13 = s:colors.terminalAnsiBlue.gui " No dark version + let g:terminal_color_14 = s:colors.terminalAnsiCyan.gui " No dark version + let g:terminal_color_15 = s:colors.comments.gui + let g:terminal_color_background = s:colors.textEditorBackground.gui + let g:terminal_color_foreground = s:colors.foregroundColorEditor.gui + " }}} + + " Neovim Diagnostics + call s:h("DiagnosticError", { "fg": s:colors.errorColor }) + call s:h("DiagnosticWarn", { "fg": s:colors.terminalAnsiYellow }) + call s:h("DiagnosticInfo", { "fg": s:colors.infoForeground }) + call s:h("DiagnosticHint", { "fg": s:colors.terminalAnsiCyan }) + call s:h("DiagnosticUnderlineError", { "fg": s:colors.errorColor, "gui": "underline", "cterm": "underline" }) + call s:h("DiagnosticUnderlineWarn", { "fg": s:colors.terminalAnsiYellow, "gui": "underline", "cterm": "underline" }) + call s:h("DiagnosticUnderlineInfo", { "fg": s:colors.terminalAnsiBlue, "gui": "underline", "cterm": "underline" }) + call s:h("DiagnosticUnderlineHint", { "fg": s:colors.terminalAnsiCyan, "gui": "underline", "cterm": "underline" }) + " }}} + + " Neovim LSP (for versions < 0.5.1) + hi link LspDiagnosticsDefaultError DiagnosticError + hi link LspDiagnosticsDefaultWarning DiagnosticWarn + hi link LspDiagnosticsDefaultInformation DiagnosticInfo + hi link LspDiagnosticsDefaultHint DiagnosticHint + hi link LspDiagnosticsUnderlineError DiagnosticUnderlineError + hi link LspDiagnosticsUnderlineWarning DiagnosticUnderlineWarn + hi link LspDiagnosticsUnderlineInformation DiagnosticUnderlineInfo + hi link LspDiagnosticsUnderlineHint DiagnosticUnderlineHint + " }}} +endif diff --git a/colors/yukihira_soma.vim b/colors/yukihira_soma.vim new file mode 100644 index 0000000..a30976c --- /dev/null +++ b/colors/yukihira_soma.vim @@ -0,0 +1,311 @@ +if v:version > 580 + highlight clear + if exists('syntax_on') + syntax reset + endif +endif + +let g:colors_name = 'yukihira_soma' + +set t_Co=256 + +" Set to "256" for 256-color terminals, or +" set to "16" to use your terminal emulator's native colors +" (a 16-color palette for this color scheme is available; see +" < https://github.com/joshdick/ +" for more information.) +if !exists("g:yukihira_soma_termcolors") + let g:yukihira_soma_termcolors = 256 +endif + +" Not all terminals support italics properly. If yours does, opt-in. +if !exists("g:yukihira_soma_terminal_italics") + let g:yukihira_soma_terminal_italics = 0 +endif + +if !(has('termguicolors') && &termguicolors) && !has('gui_running') && &t_Co != 256 + finish +endif + +" This function is based on one from FlatColor: https://github.com/MaxSt/FlatColor/ +" Which in turn was based on one found in hemisu: https://github.com/noahfrederick/vim-hemisu/ +let s:group_colors = {} " Cache of default highlight group settings, for later reference via ` +function! s:h(group, style, ...) + if (a:0 > 0) " Will be true if we got here from + let s:highlight = s:group_colors[a:group] + for style_type in ["fg", "bg", "sp"] + if (has_key(a:style, style_type)) + let l:default_style = (has_key(s:highlight, style_type) ? copy(s:highlight[style_type]) : { "cterm16": "NONE", "cterm": "NONE", "gui": "NONE" }) + let s:highlight[style_type] = extend(l:default_style, a:style[style_type]) + endif + endfor + if (has_key(a:style, "gui")) + let s:highlight.gui = a:style.gui + endif + else + let s:highlight = a:style + let s:group_colors[a:group] = s:highlight " Cache default highlight group settings + endif + + if g:yukihira_soma_terminal_italics == 0 + if has_key(s:highlight, "cterm") && s:highlight["cterm"] == "italic" + unlet s:highlight.cterm + endif + if has_key(s:highlight, "gui") && s:highlight["gui"] == "italic" + unlet s:highlight.gui + endif + endif + + if g:yukihira_soma_termcolors == 16 + let l:ctermfg = (has_key(s:highlight, "fg") ? s:highlight.fg.cterm16 : "NONE") + let l:ctermbg = (has_key(s:highlight, "bg") ? s:highlight.bg.cterm16 : "NONE") + else + let l:ctermfg = (has_key(s:highlight, "fg") ? s:highlight.fg.cterm : "NONE") + let l:ctermbg = (has_key(s:highlight, "bg") ? s:highlight.bg.cterm : "NONE") + endif + + execute "highlight" a:group + \ "guifg=" (has_key(s:highlight, "fg") ? s:highlight.fg.gui : "NONE") + \ "guibg=" (has_key(s:highlight, "bg") ? s:highlight.bg.gui : "NONE") + \ "guisp=" (has_key(s:highlight, "sp") ? s:highlight.sp.gui : "NONE") + \ "gui=" (has_key(s:highlight, "gui") ? s:highlight.gui : "NONE") + \ "ctermfg=" . l:ctermfg + \ "ctermbg=" . l:ctermbg + \ "cterm=" (has_key(s:highlight, "cterm") ? s:highlight.cterm : "NONE") +endfunction + +let s:colors = yukihira_soma#GetColors() " Autoloaded from the specific color theme + +" Global colors +call s:h("Comment", { "fg": s:colors.comments, "gui": "italic", "cterm": "italic" }) +call s:h("String", {"fg": s:colors.stringColor}) +call s:h("Constant", {"fg": s:colors.constantColor}) +call s:h("Identifier", {"fg": s:colors.foregroundColorEditor}) +call s:h("Function", {"fg": s:colors.classNameColor}) +call s:h("Underlined", {"fg": s:colors.keyColor}) +call s:h("Type", {"fg": s:colors.keyColor}) +call s:h("PreProc", {"fg": s:colors.keyColor}) +call s:h("StorageClass", {"fg": s:colors.keywordColor}) +call s:h("Keyword", {"fg": s:colors.keywordColor}) +call s:h("Statement", {"fg": s:colors.keywordColor}) +call s:h("SpecialChar", {"fg": s:colors.keyColor}) +call s:h("SpecialComment", {"fg": s:colors.keyColor}) +call s:h("Special", {"fg": s:colors.keyColor}) +call s:h("Operator", {"fg": s:colors.htmlTagColor}) +call s:h("foldBraces", {"fg": s:colors.foregroundColorEditor}) +call s:h("Error", {"fg": s:colors.errorColor, "gui": "underline", "cterm":"underline"}) + +" VIM Stuff +call s:h("Cursor", {"bg": s:colors.accentColor}) +call s:h("ColorColumn", {"bg": s:colors.caretRow}) +call s:h("CursorColumn", {"bg": s:colors.caretRow}) +call s:h("CursorLine", {"bg": s:colors.caretRow}) +call s:h("DiffAdd", {"bg": s:colors.diffInserted}) +call s:h("DiffChange", {"bg": s:colors.diffModified}) +call s:h("DiffDelete", {"bg": s:colors.diffDeleted}) +call s:h("DiffText", {"bg": s:colors.diffModified}) +call s:h("LineNr", {"fg": s:colors.lineNumberColor}) +call s:h("Pmenu", {"fg": s:colors.foregroundColorEditor}) +call s:h("Normal", {"fg": s:colors.foregroundColorEditor}) +call s:h("NonText", {"fg": s:colors.comments}) +call s:h("ModeMsg", {"fg": s:colors.infoForeground}) +call s:h("PmenuSbar", {"bg": s:colors.lightEditorColor}) +call s:h("PmenuThumb", {"bg": s:colors.accentColor}) +call s:h("ErrorMsg", {"bg": s:colors.errorColor}) +call s:h("VertSplit", {"fg": s:colors.lineNumberColor, "bg": s:colors.lightEditorColor}) +call s:h("StatusLine", {"fg": s:colors.foregroundColorEditor, "bg": s:colors.lightEditorColor}) +call s:h("StatusLineNc", {"fg": s:colors.lineNumberColor, "bg": s:colors.lightEditorColor}) +call s:h("Search", {"fg": s:colors.searchForeground, "bg": s:colors.searchBackground}) +call s:h("IncSearch", {"fg": s:colors.searchForeground, "bg": s:colors.searchBackground}) +call s:h("MatchParen", {"fg": s:colors.searchForeground, "bg": s:colors.searchBackground}) +call s:h("Visual", {"fg": s:colors.selectionForeground, "bg": s:colors.selectionBackground}) +call s:h("PmenuSel", {"fg": s:colors.selectionForeground, "bg": s:colors.selectionBackground}) +call s:h("Folded", {"fg": s:colors.comments, "bg": s:colors.foldedTextBackground}) + +" Git +call s:h("gitcommitHeader", { "fg": s:colors.classNameColor}) + +" Shell +call s:h("shQuote", { "fg": s:colors.stringColor}) +call s:h("shSingleQuote", { "fg": s:colors.stringColor}) +call s:h("shHereDoc", { "fg": s:colors.stringColor, "bg": s:colors.codeBlock}) +call s:h("shDoubleQuote", { "fg": s:colors.stringColor}) + +" XML +call s:h("xmlAttrib", { "fg": s:colors.editorAccentColor}) +call s:h("xmlDoctype", { "fg": s:colors.editorAccentColor}) +call s:h("xmlDocTypeKeyword", { "fg": s:colors.htmlTagColor}) +call s:h("xmlDocTypeDecl", { "fg": s:colors.htmlTagColor}) +call s:h("xmlTag", { "fg": s:colors.foregroundColorEditor}) +call s:h("xmlTagName", { "fg": s:colors.htmlTagColor}) +call s:h("xmlEntity", { "fg": s:colors.constantColor}) +call s:h("xmlEntityPunct", { "fg": s:colors.constantColor}) +call s:h("xmlCdata", { "fg": s:colors.stringColor}) +call s:h("xmlString", { "fg": s:colors.stringColor}) +call s:h("xmlCdataStart", { "fg": s:colors.keywordColor}) +call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor}) +call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor}) + +" Vim Script +call s:h("vimOption", { "fg": s:colors.keyColor}) +call s:h("vimFuncName", { "fg": s:colors.editorAccentColor}) +call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor}) +call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor}) +call s:h("vimCommand", { "fg": s:colors.keywordColor}) +call s:h("vimLet", { "fg": s:colors.keywordColor}) +call s:h("vimNotFunc", { "fg": s:colors.keywordColor}) +call s:h("vimIsCommand", { "fg": s:colors.classNameColor}) + +" HTML +call s:h("htmlTagName", { "fg": s:colors.htmlTagColor}) +call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor}) +call s:h("htmlEndTag", { "fg": s:colors.foregroundColorEditor}) +call s:h("htmlHead", { "fg": s:colors.htmlTagColor}) +call s:h("htmlSpecialTagName", { "fg": s:colors.htmlTagColor}) +call s:h("htmlArg", { "fg": s:colors.editorAccentColor, "gui": "italic", "cterm": "italic"}) +call s:h("htmlTagN", { "fg": s:colors.htmlTagColor}) +call s:h("htmlScriptTag", { "fg": s:colors.foregroundColorEditor}) +call s:h("htmlTag", { "fg": s:colors.foregroundColorEditor}) +call s:h("htmlTitle", { "fg": s:colors.stringColor}) +call s:h("htmlH1", { "fg": s:colors.stringColor }) +call s:h("htmlH2", { "fg": s:colors.stringColor }) +call s:h("htmlH3", { "fg": s:colors.stringColor }) +call s:h("htmlH4", { "fg": s:colors.stringColor }) +call s:h("htmlH5", { "fg": s:colors.stringColor }) +call s:h("htmlH6", { "fg": s:colors.stringColor }) +call s:h("htmlLink", { "fg": s:colors.keyColor }) +call s:h("htmlSpecialChar", { "fg": s:colors.keywordColor}) + +" Markdown +call s:h("markdownH1", { "fg": s:colors.classNameColor}) +call s:h("markdownH2", { "fg": s:colors.classNameColor}) +call s:h("markdownH3", { "fg": s:colors.classNameColor}) +call s:h("markdownH4", { "fg": s:colors.classNameColor}) +call s:h("markdownH5", { "fg": s:colors.classNameColor}) +call s:h("markdownH6", { "fg": s:colors.classNameColor}) +call s:h("markdownH7", { "fg": s:colors.classNameColor}) +call s:h("markdownHeadingRule", { "fg": s:colors.classNameColor}) +call s:h("markdownBoldDelimiter", { "fg": s:colors.keywordColor}) +call s:h("markdownItalicDelimiter", { "fg": s:colors.keywordColor}) +call s:h("markdownAutomaticLink", { "fg": s:colors.keyColor}) +call s:h("markdownUrl", { "fg": s:colors.keyColor}) +call s:h("markdownUrlDelimiter", { "fg": s:colors.keyColor}) +call s:h("markdownLinkDelimiter", { "fg": s:colors.keyColor}) +call s:h("markdownLinkTextDelimiter", { "fg": s:colors.editorAccentColor}) +call s:h("markdownLinkText", { "fg": s:colors.editorAccentColor}) +call s:h("markdownId", { "fg": s:colors.keyColor}) +call s:h("markdownUrlTitle", { "fg": s:colors.comments}) +call s:h("markdownCode", { "fg": s:colors.comments}) +call s:h("markdownCodeBlock", { "fg": s:colors.comments}) +call s:h("markdownBlockQuote", { "fg": s:colors.keywordColor}) +call s:h("markdownUrlTitleDelimiter", { "fg": s:colors.comments}) + +" Javascript +call s:h("jsFuncCall", { "fg": s:colors.editorAccentColor}) +call s:h("jsDecoratorFunction", { "fg": s:colors.editorAccentColor}) +call s:h("jsDecorator", { "fg": s:colors.editorAccentColor}) +call s:h("jsRegexpString", { "fg": s:colors.editorAccentColor}) +call s:h("jsStorageClass", { "fg": s:colors.keywordColor}) +call s:h("jsThis", { "fg": s:colors.keywordColor}) +call s:h("jsOperatorKeyword", { "fg": s:colors.keywordColor}) +call s:h("jsVariableDef", { "fg": s:colors.foregroundColorEditor}) +call s:h("jsFuncBlock", { "fg": s:colors.foregroundColorEditor}) +call s:h("jsParens", { "fg": s:colors.foregroundColorEditor}) +call s:h("jsBrackets", { "fg": s:colors.foregroundColorEditor}) +call s:h("jsGlobalObjects", { "fg": s:colors.constantColor}) +call s:h("jsArrowFunction", { "fg": s:colors.htmlTagColor}) +call s:h("jsFunctionArgs", { "fg": s:colors.stringColor}) +call s:h("jsFuncArgs", { "fg": s:colors.stringColor}) +call s:h("jsObjectProp", { "fg": s:colors.foregroundColorEditor, "gui": "bold", "cterm": "bold"}) +call s:h("jsObjectKey", { "fg": s:colors.foregroundColorEditor, "gui": "bold", "cterm": "bold"}) + +" JSON +call s:h("jsObjectKey", { "fg": s:colors.foregroundColorEditor, "gui": "bold", "cterm": "bold"}) +call s:h("jsonKeyword", { "fg": s:colors.foregroundColorEditor}) +call s:h("jsonQuote", { "fg": s:colors.foregroundColorEditor}) +call s:h("jsonBraces", { "fg": s:colors.foregroundColorEditor}) +call s:h("jsonNull", { "fg": s:colors.keywordColor}) +call s:h("jsonBoolean", { "fg": s:colors.keywordColor}) +call s:h("jsonStringMatch", { "fg": s:colors.stringColor}) + +" Typescript +call s:h("typescriptBraces", { "fg": s:colors.foregroundColorEditor}) +call s:h("typescriptEndColons", { "fg": s:colors.foregroundColorEditor}) +call s:h("typescriptParens", { "fg": s:colors.foregroundColorEditor}) +call s:h("typescriptDecorators", { "fg": s:colors.editorAccentColor}) +call s:h("typescriptGlobalObjects", { "fg": s:colors.classNameColor}) +call s:h("typescriptDocTags", { "fg": s:colors.keyColor}) +call s:h("typescriptDocParam", { "fg": s:colors.stringColor}) +call s:h("typescriptIdentifier", { "fg": s:colors.keywordColor}) + +" Java +call s:h("javaExternal", { "fg": s:colors.keywordColor}) +call s:h("javaAnnotation", { "fg": s:colors.editorAccentColor}) +call s:h("javaParen", { "fg": s:colors.foregroundColorEditor}) +call s:h("javaDocTags", { "fg": s:colors.keyColor}) +call s:h("javaDocParam", { "fg": s:colors.stringColor}) + +" Kotlin +call s:h("ktInclude", { "fg": s:colors.keywordColor}) +call s:h("ktDocTagParam", { "fg": s:colors.stringColor}) +call s:h("ktAnnotation", { "fg": s:colors.editorAccentColor}) +call s:h("ktExclExcl", { "fg": s:colors.htmlTagColor}) +call s:h("ktArrow", { "fg": s:colors.foregroundColorEditor}) + +" CSS +call s:h("cssBraces", { "fg": s:colors.foregroundColorEditor}) +call s:h("cssTagName", { "fg": s:colors.editorAccentColor}) +call s:h("cssFunctionName", { "fg": s:colors.classNameColor}) +call s:h("cssFunction", { "fg": s:colors.editorAccentColor}) +call s:h("cssClassName", { "fg": s:colors.classNameColor}) +call s:h("cssAttributeSelector", { "fg": s:colors.classNameColor}) +call s:h("cssAtKeyword", { "fg": s:colors.keywordColor}) +call s:h("cssProp", { "fg": s:colors.keyColor}) +call s:h("cssPseudoClassId", { "fg": s:colors.stringColor}) + +" Neovim-Specific Highlighting + +if has("nvim") + " Neovim terminal colors + "let g:terminal_color_0 = s:black.gui + let g:terminal_color_1 = s:colors.terminalAnsiMagenta.gui + let g:terminal_color_2 = s:colors.terminalAnsiGreen.gui + let g:terminal_color_3 = s:colors.terminalAnsiYellow.gui + let g:terminal_color_4 = s:colors.terminalAnsiGreen.gui + let g:terminal_color_5 = s:colors.terminalAnsiBlue.gui + let g:terminal_color_6 = s:colors.terminalAnsiCyan.gui + "let g:terminal_color_7 = s:white.gui + " let g:terminal_color_8 = s:visual_grey.gui + " let g:terminal_color_9 = s:dark_red.gui + let g:terminal_color_10 = s:colors.terminalAnsiGreen.gui " No dark version + let g:terminal_color_11 = s:colors.terminalAnsiYellow.gui + let g:terminal_color_12 = s:colors.terminalAnsiBlue.gui " No dark version + let g:terminal_color_13 = s:colors.terminalAnsiBlue.gui " No dark version + let g:terminal_color_14 = s:colors.terminalAnsiCyan.gui " No dark version + let g:terminal_color_15 = s:colors.comments.gui + let g:terminal_color_background = s:colors.textEditorBackground.gui + let g:terminal_color_foreground = s:colors.foregroundColorEditor.gui + " }}} + + " Neovim Diagnostics + call s:h("DiagnosticError", { "fg": s:colors.errorColor }) + call s:h("DiagnosticWarn", { "fg": s:colors.terminalAnsiYellow }) + call s:h("DiagnosticInfo", { "fg": s:colors.infoForeground }) + call s:h("DiagnosticHint", { "fg": s:colors.terminalAnsiCyan }) + call s:h("DiagnosticUnderlineError", { "fg": s:colors.errorColor, "gui": "underline", "cterm": "underline" }) + call s:h("DiagnosticUnderlineWarn", { "fg": s:colors.terminalAnsiYellow, "gui": "underline", "cterm": "underline" }) + call s:h("DiagnosticUnderlineInfo", { "fg": s:colors.terminalAnsiBlue, "gui": "underline", "cterm": "underline" }) + call s:h("DiagnosticUnderlineHint", { "fg": s:colors.terminalAnsiCyan, "gui": "underline", "cterm": "underline" }) + " }}} + + " Neovim LSP (for versions < 0.5.1) + hi link LspDiagnosticsDefaultError DiagnosticError + hi link LspDiagnosticsDefaultWarning DiagnosticWarn + hi link LspDiagnosticsDefaultInformation DiagnosticInfo + hi link LspDiagnosticsDefaultHint DiagnosticHint + hi link LspDiagnosticsUnderlineError DiagnosticUnderlineError + hi link LspDiagnosticsUnderlineWarning DiagnosticUnderlineWarn + hi link LspDiagnosticsUnderlineInformation DiagnosticUnderlineInfo + hi link LspDiagnosticsUnderlineHint DiagnosticUnderlineHint + " }}} +endif diff --git a/package.json b/package.json index bb8def7..ef94e89 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "doki-theme-vim", - "version": "74.1-1.0.0", + "version": "78.0-1.0.0", "description": "Complementary vim color scheme for your full Otaku cli experience. Works well with the Doki Theme for Hyper.js", "main": "index.js", "repository": "git@github.com:/doki-theme/doki-theme-vim.git",