From c16672570cc286bafc59af470af7defda84f2172 Mon Sep 17 00:00:00 2001 From: meck Date: Sat, 21 Jul 2018 17:55:42 +0200 Subject: [PATCH 01/10] Fix for terminal statusline in airline --- autoload/airline/themes/nord.vim | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/autoload/airline/themes/nord.vim b/autoload/airline/themes/nord.vim index 560d32a0..59369d1b 100755 --- a/autoload/airline/themes/nord.vim +++ b/autoload/airline/themes/nord.vim @@ -66,3 +66,9 @@ let s:IAMain = [s:nord5_gui, s:nord3_gui, s:nord5_term, s:nord3_term] let s:IARight = [s:nord5_gui, s:nord3_gui, s:nord5_term, s:nord3_term] let s:IAMiddle = [s:nord5_gui, s:nord1_gui, s:nord5_term, s:nord1_term] let g:airline#themes#nord#palette.inactive = airline#themes#generate_color_map(s:IAMain, s:IARight, s:IAMiddle) + +let g:airline#themes#nord#palette.normal.airline_term = s:NMiddle +let g:airline#themes#nord#palette.insert.airline_term = s:IMiddle +let g:airline#themes#nord#palette.replace.airline_term = s:RMiddle +let g:airline#themes#nord#palette.visual.airline_term = s:VMiddle +let g:airline#themes#nord#palette.inactive.airline_term = s:IAMiddle From 370af5a557c7a408bd1fbc1879d8fb0c35cd8132 Mon Sep 17 00:00:00 2001 From: meck Date: Fri, 10 Aug 2018 17:40:16 +0200 Subject: [PATCH 02/10] Add more ALE Highlights --- colors/nord.vim | 2 ++ 1 file changed, 2 insertions(+) diff --git a/colors/nord.vim b/colors/nord.vim index 2b7fca94..143c3823 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -488,6 +488,8 @@ hi! link yamlDocumentStart Keyword " > 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", "") " GitGutter " > airblade/vim-gitgutter From a23e959ca9017a7e81b5a2be1af3f83b337fcdb2 Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Sat, 13 Apr 2019 13:54:05 +0200 Subject: [PATCH 03/10] Haskell Syntax Plugin Support Added support for Haskell syntax through the neovimhaskell/haskell-vim (1) plugin. This includes better coloring for types/classes using `nord7` instead of highlighting them like keywords (`nord9`) and pre-processor and pragma elements are now colorized correctly with `nord10`. References: (1) https://github.com/neovimhaskell/haskell-vim GH-104 --- colors/nord.vim | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/colors/nord.vim b/colors/nord.vim index 328245f5..848f0515 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -548,6 +548,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, "") From 65863b23ffad39f90fc4709c1f2d85421a451f9c Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Sat, 13 Apr 2019 14:47:04 +0200 Subject: [PATCH 04/10] Improve CMake generator expression highlighting CMake generator expressions (1) are now highlighted using `nord10` as foreground instead of `nord13` as background and `nord0` as foreground. References: (1) https://cmake.org/cmake/help/latest/manual/cmake-generator-expressions.7.html GH-137 --- colors/nord.vim | 2 ++ 1 file changed, 2 insertions(+) diff --git a/colors/nord.vim b/colors/nord.vim index 328245f5..1bbfaf8e 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -309,6 +309,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 From 373c18afe7888eced47c3bbb5b5a4210638ceb08 Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Sat, 13 Apr 2019 20:28:59 +0200 Subject: [PATCH 05/10] Basic support for Asciidoc syntax highlighting This commit adds basic syntax highlighting support for Asciidoc (1) that comes bundled with Vim 8. References: (1) https://asciidoctor.org GH-131 --- colors/nord.vim | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/colors/nord.vim b/colors/nord.vim index 328245f5..6b9b3b63 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -288,6 +288,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 From 1ddc782e1efb627bb67d5b5598ee0e0a156bb03a Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Sun, 14 Apr 2019 07:06:35 +0200 Subject: [PATCH 06/10] Add theme config for bolder vertical split line Previously the `VertSplit` (1) (`:help VertSplit`) key used `nord1` as background color by default making the line appear to be very lumpy. This commit changes this style to use `nord0` as bavkground instead to visually merge with the background so only the separator charaters are a visual indiciator for the split line whih makes it look more lightweight and unclutters the overall appeareance. To allow user who liked the previous implementation to keep the style this commit also adds a new `nord_bold_vertical_split_line` theme config that can be assigned to `1` to achieve the legacy design. The README also include information and hints how to change the separator character by customizing Vim's `fillchars` (2) (`:help fillchars`) variable. References: (1) http://vimdoc.sourceforge.net/htmldoc/syntax.html#hl-VertSplit (2) http://vimdoc.sourceforge.net/htmldoc/options.html#'fillchars' GH-132 --- README.md | 16 ++++++++++++++++ ...-config-bold-vertical-split-line-default.png | Bin 0 -> 20347 bytes .../scrot-config-bold-vertical-split-line.png | Bin 0 -> 20260 bytes colors/nord.vim | 11 ++++++++++- 4 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 assets/scrot-config-bold-vertical-split-line-default.png create mode 100644 assets/scrot-config-bold-vertical-split-line.png diff --git a/README.md b/README.md index 06157d02..9989e558 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,7 @@ Nord Vim is a 16 colorspace theme build to run in GUI- and terminal mode with su - [Comment Contrast](#comment-contrast) - [Uniform diff Background](#uniform-diff-background) - [Line number background](#line-number-background) + - [Bold Vertical Split Line](#bold-vertical-split-line) - [Plugin Support](#plugin-support) - [UI Plugins](#ui-plugins) - [Language Plugins](#language-plugins) @@ -259,6 +260,20 @@ let g:nord_cursor_line_number_background = 1

