diff options
Diffstat (limited to 'colors')
| -rwxr-xr-x | colors/nord.vim | 69 |
1 files changed, 61 insertions, 8 deletions
diff --git a/colors/nord.vim b/colors/nord.vim index 143c382..af033de 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -1,5 +1,5 @@ -" Copyright (c) 2016-present Arctic Ice Studio <development@arcticicestudio.com> -" Copyright (c) 2016-present Sven Greb <code@svengreb.de> +" Copyright (C) 2016-present Arctic Ice Studio <development@arcticicestudio.com> +" Copyright (C) 2016-present Sven Greb <development@svengreb.de> " Project: Nord Vim " Repository: https://github.com/arcticicestudio/nord-vim @@ -13,13 +13,14 @@ if version > 580 endif let g:colors_name = "nord" -let s:nord_vim_version="0.9.0" +let s:nord_vim_version="0.10.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" @@ -100,8 +101,17 @@ if !exists('g:nord_uniform_status_lines') let g:nord_uniform_status_lines = 0 endif -if !exists("g:nord_comment_brightness") - let g:nord_comment_brightness = 0 +function! s:logWarning(msg) + echohl WarningMsg + echomsg 'nord: warning: ' . a:msg + echohl None +endfunction + +if exists("g:nord_comment_brightness") + call s:logWarning('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/arcticicestudio/nord-vim/issues/145 for more details.') + let g:nord_comment_brightness = 10 endif if !exists("g:nord_uniform_diff_background") @@ -112,6 +122,10 @@ if !exists("g:nord_cursor_line_number_background") let g:nord_cursor_line_number_background = 0 endif +if !exists("g:nord_bold_vertical_split_line") + let g:nord_bold_vertical_split_line = 0 +endif + function! s:hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=" . a:guifg @@ -168,6 +182,11 @@ call s:hi("healthSuccess", s:nord14_gui, s:nord1_gui, s:nord14_term, s:nord1_ter 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, "", "") +"+- 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] +endif + "+- Neovim Terminal Colors -+ if has('nvim') let g:terminal_color_0 = s:nord1_gui @@ -233,14 +252,19 @@ call s:hi("TabLineSel", s:nord8_gui, s:nord3_gui, s:nord8_term, s:nord3_term, "N "+--- Window ---+ call s:hi("Title", s:nord4_gui, "", "NONE", "", "NONE", "") -call s:hi("VertSplit", s:nord2_gui, s:nord1_gui, s:nord3_term, s:nord1_term, "NONE", "") + +if g:nord_bold_vertical_split_line == 0 + call s:hi("VertSplit", s:nord2_gui, s:nord0_gui, s:nord3_term, "NONE", "NONE", "") +else + call s:hi("VertSplit", s:nord2_gui, s:nord1_gui, s:nord3_term, s:nord1_term, "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_brightened[g:nord_comment_brightness], "", s:nord3_term, "", s:italicize_comments, "") +call s:hi("Comment", s:nord3_gui_bright, "", s:nord3_term, "", s:italicize_comments, "") call s:hi("Conditional", s:nord9_gui, "", s:nord9_term, "", "", "") call s:hi("Constant", s:nord4_gui, "", "NONE", "", "", "") call s:hi("Define", s:nord9_gui, "", s:nord9_term, "", "", "") @@ -273,6 +297,27 @@ hi! link PreCondit PreProc "+-----------+ "+ 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, "", "", "") +hi! link asciidocAdmonition Keyword +hi! link asciidocAttributeRef markdownH1 +hi! link asciidocBackslash Keyword +hi! link asciidocMacro Keyword +hi! link asciidocQuotedBold Bold +hi! link asciidocQuotedEmphasized Italic +hi! link asciidocQuotedMonospaced2 asciidocQuotedMonospaced +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, "", "bold", "") hi! link awkArrayElement Identifier @@ -294,6 +339,8 @@ call s:hi("cIncluded", s:nord7_gui, "", s:nord7_term, "", "", "") hi! link cOperator Operator hi! link cPreCondit PreCondit +call s:hi("cmakeGeneratorExpression", s:nord10_gui, "", s:nord10_term, "", "", "") + hi! link csPreCondit PreCondit hi! link csType Type hi! link csXmlTag SpecialComment @@ -466,7 +513,7 @@ 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, "", s:nord3_term, "", "bold", "") +call s:hi("xmlCdataStart", s:nord3_gui_bright, "", s:nord3_term, "", "bold", "") call s:hi("xmlNamespace", s:nord7_gui, "", s:nord7_term, "", "", "") hi! link xmlAttribPunct Delimiter hi! link xmlCdata Comment @@ -535,6 +582,12 @@ call s:hi("plugDeleted", s:nord11_gui, "", "", s:nord11_term, "", "") call s:hi("SignatureMarkText", s:nord8_gui, "", s:nord8_term, "", "", "") "+--- 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, "", "", "") +hi! link haskellPragma haskellPreProc + " JavaScript " > pangloss/vim-javascript call s:hi("jsGlobalNodeObjects", s:nord8_gui, "", s:nord8_term, "", s:italic, "") |