From bb78c584cca7a4851ebbded8a86721bbc588f099 Mon Sep 17 00:00:00 2001 From: Vivian De Smedt Date: Tue, 21 Mar 2023 15:32:52 +0100 Subject: [PATCH 1/4] theme does not set Terminal highlight group #325 --- colors/nord.vim | 1 + 1 file changed, 1 insertion(+) diff --git a/colors/nord.vim b/colors/nord.vim index 97c1690..2af374d 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -152,6 +152,7 @@ call s:hi("VisualNOS", "", s:nord2_gui, "", s:nord1_term, "", "") "+- Vim 8 Terminal Colors -+ if has('terminal') let g:terminal_ansi_colors = [s:nord1_gui, s:nord11_gui, s:nord14_gui, s:nord13_gui, s:nord9_gui, s:nord15_gui, s:nord8_gui, s:nord5_gui, s:nord3_gui, s:nord11_gui, s:nord14_gui, s:nord13_gui, s:nord9_gui, s:nord15_gui, s:nord7_gui, s:nord6_gui] + highlight! link Terminal Normal endif if has('nvim') From 37a1207c436a877f6edfed4deb21ec183f2bbf3b Mon Sep 17 00:00:00 2001 From: Vivian De Smedt Date: Wed, 10 Apr 2024 19:54:26 +0200 Subject: [PATCH 2/4] correct diagnostic groups and diff groups --- .gitignore | 2 ++ colors/nord.vim | 36 ++++++++++++++++++++---------------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index b080a12..407b87a 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ # + Node.js + # +---------+ node_modules/ + +tags diff --git a/colors/nord.vim b/colors/nord.vim index ba0afba..ec666ba 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -142,10 +142,10 @@ call s:hi("PmenuSbar", s:nord4_gui, s:nord2_gui, "NONE", s:nord1_term, "", "") call s:hi("PmenuSel", s:nord8_gui, s:nord3_gui, s:nord8_term, s:nord3_term, "", "") call s:hi("PmenuThumb", s:nord8_gui, s:nord3_gui, "NONE", s:nord3_term, "", "") call s:hi("SpecialKey", s:nord3_gui, "", s:nord3_term, "", "", "") -call s:hi("SpellBad", s:nord11_gui, s:nord0_gui, s:nord11_term, "NONE", "undercurl", s:nord11_gui) -call s:hi("SpellCap", s:nord13_gui, s:nord0_gui, s:nord13_term, "NONE", "undercurl", s:nord13_gui) -call s:hi("SpellLocal", s:nord5_gui, s:nord0_gui, s:nord5_term, "NONE", "undercurl", s:nord5_gui) -call s:hi("SpellRare", s:nord6_gui, s:nord0_gui, s:nord6_term, "NONE", "undercurl", s:nord6_gui) +call s:hi("SpellBad", "", "", "NONE", "NONE", "undercurl", s:nord11_gui) +call s:hi("SpellCap", "", "", "NONE", "NONE", "undercurl", s:nord13_gui) +call s:hi("SpellLocal","", "", "NONE", "NONE", "undercurl", s:nord5_gui) +call s:hi("SpellRare", "", "", "NONE", "NONE", "undercurl", s:nord6_gui) call s:hi("Visual", "", s:nord2_gui, "", s:nord1_term, "", "") call s:hi("VisualNOS", "", s:nord2_gui, "", s:nord1_term, "", "") @@ -185,10 +185,10 @@ if has('nvim') call s:hi("DiagnosticError" , s:nord11_gui, "", s:nord11_term, "", "", "") call s:hi("DiagnosticInfo" , s:nord8_gui, "", s:nord8_term, "", "", "") call s:hi("DiagnosticHint" , s:nord10_gui, "", s:nord10_term, "", "", "") - call s:hi("DiagnosticUnderlineWarn" , s:nord13_gui, "", s:nord13_term, "", "undercurl", "") - call s:hi("DiagnosticUnderlineError" , s:nord11_gui, "", s:nord11_term, "", "undercurl", "") - call s:hi("DiagnosticUnderlineInfo" , s:nord8_gui, "", s:nord8_term, "", "undercurl", "") - call s:hi("DiagnosticUnderlineHint" , s:nord10_gui, "", s:nord10_term, "", "undercurl", "") + call s:hi("DiagnosticUnderlineWarn" , "", "", s:nord13_term, "", "undercurl", s:nord13_gui) + call s:hi("DiagnosticUnderlineError" , "", "", s:nord11_term, "", "undercurl", s:nord11_gui) + call s:hi("DiagnosticUnderlineInfo" , "", "", s:nord8_term, "", "undercurl", s:nord8_gui) + call s:hi("DiagnosticUnderlineHint" , "", "", s:nord10_term, "", "undercurl", s:nord10_gui) "+- Neovim DocumentHighlight -+ call s:hi("LspReferenceText", "", s:nord3_gui, "", s:nord3_term, "", "") @@ -368,16 +368,20 @@ hi! link dtLocaleValue Keyword hi! link dtTypeValue Keyword if g:nord_uniform_diff_background == 0 - call s:hi("DiffAdd", s:nord14_gui, s:nord0_gui, s:nord14_term, "NONE", "inverse", "") - call s:hi("DiffChange", s:nord13_gui, s:nord0_gui, s:nord13_term, "NONE", "inverse", "") - call s:hi("DiffDelete", s:nord11_gui, s:nord0_gui, s:nord11_term, "NONE", "inverse", "") - call s:hi("DiffText", s:nord9_gui, s:nord0_gui, s:nord9_term, "NONE", "inverse", "") + " call s:hi("DiffAdd", s:nord14_gui, s:nord0_gui, s:nord14_term, "NONE", "inverse", "") + " call s:hi("DiffChange", s:nord13_gui, s:nord0_gui, s:nord13_term, "NONE", "inverse", "") + " call s:hi("DiffDelete", s:nord11_gui, s:nord0_gui, s:nord11_term, "NONE", "inverse", "") + " call s:hi("DiffText", s:nord9_gui, s:nord0_gui, s:nord9_term, "NONE", "inverse", "") else - call s:hi("DiffAdd", s:nord14_gui, s:nord1_gui, s:nord14_term, s:nord1_term, "", "") - call s:hi("DiffChange", s:nord13_gui, s:nord1_gui, s:nord13_term, s:nord1_term, "", "") - call s:hi("DiffDelete", s:nord11_gui, s:nord1_gui, s:nord11_term, s:nord1_term, "", "") - call s:hi("DiffText", s:nord9_gui, s:nord1_gui, s:nord9_term, s:nord1_term, "", "") + " call s:hi("DiffAdd", s:nord14_gui, s:nord1_gui, s:nord14_term, s:nord1_term, "", "") + " call s:hi("DiffChange", s:nord13_gui, s:nord1_gui, s:nord13_term, s:nord1_term, "", "") + " call s:hi("DiffDelete", s:nord11_gui, s:nord1_gui, s:nord11_term, s:nord1_term, "", "") + " call s:hi("DiffText", s:nord9_gui, s:nord1_gui, s:nord9_term, s:nord1_term, "", "") endif +call s:hi("DiffAdd", "NONE", s:nord1_gui, "NONE", s:nord1_term, "", "") +call s:hi("DiffChange", "NONE", s:nord1_gui, "NONE", s:nord1_term, "", "") +call s:hi("DiffDelete", "NONE", s:nord0_gui, "NONE", "NONE", "", "") +call s:hi("DiffText", "NONE", s:nord3_gui_bright, "NONE", s:nord3_term, "", "") " Legacy groups for official git.vim and diff.vim syntax hi! link diffAdded DiffAdd hi! link diffChanged DiffChange From a9e3f7fee420d0f8603d2f8bad666c440a7ac8c9 Mon Sep 17 00:00:00 2001 From: Vivian De Smedt Date: Fri, 19 Apr 2024 20:48:34 +0200 Subject: [PATCH 3/4] refactor using meaningfull colorname and coherent api term vs. gui --- colors/nord.vim | 762 +++++++++++++++++++++++++++--------------------- 1 file changed, 422 insertions(+), 340 deletions(-) diff --git a/colors/nord.vim b/colors/nord.vim index ec666ba..cf69fea 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -12,62 +12,121 @@ let g:colors_name = "nord" let s:nord_vim_version="0.19.0" set background=dark -let s:nord0_gui = "#2E3440" -let s:nord1_gui = "#3B4252" -let s:nord2_gui = "#434C5E" -let s:nord3_gui = "#4C566A" -let s:nord3_gui_bright = "#616E88" -let s:nord4_gui = "#D8DEE9" -let s:nord5_gui = "#E5E9F0" -let s:nord6_gui = "#ECEFF4" -let s:nord7_gui = "#8FBCBB" -let s:nord8_gui = "#88C0D0" -let s:nord9_gui = "#81A1C1" -let s:nord10_gui = "#5E81AC" -let s:nord11_gui = "#BF616A" -let s:nord12_gui = "#D08770" -let s:nord13_gui = "#EBCB8B" -let s:nord14_gui = "#A3BE8C" -let s:nord15_gui = "#B48EAD" - -let s:nord1_term = "0" -let s:nord3_term = "8" -let s:nord5_term = "7" -let s:nord6_term = "15" -let s:nord7_term = "14" -let s:nord8_term = "6" -let s:nord9_term = "4" -let s:nord10_term = "12" -let s:nord11_term = "1" -let s:nord12_term = "11" -let s:nord13_term = "3" -let s:nord14_term = "2" -let s:nord15_term = "5" - -let s:nord3_gui_brightened = [ - \ s:nord3_gui, - \ "#4e586d", - \ "#505b70", - \ "#525d73", - \ "#556076", - \ "#576279", - \ "#59647c", - \ "#5b677f", - \ "#5d6982", - \ "#5f6c85", - \ "#616e88", - \ "#63718b", - \ "#66738e", - \ "#687591", - \ "#6a7894", - \ "#6d7a96", - \ "#6f7d98", - \ "#72809a", - \ "#75829c", - \ "#78859e", - \ "#7b88a1", + +let s:nord_dark_black_gui = "#3B4252" +let s:nord_dark_black_term = "0" +let s:dark_black= [s:nord_dark_black_gui, s:nord_dark_black_term] + +let s:nord_light_black_gui = "#4C566A" +let s:nord_light_black_term = "8" +let s:light_black = [s:nord_light_black_gui, s:nord_light_black_term] + +let s:nord_light_red_gui = "#BF616A" +let s:nord_light_red_term = "1" +let s:light_red = [s:nord_light_red_gui, s:nord_light_red_term] +" let s:dark_red = [s:nord_light_red_gui, s:nord_light_red_term] + +let s:nord_light_green_gui = "#A3BE8C" +let s:nord_light_green_term = "2" +let s:light_green = [s:nord_light_green_gui, s:nord_light_green_term] +" let s:dark_green = [s:nord_light_green_gui, s:nord_light_green_term] + +let s:nord_light_yellow_gui = "#EBCB8B" +let s:nord_light_yellow_term = "3" +let s:light_yellow = [s:nord_light_yellow_gui, s:nord_light_yellow_term] + +let s:nord_dark_yellow_gui = "#D08770" +let s:nord_dark_yellow_term = "11" +let s:dark_yellow= [s:nord_dark_yellow_gui, s:nord_dark_yellow_term] + +let s:nord_light_blue_gui = "#81A1C1" +let s:nord_light_blue_term = "4" +let s:light_blue = [s:nord_light_blue_gui, s:nord_light_blue_term] + +let s:nord_dark_blue_gui = "#5E81AC" +let s:nord_dark_blue_term = "12" +let s:dark_blue = [s:nord_dark_blue_gui, s:nord_dark_blue_term] + +let s:nord_light_violet_gui = "#B48EAD" +let s:nord_light_violet_term = "5" +let s:light_violet = [s:nord_light_violet_gui, s:nord_light_violet_term] +" let s:dark_violet = [s:nord_light_violet_gui, s:nord_light_violet_term] + +let s:nord_light_cyan_gui = "#88C0D0" +let s:nord_light_cyan_term = "6" +let s:light_cyan= [s:nord_light_cyan_gui, s:nord_light_cyan_term] + +let s:nord_dark_cyan_gui = "#8FBCBB" +let s:nord_dark_cyan_term = "14" +let s:dark_cyan = [s:nord_dark_cyan_gui, s:nord_dark_cyan_term] + +let s:nord_dark_white_gui = "#E5E9F0" +let s:nord_dark_white_term = "7" +let s:dark_white= [s:nord_dark_white_gui, s:nord_dark_white_term] + +let s:nord_light_white_gui = "#ECEFF4" +let s:nord_light_white_term = "15" +let s:light_white = [s:nord_light_white_gui, s:nord_light_white_term] + +let s:transparent = ["NONE", "NONE"] + +let s:nord_black_gui = "#2E3440" +let s:black = [s:nord_black_gui, "NONE"] + +let s:nord_white_gui = "#D8DEE9" +let s:white = [s:nord_white_gui, "NONE"] + +let s:nord_medium_black_gui = "#434C5E" +let s:medium_black_alt = [s:nord_medium_black_gui, s:nord_dark_black_term] +let s:medium_black = [s:nord_medium_black_gui, s:nord_light_black_term] + +let s:nord_light_black_gui_bright = "#616E88" +let s:bright_black = [s:nord_light_black_gui_bright, s:nord_light_black_term] + +let s:palette = [ +\ s:nord_black_gui, +\ s:nord_dark_black_gui, +\ s:nord_medium_black_gui, +\ s:nord_light_black_gui, +\ s:nord_light_black_gui_bright, +\ s:nord_white_gui, +\ s:nord_dark_white_gui, +\ s:nord_light_white_gui, +\ s:nord_dark_cyan_gui, +\ s:nord_light_cyan_gui, +\ s:nord_light_blue_gui, +\ s:nord_dark_blue_gui, +\ s:nord_light_red_gui, +\ s:nord_dark_yellow_gui, +\ s:nord_light_yellow_gui, +\ s:nord_light_green_gui, +\ s:nord_light_violet_gui, \ ] +" let s:nord_light_black_gui_brightened = [ +" \ s:nord_light_black_gui, +" \ "#4e586d", +" \ "#505b70", +" \ "#525d73", +" \ "#556076", +" \ "#576279", +" \ "#59647c", +" \ "#5b677f", +" \ "#5d6982", +" \ "#5f6c85", +" \ s:nord_light_black_gui_bright, +" \ "#63718b", +" \ "#66738e", +" \ "#687591", +" \ "#6a7894", +" \ "#6d7a96", +" \ "#6f7d98", +" \ "#72809a", +" \ "#75829c", +" \ "#78859e", +" \ "#7b88a1", +" \ ] + let g:nord_bold = get(g:, "nord_bold", 1) let s:bold = (g:nord_bold == 0) ? "" : "bold," @@ -86,8 +145,8 @@ let g:nord_bold_vertical_split_line = get(g:, "nord_bold_vertical_split_line", 0 if exists("g:nord_comment_brightness") echohl WarningMsg echomsg 'nord: warning: Variable g:nord_comment_brightness has been deprecated and will be removed in version 1.0.0!' . - \' The comment color brightness has been increased by 10% by default.' . - \' Please see https://github.com/nordtheme/vim/issues/145 for more details.' + \ ' The comment color brightness has been increased by 10% by default.' . + \ ' Please see https://github.com/nordtheme/vim/issues/145 for more details.' echohl None let g:nord_comment_brightness = 10 endif @@ -119,172 +178,196 @@ function! s:hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) endif endfunction +function! s:highlight(group, foreground, background, attribute, attribute_color) + call s:hi(a:group, a:foreground[0], a:background[0], a:foreground[1], a:background[1], a:attribute, a:attribute_color) +endfunction + "+---------------+ "+ UI Components + "+---------------+ "+--- Attributes ---+ -call s:hi("Bold", "", "", "", "", s:bold, "") -call s:hi("Italic", "", "", "", "", s:italic, "") -call s:hi("Underline", "", "", "", "", s:underline, "") +call s:highlight("Bold", s:transparent, s:transparent, s:bold, "") +call s:highlight("Italic", s:transparent, s:transparent, s:italic, "") +call s:highlight("Underlined", s:transparent, s:transparent, s:underline, "") "+--- Editor ---+ -call s:hi("ColorColumn", "", s:nord1_gui, "NONE", s:nord1_term, "", "") -call s:hi("Cursor", s:nord0_gui, s:nord4_gui, "", "NONE", "", "") -call s:hi("CursorLine", "", s:nord1_gui, "NONE", s:nord1_term, "NONE", "") -call s:hi("Error", s:nord4_gui, s:nord11_gui, "", s:nord11_term, "", "") -call s:hi("iCursor", s:nord0_gui, s:nord4_gui, "", "NONE", "", "") -call s:hi("LineNr", s:nord3_gui, "NONE", s:nord3_term, "NONE", "", "") -call s:hi("MatchParen", s:nord8_gui, s:nord3_gui, s:nord8_term, s:nord3_term, "", "") -call s:hi("NonText", s:nord2_gui, "", s:nord3_term, "", "", "") -call s:hi("Normal", s:nord4_gui, s:nord0_gui, "NONE", "NONE", "", "") -call s:hi("Pmenu", s:nord4_gui, s:nord2_gui, "NONE", s:nord1_term, "NONE", "") -call s:hi("PmenuSbar", s:nord4_gui, s:nord2_gui, "NONE", s:nord1_term, "", "") -call s:hi("PmenuSel", s:nord8_gui, s:nord3_gui, s:nord8_term, s:nord3_term, "", "") -call s:hi("PmenuThumb", s:nord8_gui, s:nord3_gui, "NONE", s:nord3_term, "", "") -call s:hi("SpecialKey", s:nord3_gui, "", s:nord3_term, "", "", "") -call s:hi("SpellBad", "", "", "NONE", "NONE", "undercurl", s:nord11_gui) -call s:hi("SpellCap", "", "", "NONE", "NONE", "undercurl", s:nord13_gui) -call s:hi("SpellLocal","", "", "NONE", "NONE", "undercurl", s:nord5_gui) -call s:hi("SpellRare", "", "", "NONE", "NONE", "undercurl", s:nord6_gui) -call s:hi("Visual", "", s:nord2_gui, "", s:nord1_term, "", "") -call s:hi("VisualNOS", "", s:nord2_gui, "", s:nord1_term, "", "") +call s:highlight("ColorColumn", s:transparent, s:dark_black, "", "") +call s:highlight("Cursor", s:black, s:white, "", "") +call s:highlight("CursorLine", s:transparent, s:dark_black, "NONE", "") +call s:highlight("Error", s:white, s:light_red, "", "") +call s:highlight("iCursor", s:black, s:white, "", "") +call s:highlight("LineNr", s:light_black, s:transparent, "", "") +call s:highlight("MatchParen", s:light_cyan, s:light_black, "", "") +call s:highlight("NonText", s:medium_black, s:transparent, "", "") +call s:highlight("Normal", s:white, s:black, "", "") +call s:highlight("Pmenu", s:white, s:medium_black_alt, "", "") +call s:highlight("PmenuSbar", s:white, s:medium_black_alt, "", "") +call s:highlight("PmenuSel", s:light_cyan, s:light_black, "", "") +call s:highlight("PmenuThumb", s:light_cyan, s:light_black, "", "") " why the terminal foreground color was NONE +call s:highlight("SpecialKey", s:light_black, s:transparent, "", "") +call s:highlight("SpellBad", s:transparent, s:transparent, "undercurl", s:nord_light_red_gui) +call s:highlight("SpellCap", s:transparent, s:transparent, "undercurl", s:nord_light_yellow_gui) +call s:highlight("SpellLocal", s:transparent, s:transparent, "undercurl", s:nord_dark_white_gui) +call s:highlight("SpellRare", s:transparent, s:transparent, "undercurl", s:nord_light_white_gui) +call s:highlight("Visual", s:transparent, s:medium_black_alt, "", "") +call s:highlight("VisualNOS", s:transparent, s:medium_black_alt, "", "") "+- Vim 8 Terminal Colors -+ if has('terminal') - let g:terminal_ansi_colors = [s:nord1_gui, s:nord11_gui, s:nord14_gui, s:nord13_gui, s:nord9_gui, s:nord15_gui, s:nord8_gui, s:nord5_gui, s:nord3_gui, s:nord11_gui, s:nord14_gui, s:nord13_gui, s:nord9_gui, s:nord15_gui, s:nord7_gui, s:nord6_gui] + let g:terminal_ansi_colors = [ + \ s:nord_dark_black_gui, + \ s:nord_light_red_gui, + \ s:nord_light_green_gui, + \ s:nord_light_yellow_gui, + \ s:nord_light_blue_gui, + \ s:nord_light_violet_gui, + \ s:nord_light_cyan_gui, + \ s:nord_dark_white_gui, + \ s:nord_light_black_gui, + \ s:nord_light_red_gui, + \ s:nord_light_green_gui, + \ s:nord_dark_yellow_gui, + \ s:nord_dark_blue_gui, + \ s:nord_light_violet_gui, + \ s:nord_dark_cyan_gui, + \ s:nord_light_white_gui + \ ] + highlight! link Terminal Normal endif if has('nvim') "+- Neovim Terminal Colors -+ - let g:terminal_color_0 = s:nord1_gui - let g:terminal_color_1 = s:nord11_gui - let g:terminal_color_2 = s:nord14_gui - let g:terminal_color_3 = s:nord13_gui - let g:terminal_color_4 = s:nord9_gui - let g:terminal_color_5 = s:nord15_gui - let g:terminal_color_6 = s:nord8_gui - let g:terminal_color_7 = s:nord5_gui - let g:terminal_color_8 = s:nord3_gui - let g:terminal_color_9 = s:nord11_gui - let g:terminal_color_10 = s:nord14_gui - let g:terminal_color_11 = s:nord13_gui - let g:terminal_color_12 = s:nord9_gui - let g:terminal_color_13 = s:nord15_gui - let g:terminal_color_14 = s:nord7_gui - let g:terminal_color_15 = s:nord6_gui + let g:terminal_color_0 = s:nord_dark_black_gui + let g:terminal_color_1 = s:nord_light_red_gui + let g:terminal_color_2 = s:nord_light_green_gui + let g:terminal_color_3 = s:nord_light_yellow_gui + let g:terminal_color_4 = s:nord_light_blue_gui + let g:terminal_color_5 = s:nord_light_violet_gui + let g:terminal_color_6 = s:nord_light_cyan_gui + let g:terminal_color_7 = s:nord_dark_white_gui + let g:terminal_color_8 = s:nord_light_black_gui + let g:terminal_color_9 = s:nord_light_red_gui + let g:terminal_color_10 = s:nord_light_green_gui + let g:terminal_color_11 = s:nord_light_yellow_gui + let g:terminal_color_12 = s:nord_light_blue_gui + let g:terminal_color_13 = s:nord_light_violet_gui + let g:terminal_color_14 = s:nord_dark_cyan_gui + let g:terminal_color_15 = s:nord_light_white_gui "+- Neovim Support -+ - call s:hi("healthError", s:nord11_gui, s:nord1_gui, s:nord11_term, s:nord1_term, "", "") - call s:hi("healthSuccess", s:nord14_gui, s:nord1_gui, s:nord14_term, s:nord1_term, "", "") - call s:hi("healthWarning", s:nord13_gui, s:nord1_gui, s:nord13_term, s:nord1_term, "", "") - call s:hi("TermCursorNC", "", s:nord1_gui, "", s:nord1_term, "", "") + call s:highlight("healthError", s:light_red, s:dark_black, "", "") + call s:highlight("healthSuccess", s:light_green, s:dark_black, "", "") + call s:highlight("healthWarning", s:light_yellow, s:dark_black, "", "") + call s:highlight("TermCursorNC", s:transparent, s:dark_black, "", "") "+- Neovim Diagnostics API -+ - call s:hi("DiagnosticWarn", s:nord13_gui, "", s:nord13_term, "", "", "") - call s:hi("DiagnosticError" , s:nord11_gui, "", s:nord11_term, "", "", "") - call s:hi("DiagnosticInfo" , s:nord8_gui, "", s:nord8_term, "", "", "") - call s:hi("DiagnosticHint" , s:nord10_gui, "", s:nord10_term, "", "", "") - call s:hi("DiagnosticUnderlineWarn" , "", "", s:nord13_term, "", "undercurl", s:nord13_gui) - call s:hi("DiagnosticUnderlineError" , "", "", s:nord11_term, "", "undercurl", s:nord11_gui) - call s:hi("DiagnosticUnderlineInfo" , "", "", s:nord8_term, "", "undercurl", s:nord8_gui) - call s:hi("DiagnosticUnderlineHint" , "", "", s:nord10_term, "", "undercurl", s:nord10_gui) + call s:highlight("DiagnosticWarn", s:light_yellow, s:transparent, "", "") + call s:highlight("DiagnosticError", s:light_red, s:transparent, "", "") + call s:highlight("DiagnosticInfo", s:light_cyan, s:transparent, "", "") + call s:highlight("DiagnosticHint", s:dark_blue, s:transparent, "", "") + + " TODO: Introduce new special colors + call s:hi("DiagnosticUnderlineWarn" , "", "", s:nord_light_yellow_term, "", "undercurl", s:nord_light_yellow_gui) + call s:hi("DiagnosticUnderlineError" , "", "", s:nord_light_red_term, "", "undercurl", s:nord_light_red_gui) + call s:hi("DiagnosticUnderlineInfo" , "", "", s:nord_light_cyan_term, "", "undercurl", s:nord_light_cyan_gui) + call s:hi("DiagnosticUnderlineHint" , "", "", s:nord_dark_blue_term, "", "undercurl", s:nord_dark_blue_gui) "+- Neovim DocumentHighlight -+ - call s:hi("LspReferenceText", "", s:nord3_gui, "", s:nord3_term, "", "") - call s:hi("LspReferenceRead", "", s:nord3_gui, "", s:nord3_term, "", "") - call s:hi("LspReferenceWrite", "", s:nord3_gui, "", s:nord3_term, "", "") + call s:highlight("LspReferenceText", s:transparent, s:light_black, "", "") + call s:highlight("LspReferenceRead", s:transparent, s:light_black, "", "") + call s:highlight("LspReferenceWrite", s:transparent, s:light_black, "", "") "+- Neovim LspSignatureHelp -+ - call s:hi("LspSignatureActiveParameter", s:nord8_gui, "", s:nord8_term, "", s:underline, "") + call s:highlight("LspSignatureActiveParameter", s:light_cyan, s:transparent, s:underline, "") endif "+--- Gutter ---+ -call s:hi("CursorColumn", "", s:nord1_gui, "NONE", s:nord1_term, "", "") +call s:highlight("CursorColumn", s:transparent, s:dark_black, "", "") if g:nord_cursor_line_number_background == 0 - call s:hi("CursorLineNr", s:nord4_gui, "", "NONE", "", "NONE", "") + call s:highlight("CursorLineNr", s:white, s:transparent, "NONE", "") else - call s:hi("CursorLineNr", s:nord4_gui, s:nord1_gui, "NONE", s:nord1_term, "NONE", "") + call s:highlight("CursorLineNr", s:white, s:dark_black, "NONE", "") endif -call s:hi("Folded", s:nord3_gui, s:nord1_gui, s:nord3_term, s:nord1_term, s:bold, "") -call s:hi("FoldColumn", s:nord3_gui, s:nord0_gui, s:nord3_term, "NONE", "", "") -call s:hi("SignColumn", s:nord1_gui, s:nord0_gui, s:nord1_term, "NONE", "", "") + +call s:highlight("Folded", s:light_black, s:dark_black, s:bold, "") +call s:highlight("FoldColumn", s:light_black, s:black, "", "") +call s:highlight("SignColumn", s:dark_black, s:black, "", "") "+--- Navigation ---+ -call s:hi("Directory", s:nord8_gui, "", s:nord8_term, "NONE", "", "") +call s:highlight("Directory", s:light_cyan, s:transparent, "", "") "+--- Prompt/Status ---+ -call s:hi("EndOfBuffer", s:nord1_gui, "", s:nord1_term, "NONE", "", "") -call s:hi("ErrorMsg", s:nord4_gui, s:nord11_gui, "NONE", s:nord11_term, "", "") -call s:hi("ModeMsg", s:nord4_gui, "", "", "", "", "") -call s:hi("MoreMsg", s:nord8_gui, "", s:nord8_term, "", "", "") -call s:hi("Question", s:nord4_gui, "", "NONE", "", "", "") +call s:highlight("EndOfBuffer", s:dark_black, s:transparent, "", "") +call s:highlight("ErrorMsg", s:white, s:light_red, "", "") +call s:highlight("ModeMsg", s:white, s:transparent, "", "") +call s:highlight("MoreMsg", s:light_cyan, s:transparent, "", "") +call s:highlight("Question", s:white, s:transparent, "", "") + +call s:highlight("StatusLine", s:light_cyan, s:light_black, "NONE", "") +call s:highlight("StatusLineTerm", s:light_cyan, s:light_black, "NONE", "") if g:nord_uniform_status_lines == 0 - call s:hi("StatusLine", s:nord8_gui, s:nord3_gui, s:nord8_term, s:nord3_term, "NONE", "") - call s:hi("StatusLineNC", s:nord4_gui, s:nord1_gui, "NONE", s:nord1_term, "NONE", "") - call s:hi("StatusLineTerm", s:nord8_gui, s:nord3_gui, s:nord8_term, s:nord3_term, "NONE", "") - call s:hi("StatusLineTermNC", s:nord4_gui, s:nord1_gui, "NONE", s:nord1_term, "NONE", "") + call s:highlight("StatusLineNC", s:white, s:dark_black, "NONE", "") + call s:highlight("StatusLineTermNC", s:white, s:dark_black, "", "") else - call s:hi("StatusLine", s:nord8_gui, s:nord3_gui, s:nord8_term, s:nord3_term, "NONE", "") - call s:hi("StatusLineNC", s:nord4_gui, s:nord3_gui, "NONE", s:nord3_term, "NONE", "") - call s:hi("StatusLineTerm", s:nord8_gui, s:nord3_gui, s:nord8_term, s:nord3_term, "NONE", "") - call s:hi("StatusLineTermNC", s:nord4_gui, s:nord3_gui, "NONE", s:nord3_term, "NONE", "") + call s:highlight("StatusLineNC", s:white, s:light_black, "NONE", "") + call s:highlight("StatusLineTermNC", s:white, s:light_black, "", "") endif -call s:hi("WarningMsg", s:nord0_gui, s:nord13_gui, s:nord1_term, s:nord13_term, "", "") -call s:hi("WildMenu", s:nord8_gui, s:nord1_gui, s:nord8_term, s:nord1_term, "", "") +call s:highlight("WarningMsg", s:black, s:light_yellow, "", "") " Why the terminal color is dark_black and not black? +call s:highlight("WildMenu", s:light_cyan, s:dark_black, "", "") -"+--- Search ---+ -call s:hi("IncSearch", s:nord6_gui, s:nord10_gui, s:nord6_term, s:nord10_term, s:underline, "") -call s:hi("Search", s:nord1_gui, s:nord8_gui, s:nord1_term, s:nord8_term, "NONE", "") +"+--- Search Highlight ---+ +call s:highlight("IncSearch", s:light_white, s:dark_blue, "NONE", "") +call s:highlight("Search", s:dark_black, s:light_cyan, "", "") "+--- Tabs ---+ -call s:hi("TabLine", s:nord4_gui, s:nord1_gui, "NONE", s:nord1_term, "NONE", "") -call s:hi("TabLineFill", s:nord4_gui, s:nord1_gui, "NONE", s:nord1_term, "NONE", "") -call s:hi("TabLineSel", s:nord8_gui, s:nord3_gui, s:nord8_term, s:nord3_term, "NONE", "") +call s:highlight("TabLine", s:white, s:dark_black, "NONE", "") +call s:highlight("TabLineFill", s:white, s:dark_black, "NONE", "") +call s:highlight("TabLineSel", s:light_cyan, s:light_black, "NONE", "") "+--- Window ---+ -call s:hi("Title", s:nord4_gui, "", "NONE", "", "NONE", "") +call s:highlight("Title", s:white, s:transparent, "NONE", "") if g:nord_bold_vertical_split_line == 0 - call s:hi("VertSplit", s:nord2_gui, s:nord0_gui, s:nord3_term, "NONE", "NONE", "") + call s:highlight("VertSplit", s:medium_black, s:black, "NONE", "") else - call s:hi("VertSplit", s:nord2_gui, s:nord1_gui, s:nord3_term, s:nord1_term, "NONE", "") + call s:highlight("VertSplit", s:medium_black, s:dark_black, "NONE", "") endif "+----------------------+ "+ Language Base Groups + "+----------------------+ -call s:hi("Boolean", s:nord9_gui, "", s:nord9_term, "", "", "") -call s:hi("Character", s:nord14_gui, "", s:nord14_term, "", "", "") -call s:hi("Comment", s:nord3_gui_bright, "", s:nord3_term, "", s:italicize_comments, "") -call s:hi("Conceal", "", "NONE", "", "NONE", "", "") -call s:hi("Conditional", s:nord9_gui, "", s:nord9_term, "", "", "") -call s:hi("Constant", s:nord4_gui, "", "NONE", "", "", "") -call s:hi("Decorator", s:nord12_gui, "", s:nord12_term, "", "", "") -call s:hi("Define", s:nord9_gui, "", s:nord9_term, "", "", "") -call s:hi("Delimiter", s:nord6_gui, "", s:nord6_term, "", "", "") -call s:hi("Exception", s:nord9_gui, "", s:nord9_term, "", "", "") -call s:hi("Float", s:nord15_gui, "", s:nord15_term, "", "", "") -call s:hi("Function", s:nord8_gui, "", s:nord8_term, "", "", "") -call s:hi("Identifier", s:nord4_gui, "", "NONE", "", "NONE", "") -call s:hi("Include", s:nord9_gui, "", s:nord9_term, "", "", "") -call s:hi("Keyword", s:nord9_gui, "", s:nord9_term, "", "", "") -call s:hi("Label", s:nord9_gui, "", s:nord9_term, "", "", "") -call s:hi("Number", s:nord15_gui, "", s:nord15_term, "", "", "") -call s:hi("Operator", s:nord9_gui, "", s:nord9_term, "", "NONE", "") -call s:hi("PreProc", s:nord9_gui, "", s:nord9_term, "", "NONE", "") -call s:hi("Repeat", s:nord9_gui, "", s:nord9_term, "", "", "") -call s:hi("Special", s:nord4_gui, "", "NONE", "", "", "") -call s:hi("SpecialChar", s:nord13_gui, "", s:nord13_term, "", "", "") -call s:hi("SpecialComment", s:nord8_gui, "", s:nord8_term, "", s:italicize_comments, "") -call s:hi("Statement", s:nord9_gui, "", s:nord9_term, "", "", "") -call s:hi("StorageClass", s:nord9_gui, "", s:nord9_term, "", "", "") -call s:hi("String", s:nord14_gui, "", s:nord14_term, "", "", "") -call s:hi("Structure", s:nord9_gui, "", s:nord9_term, "", "", "") -call s:hi("Tag", s:nord4_gui, "", "", "", "", "") -call s:hi("Todo", s:nord13_gui, "NONE", s:nord13_term, "NONE", "", "") -call s:hi("Type", s:nord9_gui, "", s:nord9_term, "", "NONE", "") -call s:hi("Typedef", s:nord9_gui, "", s:nord9_term, "", "", "") +call s:highlight("Boolean", s:light_blue, s:transparent, "", "") +call s:highlight("Character", s:light_green, s:transparent, "", "") +call s:highlight("Comment", s:bright_black, s:transparent, s:italicize_comments, "") +call s:highlight("Conceal", s:transparent, s:transparent, "", "") +call s:highlight("Conditional", s:light_blue, s:transparent, "", "") +call s:highlight("Constant", s:white, "", "", "") +call s:highlight("Decorator", s:dark_yellow, s:transparent, "", "") +call s:highlight("Define", s:light_blue, s:transparent, "", "") +call s:highlight("Delimiter", s:light_white, s:transparent, "", "") +call s:highlight("Exception", s:light_blue, s:transparent, "", "") +call s:highlight("Float", s:light_violet, s:transparent, "", "") +call s:highlight("Function", s:light_cyan, s:transparent, "", "") +call s:highlight("Identifier", s:white, s:transparent, "NONE", "") +call s:highlight("Include", s:light_blue, s:transparent, "", "") +call s:highlight("Keyword", s:light_blue, s:transparent, "", "") +call s:highlight("Label", s:light_blue, s:transparent, "", "") +call s:highlight("Number", s:light_violet, s:transparent, "", "") +call s:highlight("Operator", s:light_blue, s:transparent, "", "") +call s:highlight("PreProc", s:light_blue, s:transparent, "", "") +call s:highlight("Repeat", s:light_blue, s:transparent, "", "") +call s:highlight("Special", s:white, s:transparent, "", "") +call s:highlight("SpecialChar", s:light_yellow, s:transparent, "", "") +call s:highlight("SpecialComment", s:light_cyan, s:transparent, s:italicize_comments, "") +call s:highlight("Statement", s:light_blue, s:transparent, "", "") +call s:highlight("StorageClass", s:light_blue, s:transparent, "", "") +call s:highlight("String", s:light_green, s:transparent, "", "") +call s:highlight("Structure", s:light_blue, s:transparent, "", "") +call s:highlight("Tag", s:white, s:transparent, "", "") +call s:highlight("Todo", s:light_yellow, s:transparent, "", "") +call s:highlight("Type", s:light_blue, s:transparent, "NONE", "") +call s:highlight("Typedef", s:light_blue, s:transparent, "", "") hi! link Annotation Decorator hi! link Macro Define hi! link PreCondit PreProc @@ -293,16 +376,16 @@ hi! link Variable Identifier "+-----------+ "+ Languages + "+-----------+ -call s:hi("asciidocAttributeEntry", s:nord10_gui, "", s:nord10_term, "", "", "") -call s:hi("asciidocAttributeList", s:nord10_gui, "", s:nord10_term, "", "", "") -call s:hi("asciidocAttributeRef", s:nord10_gui, "", s:nord10_term, "", "", "") -call s:hi("asciidocHLabel", s:nord9_gui, "", s:nord9_term, "", "", "") -call s:hi("asciidocListingBlock", s:nord7_gui, "", s:nord7_term, "", "", "") -call s:hi("asciidocMacroAttributes", s:nord8_gui, "", s:nord8_term, "", "", "") -call s:hi("asciidocOneLineTitle", s:nord8_gui, "", s:nord8_term, "", "", "") -call s:hi("asciidocPassthroughBlock", s:nord9_gui, "", s:nord9_term, "", "", "") -call s:hi("asciidocQuotedMonospaced", s:nord7_gui, "", s:nord7_term, "", "", "") -call s:hi("asciidocTriplePlusPassthrough", s:nord7_gui, "", s:nord7_term, "", "", "") +call s:highlight("asciidocAttributeEntry", s:dark_blue, s:transparent, "", "") +call s:highlight("asciidocAttributeList", s:dark_blue, s:transparent, "", "") +call s:highlight("asciidocAttributeRef", s:dark_blue, s:transparent, "", "") +call s:highlight("asciidocHLabel", s:light_blue, s:transparent, "", "") +call s:highlight("asciidocListingBlock", s:dark_cyan, s:transparent, "", "") +call s:highlight("asciidocMacroAttributes", s:light_cyan, s:transparent, "", "") +call s:highlight("asciidocOneLineTitle", s:light_cyan, s:transparent, "", "") +call s:highlight("asciidocPassthroughBlock", s:light_blue, s:transparent, "", "") +call s:highlight("asciidocQuotedMonospaced", s:dark_cyan, s:transparent, "", "") +call s:highlight("asciidocTriplePlusPassthrough", s:dark_cyan, s:transparent, "", "") hi! link asciidocAdmonition Keyword hi! link asciidocAttributeRef markdownH1 hi! link asciidocBackslash Keyword @@ -314,8 +397,8 @@ hi! link asciidocQuotedUnconstrainedBold asciidocQuotedBold hi! link asciidocQuotedUnconstrainedEmphasized asciidocQuotedEmphasized hi! link asciidocURL markdownLinkText -call s:hi("awkCharClass", s:nord7_gui, "", s:nord7_term, "", "", "") -call s:hi("awkPatterns", s:nord9_gui, "", s:nord9_term, "", s:bold, "") +call s:highlight("awkCharClass", s:dark_cyan, s:transparent, "", "") +call s:highlight("awkPatterns", s:light_blue, s:transparent, s:bold, "") hi! link awkArrayElement Identifier hi! link awkBoolLogic Keyword hi! link awkBrktRegExp SpecialChar @@ -331,21 +414,21 @@ hi! link awkSpecialCharacter SpecialChar hi! link awkSpecialPrintf SpecialChar hi! link awkVariables Identifier -call s:hi("cIncluded", s:nord7_gui, "", s:nord7_term, "", "", "") +call s:highlight("cIncluded", s:dark_cyan, s:transparent, "", "") hi! link cOperator Operator hi! link cPreCondit PreCondit hi! link cConstant Type -call s:hi("cmakeGeneratorExpression", s:nord10_gui, "", s:nord10_term, "", "", "") +call s:highlight("cmakeGeneratorExpression", s:dark_blue, s:transparent, "", "") hi! link csPreCondit PreCondit hi! link csType Type hi! link csXmlTag SpecialComment -call s:hi("cssAttributeSelector", s:nord7_gui, "", s:nord7_term, "", "", "") -call s:hi("cssDefinition", s:nord7_gui, "", s:nord7_term, "", "NONE", "") -call s:hi("cssIdentifier", s:nord7_gui, "", s:nord7_term, "", s:underline, "") -call s:hi("cssStringQ", s:nord7_gui, "", s:nord7_term, "", "", "") +call s:highlight("cssAttributeSelector", s:dark_cyan, s:transparent, "", "") +call s:highlight("cssDefinition", s:dark_cyan, s:transparent, "NONE", "") +call s:highlight("cssIdentifier", s:dark_cyan, s:transparent, s:underline, "") +call s:highlight("cssStringQ", s:dark_cyan, s:transparent, "", "") hi! link cssAttr Keyword hi! link cssBraces Delimiter hi! link cssClassName cssDefinition @@ -355,56 +438,56 @@ hi! link cssPseudoClass cssDefinition hi! link cssPseudoClassId cssPseudoClass hi! link cssVendor Keyword -call s:hi("dosiniHeader", s:nord8_gui, "", s:nord8_term, "", "", "") +call s:highlight("dosiniHeader", s:light_cyan, s:transparent, "", "") hi! link dosiniLabel Type -call s:hi("dtBooleanKey", s:nord7_gui, "", s:nord7_term, "", "", "") -call s:hi("dtExecKey", s:nord7_gui, "", s:nord7_term, "", "", "") -call s:hi("dtLocaleKey", s:nord7_gui, "", s:nord7_term, "", "", "") -call s:hi("dtNumericKey", s:nord7_gui, "", s:nord7_term, "", "", "") -call s:hi("dtTypeKey", s:nord7_gui, "", s:nord7_term, "", "", "") +call s:highlight("dtBooleanKey", s:dark_cyan, s:transparent, "", "") +call s:highlight("dtExecKey", s:dark_cyan, s:transparent, "", "") +call s:highlight("dtLocaleKey", s:dark_cyan, s:transparent, "", "") +call s:highlight("dtNumericKey", s:dark_cyan, s:transparent, "", "") +call s:highlight("dtTypeKey", s:dark_cyan, s:transparent, "", "") hi! link dtDelim Delimiter hi! link dtLocaleValue Keyword hi! link dtTypeValue Keyword if g:nord_uniform_diff_background == 0 - " call s:hi("DiffAdd", s:nord14_gui, s:nord0_gui, s:nord14_term, "NONE", "inverse", "") - " call s:hi("DiffChange", s:nord13_gui, s:nord0_gui, s:nord13_term, "NONE", "inverse", "") - " call s:hi("DiffDelete", s:nord11_gui, s:nord0_gui, s:nord11_term, "NONE", "inverse", "") - " call s:hi("DiffText", s:nord9_gui, s:nord0_gui, s:nord9_term, "NONE", "inverse", "") + " call s:highlight("DiffAdd", s:light_green, s:black, "inverse", "") + " call s:highlight("DiffChange", s:light_yellow, s:black, "inverse", "") + " call s:highlight("DiffDelete", s:light_red, s:black, "inverse", "") + " call s:highlight("DiffText", s:light_blue, s:black, "inverse", "") else - " call s:hi("DiffAdd", s:nord14_gui, s:nord1_gui, s:nord14_term, s:nord1_term, "", "") - " call s:hi("DiffChange", s:nord13_gui, s:nord1_gui, s:nord13_term, s:nord1_term, "", "") - " call s:hi("DiffDelete", s:nord11_gui, s:nord1_gui, s:nord11_term, s:nord1_term, "", "") - " call s:hi("DiffText", s:nord9_gui, s:nord1_gui, s:nord9_term, s:nord1_term, "", "") + " call s:highlight("DiffAdd", s:light_green, s:dark_black, "", "") + " call s:highlight("DiffChange", s:light_yellow, s:dark_black, "", "") + " call s:highlight("DiffDelete", s:light_red, s:dark_black, "", "") + " call s:highlight("DiffText", s:light_blue, s:dark_black, "", "") endif -call s:hi("DiffAdd", "NONE", s:nord1_gui, "NONE", s:nord1_term, "", "") -call s:hi("DiffChange", "NONE", s:nord1_gui, "NONE", s:nord1_term, "", "") -call s:hi("DiffDelete", "NONE", s:nord0_gui, "NONE", "NONE", "", "") -call s:hi("DiffText", "NONE", s:nord3_gui_bright, "NONE", s:nord3_term, "", "") +call s:highlight("DiffAdd", s:transparent, s:dark_black, "", "") +call s:highlight("DiffChange", s:transparent, s:dark_black, "", "") +call s:highlight("DiffDelete", s:transparent, s:black, "", "") +call s:highlight("DiffText", s:transparent, s:bright_black, "", "") " Legacy groups for official git.vim and diff.vim syntax hi! link diffAdded DiffAdd hi! link diffChanged DiffChange hi! link diffRemoved DiffDelete -call s:hi("elixirModuleDeclaration", s:nord7_gui, "", s:nord7_term, "", "", "") -call s:hi("elixirAlias", s:nord7_gui, "", s:nord7_term, "", "", "") -call s:hi("elixirAtom", s:nord6_gui, "", s:nord6_term, "", s:bold, "") +call s:highlight("elixirModuleDeclaration", s:dark_cyan, s:transparent, "", "") +call s:highlight("elixirAlias", s:dark_cyan, s:transparent, "", "") +call s:highlight("elixirAtom", s:light_white, s:transparent, s:bold, "") -call s:hi("gitconfigVariable", s:nord7_gui, "", s:nord7_term, "", "", "") +call s:highlight("gitconfigVariable", s:dark_cyan, s:transparent, "", "") -call s:hi("goBuiltins", s:nord7_gui, "", s:nord7_term, "", "", "") +call s:highlight("goBuiltins", s:dark_cyan, s:transparent, "", "") hi! link goConstants Keyword " fatih/vim-go -call s:hi("gomodVersion", s:nord7_gui, "", s:nord7_term, "", "", "") -call s:hi("gomodGoVersion", s:nord8_gui, "", s:nord8_term, "", "", "") +call s:highlight("gomodVersion", s:dark_cyan, s:transparent, "", "") +call s:highlight("gomodGoVersion", s:light_cyan, s:transparent, "", "") -call s:hi("helpBar", s:nord3_gui, "", s:nord3_term, "", "", "") -call s:hi("helpHyperTextJump", s:nord8_gui, "", s:nord8_term, "", s:underline, "") +call s:highlight("helpBar", s:light_black, s:transparent, "", "") +call s:highlight("helpHyperTextJump", s:light_cyan, s:transparent, s:underline, "") -call s:hi("htmlArg", s:nord7_gui, "", s:nord7_term, "", "", "") -call s:hi("htmlLink", s:nord4_gui, "", "", "", "NONE", "NONE") +call s:highlight("htmlArg", s:dark_cyan, s:transparent, "", "") +call s:highlight("htmlLink", s:white, s:transparent, "", "") hi! link htmlBold Bold hi! link htmlEndTag htmlTag hi! link htmlItalic Italic @@ -418,15 +501,15 @@ hi! link htmlSpecialChar SpecialChar hi! link htmlTag Keyword hi! link htmlTagN htmlTag -call s:hi("javaDocTags", s:nord7_gui, "", s:nord7_term, "", "", "") +call s:highlight("javaDocTags", s:dark_cyan, s:transparent, "", "") hi! link javaCommentTitle Comment hi! link javaScriptBraces Delimiter hi! link javaScriptIdentifier Keyword hi! link javaScriptNumber Number -call s:hi("jsonKeyword", s:nord7_gui, "", s:nord7_term, "", "", "") +call s:highlight("jsonKeyword", s:dark_cyan, s:transparent, "", "") -call s:hi("lessClass", s:nord7_gui, "", s:nord7_term, "", "", "") +call s:highlight("lessClass", s:dark_cyan, s:transparent, "", "") hi! link lessAmpersand Keyword hi! link lessCssAttribute Delimiter hi! link lessFunction Function @@ -440,15 +523,15 @@ hi! link lispFunc Function hi! link luaFunc Function -call s:hi("markdownBlockquote", s:nord7_gui, "", s:nord7_term, "", "", "") -call s:hi("markdownCode", s:nord7_gui, "", s:nord7_term, "", "", "") -call s:hi("markdownCodeDelimiter", s:nord7_gui, "", s:nord7_term, "", "", "") -call s:hi("markdownFootnote", s:nord7_gui, "", s:nord7_term, "", "", "") -call s:hi("markdownId", s:nord7_gui, "", s:nord7_term, "", "", "") -call s:hi("markdownIdDeclaration", s:nord7_gui, "", s:nord7_term, "", "", "") -call s:hi("markdownH1", s:nord8_gui, "", s:nord8_term, "", "", "") -call s:hi("markdownLinkText", s:nord8_gui, "", s:nord8_term, "", "", "") -call s:hi("markdownUrl", s:nord4_gui, "", "NONE", "", "NONE", "") +call s:highlight("markdownBlockquote", s:dark_cyan, s:transparent, "", "") +call s:highlight("markdownCode", s:dark_cyan, s:transparent, "", "") +call s:highlight("markdownCodeDelimiter", s:dark_cyan, s:transparent, "", "") +call s:highlight("markdownFootnote", s:dark_cyan, s:transparent, "", "") +call s:highlight("markdownId", s:dark_cyan, s:transparent, "", "") +call s:highlight("markdownIdDeclaration", s:dark_cyan, s:transparent, "", "") +call s:highlight("markdownH1", s:light_cyan, s:transparent, "", "") +call s:highlight("markdownLinkText", s:light_cyan, s:transparent, "", "") +call s:highlight("markdownUrl", s:white, s:transparent, "", "") hi! link markdownBold Bold hi! link markdownBoldDelimiter Keyword hi! link markdownFootnoteDefinition markdownFootnote @@ -466,22 +549,22 @@ hi! link markdownListMarker Keyword hi! link markdownRule Keyword hi! link markdownHeadingDelimiter Keyword -call s:hi("perlPackageDecl", s:nord7_gui, "", s:nord7_term, "", "", "") +call s:highlight("perlPackageDecl", s:dark_cyan, s:transparent, "", "") -call s:hi("phpClasses", s:nord7_gui, "", s:nord7_term, "", "", "") -call s:hi("phpDocTags", s:nord7_gui, "", s:nord7_term, "", "", "") +call s:highlight("phpClasses", s:dark_cyan, s:transparent, "", "") +call s:highlight("phpDocTags", s:dark_cyan, s:transparent, "", "") hi! link phpDocCustomTags phpDocTags hi! link phpMemberSelector Keyword -call s:hi("podCmdText", s:nord7_gui, "", s:nord7_term, "", "", "") -call s:hi("podVerbatimLine", s:nord4_gui, "", "NONE", "", "", "") +call s:highlight("podCmdText", s:dark_cyan, s:transparent, "", "") +call s:highlight("podVerbatimLine", s:white, s:transparent, "", "") hi! link podFormat Keyword hi! link pythonBuiltin Type hi! link pythonEscape SpecialChar -call s:hi("rubyConstant", s:nord7_gui, "", s:nord7_term, "", "", "") -call s:hi("rubySymbol", s:nord6_gui, "", s:nord6_term, "", s:bold, "") +call s:highlight("rubyConstant", s:dark_cyan, s:transparent, "", "") +call s:highlight("rubySymbol", s:light_white, s:transparent, s:bold, "") hi! link rubyAttribute Identifier hi! link rubyBlockParameterList Operator hi! link rubyInterpolationDelimiter Keyword @@ -490,20 +573,20 @@ hi! link rubyLocalVariableOrMethod Function hi! link rubyPseudoVariable Keyword hi! link rubyRegexp SpecialChar -call s:hi("rustAttribute", s:nord10_gui, "", s:nord10_term, "", "", "") -call s:hi("rustEnum", s:nord7_gui, "", s:nord7_term, "", s:bold, "") -call s:hi("rustMacro", s:nord8_gui, "", s:nord8_term, "", s:bold, "") -call s:hi("rustModPath", s:nord7_gui, "", s:nord7_term, "", "", "") -call s:hi("rustPanic", s:nord9_gui, "", s:nord9_term, "", s:bold, "") -call s:hi("rustTrait", s:nord7_gui, "", s:nord7_term, "", s:italic, "") +call s:highlight("rustAttribute", s:dark_blue, s:transparent, "", "") +call s:highlight("rustEnum", s:dark_cyan, s:transparent, s:bold, "") +call s:highlight("rustMacro", s:light_cyan, s:transparent, s:bold, "") +call s:highlight("rustModPath", s:dark_cyan, s:transparent, "", "") +call s:highlight("rustPanic", s:light_blue, s:transparent, s:bold, "") +call s:highlight("rustTrait", s:dark_cyan, s:transparent, s:italic, "") hi! link rustCommentLineDoc Comment hi! link rustDerive rustAttribute hi! link rustEnumVariant rustEnum hi! link rustEscape SpecialChar hi! link rustQuestionMark Keyword -call s:hi("sassClass", s:nord7_gui, "", s:nord7_term, "", "", "") -call s:hi("sassId", s:nord7_gui, "", s:nord7_term, "", s:underline, "") +call s:highlight("sassClass", s:dark_cyan, s:transparent, "", "") +call s:highlight("sassId", s:dark_cyan, s:transparent, s:underline, "") hi! link sassAmpersand Keyword hi! link sassClassChar Delimiter hi! link sassControl Keyword @@ -526,16 +609,16 @@ hi! link shDerefVar Identifier hi! link sqlKeyword Keyword hi! link sqlSpecial Keyword -call s:hi("vimAugroup", s:nord7_gui, "", s:nord7_term, "", "", "") -call s:hi("vimMapRhs", s:nord7_gui, "", s:nord7_term, "", "", "") -call s:hi("vimNotation", s:nord7_gui, "", s:nord7_term, "", "", "") +call s:highlight("vimAugroup", s:dark_cyan, s:transparent, "", "") +call s:highlight("vimMapRhs", s:dark_cyan, s:transparent, "", "") +call s:highlight("vimNotation", s:dark_cyan, s:transparent, "", "") hi! link vimFunc Function hi! link vimFunction Function hi! link vimUserFunc Function -call s:hi("xmlAttrib", s:nord7_gui, "", s:nord7_term, "", "", "") -call s:hi("xmlCdataStart", s:nord3_gui_bright, "", s:nord3_term, "", s:bold, "") -call s:hi("xmlNamespace", s:nord7_gui, "", s:nord7_term, "", "", "") +call s:highlight("xmlAttrib", s:dark_cyan, s:transparent, "", "") +call s:highlight("xmlCdataStart", s:bright_black, s:transparent, s:bold, "") +call s:highlight("xmlNamespace", s:dark_cyan, s:transparent, "", "") hi! link xmlAttribPunct Delimiter hi! link xmlCdata Comment hi! link xmlCdataCdata xmlCdataStart @@ -544,7 +627,7 @@ hi! link xmlEndTag xmlTagName hi! link xmlProcessingDelim Keyword hi! link xmlTagName Keyword -call s:hi("yamlBlockMappingKey", s:nord7_gui, "", s:nord7_term, "", "", "") +call s:highlight("yamlBlockMappingKey", s:dark_cyan, s:transparent, "", "") hi! link yamlBool Keyword hi! link yamlDocumentStart Keyword @@ -554,33 +637,33 @@ hi! link yamlDocumentStart Keyword "+--- UI ---+ " ALE " > w0rp/ale -call s:hi("ALEWarningSign", s:nord13_gui, "", s:nord13_term, "", "", "") -call s:hi("ALEErrorSign" , s:nord11_gui, "", s:nord11_term, "", "", "") -call s:hi("ALEWarning" , s:nord13_gui, "", s:nord13_term, "", "undercurl", "") -call s:hi("ALEError" , s:nord11_gui, "", s:nord11_term, "", "undercurl", "") +call s:highlight("ALEWarningSign", s:light_yellow, s:transparent, "", "") +call s:highlight("ALEErrorSign", s:light_red, s:transparent, "", "") +call s:highlight("ALEWarning", s:light_yellow, s:transparent, "undercurl", "") +call s:highlight("ALEError", s:light_red, s:transparent, "undercurl", "") " Coc " > neoclide/coc.vim -call s:hi("CocWarningHighlight" , s:nord13_gui, "", s:nord13_term, "", "undercurl", "") -call s:hi("CocErrorHighlight" , s:nord11_gui, "", s:nord11_term, "", "undercurl", "") -call s:hi("CocWarningSign", s:nord13_gui, "", s:nord13_term, "", "", "") -call s:hi("CocErrorSign" , s:nord11_gui, "", s:nord11_term, "", "", "") -call s:hi("CocInfoSign" , s:nord8_gui, "", s:nord8_term, "", "", "") -call s:hi("CocHintSign" , s:nord10_gui, "", s:nord10_term, "", "", "") +call s:highlight("CocWarningHighlight", s:light_yellow, s:transparent, "undercurl", "") +call s:highlight("CocErrorHighlight", s:light_red, s:transparent, "undercurl", "") +call s:highlight("CocWarningSign", s:light_yellow, s:transparent, "", "") +call s:highlight("CocErrorSign", s:light_red, s:transparent, "", "") +call s:highlight("CocInfoSign", s:light_cyan, s:transparent, "", "") +call s:highlight("CocHintSign", s:dark_blue, s:transparent, "", "") if has('nvim') " Neovim LSP " > neovim/nvim-lspconfig - call s:hi("LspCodeLens", s:nord3_gui_bright, "", s:nord3_term, "", "", "") + call s:highlight("LspCodeLens", s:bright_black, s:transparent, "", "") if has("nvim-0.5") - call s:hi("LspDiagnosticsDefaultWarning", s:nord13_gui, "", s:nord13_term, "", "", "") - call s:hi("LspDiagnosticsDefaultError" , s:nord11_gui, "", s:nord11_term, "", "", "") - call s:hi("LspDiagnosticsDefaultInformation" , s:nord8_gui, "", s:nord8_term, "", "", "") - call s:hi("LspDiagnosticsDefaultHint" , s:nord10_gui, "", s:nord10_term, "", "", "") - call s:hi("LspDiagnosticsUnderlineWarning" , s:nord13_gui, "", s:nord13_term, "", "undercurl", "") - call s:hi("LspDiagnosticsUnderlineError" , s:nord11_gui, "", s:nord11_term, "", "undercurl", "") - call s:hi("LspDiagnosticsUnderlineInformation" , s:nord8_gui, "", s:nord8_term, "", "undercurl", "") - call s:hi("LspDiagnosticsUnderlineHint" , s:nord10_gui, "", s:nord10_term, "", "undercurl", "") + call s:highlight("LspDiagnosticsDefaultWarning", s:light_yellow, s:transparent, "", "") + call s:highlight("LspDiagnosticsDefaultError", s:light_red, s:transparent, "", "") + call s:highlight("LspDiagnosticsDefaultInformation", s:light_cyan, s:transparent, "", "") + call s:highlight("LspDiagnosticsDefaultHint", s:dark_blue, s:transparent, "", "") + call s:highlight("LspDiagnosticsUnderlineWarning", s:light_yellow, s:transparent, "undercurl", "") + call s:highlight("LspDiagnosticsUnderlineError", s:light_red, s:transparent, "undercurl", "") + call s:highlight("LspDiagnosticsUnderlineInformation", s:light_cyan, s:transparent, "undercurl", "") + call s:highlight("LspDiagnosticsUnderlineHint", s:dark_blue, s:transparent, "undercurl", "") endif " Gitsigns @@ -590,17 +673,17 @@ endif " GitGutter " > airblade/vim-gitgutter -call s:hi("GitGutterAdd", s:nord14_gui, "", s:nord14_term, "", "", "") -call s:hi("GitGutterChange", s:nord13_gui, "", s:nord13_term, "", "", "") -call s:hi("GitGutterChangeDelete", s:nord11_gui, "", s:nord11_term, "", "", "") -call s:hi("GitGutterDelete", s:nord11_gui, "", s:nord11_term, "", "", "") +call s:highlight("GitGutterAdd", s:light_green, s:transparent, "", "") +call s:highlight("GitGutterChange", s:light_yellow, s:transparent, "", "") +call s:highlight("GitGutterChangeDelete", s:light_red, s:transparent, "", "") +call s:highlight("GitGutterDelete", s:light_red, s:transparent, "", "") " Signify " > mhinz/vim-signify -call s:hi("SignifySignAdd", s:nord14_gui, "", s:nord14_term, "", "", "") -call s:hi("SignifySignChange", s:nord13_gui, "", s:nord13_term, "", "", "") -call s:hi("SignifySignChangeDelete", s:nord11_gui, "", s:nord11_term, "", "", "") -call s:hi("SignifySignDelete", s:nord11_gui, "", s:nord11_term, "", "", "") +call s:highlight("SignifySignAdd", s:light_green, s:transparent, "", "") +call s:highlight("SignifySignChange", s:light_yellow, s:transparent, "", "") +call s:highlight("SignifySignChangeDelete", s:light_red, s:transparent, "", "") +call s:highlight("SignifySignDelete", s:light_red, s:transparent, "", "") " Sneak " > justinmk/vim-sneak @@ -608,17 +691,17 @@ hi! link Sneak Search " fugitive.vim " > tpope/vim-fugitive -call s:hi("gitcommitDiscardedFile", s:nord11_gui, "", s:nord11_term, "", "", "") -call s:hi("gitcommitUntrackedFile", s:nord11_gui, "", s:nord11_term, "", "", "") -call s:hi("gitcommitSelectedFile", s:nord14_gui, "", s:nord14_term, "", "", "") +call s:highlight("gitcommitDiscardedFile", s:light_red, s:transparent, "", "") +call s:highlight("gitcommitUntrackedFile", s:light_red, s:transparent, "", "") +call s:highlight("gitcommitSelectedFile", s:light_green, s:transparent, "", "") " davidhalter/jedi-vim -call s:hi("jediFunction", s:nord4_gui, s:nord3_gui, "", s:nord3_term, "", "") -call s:hi("jediFat", s:nord8_gui, s:nord3_gui, s:nord8_term, s:nord3_term, s:underline.s:bold, "") +call s:highlight("jediFunction", s:white, s:light_black, "", "") +call s:highlight("jediFat", s:light_cyan, s:light_black, s:underline.s:bold, "") " NERDTree " > scrooloose/nerdtree -call s:hi("NERDTreeExecFile", s:nord7_gui, "", s:nord7_term, "", "", "") +call s:highlight("NERDTreeExecFile", s:dark_cyan, s:transparent, "", "") hi! link NERDTreeDirSlash Keyword hi! link NERDTreeHelp Comment @@ -629,24 +712,24 @@ hi! link CtrlPBufferHid Normal " vim-clap " > liuchengxu/vim-clap -call s:hi("ClapDir", s:nord4_gui, "", "", "", "", "") -call s:hi("ClapDisplay", s:nord4_gui, s:nord1_gui, "", s:nord1_term, "", "") -call s:hi("ClapFile", s:nord4_gui, "", "", "NONE", "", "") -call s:hi("ClapMatches", s:nord8_gui, "", s:nord8_term, "", "", "") -call s:hi("ClapNoMatchesFound", s:nord13_gui, "", s:nord13_term, "", "", "") -call s:hi("ClapSelected", s:nord7_gui, "", s:nord7_term, "", s:bold, "") -call s:hi("ClapSelectedSign", s:nord9_gui, "", s:nord9_term, "", "", "") +call s:highlight("ClapDir", s:white, s:transparent, "", "") +call s:highlight("ClapDisplay", s:white, s:dark_black, "", "") +call s:highlight("ClapFile", s:white, s:transparent, "", "") +call s:highlight("ClapMatches", s:light_cyan, s:transparent, "", "") +call s:highlight("ClapNoMatchesFound", s:light_yellow, s:transparent, "", "") +call s:highlight("ClapSelected", s:dark_cyan, s:transparent, s:bold, "") +call s:highlight("ClapSelectedSign", s:light_blue, s:transparent, "", "") let s:clap_matches = [ - \ [s:nord8_gui, s:nord8_term] , - \ [s:nord9_gui, s:nord9_term] , - \ [s:nord10_gui, s:nord10_term] , - \ ] -for s:nord_clap_match_i in range(1,12) - let clap_match_color = s:clap_matches[s:nord_clap_match_i % len(s:clap_matches) - 1] - call s:hi("ClapMatches" . s:nord_clap_match_i, clap_match_color[0], "", clap_match_color[1], "", "", "") - call s:hi("ClapFuzzyMatches" . s:nord_clap_match_i, clap_match_color[0], "", clap_match_color[1], "", "", "") +\ s:light_cyan, +\ s:light_blue, +\ s:dark_blue, +\ ] +for s:clap_match_i in range(1, 12) + let clap_match_color = s:clap_matches[s:clap_match_i % len(s:clap_matches) - 1] + call s:highlight("ClapMatches" . s:clap_match_i, clap_match_color, s:transparent, "", "") + call s:highlight("ClapFuzzyMatches" . s:clap_match_i, clap_match_color, s:transparent, "", "") endfor -unlet s:nord_clap_match_i +unlet s:clap_match_i hi! link ClapCurrentSelection PmenuSel hi! link ClapCurrentSelectionSign ClapSelectedSign hi! link ClapInput Pmenu @@ -657,24 +740,24 @@ hi! link ClapProviderId Type " vim-indent-guides " > nathanaelkane/vim-indent-guides -call s:hi("IndentGuidesEven", "", s:nord1_gui, "", s:nord1_term, "", "") -call s:hi("IndentGuidesOdd", "", s:nord2_gui, "", s:nord3_term, "", "") +call s:highlight("IndentGuidesEven", "", s:dark_black, "", "") +call s:highlight("IndentGuidesOdd", "", s:medium_black, "", "") " vim-plug " > junegunn/vim-plug -call s:hi("plugDeleted", s:nord11_gui, "", "", s:nord11_term, "", "") +call s:highlight("plugDeleted", s:light_red, s:transparent, "", "") " vim-signature " > kshenoy/vim-signature -call s:hi("SignatureMarkText", s:nord8_gui, "", s:nord8_term, "", "", "") +call s:highlight("SignatureMarkText", s:light_cyan, s:transparent, "", "") " vim-startify " > mhinz/vim-startify -call s:hi("StartifyFile", s:nord6_gui, "", s:nord6_term, "", "", "") -call s:hi("StartifyFooter", s:nord7_gui, "", s:nord7_term, "", "", "") -call s:hi("StartifyHeader", s:nord8_gui, "", s:nord8_term, "", "", "") -call s:hi("StartifyNumber", s:nord7_gui, "", s:nord7_term, "", "", "") -call s:hi("StartifyPath", s:nord8_gui, "", s:nord8_term, "", "", "") +call s:highlight("StartifyFile", s:light_white, s:transparent, "", "") +call s:highlight("StartifyFooter", s:dark_cyan, s:transparent, "", "") +call s:highlight("StartifyHeader", s:light_cyan, s:transparent, "", "") +call s:highlight("StartifyNumber", s:dark_cyan, s:transparent, "", "") +call s:highlight("StartifyPath", s:light_cyan, s:transparent, "", "") hi! link StartifyBracket Delimiter hi! link StartifySlash Normal hi! link StartifySpecial Comment @@ -682,13 +765,13 @@ hi! link StartifySpecial Comment "+--- Languages ---+ " Haskell " > neovimhaskell/haskell-vim -call s:hi("haskellPreProc", s:nord10_gui, "", s:nord10_term, "", "", "") -call s:hi("haskellType", s:nord7_gui, "", s:nord7_term, "", "", "") +call s:highlight("haskellPreProc", s:dark_blue, s:transparent, "", "") +call s:highlight("haskellType", s:dark_cyan, s:transparent, "", "") hi! link haskellPragma haskellPreProc " JavaScript " > pangloss/vim-javascript -call s:hi("jsGlobalNodeObjects", s:nord8_gui, "", s:nord8_term, "", s:italic, "") +call s:highlight("jsGlobalNodeObjects", s:light_cyan, s:transparent, s:italic, "") hi! link jsBrackets Delimiter hi! link jsFuncCall Function hi! link jsFuncParens Delimiter @@ -699,8 +782,8 @@ hi! link jsRegexpString SpecialChar " Pandoc " > vim-pandoc/vim-pandoc-syntax -call s:hi("pandocDefinitionBlockTerm", s:nord7_gui, "", s:nord7_term, "", s:italic, "") -call s:hi("pandocTableDelims", s:nord3_gui, "", s:nord3_term, "", "", "") +call s:highlight("pandocDefinitionBlockTerm", s:dark_cyan, s:transparent, s:italic, "") +call s:highlight("pandocTableDelims", s:light_black, s:transparent, "", "") hi! link pandocAtxHeader markdownH1 hi! link pandocBlockQuote markdownBlockquote hi! link pandocCiteAnchor Operator @@ -742,13 +825,13 @@ endif " TypeScript " > HerringtonDarkholme/yats.vim -call s:hi("typescriptBOMWindowMethod", s:nord8_gui, "", s:nord8_term, "", s:italic, "") -call s:hi("typescriptClassName", s:nord7_gui, "", s:nord7_term, "", "", "") -call s:hi("typescriptDecorator", s:nord12_gui, "", s:nord12_term, "", "", "") -call s:hi("typescriptInterfaceName", s:nord7_gui, "", s:nord7_term, "", s:bold, "") -call s:hi("typescriptRegexpString", s:nord13_gui, "", s:nord13_term, "", "", "") +call s:highlight("typescriptBOMWindowMethod", s:light_cyan, s:transparent, s:italic, "") +call s:highlight("typescriptClassName", s:dark_cyan, s:transparent, "", "") +call s:highlight("typescriptDecorator", s:dark_yellow, s:transparent, "", "") +call s:highlight("typescriptInterfaceName", s:dark_cyan, s:transparent, s:bold, "") +call s:highlight("typescriptRegexpString", s:light_yellow, s:transparent, "", "") " TypeScript JSX - call s:hi("tsxAttrib", s:nord7_gui, "", s:nord7_term, "", "", "") +call s:highlight("tsxAttrib", s:dark_cyan, s:transparent, "", "") hi! link typescriptOperator Operator hi! link typescriptBinaryOp Operator hi! link typescriptAssign Operator @@ -783,10 +866,10 @@ hi! link tsxTagName tsxIntrinsicTagName " Markdown " > plasticboy/vim-markdown -call s:hi("mkdCode", s:nord7_gui, "", s:nord7_term, "", "", "") -call s:hi("mkdFootnote", s:nord8_gui, "", s:nord8_term, "", "", "") -call s:hi("mkdRule", s:nord10_gui, "", s:nord10_term, "", "", "") -call s:hi("mkdLineBreak", s:nord9_gui, "", s:nord9_term, "", "", "") +call s:highlight("mkdCode", s:dark_cyan, s:transparent, "", "") +call s:highlight("mkdFootnote", s:light_cyan, s:transparent, "", "") +call s:highlight("mkdRule", s:dark_blue, s:transparent, "", "") +call s:highlight("mkdLineBreak", s:light_blue, s:transparent, "", "") hi! link mkdBold Bold hi! link mkdItalic Italic hi! link mkdString Keyword @@ -807,8 +890,8 @@ hi! link mkdDelimiter Keyword " PHP " > StanAngeloff/php.vim -call s:hi("phpClass", s:nord7_gui, "", s:nord7_term, "", "", "") -call s:hi("phpClassImplements", s:nord7_gui, "", s:nord7_term, "", s:bold, "") +call s:highlight("phpClass", s:dark_cyan, s:transparent, "", "") +call s:highlight("phpClassImplements", s:dark_cyan, s:transparent, s:bold, "") hi! link phpClassExtends phpClass hi! link phpFunction Function hi! link phpMethod Function @@ -817,24 +900,23 @@ hi! link phpUseClass phpClass " Vimwiki " > vimwiki/vimwiki if !exists("g:vimwiki_hl_headers") || g:vimwiki_hl_headers == 0 - for s:i in range(1,6) - call s:hi("VimwikiHeader".s:i, s:nord8_gui, "", s:nord8_term, "", s:bold, "") + for s:i in range(1, 6) + call s:highlight("VimwikiHeader".s:i, s:light_cyan, s:transparent, s:bold, "") endfor else - let s:vimwiki_hcolor_guifg = [s:nord7_gui, s:nord8_gui, s:nord9_gui, s:nord10_gui, s:nord14_gui, s:nord15_gui] - let s:vimwiki_hcolor_ctermfg = [s:nord7_term, s:nord8_term, s:nord9_term, s:nord10_term, s:nord14_term, s:nord15_term] - for s:i in range(1,6) - call s:hi("VimwikiHeader".s:i, s:vimwiki_hcolor_guifg[s:i-1] , "", s:vimwiki_hcolor_ctermfg[s:i-1], "", s:bold, "") + let s:vimwiki_hcolorfg = [s:dark_cyan, s:light_cyan, s:light_blue, s:dark_blue, s:light_green, s:light_violet] + for s:i in range(1, 6) + call s:hightlight("VimwikiHeader" . s:i, s:vimwiki_hcolor_guifg[s:i-1] , s:transparent, s:bold, "") endfor endif -call s:hi("VimwikiLink", s:nord8_gui, "", s:nord8_term, "", s:underline, "") +call s:highlight("VimwikiLink", s:light_cyan, s:transparent, s:underline, "") hi! link VimwikiHeaderChar markdownHeadingDelimiter hi! link VimwikiHR Keyword hi! link VimwikiList markdownListMarker " YAML " > stephpy/vim-yaml -call s:hi("yamlKey", s:nord7_gui, "", s:nord7_term, "", "", "") +call s:highlight("yamlKey", s:dark_cyan, s:transparent, "", "") "+------------+ "+ Public API + @@ -844,8 +926,8 @@ call s:hi("yamlKey", s:nord7_gui, "", s:nord7_term, "", "", "") function! NordPalette() abort let ret = {} for color in range(16) - execute 'let ret["nord'.color.'"] = s:nord'.color.'_gui' + let ret['nord' . color] = s:palette[color] endfor - let ret["nord3_bright"] = s:nord3_gui_bright + let ret["nord3_bright"] = s:nord_light_black_gui_bright return ret endfunction From 8e107dd339b210aa08bce7590dbcf6c9e078502b Mon Sep 17 00:00:00 2001 From: Vivian De Smedt Date: Sat, 20 Apr 2024 10:04:39 +0200 Subject: [PATCH 4/4] fine tuning coc and add CSV support --- colors/nord.vim | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/colors/nord.vim b/colors/nord.vim index cf69fea..216b86e 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -290,7 +290,11 @@ else call s:highlight("CursorLineNr", s:white, s:dark_black, "NONE", "") endif -call s:highlight("Folded", s:light_black, s:dark_black, s:bold, "") +" Original +" call s:highlight("Folded", s:light_black, s:dark_black, s:bold, "") +" Make the foreground color more bright +call s:highlight("Folded", s:white, s:dark_black, s:bold, "") + call s:highlight("FoldColumn", s:light_black, s:black, "", "") call s:highlight("SignColumn", s:dark_black, s:black, "", "") @@ -646,8 +650,11 @@ call s:highlight("ALEError", s:light_red, s:transparent, "undercurl", "") " > neoclide/coc.vim call s:highlight("CocWarningHighlight", s:light_yellow, s:transparent, "undercurl", "") call s:highlight("CocErrorHighlight", s:light_red, s:transparent, "undercurl", "") -call s:highlight("CocWarningSign", s:light_yellow, s:transparent, "", "") +" call s:highlight("CocWarningSign", s:light_yellow, s:transparent, "", "") +call s:highlight("CocWarningSign", s:dark_yellow, s:transparent, "", "") +call s:highlight("CocWarningVirtualText", s:dark_yellow, s:transparent, "", "") call s:highlight("CocErrorSign", s:light_red, s:transparent, "", "") +call s:highlight("CocErrorVirtualText", s:light_red, s:transparent, "", "") call s:highlight("CocInfoSign", s:light_cyan, s:transparent, "", "") call s:highlight("CocHintSign", s:dark_blue, s:transparent, "", "") @@ -918,6 +925,14 @@ hi! link VimwikiList markdownListMarker " > stephpy/vim-yaml call s:highlight("yamlKey", s:dark_cyan, s:transparent, "", "") +" CSV +" > chrisbra/csv.vim +call s:highlight("CSVDelimiter", s:bright_black, s:black, "", "") +call s:highlight("CSVColumnEven", s:white, s:medium_black, "", "") +call s:highlight("CSVColumnOdd", s:white, s:black, "", "") +call s:highlight("CSVColumnHeaderEven", s:white, s:medium_black, "", "") +call s:highlight("CSVColumnHeaderOdd", s:white, s:black, "", "") + "+------------+ "+ Public API + "+------------+