No background (default)

Enabled background

+### Bold Vertical Split Line + +Enables a bolder vertical split line by using `nord1` as background. + +```viml +let g:nord_bold_vertical_split_line = 1 +``` + +To change the separator character used to display the vertical line please see the documentation about Vim's [`fillchars`][vdoc-fillchars] variable: `:help fillchars` + +

With base editor background (default)

+ +

With enabled bold nord1 background

+ ## Plugin Support Nord Vim provides support for many third-party language- and UI plugins. @@ -332,3 +347,4 @@ Please report issues/bugs, feature requests and suggestions for improvements to [scrot-lang-ruby]: https://raw.githubusercontent.com/arcticicestudio/nord-vim/develop/assets/scrot-lang-ruby.png [scrot-readme-default-profile]: https://raw.githubusercontent.com/arcticicestudio/nord-vim/develop/assets/scrot-readme-default-profile.png [scrot-readme-lazy-profile-change]: https://raw.githubusercontent.com/arcticicestudio/nord-vim/develop/assets/scrot-readme-lazy-profile-change.png +[vdoc-fillchars]: http://vimdoc.sourceforge.net/htmldoc/options.html#'fillchars' diff --git a/assets/scrot-config-bold-vertical-split-line-default.png b/assets/scrot-config-bold-vertical-split-line-default.png new file mode 100644 index 0000000000000000000000000000000000000000..bbda6880efd8a1d1e530cb42f137d75012a261e7 GIT binary patch literal 20347 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 literal 0 HcmV?d00001 diff --git a/colors/nord.vim b/colors/nord.vim index 1bbfaf8e..9b4ad259 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -122,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 @@ -248,7 +252,12 @@ 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 + From 40f85c4bc9cac624596f5555445f067e85e57335 Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Sun, 14 Apr 2019 19:38:47 +0200 Subject: [PATCH 07/10] Added basic syntax highlighting support for Rust This commit adds basic syntax highlighting support for Rust (1): Traits (2) and enums (3) are colorized with `nord7` and with bold font to make them visually stand out more. Also attributes (4) and derives (5) are colored with `nord10`. Macros (6) are colorized with `nord8` and bold font to make them visually different from "normal" functions. Escape (7) sequences are colored with `nord13`. Import statements and paths are correctly colored with keyword and type colors. References: (1) https://www.rust-lang.org (2) https://doc.rust-lang.org/book/ch10-02-traits.html (3) https://doc.rust-lang.org/1.1.0/book/enums.html (4) https://doc.rust-lang.org/reference/attributes.html (5) https://doc.rust-lang.org/edition-guide/rust-2018/macros/custom-derive.html (6) https://doc.rust-lang.org/1.8.0/book/macros.html (7) https://doc.rust-lang.org/reference/tokens.html#ascii-escapes GH-138 --- colors/nord.vim | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/colors/nord.vim b/colors/nord.vim index 1bbfaf8e..2b58b5c9 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -451,6 +451,18 @@ 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, "", "bold", "") +call s:hi("rustMacro", s:nord8_gui, "", s:nord8_term, "", "bold", "") +call s:hi("rustModPath", s:nord7_gui, "", s:nord7_term, "", "", "") +call s:hi("rustPanic", s:nord9_gui, "", s:nord9_term, "", "bold", "") +call s:hi("rustTrait", s:nord7_gui, "", s:nord7_term, "", 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, "") hi! link sassAmpersand Keyword From d85568fb6eea503b0a5e6125c82d9ec792ee345c Mon Sep 17 00:00:00 2001 From: Axel Pardemann Date: Wed, 27 Jun 2018 14:20:06 -0500 Subject: [PATCH 08/10] Add support for airline warning and error colors --- autoload/airline/themes/nord.vim | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/autoload/airline/themes/nord.vim b/autoload/airline/themes/nord.vim index e586921f..61744e37 100755 --- a/autoload/airline/themes/nord.vim +++ b/autoload/airline/themes/nord.vim @@ -45,27 +45,47 @@ let s:nord6_term = "15" let s:NMain = [s:nord1_gui, s:nord8_gui, s:nord1_term, s:nord8_term] let s:NRight = [s:nord1_gui, s:nord9_gui, s:nord1_term, s:nord9_term] let s:NMiddle = [s:nord5_gui, s:nord3_gui, s:nord5_term, s:nord3_term] +let s:NWarn = [s:nord3_gui, s:nord13_gui, s:nord3_term, s:nord13_term] +let s:NError = [s:nord0_gui, s:nord11_gui, s:nord1_term, s:nord11_term] let g:airline#themes#nord#palette.normal = airline#themes#generate_color_map(s:NMain, s:NRight, s:NMiddle) +let g:airline#themes#nord#palette.normal.airline_warning = s:NWarn +let g:airline#themes#nord#palette.normal.airline_error = s:NError let s:IMain = [s:nord1_gui, s:nord14_gui, s:nord1_term, s:nord6_term] let s:IRight = [s:nord1_gui, s:nord9_gui, s:nord1_term, s:nord9_term] let s:IMiddle = [s:nord5_gui, s:nord3_gui, s:nord5_term, s:nord3_term] +let s:IWarn = [s:nord3_gui, s:nord13_gui, s:nord3_term, s:nord13_term] +let s:IError = [s:nord0_gui, s:nord11_gui, s:nord1_term, s:nord11_term] let g:airline#themes#nord#palette.insert = airline#themes#generate_color_map(s:IMain, s:IRight, s:IMiddle) +let g:airline#themes#nord#palette.insert.airline_warning = s:IWarn +let g:airline#themes#nord#palette.insert.airline_error = s:IError let s:RMain = [s:nord1_gui, s:nord14_gui, s:nord1_term, s:nord14_term] let s:RRight = [s:nord1_gui, s:nord9_gui, s:nord1_term, s:nord9_term] let s:RMiddle = [s:nord5_gui, s:nord3_gui, s:nord5_term, s:nord3_term] +let s:RWarn = [s:nord3_gui, s:nord13_gui, s:nord3_term, s:nord13_term] +let s:RError = [s:nord0_gui, s:nord11_gui, s:nord1_term, s:nord11_term] let g:airline#themes#nord#palette.replace = airline#themes#generate_color_map(s:RMain, s:RRight, s:RMiddle) +let g:airline#themes#nord#palette.replace.airline_warning = s:RWarn +let g:airline#themes#nord#palette.replace.airline_error = s:RError let s:VMain = [s:nord1_gui, s:nord7_gui, s:nord1_term, s:nord7_term] let s:VRight = [s:nord1_gui, s:nord9_gui, s:nord1_term, s:nord9_term] let s:VMiddle = [s:nord5_gui, s:nord3_gui, s:nord5_term, s:nord3_term] +let s:VWarn = [s:nord3_gui, s:nord13_gui, s:nord3_term, s:nord13_term] +let s:VError = [s:nord0_gui, s:nord11_gui, s:nord1_term, s:nord11_term] let g:airline#themes#nord#palette.visual = airline#themes#generate_color_map(s:VMain, s:VRight, s:VMiddle) +let g:airline#themes#nord#palette.visual.airline_warning = s:VWarn +let g:airline#themes#nord#palette.visual.airline_error = s:VError let s:IAMain = [s:nord5_gui, s:nord3_gui, s:nord5_term, s:nord3_term] let s:IARight = [s:nord5_gui, s:nord3_gui, s:nord5_term, s:nord3_term] let s:IAMiddle = [s:nord5_gui, s:nord1_gui, s:nord5_term, s:nord1_term] +let s:IAWarn = [s:nord3_gui, s:nord13_gui, s:nord3_term, s:nord13_term] +let s:IAError = [s:nord0_gui, s:nord11_gui, s:nord1_term, s:nord11_term] let g:airline#themes#nord#palette.inactive = airline#themes#generate_color_map(s:IAMain, s:IARight, s:IAMiddle) +let g:airline#themes#nord#palette.inactive.airline_warning = s:IAWarn +let g:airline#themes#nord#palette.inactive.airline_error = s:IAError let g:airline#themes#nord#palette.normal.airline_term = s:NMiddle let g:airline#themes#nord#palette.insert.airline_term = s:IMiddle From 2a633e28919267f8206800c625f9dd1c9cebe906 Mon Sep 17 00:00:00 2001 From: Axel Pardemann Date: Sun, 14 Apr 2019 18:06:53 -0500 Subject: [PATCH 09/10] Add more contrast between background and text As suggested in the comments of pull request #130 --- autoload/airline/themes/nord.vim | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/autoload/airline/themes/nord.vim b/autoload/airline/themes/nord.vim index 61744e37..7840cce0 100755 --- a/autoload/airline/themes/nord.vim +++ b/autoload/airline/themes/nord.vim @@ -45,7 +45,7 @@ let s:nord6_term = "15" let s:NMain = [s:nord1_gui, s:nord8_gui, s:nord1_term, s:nord8_term] let s:NRight = [s:nord1_gui, s:nord9_gui, s:nord1_term, s:nord9_term] let s:NMiddle = [s:nord5_gui, s:nord3_gui, s:nord5_term, s:nord3_term] -let s:NWarn = [s:nord3_gui, s:nord13_gui, s:nord3_term, s:nord13_term] +let s:NWarn = [s:nord1_gui, s:nord13_gui, s:nord3_term, s:nord13_term] let s:NError = [s:nord0_gui, s:nord11_gui, s:nord1_term, s:nord11_term] let g:airline#themes#nord#palette.normal = airline#themes#generate_color_map(s:NMain, s:NRight, s:NMiddle) let g:airline#themes#nord#palette.normal.airline_warning = s:NWarn @@ -54,7 +54,7 @@ let g:airline#themes#nord#palette.normal.airline_error = s:NError let s:IMain = [s:nord1_gui, s:nord14_gui, s:nord1_term, s:nord6_term] let s:IRight = [s:nord1_gui, s:nord9_gui, s:nord1_term, s:nord9_term] let s:IMiddle = [s:nord5_gui, s:nord3_gui, s:nord5_term, s:nord3_term] -let s:IWarn = [s:nord3_gui, s:nord13_gui, s:nord3_term, s:nord13_term] +let s:IWarn = [s:nord1_gui, s:nord13_gui, s:nord3_term, s:nord13_term] let s:IError = [s:nord0_gui, s:nord11_gui, s:nord1_term, s:nord11_term] let g:airline#themes#nord#palette.insert = airline#themes#generate_color_map(s:IMain, s:IRight, s:IMiddle) let g:airline#themes#nord#palette.insert.airline_warning = s:IWarn @@ -63,7 +63,7 @@ let g:airline#themes#nord#palette.insert.airline_error = s:IError let s:RMain = [s:nord1_gui, s:nord14_gui, s:nord1_term, s:nord14_term] let s:RRight = [s:nord1_gui, s:nord9_gui, s:nord1_term, s:nord9_term] let s:RMiddle = [s:nord5_gui, s:nord3_gui, s:nord5_term, s:nord3_term] -let s:RWarn = [s:nord3_gui, s:nord13_gui, s:nord3_term, s:nord13_term] +let s:RWarn = [s:nord1_gui, s:nord13_gui, s:nord3_term, s:nord13_term] let s:RError = [s:nord0_gui, s:nord11_gui, s:nord1_term, s:nord11_term] let g:airline#themes#nord#palette.replace = airline#themes#generate_color_map(s:RMain, s:RRight, s:RMiddle) let g:airline#themes#nord#palette.replace.airline_warning = s:RWarn @@ -72,7 +72,7 @@ let g:airline#themes#nord#palette.replace.airline_error = s:RError let s:VMain = [s:nord1_gui, s:nord7_gui, s:nord1_term, s:nord7_term] let s:VRight = [s:nord1_gui, s:nord9_gui, s:nord1_term, s:nord9_term] let s:VMiddle = [s:nord5_gui, s:nord3_gui, s:nord5_term, s:nord3_term] -let s:VWarn = [s:nord3_gui, s:nord13_gui, s:nord3_term, s:nord13_term] +let s:VWarn = [s:nord1_gui, s:nord13_gui, s:nord3_term, s:nord13_term] let s:VError = [s:nord0_gui, s:nord11_gui, s:nord1_term, s:nord11_term] let g:airline#themes#nord#palette.visual = airline#themes#generate_color_map(s:VMain, s:VRight, s:VMiddle) let g:airline#themes#nord#palette.visual.airline_warning = s:VWarn @@ -81,7 +81,7 @@ let g:airline#themes#nord#palette.visual.airline_error = s:VError let s:IAMain = [s:nord5_gui, s:nord3_gui, s:nord5_term, s:nord3_term] let s:IARight = [s:nord5_gui, s:nord3_gui, s:nord5_term, s:nord3_term] let s:IAMiddle = [s:nord5_gui, s:nord1_gui, s:nord5_term, s:nord1_term] -let s:IAWarn = [s:nord3_gui, s:nord13_gui, s:nord3_term, s:nord13_term] +let s:IAWarn = [s:nord1_gui, s:nord13_gui, s:nord3_term, s:nord13_term] let s:IAError = [s:nord0_gui, s:nord11_gui, s:nord1_term, s:nord11_term] let g:airline#themes#nord#palette.inactive = airline#themes#generate_color_map(s:IAMain, s:IARight, s:IAMiddle) let g:airline#themes#nord#palette.inactive.airline_warning = s:IAWarn From bfa83e8dcc23176a8c8a93e6fb0057c6cb2ff45d Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Thu, 18 Apr 2019 10:03:29 +0200 Subject: [PATCH 10/10] Prepare release version 0.11.0 --- CHANGELOG.md | 160 +++++++++++++++++++++++- README.md | 4 +- autoload/airline/themes/nord.vim | 2 +- autoload/lightline/colorscheme/nord.vim | 2 +- colors/nord.vim | 2 +- 5 files changed, 161 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a4c466c6..17835ac3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,122 @@ --- +# 0.11.0 + +![Release Date: 2019-04-18](https://img.shields.io/badge/Release_Date-2019--04--18-88C0D0.svg?style=flat-square) [![Project Board](https://img.shields.io/badge/Project_Board-0.11.0-88C0D0.svg?style=flat-square)](https://github.com/arcticicestudio/nord-vim/projects/16) [![Milestone](https://img.shields.io/badge/Milestone-0.11.0-88C0D0.svg?style=flat-square)](https://github.com/arcticicestudio/nord-vim/milestone/13) + +## Features + +### Syntax + +**Basic support for Asciidoc syntax highlighting** — #131 ⇄ #152 (⊶ 6e6025b9) by [@tidux][gh-user-tidux] +↠ Added basic syntax highlighting support for [Asciidoc][] that comes bundled with Vim 8. + +

+ +**Basic syntax highlighting support for Rust** — #138 ⇄ #154 (⊶ b0ffc6b5) by [@TerminalWitchcraft][gh-user-terminalwitchcraft] +↠ Added basic syntax highlighting support for [Rust][]. + +[Traits][rustdoc-traits] and [enums][rustdoc-enums] are colorized with `nord7` and with bold font to make them visually stand out more. +Also [attributes][rustdoc-attributes] and [derives][rustdoc-derives] are colored with `nord10`. + +

Before

+ +

After

+ +[Macros][rustdoc-macros] are colorized with `nord8` and bold font to make them visually different from "normal" functions. + +

Before

+ +

After

+ +[Escape][rustdoc-escapes] sequences are colored with `nord13`. + +

Before

+ +

After

+ +Import statements and paths are correctly colored with keyword and type colors. + +

Before

+ +

After

+ +#### Plugin Support + +**Haskell Syntax Plugin Support** — #104 ⇄ #150 (⊶ b0ffc6b5) by [@vabatta][gh-user-vabatta] +↠ Added support for Haskell syntax through the [neovimhaskell/haskell-vim][] plugin. +This includes better coloring for types/classes using `nord7` instead of highlighting them like keywords (`nord9`) and pre-processor and pragma elements are now colorized correctly with `nord10`. + +#### Pragma + +

Before

+ +

After

+ +#### Pre-Processor + +

Before

+ +

After

+ +#### Types/Classes + +

Before

+ +

After

+ +### UI + +**Theme config for bolder vertical split line** — #132 ⇄ #153 (⊶ 9059d7d8) by [@huyvohcmc][gh-user-huyvohcmc] +↠ Previously the [`VertSplit`][vdoc-vsplit] (`:help VertSplit`) key used `nord1` as background color by default making the line appear to be very lumpy. This has now been changed to use `nord0` as background instead to visually merge with the background so only the separator characters are a visual indicator for the split line which makes it look more lightweight and declutters the overall appearance. + +

With base editor background (default)

+ +

With enabled bold nord1 background

+ +To allow user who liked the previous implementation to keep the style a new `nord_bold_vertical_split_line` theme config was also added that can be assigned to `1` to achieve the legacy design. + +```viml +let g:nord_bold_vertical_split_line = 1 +``` + +The README includes information and hints how to change the separator character by customizing Vim's [`fillchars`][vdoc-fchar] (`:help fillchars`) variable. + +#### Plugin Support + +**`:terminal` status line in airline** — #134 (⊶ be815f09) by [@meck][gh-user-meck] +↠ Added support for Vim's new `:terminal` mode in [airline][gh-src-airline]. + +

Before: No :terminal support (before)

+ +

After: Support for airline's new _term theme keys

+ +## Improvements + +### Syntax + +**Better generator expressions in CMake** — #137 ⇄ #151 (⊶ d2774cbb) by [@markand][gh-user-markand] +↠ [CMake generator expressions][cmake-doc-genexpr] are now highlighted using `nord10` as foreground instead of `nord13` as background and `nord0` as foreground. + +

Before

+ +

After

+ +### UI + +#### Plugin Support + +**airline warnings and errors** — #130 (⊶ e85dbe75) by [@axelitus][gh-user-axelitus] +↠ Added support for error and warning elements of [airline][gh-src-airline]. + +

Before

+ +

After

+ +**ALE error and warning support** — #135 (⊶ 9d82b7a1) by [@meck][gh-user-meck] +↠ Added support highlighting and underlines for [ALE][plugin-ale] errors and warnings to also align the style with gutter signs. + # 0.10.0 ![Release Date: 2019-03-21](https://img.shields.io/badge/Release_Date-2019--03--21-88C0D0.svg?style=flat-square) [![Project Board](https://img.shields.io/badge/Project_Board-0.10.0-88C0D0.svg?style=flat-square)](https://github.com/arcticicestudio/nord-vim/projects/15) [![Milestone](https://img.shields.io/badge/Milestone-0.10.0-88C0D0.svg?style=flat-square)](https://github.com/arcticicestudio/nord-vim/milestone/12) @@ -483,6 +599,21 @@ Detailed information about features, supported plugins/languages and install ins ![Release Date: 2016-12-25](https://img.shields.io/badge/Release_Date-2016--12--25-88C0D0.svg?style=flat-square) + + + + + + +[asciidoc]: https://asciidoctor.org [gh-11]: https://github.com/arcticicestudio/nord-vim/issues/11 [gh-55-arcticicestudio/nord]: https://github.com/arcticicestudio/nord/issues/55 [gh-lightline.vim]: https://github.com/itchyny/lightline.vim @@ -491,11 +622,11 @@ Detailed information about features, supported plugins/languages and install ins [gh-tmuxline.vim]: https://github.com/edkolev/tmuxline.vim [gh-user-cg433n]: https://github.com/cg433n [gist-colors-in-terminals]: https://gist.github.com/XVilka/8346728 -[itchyny/lightline.vim-gh-257]: https://github.com/itchyny/lightline.vim/pull/257 [itchyny/lightline-adv-config]: https://github.com/itchyny/lightline.vim#advanced-configuration +[itchyny/lightline.vim-gh-257]: https://github.com/itchyny/lightline.vim/pull/257 [lesscss-doc-fn-lighten]: http://lesscss.org/functions/#color-operations-lighten -[nord-gh]: https://github.com/arcticicestudio/nord [nord-atom-syntax-pr-47]: https://github.com/arcticicestudio/nord-atom-syntax/pull/47 +[nord-gh]: https://github.com/arcticicestudio/nord [nord-lightline]: https://github.com/arcticicestudio/nord-vim/blob/develop/autoload/lightline/colorscheme/nord.vim [plugin-ale]: https://github.com/w0rp/ale [plugin-ctrlp]: https://github.com/ctrlpvim/ctrlp.vim @@ -506,12 +637,33 @@ Detailed information about features, supported plugins/languages and install ins [plugin-stephpy/vim-yaml]: https://github.com/stephpy/vim-yaml [plugin-tpope/vim-fugitive]: https://github.com/tpope/vim-fugitive [plugin-vimwiki/vimwiki]: https://github.com/vimwiki/vimwiki -[readme-config]: https://github.com/arcticicestudio/nord-vim#configuration [readme-config-comment-brightness]: https://github.com/arcticicestudio/nord-vim#comment-contrast [readme-config-italic]: https://github.com/arcticicestudio/nord-vim#italic-support [readme-config-line-number-background]: https://github.com/arcticicestudio/nord-vim#line-number-background [readme-config-underline-support]: https://github.com/arcticicestudio/nord-vim#underline-support [readme-config-uniform-diff-background]: https://github.com/arcticicestudio/nord-vim#uniform-diff-background [readme-config-uniform-statusline-background]: https://github.com/arcticicestudio/nord-vim#uniform-status-lines -[vim-doc-diffAdd]: http://vimdoc.sourceforge.net/htmldoc/syntax.html#hl-DiffAdd +[readme-config]: https://github.com/arcticicestudio/nord-vim#configuration +[rust]: https://www.rust-lang.org +[vdoc-fchar]: http://vimdoc.sourceforge.net/htmldoc/options.html#'fillchars' +[vdoc-vsplit]: http://vimdoc.sourceforge.net/htmldoc/syntax.html#hl-VertSplit +[vim-doc-diffadd]: http://vimdoc.sourceforge.net/htmldoc/syntax.html#hl-DiffAdd [yaml]: http://yaml.org + + + +[cmake-doc-genexpr]: https://cmake.org/cmake/help/latest/manual/cmake-generator-expressions.7.html +[gh-user-axelitus]: https://github.com/axelitus +[gh-user-huyvohcmc]: https://github.com/huyvohcmc +[gh-user-markand]: https://github.com/markand +[gh-user-meck]: https://github.com/meck +[gh-user-terminalwitchcraft]: https://github.com/terminalwitchcraft +[gh-user-tidux]: https://github.com/tidux +[gh-user-vabatta]: https://github.com/vabatta +[neovimhaskell/haskell-vim]: https://github.com/neovimhaskell/haskell-vim +[rustdoc-attributes]: https://doc.rust-lang.org/reference/attributes.html +[rustdoc-derives]: https://doc.rust-lang.org/edition-guide/rust-2018/macros/custom-derive.html +[rustdoc-enums]: https://doc.rust-lang.org/1.1.0/book/enums.html +[rustdoc-escapes]: https://doc.rust-lang.org/reference/tokens.html#ascii-escapes +[rustdoc-macros]: https://doc.rust-lang.org/1.8.0/book/macros.html +[rustdoc-traits]: https://doc.rust-lang.org/book/ch10-02-traits.html diff --git a/README.md b/README.md index 9989e558..92ccf7c7 100644 --- a/README.md +++ b/README.md @@ -92,7 +92,7 @@ Plug 'arcticicestudio/nord-vim', { 'branch': 'develop' } A explicit version can be installed via Git tags: ```vim -Plug 'arcticicestudio/nord-vim', { 'tag': 'v0.10.0' } +Plug 'arcticicestudio/nord-vim', { 'tag': 'v0.11.0' } ``` #### Manual @@ -316,7 +316,7 @@ Detailed descriptions for supported languages can be found in the [project wiki] ## Development -[![](https://img.shields.io/badge/Changelog-0.10.0-81A1C1.svg?style=flat-square)](https://github.com/arcticicestudio/nord-vim/blob/v0.10.0/CHANGELOG.md#0100) [![](https://img.shields.io/badge/Workflow-gitflow--branching--model-81A1C1.svg?style=flat-square)](http://nvie.com/posts/a-successful-git-branching-model) [![](https://img.shields.io/badge/Versioning-ArcVer_0.8.0-81A1C1.svg?style=flat-square)](https://github.com/arcticicestudio/arcver) +[![](https://img.shields.io/badge/Changelog-0.11.0-81A1C1.svg?style=flat-square)](https://github.com/arcticicestudio/nord-vim/blob/v0.11.0/CHANGELOG.md#0110) [![](https://img.shields.io/badge/Workflow-gitflow--branching--model-81A1C1.svg?style=flat-square)](http://nvie.com/posts/a-successful-git-branching-model) [![](https://img.shields.io/badge/Versioning-ArcVer_0.8.0-81A1C1.svg?style=flat-square)](https://github.com/arcticicestudio/arcver) ### Contribution diff --git a/autoload/airline/themes/nord.vim b/autoload/airline/themes/nord.vim index 7840cce0..358b3900 100755 --- a/autoload/airline/themes/nord.vim +++ b/autoload/airline/themes/nord.vim @@ -5,7 +5,7 @@ " Repository: https://github.com/arcticicestudio/nord-vim " License: MIT -let s:nord_vim_version="0.10.0" +let s:nord_vim_version="0.11.0" let g:airline#themes#nord#palette = {} let s:nord0_gui = "#2E3440" diff --git a/autoload/lightline/colorscheme/nord.vim b/autoload/lightline/colorscheme/nord.vim index 76e7ab2e..11813014 100755 --- a/autoload/lightline/colorscheme/nord.vim +++ b/autoload/lightline/colorscheme/nord.vim @@ -5,7 +5,7 @@ " Repository: https://github.com/arcticicestudio/nord-vim " License: MIT -let s:nord_vim_version="0.10.0" +let s:nord_vim_version="0.11.0" let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}} let s:nord0 = ["#2E3440", "NONE"] diff --git a/colors/nord.vim b/colors/nord.vim index fbd3deb3..2e633c62 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -13,7 +13,7 @@ if version > 580 endif let g:colors_name = "nord" -let s:nord_vim_version="0.10.0" +let s:nord_vim_version="0.11.0" set background=dark let s:nord0_gui = "#2E3440"