From e4972763ba7426b8bcfe4349f41db9f6348e2990 Mon Sep 17 00:00:00 2001 From: "john.hennessey" Date: Tue, 4 Jun 2019 18:34:39 -0400 Subject: [PATCH 01/28] adds coc error gutter support --- colors/nord.vim | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/colors/nord.vim b/colors/nord.vim index 632bf3f8..73c52105 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -559,6 +559,13 @@ 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", "") +" Coc +" > neoclide/coc +call s:hi("CocWarningSign", s:nord13_gui, "", s:nord13_term, "", "", "") +call s:hi("CocErrorSign" , s:nord11_gui, "", s:nord11_term, "", "", "") +call s:hi("CocWarningSign", s:nord13_gui, "", s:nord13_term, "", "", "") +call s:hi("CocErrorSign" , s:nord11_gui, "", s:nord11_term, "", "", "") + " GitGutter " > airblade/vim-gitgutter call s:hi("GitGutterAdd", s:nord14_gui, "", s:nord14_term, "", "", "") From 09636f0c32e7b73fcffb506756f495bbf6195738 Mon Sep 17 00:00:00 2001 From: "john.hennessey" Date: Tue, 4 Jun 2019 18:38:01 -0400 Subject: [PATCH 02/28] remove duplicated entries --- colors/nord.vim | 2 -- 1 file changed, 2 deletions(-) diff --git a/colors/nord.vim b/colors/nord.vim index 73c52105..ea05c328 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -563,8 +563,6 @@ call s:hi("ALEError" , s:nord11_gui, "", s:nord11_term, "", "undercurl", "") " > neoclide/coc call s:hi("CocWarningSign", s:nord13_gui, "", s:nord13_term, "", "", "") call s:hi("CocErrorSign" , s:nord11_gui, "", s:nord11_term, "", "", "") -call s:hi("CocWarningSign", s:nord13_gui, "", s:nord13_term, "", "", "") -call s:hi("CocErrorSign" , s:nord11_gui, "", s:nord11_term, "", "", "") " GitGutter " > airblade/vim-gitgutter From a6f05fd2d60a68a5c738f9c2afa45b16a0a42559 Mon Sep 17 00:00:00 2001 From: John Hennessey Date: Fri, 7 Jun 2019 15:05:55 -0400 Subject: [PATCH 03/28] Update colors/nord.vim Co-Authored-By: Arctic Ice Studio --- colors/nord.vim | 2 ++ 1 file changed, 2 insertions(+) diff --git a/colors/nord.vim b/colors/nord.vim index ea05c328..a14b8e07 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -563,6 +563,8 @@ call s:hi("ALEError" , s:nord11_gui, "", s:nord11_term, "", "undercurl", "") " > neoclide/coc 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, "", "", "") " GitGutter " > airblade/vim-gitgutter From e4f31c88a4e517146f93b3e0f7427a4339848078 Mon Sep 17 00:00:00 2001 From: Radu Vasilescu Date: Mon, 10 Jun 2019 14:39:27 -0400 Subject: [PATCH 04/28] Fix typo line 13 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 67a87ff5..12367764 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@

-Build for Vim's terminal- and GUI mode with _true colors_ with support for many third-party syntax and UI plugins including bundled themes for[lightline.vim][gh-itchyny/lightline.vim] and [vim-airline][gh-vim-airline/vim-airline]. +Build for Vim's terminal- and GUI mode with _true colors_ with support for many third-party syntax and UI plugins including bundled themes for [lightline.vim][gh-itchyny/lightline.vim] and [vim-airline][gh-vim-airline/vim-airline]. ## Getting Started From db742c0f4b5638c6bd1b0f68193e18ffd283b710 Mon Sep 17 00:00:00 2001 From: "Jose M. Murinello" Date: Wed, 17 Jul 2019 03:17:51 +0900 Subject: [PATCH 05/28] Uniform status lines config for bundled airline and lightline themes (#169) The included theme bundles have not supported the "uniform status line" feature (GH-58), which allows to change the background color of the status bar (StatusLine) group to `nord3`. Related to GH-58 Resolves GH-168 --- autoload/airline/themes/nord.vim | 6 +++++- autoload/lightline/colorscheme/nord.vim | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/autoload/airline/themes/nord.vim b/autoload/airline/themes/nord.vim index 022f1461..d82ef661 100755 --- a/autoload/airline/themes/nord.vim +++ b/autoload/airline/themes/nord.vim @@ -80,7 +80,11 @@ 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] +if g:nord_uniform_status_lines == 0 + let s:IAMiddle = [s:nord5_gui, s:nord1_gui, s:nord5_term, s:nord1_term] +else + let s:IAMiddle = [s:nord5_gui, s:nord3_gui, s:nord5_term, s:nord3_term] +endif 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) diff --git a/autoload/lightline/colorscheme/nord.vim b/autoload/lightline/colorscheme/nord.vim index 62f8ae24..f911f927 100755 --- a/autoload/lightline/colorscheme/nord.vim +++ b/autoload/lightline/colorscheme/nord.vim @@ -32,7 +32,7 @@ let s:p.normal.warning = [ [ s:nord1, s:nord13 ] ] let s:p.normal.error = [ [ s:nord1, s:nord11 ] ] let s:p.inactive.left = [ [ s:nord1, s:nord8 ], [ s:nord5, s:nord1 ] ] -let s:p.inactive.middle = [ [ s:nord5, s:nord1 ] ] +let s:p.inactive.middle = g:nord_uniform_status_lines == 0 ? [ [ s:nord5, s:nord1 ] ] : [ [ s:nord5, s:nord3 ] ] let s:p.inactive.right = [ [ s:nord5, s:nord1 ], [ s:nord5, s:nord1 ] ] let s:p.insert.left = [ [ s:nord1, s:nord6 ], [ s:nord5, s:nord1 ] ] From aaa73440dc89bcf11088f03b68e541f911eb8cee Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Thu, 10 Oct 2019 08:39:12 +0200 Subject: [PATCH 06/28] Plugin support for `vim-startify` (#176) Added custom highlight groups of the `vim-startify` (1) plugin to adapt to Nord's style. References: (1) https://github.com/mhinz/vim-startify Resolves GH-159 --- colors/nord.vim | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/colors/nord.vim b/colors/nord.vim index a14b8e07..69a7e5d0 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -609,6 +609,17 @@ call s:hi("plugDeleted", s:nord11_gui, "", "", s:nord11_term, "", "") " > kshenoy/vim-signature call s:hi("SignatureMarkText", s:nord8_gui, "", s:nord8_term, "", "", "") +" 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, "", "", "") +hi! link StartifyBracket Delimiter +hi! link StartifySlash Normal +hi! link StartifySpecial Comment + "+--- Languages ---+ " Haskell " > neovimhaskell/haskell-vim From 0cca2803e6ba5640bc08f1d6239da5036b5b9b6b Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Tue, 17 Dec 2019 13:06:51 +0100 Subject: [PATCH 07/28] Remove underline from gutter line numbers (#185) Vim version 8.1.2029 [1] added the `underline` attribute for the `CursorLineNr` group to `cterm` [2] based on vim/vim#4933 [3]. This change resulted in gutter line numbers being underlined which has now been reverted back to Nord's style by explicitly setting the attribute for the group to `NONE`. [1]: https://github.com/vim/vim/releases/tag/v8.1.2029 [2]: https://github.com/vim/vim/compare/d9b0d83b13d2691e4544709abd87eac004715175...017ba07fa2cdc578245618717229444fd50c470d#diff-80fffb3e9c20e93e5b2328a9a20e19c9 [3]: https://github.com/vim/vim/pull/4933 Resolves GH-174 --- colors/nord.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/colors/nord.vim b/colors/nord.vim index 69a7e5d0..2bf6dd14 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -219,9 +219,9 @@ endif "+--- Gutter ---+ call s:hi("CursorColumn", "", s:nord1_gui, "NONE", s:nord1_term, "", "") if g:nord_cursor_line_number_background == 0 - call s:hi("CursorLineNr", s:nord4_gui, s:nord0_gui, "NONE", "", "", "") + call s:hi("CursorLineNr", s:nord4_gui, s:nord0_gui, "NONE", "", "NONE", "") else - call s:hi("CursorLineNr", s:nord4_gui, s:nord1_gui, "NONE", s:nord1_term, "", "") + call s:hi("CursorLineNr", s:nord4_gui, s:nord1_gui, "NONE", s:nord1_term, "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", "", "") From 2212c21a510b93210747a33aef095a2ae10b87ad Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Tue, 17 Dec 2019 20:13:44 +0100 Subject: [PATCH 08/28] Prepare release version 0.13.0 --- CHANGELOG.md | 71 ++++++++++++++++++++++++- autoload/airline/themes/nord.vim | 2 +- autoload/lightline/colorscheme/nord.vim | 2 +- colors/nord.vim | 2 +- 4 files changed, 73 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a611461..e3d12568 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,9 +6,61 @@ +# 0.13.0 + +![Release Date: 2019-12-17](https://img.shields.io/badge/Release_Date-2019--12--17-88C0D0.svg?style=flat-square) [![Project Board](https://img.shields.io/badge/Project_Board-0.13.0-88C0D0.svg?style=flat-square)](https://github.com/arcticicestudio/nord-vim/projects/19) [![Milestone](https://img.shields.io/badge/Milestone-0.13.0-88C0D0.svg?style=flat-square)](https://github.com/arcticicestudio/nord-vim/milestone/15) + +## Features + +### UI + +**Support uniform status line background configuration for _vim-airline_ and _lightline.vim_ themes** — #168 ⇄ #169 (⊶ 73b3d340) by [@jmurinello][gh-user-jmurinello] +↠ Added support for the [uniform status line][nord-config-port-vim#uni_st_line] theme configuration, [introduced in version 0.7.0][gh-rel-v0.7.0] through [arcticicestudio/nord-vim#58][], for the bundled _vim-airline_ and _lightline.vim_ themes. + +

lightline.vim

+

Before

+

+

After

+

+ +

vim-airline

+

Before

+

+

After

+

+ +**Basic support for coc.vim (Conquer of Completion)** — #164 (⊶ a7797269) by [@hennessey][gh-user-hennessey] +↠ Added basic support for [coc.nvim][neoclide/coc.nvim], a _Intellisense_ engine for Vim 8 & NeoVim with full language server protocol support. + +**Basic support for _vim-startify_** — #159 ⇄ #176 (⊶ 38ab4a9c) +↠ Added basic support for [vim-startify][mhinz/vim-startify] with custom highlight groups. + +

+ +## Improvements + +### UI + +**No underlined style for gutter line numbers** — #174 ⇄ #185 (⊶ 0d352c4b) by [@nixtrace][gh-user-nixtrace] and [@alexandremjacques][gh-user-alexandremjacques] +↠ [Vim version 8.1.2029][vim/vim-rel-v8.1.2029] added the [`underline` attribute for the `CursorLineNr` group to `cterm`][vim/vim-diff#d9b0d83b...017ba07f] based on [vim/vim#4933][]. +This change resulted in gutter line numbers being underlined which has now been reverted back to Nord's style by explicitly setting the attribute for the group to `NONE`. + +

Before

+

+ +

After

+

+ +## Bug Fixes + +### Documentation + +**Fix missing whitespace** — #165 (⊶ 81d80e4a) by [@vasilescur][gh-user-vasilescur] +↠ Fixed a missing whitespace in the README project description. + # 0.12.0 -![Release Date: 2019-05-25](https://img.shields.io/badge/Release_Date-2019--05--25-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/18) [![Milestone](https://img.shields.io/badge/Milestone-0.11.0-88C0D0.svg?style=flat-square)](https://github.com/arcticicestudio/nord-vim/milestone/14) +![Release Date: 2019-05-25](https://img.shields.io/badge/Release_Date-2019--05--25-88C0D0.svg?style=flat-square) [![Project Board](https://img.shields.io/badge/Project_Board-0.12.0-88C0D0.svg?style=flat-square)](https://github.com/arcticicestudio/nord-vim/projects/18) [![Milestone](https://img.shields.io/badge/Milestone-0.12.0-88C0D0.svg?style=flat-square)](https://github.com/arcticicestudio/nord-vim/milestone/14) ## Features @@ -673,6 +725,7 @@ Detailed information about features, supported plugins/languages and install ins [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-atom-syntax-pr-47]: https://github.com/arcticicestudio/nord-atom-syntax/pull/47 +[nord-config-port-vim#uni_st_line]: https://www.nordtheme.com/docs/ports/vim/configuration#uniform-status-lines [nord-docs-config-font-bold]: https://www.nordtheme.com/ports/vim/configuration#bold-styles [nord-gh]: https://github.com/arcticicestudio/nord [nord-home]: https://www.nordtheme.com/ports/vim @@ -722,3 +775,19 @@ Detailed information about features, supported plugins/languages and install ins [gh-user-aborzunov]: https://github.com/aborzunov [gh-user-tobydeh]: https://github.com/tobydeh + + + +[arcticicestudio/nord-vim#58]: https://github.com/arcticicestudio/nord-vim/pull/58 +[gh-rel-v0.7.0]: https://github.com/arcticicestudio/nord-vim/releases/tag/v0.7.0 +[gh-user-alexandremjacques]: https://github.com/alexandremjacques +[gh-user-hennessey]: https://github.com/hennessey +[gh-user-jmurinello]: https://github.com/jmurinello +[gh-user-nixtrace]: https://github.com/nixtrace +[gh-user-vasilescur]: https://github.com/vasilescur +[mhinz/vim-startify]: https://github.com/mhinz/vim-startify +[neoclide/coc.nvim]: https://github.com/neoclide/coc.nvim +[nord-config-port-vim#uni_st_line]: https://www.nordtheme.com/docs/ports/vim/configuration#uniform-status-lines +[vim/vim-diff#d9b0d83b...017ba07f]: https://github.com/vim/vim/compare/d9b0d83b13d2691e4544709abd87eac004715175...017ba07fa2cdc578245618717229444fd50c470d#diff-80fffb3e9c20e93e5b2328a9a20e19c +[vim/vim-rel-v8.1.2029]: https://github.com/vim/vim/releases/tag/v8.1.2029 +[vim/vim#4933]: https://github.com/vim/vim/pull/4933 diff --git a/autoload/airline/themes/nord.vim b/autoload/airline/themes/nord.vim index d82ef661..3ab5fee4 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.12.0" +let s:nord_vim_version="0.13.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 f911f927..b81e793b 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.12.0" +let s:nord_vim_version="0.13.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 2bf6dd14..79842dce 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.12.0" +let s:nord_vim_version="0.13.0" set background=dark let s:nord0_gui = "#2E3440" From afa1c932b263d30b2341fad968706b87cf821585 Mon Sep 17 00:00:00 2001 From: "john.hennessey" Date: Tue, 4 Jun 2019 18:34:39 -0400 Subject: [PATCH 09/28] adds coc error gutter support --- colors/nord.vim | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/colors/nord.vim b/colors/nord.vim index 79842dce..3a69c782 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -566,6 +566,13 @@ 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, "", "", "") +" Coc +" > neoclide/coc +call s:hi("CocWarningSign", s:nord13_gui, "", s:nord13_term, "", "", "") +call s:hi("CocErrorSign" , s:nord11_gui, "", s:nord11_term, "", "", "") +call s:hi("CocWarningSign", s:nord13_gui, "", s:nord13_term, "", "", "") +call s:hi("CocErrorSign" , s:nord11_gui, "", s:nord11_term, "", "", "") + " GitGutter " > airblade/vim-gitgutter call s:hi("GitGutterAdd", s:nord14_gui, "", s:nord14_term, "", "", "") From fab33d1ecfc4969a18142b0a615bbe140f098d49 Mon Sep 17 00:00:00 2001 From: Alexander Jeurissen <1220084+alexanderjeurissen@users.noreply.github.com> Date: Tue, 10 Mar 2020 06:12:41 +0100 Subject: [PATCH 10/28] Add nvim-lsp support (#198) Added highlighting support for the build-in Neovim language server [1] using the coc.nvim [2] groups as reference. [1]: https://github.com/neovim/nvim-lsp [2]: https://github.com/neoclide/coc.nvim --- colors/nord.vim | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/colors/nord.vim b/colors/nord.vim index 3a69c782..549dd07d 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -573,6 +573,13 @@ call s:hi("CocErrorSign" , s:nord11_gui, "", s:nord11_term, "", "", "") call s:hi("CocWarningSign", s:nord13_gui, "", s:nord13_term, "", "", "") call s:hi("CocErrorSign" , s:nord11_gui, "", s:nord11_term, "", "", "") +" Nvim LSP +" > neovim/nvim-lsp +call s:hi("LSPDiagnosticsWarning", s:nord13_gui, "", s:nord13_term, "", "", "") +call s:hi("LSPDiagnosticsError" , s:nord11_gui, "", s:nord11_term, "", "", "") +call s:hi("LSPDiagnosticsInformation" , s:nord8_gui, "", s:nord8_term, "", "", "") +call s:hi("LSPDiagnosticsHint" , s:nord10_gui, "", s:nord10_term, "", "", "") + " GitGutter " > airblade/vim-gitgutter call s:hi("GitGutterAdd", s:nord14_gui, "", s:nord14_term, "", "", "") From ccad4325ec483f95d866f0da65f53e6c2445e4ac Mon Sep 17 00:00:00 2001 From: xulongwu4 Date: Tue, 28 Apr 2020 10:27:09 -0400 Subject: [PATCH 11/28] Consistent `Error` and MoreMsg highlight group consistent between console and GUI modes. (#202) Consistent `Error` and `MoreMsg` highligh. in term and GUI mode (#202) Before the `Error` group in GUI mode used `nord0` as foreground color instead of `nord4` resulting in a bad contrast. Also after checking ( links to it) Also since there was also no color defined for terminal mode for the `MoreMsg` group (see `:help MoreMsg` that link to `:help more-prompt`) Vim used the default color which was some kind of green. To ensure it matches Nord's style it has now been changed to use `nord8` (main accent color) for both terminal and GUI mode. This can be tested by running `:echon "MESSAGE\n"` taht produces a lot of lines that won't fit on the current screen space anymore. Co-authored-by: Arctic Ice Studio Co-authored-by: Sven Greb --- colors/nord.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/colors/nord.vim b/colors/nord.vim index 549dd07d..0ba4416d 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -168,7 +168,7 @@ call s:hi("Underline", "", "", "", "", s:underline, "") 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:nord0_gui, s:nord11_gui, "", s:nord11_term, "", "") +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, s:nord0_gui, s:nord3_term, "NONE", "", "") call s:hi("MatchParen", s:nord8_gui, s:nord3_gui, s:nord8_term, s:nord3_term, "", "") @@ -234,7 +234,7 @@ call s:hi("Directory", s:nord8_gui, "", s:nord8_term, "NONE", "", "") 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:nord4_gui, "", "", "", "", "") +call s:hi("MoreMsg", s:nord8_gui, "", s:nord8_term, "", "", "") call s:hi("Question", s:nord4_gui, "", "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", "") From e420e7f38db7fd8a5433237d7839b6a39e6feac3 Mon Sep 17 00:00:00 2001 From: xulongwu4 Date: Thu, 7 May 2020 03:21:20 -0400 Subject: [PATCH 12/28] Use transparent background for gutter line number in GUI mode (#204) The `LineNr` and `CursorLineNr` highlight groups now have a transparent background in GUI mode. Before it was set to `nord0_gui` which worked fine in most cases. However, some plugins use these highlight groups to render their content in a popup window which can potentially have a different background color. This caused some issues e.g. for the fuzzy search plugin LeaderF [1]. The compatibility with the `g:nord_cursor_line_number_background` theme configuration has been verified to work as expected in both modes when it is set to `0` or `1`. This change is not related to the terminal mode or when using `set notermguicolors` since `ctermbg` for `LineNr` and `CursorLineNr` is set to `NONE` by default. [1]: https://github.com/Yggdroot/LeaderF --- colors/nord.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/colors/nord.vim b/colors/nord.vim index 0ba4416d..6b4054ee 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -170,7 +170,7 @@ 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, s:nord0_gui, s:nord3_term, "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", "", "") @@ -219,7 +219,7 @@ endif "+--- Gutter ---+ call s:hi("CursorColumn", "", s:nord1_gui, "NONE", s:nord1_term, "", "") if g:nord_cursor_line_number_background == 0 - call s:hi("CursorLineNr", s:nord4_gui, s:nord0_gui, "NONE", "", "NONE", "") + call s:hi("CursorLineNr", s:nord4_gui, "", "NONE", "", "NONE", "") else call s:hi("CursorLineNr", s:nord4_gui, s:nord1_gui, "NONE", s:nord1_term, "NONE", "") endif From 9a2cebb1cb417e350f3ecf5881b51957d09e45c1 Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Tue, 16 Jun 2020 07:55:20 +0200 Subject: [PATCH 13/28] Release version 0.14.0 --- CHANGELOG.md | 49 ++++++++++++++++++++++++- autoload/airline/themes/nord.vim | 2 +- autoload/lightline/colorscheme/nord.vim | 2 +- colors/nord.vim | 2 +- 4 files changed, 50 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e3d12568..f8aba596 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,45 @@ +# 0.14.0 + +![Release Date: 2020-06-16](https://img.shields.io/badge/Release_Date-2020--06--16-88C0D0.svg?style=flat-square) [![Project Board](https://img.shields.io/badge/Project_Board-0.14.0-88C0D0.svg?style=flat-square)](https://github.com/arcticicestudio/nord-vim/projects/20) [![Milestone](https://img.shields.io/badge/Milestone-0.14.0-88C0D0.svg?style=flat-square)](https://github.com/arcticicestudio/nord-vim/milestone/16) + +## Features + +### UI + +**Basic support for nvim-lsp (Language Server Protocol)** — #198 (⊶ 0ccf70b6) by [@alexanderjeurissen][gh-user-alexanderjeurissen] +↠ Added basic support for [nvim-lsp][neovim/nvim-lsp], a collection of common configurations for the NVim language server protocol client. + +## Improvements + +### UI + +**Consistent error highlighting between GUI and terminal mode** — #202 (⊶ 974a9190) by [@xulongwu4][gh-user-xulongwu4] +↠ The highlighting of errors in GUI and _true color_ terminal mode now also uses `nord4` as foreground color of instead of `nord0`. + +

Before

+

+

After

+

+ +**Improved highlighting for “More“ separator** — #202 (⊶ 974a9190) by [@xulongwu4][gh-user-xulongwu4] +↠ The highlighting of the _More_ separator is now highlighted with the `nord8` accent color. + +

Before

+

+

After

+

+ +**Transparent line number and cursor line background by default** — #204 (⊶ 6323f662) by [@xulongwu4][gh-user-xulongwu4] +↠ Before the background color of the `LineNr` and `CursorLineNr` highlighting groups were set to `nord0` which was fine in most cases, but conflicted with plugins like [Yggdroot/LeaderF][] that renders line numbers in a popup windows with a different background color. + +

Before

+

+

After

+

+ # 0.13.0 ![Release Date: 2019-12-17](https://img.shields.io/badge/Release_Date-2019--12--17-88C0D0.svg?style=flat-square) [![Project Board](https://img.shields.io/badge/Project_Board-0.13.0-88C0D0.svg?style=flat-square)](https://github.com/arcticicestudio/nord-vim/projects/19) [![Milestone](https://img.shields.io/badge/Milestone-0.13.0-88C0D0.svg?style=flat-square)](https://github.com/arcticicestudio/nord-vim/milestone/15) @@ -237,8 +276,6 @@ The README includes information and hints how to change the separator character The default comment color has been adjusted so the configuration is not required anymore for users to increase the brightness on their own. To notify users about this change a deprecation warning will be shown when the `g:nord_comment_brightness` configuration variable has been set and initialized through the user's configuration. -## Improvements - **Improved compatibility of airline with tmuxline.vim plugin** — #117 ⇄ #128 (⊶ 3150628f) ↠ The [Nord airline.vim][gh-src-airline] UI plugin theme now includes better support for the [tmuxline.vim][gh-tmuxline.vim] plugin. Previously text shown in the main segment of the _tmuxline_, generated via the `:Tmuxline airline` command, caused a `bad colour: NONE` error or has been colorized using `nord0` which resulted in unreadable text due to a `nord3` background. @@ -775,6 +812,7 @@ Detailed information about features, supported plugins/languages and install ins [gh-user-aborzunov]: https://github.com/aborzunov [gh-user-tobydeh]: https://github.com/tobydeh +[nord-docs#143]: https://github.com/arcticicestudio/nord-docs/issues/143 @@ -791,3 +829,10 @@ Detailed information about features, supported plugins/languages and install ins [vim/vim-diff#d9b0d83b...017ba07f]: https://github.com/vim/vim/compare/d9b0d83b13d2691e4544709abd87eac004715175...017ba07fa2cdc578245618717229444fd50c470d#diff-80fffb3e9c20e93e5b2328a9a20e19c [vim/vim-rel-v8.1.2029]: https://github.com/vim/vim/releases/tag/v8.1.2029 [vim/vim#4933]: https://github.com/vim/vim/pull/4933 + + + +[gh-user-alexanderjeurissen]: https://github.com/alexanderjeurissen +[gh-user-xulongwu4]: https://github.com/xulongwu4 +[neovim/nvim-lsp]: https://github.com/neovim/nvim-lsp +[yggdroot/leaderf]: https://github.com/Yggdroot/LeaderF diff --git a/autoload/airline/themes/nord.vim b/autoload/airline/themes/nord.vim index 3ab5fee4..6cbde1f9 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.13.0" +let s:nord_vim_version="0.14.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 b81e793b..201f16d6 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.13.0" +let s:nord_vim_version="0.14.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 6b4054ee..056289bc 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.13.0" +let s:nord_vim_version="0.14.0" set background=dark let s:nord0_gui = "#2E3440" From e3267e0c159c054c143cef689ac2d11b6626f1b4 Mon Sep 17 00:00:00 2001 From: "john.hennessey" Date: Tue, 4 Jun 2019 18:34:39 -0400 Subject: [PATCH 14/28] adds coc error gutter support --- colors/nord.vim | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/colors/nord.vim b/colors/nord.vim index 056289bc..ac6d3cce 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -580,6 +580,13 @@ call s:hi("LSPDiagnosticsError" , s:nord11_gui, "", s:nord11_term, "", "", "") call s:hi("LSPDiagnosticsInformation" , s:nord8_gui, "", s:nord8_term, "", "", "") call s:hi("LSPDiagnosticsHint" , s:nord10_gui, "", s:nord10_term, "", "", "") +" Coc +" > neoclide/coc +call s:hi("CocWarningSign", s:nord13_gui, "", s:nord13_term, "", "", "") +call s:hi("CocErrorSign" , s:nord11_gui, "", s:nord11_term, "", "", "") +call s:hi("CocWarningSign", s:nord13_gui, "", s:nord13_term, "", "", "") +call s:hi("CocErrorSign" , s:nord11_gui, "", s:nord11_term, "", "", "") + " GitGutter " > airblade/vim-gitgutter call s:hi("GitGutterAdd", s:nord14_gui, "", s:nord14_term, "", "", "") From bf09c474feaa2ab067f201fce655dce24593519f Mon Sep 17 00:00:00 2001 From: Alexander Jeurissen <1220084+alexanderjeurissen@users.noreply.github.com> Date: Tue, 10 Mar 2020 06:12:41 +0100 Subject: [PATCH 15/28] Add nvim-lsp support (#198) Added highlighting support for the build-in Neovim language server [1] using the coc.nvim [2] groups as reference. [1]: https://github.com/neovim/nvim-lsp [2]: https://github.com/neoclide/coc.nvim --- colors/nord.vim | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/colors/nord.vim b/colors/nord.vim index ac6d3cce..9552c92e 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -566,13 +566,6 @@ 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, "", "", "") -" Coc -" > neoclide/coc -call s:hi("CocWarningSign", s:nord13_gui, "", s:nord13_term, "", "", "") -call s:hi("CocErrorSign" , s:nord11_gui, "", s:nord11_term, "", "", "") -call s:hi("CocWarningSign", s:nord13_gui, "", s:nord13_term, "", "", "") -call s:hi("CocErrorSign" , s:nord11_gui, "", s:nord11_term, "", "", "") - " Nvim LSP " > neovim/nvim-lsp call s:hi("LSPDiagnosticsWarning", s:nord13_gui, "", s:nord13_term, "", "", "") @@ -580,13 +573,6 @@ call s:hi("LSPDiagnosticsError" , s:nord11_gui, "", s:nord11_term, "", "", "") call s:hi("LSPDiagnosticsInformation" , s:nord8_gui, "", s:nord8_term, "", "", "") call s:hi("LSPDiagnosticsHint" , s:nord10_gui, "", s:nord10_term, "", "", "") -" Coc -" > neoclide/coc -call s:hi("CocWarningSign", s:nord13_gui, "", s:nord13_term, "", "", "") -call s:hi("CocErrorSign" , s:nord11_gui, "", s:nord11_term, "", "", "") -call s:hi("CocWarningSign", s:nord13_gui, "", s:nord13_term, "", "", "") -call s:hi("CocErrorSign" , s:nord11_gui, "", s:nord11_term, "", "", "") - " GitGutter " > airblade/vim-gitgutter call s:hi("GitGutterAdd", s:nord14_gui, "", s:nord14_term, "", "", "") From 776a02a89eb33fc52bb1c654e6dd343cbe3b593c Mon Sep 17 00:00:00 2001 From: iamdi Date: Sat, 20 Jun 2020 20:10:58 +1000 Subject: [PATCH 16/28] Add basic TypeScript and improve TSX support (#208) Basic highlighting support for TypeScript & TSX Added basic support to highlight TypeScript & TSX syntax more consistently through the HerringtonDarkholme/yats.vim plugin [1]. This includes improvements to highlight... 1. ...TypeScript interface an class names using `nord7` as foreground, where interfaces also use the bold attribute, to match with structs/classes. 2. ...global methods like e.g. `setTimeout` with `nord8` using the italic attribute to mark it kind of static. 3. ...regular expressions with `nord13` as foreground color instead of the normal color for quoted strings (`nord14`) to make it easier to differ between both. 4. ...global objects like `Error`, `JSON` and `console` with `nord7`. 5. ...primitive/builtin types like `string` with `nord9`. 6. ...TypeScript type references with `nord7`. 7. ...TypeScript specific characters like for type annotations (`:`) and member optionality (`?`) as operator with `nord9`. This also includes improvements for "vanilla" JavaScript elements. [1]: https://github.com/HerringtonDarkholme/yats.vim Resolves GH-208 Co-authored-by: Arctic Ice Studio Co-authored-by: Sven Greb --- colors/nord.vim | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/colors/nord.vim b/colors/nord.vim index 9552c92e..f7f72f6f 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -645,6 +645,47 @@ hi! link jsNoise Delimiter hi! link jsPrototype Keyword hi! link jsRegexpString SpecialChar +" 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, "", "", "") +" TypeScript JSX + call s:hi("tsxAttrib", s:nord7_gui, "", s:nord7_term, "", "", "") +hi! link typescriptOperator Operator +hi! link typescriptBinaryOp Operator +hi! link typescriptAssign Operator +hi! link typescriptMember Identifier +hi! link typescriptDOMStorageMethod Identifier +hi! link typescriptArrowFuncArg Identifier +hi! link typescriptGlobal typescriptClassName +hi! link typescriptBOMWindowProp Function +hi! link typescriptArrowFuncDef Function +hi! link typescriptAliasDeclaration Function +hi! link typescriptPredefinedType Type +hi! link typescriptTypeReference typescriptClassName +hi! link typescriptTypeAnnotation Structure +hi! link typescriptDocNamedParamType SpecialComment +hi! link typescriptDocNotation Keyword +hi! link typescriptDocTags Keyword +hi! link typescriptImport Keyword +hi! link typescriptExport Keyword +hi! link typescriptTry Keyword +hi! link typescriptVariable Keyword +hi! link typescriptBraces Normal +hi! link typescriptObjectLabel Normal +hi! link typescriptCall Normal +hi! link typescriptClassHeritage typescriptClassName +hi! link typescriptFuncTypeArrow Structure +hi! link typescriptMemberOptionality Structure +hi! link typescriptNodeGlobal typescriptGlobal +hi! link typescriptTypeBrackets Structure +hi! link tsxEqual Operator +hi! link tsxIntrinsicTagName htmlTag +hi! link tsxTagName tsxIntrinsicTagName + " Markdown " > plasticboy/vim-markdown call s:hi("mkdCode", s:nord7_gui, "", s:nord7_term, "", "", "") From 5d58f9b5980c78608269f69de91843c133d36ac0 Mon Sep 17 00:00:00 2001 From: Johan Date: Sun, 5 Jul 2020 15:53:01 +0200 Subject: [PATCH 17/28] Add support for vim-clap (#178) Added basic support for vim-clap [1], a modern and performant generic finder and dispatcher for Vim and NeoVim. [1]: https://github.com/liuchengxu/vim-clap GH-178 Co-authored-by: Arctic Ice Studio Co-authored-by: Sven Greb --- colors/nord.vim | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/colors/nord.vim b/colors/nord.vim index f7f72f6f..8a529200 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -608,6 +608,36 @@ hi! link NERDTreeHelp Comment hi! link CtrlPMatch Keyword 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, "", "", "") + +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], "", "", "") +endfor +unlet s:nord_clap_match_i + +hi! link ClapCurrentSelection PmenuSel +hi! link ClapCurrentSelectionSign ClapSelectedSign +hi! link ClapInput Pmenu +hi! link ClapPreview Pmenu +hi! link ClapProviderAbout ClapDisplay +hi! link ClapProviderColon Type +hi! link ClapProviderId Type + " vim-plug " > junegunn/vim-plug call s:hi("plugDeleted", s:nord11_gui, "", "", s:nord11_term, "", "") From 16709e65760c79ccca2ff778cd1b21c384f8bfa1 Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Mon, 6 Jul 2020 07:40:16 +0200 Subject: [PATCH 18/28] Release version 0.15.0 --- CHANGELOG.md | 47 +++++++++++++++++++++++++ autoload/airline/themes/nord.vim | 2 +- autoload/lightline/colorscheme/nord.vim | 2 +- colors/nord.vim | 2 +- 4 files changed, 50 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f8aba596..75c53c9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,43 @@ +# 0.15.0 + +![Release Date: 2020-07-06](https://img.shields.io/badge/Release_Date-2020--07--06-88C0D0.svg?style=flat-square) [![Project Board](https://img.shields.io/badge/Project_Board-0.15.0-88C0D0.svg?style=flat-square)](https://github.com/arcticicestudio/nord-vim/projects/21) [![Milestone](https://img.shields.io/badge/Milestone-0.15.0-88C0D0.svg?style=flat-square)](https://github.com/arcticicestudio/nord-vim/milestone/17) + +## Features + +### Syntax + +**Extended support for TypeScript and TSX** — #208 (⊶ 1bd44ade) by [@iamdidev][gh-user-iamdidev] +↠ Added extended support for [TypeScript][] and [TSX][ts-docs-jsx] through the [yats.vim][herringtonharkholme/yats.vim] plugin. +This provides, among many other good changes, better highlighting for syntax elements like [decorators][ts-docs-decorators], more granular separation of different language elements within a single code line as well as highlighting for… + +

…interfaces with bold font style, typing characters and types.

+

+ +

…global methods like setTimeout with italic font style.

+

+ +

…regular expressions with nord13 instead of the normal color for quoted strings.

+

+ +

…global elements like Error, JSON and console.

+

+ +

…brackets of types as structural elements.

+

+ +

…TSX/JSX and HTML with a consistent appearance.

+

+ +### UI + +**Support for vim-clap** — #178 (⊶ 7a52f66c) by [@meck][gh-user-meck] and [@ikalnytskyi][gh-user-ikalnytskyi] +↠ Added basic support for [vim-clap][liuchengxu/vim-clap], a modern and performant generic finder and dispatcher for Vim and NeoVim. + +

+ # 0.14.0 ![Release Date: 2020-06-16](https://img.shields.io/badge/Release_Date-2020--06--16-88C0D0.svg?style=flat-square) [![Project Board](https://img.shields.io/badge/Project_Board-0.14.0-88C0D0.svg?style=flat-square)](https://github.com/arcticicestudio/nord-vim/projects/20) [![Milestone](https://img.shields.io/badge/Milestone-0.14.0-88C0D0.svg?style=flat-square)](https://github.com/arcticicestudio/nord-vim/milestone/16) @@ -836,3 +873,13 @@ Detailed information about features, supported plugins/languages and install ins [gh-user-xulongwu4]: https://github.com/xulongwu4 [neovim/nvim-lsp]: https://github.com/neovim/nvim-lsp [yggdroot/leaderf]: https://github.com/Yggdroot/LeaderF + + + +[gh-user-iamdidev]: https://github.com/iamdidev +[gh-user-ikalnytskyi]: https://github.com/ikalnytskyi +[herringtonharkholme/yats.vim]: https://github.com/HerringtonDarkholme/yats.vim +[liuchengxu/vim-clap]: https://github.com/liuchengxu/vim-clap +[ts-docs-decorators]: https://www.typescriptlang.org/docs/handbook/decorators.html +[ts-docs-jsx]: https://www.typescriptlang.org/docs/handbook/jsx.html +[typescript]: https://www.typescriptlang.org diff --git a/autoload/airline/themes/nord.vim b/autoload/airline/themes/nord.vim index 6cbde1f9..38d3add6 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.14.0" +let s:nord_vim_version="0.15.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 201f16d6..fceb189f 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.14.0" +let s:nord_vim_version="0.15.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 8a529200..6b00afbc 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.14.0" +let s:nord_vim_version="0.15.0" set background=dark let s:nord0_gui = "#2E3440" From 53c6aa0905ee2d7eb0beba937c80d2af0241c5f7 Mon Sep 17 00:00:00 2001 From: "john.hennessey" Date: Tue, 4 Jun 2019 18:34:39 -0400 Subject: [PATCH 19/28] adds coc error gutter support --- colors/nord.vim | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/colors/nord.vim b/colors/nord.vim index c7ad0705..2a039540 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -568,6 +568,10 @@ 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:hi("CocWarningSign", s:nord13_gui, "", s:nord13_term, "", "", "") +call s:hi("CocErrorSign" , s:nord11_gui, "", s:nord11_term, "", "", "") +call s:hi("CocWarningSign", s:nord13_gui, "", s:nord13_term, "", "", "") +call s:hi("CocErrorSign" , s:nord11_gui, "", s:nord11_term, "", "", "") " Neovim LSP " > neovim/nvim-lspconfig From 234b033e1cf75fd233b79b047ef11abe52a12bfb Mon Sep 17 00:00:00 2001 From: Ferran Jovell Date: Mon, 15 Mar 2021 14:40:11 +0100 Subject: [PATCH 20/28] Add Treesitter Support From: https://github.com/arcticicestudio/nord-vim/issues/235 --- colors/nord.vim | 229 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 229 insertions(+) diff --git a/colors/nord.vim b/colors/nord.vim index 2a039540..a12ef7e8 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -801,3 +801,232 @@ function! NordPalette() abort let ret["nord3_bright"] = s:nord3_gui_bright return ret endfunction + +" Treesitter +hi ColorColumn guifg=NONE ctermfg=NONE guibg=#3b4252 ctermbg=238 gui=NONE cterm=NONE +hi Cursor guifg=#2e3440 ctermfg=237 guibg=#d8dee9 ctermbg=254 gui=NONE cterm=NONE +hi CursorLine guifg=NONE ctermfg=NONE guibg=#3b4252 ctermbg=238 gui=NONE cterm=NONE +hi Error guifg=#d8dee9 ctermfg=254 guibg=#bf616a ctermbg=131 gui=NONE cterm=NONE +hi LineNr guifg=#4c566a ctermfg=240 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi MatchParen guifg=#88c0d0 ctermfg=110 guibg=#4c566a ctermbg=240 gui=NONE cterm=NONE +hi NonText guifg=#434c5e ctermfg=239 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Normal guifg=#d8dee9 ctermfg=254 guibg=#2e3440 ctermbg=237 gui=NONE cterm=NONE +hi Pmenu guifg=#d8dee9 ctermfg=254 guibg=#434c5e ctermbg=239 gui=NONE cterm=NONE +hi PmenuSbar guifg=#d8dee9 ctermfg=254 guibg=#434c5e ctermbg=239 gui=NONE cterm=NONE +hi PmenuSel guifg=#88c0d0 ctermfg=110 guibg=#4c566a ctermbg=240 gui=NONE cterm=NONE +hi PmenuThumb guifg=#88c0d0 ctermfg=110 guibg=#4c566a ctermbg=240 gui=NONE cterm=NONE +hi SpecialKey guifg=#4c566a ctermfg=240 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi SpellBad guifg=#bf616a ctermfg=131 guibg=#2e3440 ctermbg=237 gui=underline cterm=underline +hi SpellCap guifg=#ebcb8b ctermfg=222 guibg=#88c0d0 ctermbg=110 gui=underline cterm=underline +hi SpellLocal guifg=#e5e9f0 ctermfg=255 guibg=#2e3440 ctermbg=237 gui=underline cterm=underline +hi SpellRare guifg=#eceff4 ctermfg=255 guibg=#2e3440 ctermbg=237 gui=underline cterm=underline +hi Visual guifg=NONE ctermfg=NONE guibg=#434c5e ctermbg=239 gui=NONE cterm=NONE +hi VisualNOS guifg=NONE ctermfg=NONE guibg=#434c5e ctermbg=239 gui=NONE cterm=NONE +hi QuickFixLine guifg=#2e3440 ctermfg=237 guibg=#ebcb8b ctermbg=222 gui=NONE cterm=NONE +hi Terminal guifg=#eceff4 ctermfg=255 guibg=#2e3440 ctermbg=237 gui=NONE cterm=NONE +hi healthError guifg=#bf616a ctermfg=131 guibg=#3b4252 ctermbg=238 gui=NONE cterm=NONE +hi healthSuccess guifg=#a3be8c ctermfg=144 guibg=#3b4252 ctermbg=238 gui=NONE cterm=NONE +hi healthWarning guifg=#ebcb8b ctermfg=222 guibg=#3b4252 ctermbg=238 gui=NONE cterm=NONE +hi CursorColumn guifg=NONE ctermfg=NONE guibg=#3b4252 ctermbg=238 gui=NONE cterm=NONE +hi CursorLineNr guifg=#d8dee9 ctermfg=254 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Folded guifg=#4c566a ctermfg=240 guibg=#2e3440 ctermbg=237 gui=NONE cterm=NONE +hi FoldColumn guifg=#4c566a ctermfg=240 guibg=#2e3440 ctermbg=237 gui=NONE cterm=NONE +hi SignColumn guifg=#3b4252 ctermfg=238 guibg=#2e3440 ctermbg=237 gui=NONE cterm=NONE +hi Directory guifg=#88c0d0 ctermfg=110 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi EndOfBuffer guifg=#3b4252 ctermfg=238 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi ErrorMsg guifg=#d8dee9 ctermfg=254 guibg=#bf616a ctermbg=131 gui=NONE cterm=NONE +hi ModeMsg guifg=#d8dee9 ctermfg=254 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi MoreMsg guifg=#88c0d0 ctermfg=110 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Question guifg=#d8dee9 ctermfg=254 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi StatusLine guifg=#eceff4 ctermfg=255 guibg=#4c566a ctermbg=240 gui=NONE cterm=NONE +hi StatusLineNC guifg=#d8dee9 ctermfg=254 guibg=#4c566a ctermbg=240 gui=NONE cterm=NONE +hi StatusLineTerm guifg=#88c0d0 ctermfg=110 guibg=#4c566a ctermbg=240 gui=NONE cterm=NONE +hi StatusLineTermNC guifg=#d8dee9 ctermfg=254 guibg=#4c566a ctermbg=240 gui=NONE cterm=NONE +hi WarningMsg guifg=#2e3440 ctermfg=237 guibg=#ebcb8b ctermbg=222 gui=NONE cterm=NONE +hi WildMenu guifg=#88c0d0 ctermfg=110 guibg=#3b4252 ctermbg=238 gui=NONE cterm=NONE +hi IncSearch guifg=#2e3440 ctermfg=237 guibg=#ebcb8b ctermbg=222 gui=underline cterm=underline +hi Search guifg=#2e3440 ctermfg=237 guibg=#ebcb8b ctermbg=222 gui=NONE cterm=NONE +hi TabLine guifg=#d8dee9 ctermfg=254 guibg=#3b4252 ctermbg=238 gui=NONE cterm=NONE +hi TabLineFill guifg=#d8dee9 ctermfg=254 guibg=#3b4252 ctermbg=238 gui=NONE cterm=NONE +hi TabLineSel guifg=#88c0d0 ctermfg=110 guibg=#4c566a ctermbg=240 gui=NONE cterm=NONE +hi Title guifg=#d8dee9 ctermfg=254 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi VertSplit guifg=#434c5e ctermfg=239 guibg=#2e3440 ctermbg=237 gui=NONE cterm=NONE +hi Boolean guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Character guifg=#a3be8c ctermfg=144 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Comment guifg=#616e88 ctermfg=60 guibg=NONE ctermbg=NONE gui=italic cterm=italic +hi Conditional guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Constant guifg=#88c0d0 ctermfg=110 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Define guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Delimeter guifg=#eceff4 ctermfg=255 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Exception guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Float guifg=#b48ead ctermfg=139 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Function guifg=#88c0d0 ctermfg=110 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Identifier guifg=#d8dee9 ctermfg=254 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Include guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Keyword guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Label guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Number guifg=#b48ead ctermfg=139 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Operator guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi PreProc guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Repeat guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Special guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi SpecialChar guifg=#ebcb8b ctermfg=222 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi SpecialComment guifg=#88c0d0 ctermfg=110 guibg=NONE ctermbg=NONE gui=italic cterm=italic +hi Statement guifg=#b48ead ctermfg=139 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi StorageClass guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi String guifg=#a3be8c ctermfg=144 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Structure guifg=#ebcb8b ctermfg=222 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Tag guifg=#d8dee9 ctermfg=254 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Todo guifg=#ebcb8b ctermfg=222 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Type guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Typedef guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Macro guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi PreCondit guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi DiffAdd guifg=#a3be8c ctermfg=144 guibg=#3b4252 ctermbg=238 gui=NONE cterm=NONE +hi DiffChange guifg=#ebcb8b ctermfg=222 guibg=#3b4252 ctermbg=238 gui=NONE cterm=NONE +hi DiffDelete guifg=#bf616a ctermfg=131 guibg=#3b4252 ctermbg=238 gui=NONE cterm=NONE +hi DiffText guifg=#81a1c1 ctermfg=109 guibg=#3b4252 ctermbg=238 gui=NONE cterm=NONE +hi diffAdded guifg=#a3be8c ctermfg=144 guibg=#3b4252 ctermbg=238 gui=NONE cterm=NONE +hi diffChanged guifg=#ebcb8b ctermfg=222 guibg=#3b4252 ctermbg=238 gui=NONE cterm=NONE +hi diffRemoved guifg=#bf616a ctermfg=131 guibg=#3b4252 ctermbg=238 gui=NONE cterm=NONE +hi diffFileId guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=bold,reverse cterm=bold,reverse +hi diffFile guifg=#3b4048 ctermfg=238 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi diffNewFile guifg=#a3be8c ctermfg=144 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi diffOldFile guifg=#bf616a ctermfg=131 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi gitconfigVariable guifg=#8fbcbb ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi debugPc guifg=NONE ctermfg=NONE guibg=#8fbcbb ctermbg=109 gui=NONE cterm=NONE +hi debugBreakpoint guifg=#bf616a ctermfg=131 guibg=NONE ctermbg=NONE gui=reverse cterm=reverse +hi TSError guifg=#bf616a ctermfg=131 guibg=NONE ctermbg=NONE gui=underline cterm=underline +hi TSPunctDelimiter guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSPunctBracket guifg=#eceff4 ctermfg=255 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSPunctSpecial guifg=#eceff4 ctermfg=255 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSConstant guifg=#88c0d0 ctermfg=110 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSConstBuiltin guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSConstMacro guifg=#8fbcbb ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSStringRegex guifg=#a3be8c ctermfg=144 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSString guifg=#a3be8c ctermfg=144 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSStringEscape guifg=#88c0d0 ctermfg=110 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSCharacter guifg=#a3be8c ctermfg=144 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSNumber guifg=#b48ead ctermfg=139 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSBoolean guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSFloat guifg=#b48ead ctermfg=139 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSAnnotation guifg=#d08770 ctermfg=173 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSAttribute guifg=#8fbcbb ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSNamespace guifg=#8FBCBB ctermfg=201 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSFuncBuiltin guifg=#88c0d0 ctermfg=110 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSFunction guifg=#88c0d0 ctermfg=110 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSFuncMacro guifg=#88c0d0 ctermfg=110 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSParameter guifg=#e5e9f0 ctermfg=255 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSParameterReference guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSMethod guifg=#88c0d0 ctermfg=110 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSField guifg=#e5e9f0 ctermfg=255 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSProperty guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSConstructor guifg=#8fbcbb ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSConditional guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSRepeat guifg=#b48ead ctermfg=139 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSLabel guifg=#88c0d0 ctermfg=110 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSKeyword guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSKeywordFunction guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSKeywordOperator guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSOperator guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSException guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSType guifg=#8fbcbb ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSTypeBuiltin guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSStructure guifg=#8FBCBB ctermfg=201 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSInclude guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSVariable guifg=#e5e9f0 ctermfg=255 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSVariableBuiltin guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSText guifg=#D8DEE9 ctermfg=226 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSStrong guifg=#D8DEE9 ctermfg=226 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSEmphasis guifg=#D8DEE9 ctermfg=226 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSUnderline guifg=#D8DEE9 ctermfg=226 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSTitle guifg=#D8DEE9 ctermfg=226 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSLiteral guifg=#D8DEE9 ctermfg=226 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSURI guifg=#D8DEE9 ctermfg=226 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSTag guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi TSTagDelimiter guifg=#5c6370 ctermfg=241 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi htmlArg guifg=#88c0d0 ctermfg=110 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi htmlBold guifg=#88c0d0 ctermfg=110 guibg=NONE ctermbg=NONE gui=bold cterm=bold +hi htmlEndTag guifg=#eceff4 ctermfg=255 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi htmlH1 guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi htmlH2 guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi htmlH3 guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi htmlH4 guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi htmlH5 guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi htmlH6 guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi htmlItalic guifg=#b48ead ctermfg=139 guibg=NONE ctermbg=NONE gui=italic cterm=italic +hi htmlLink guifg=#8fbcbb ctermfg=109 guibg=NONE ctermbg=NONE gui=underline cterm=underline +hi htmlSpecialChar guifg=#88c0d0 ctermfg=110 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi htmlSpecialTagName guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi htmlTag guifg=#eceff4 ctermfg=255 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi htmlTagN guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi htmlTagName guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi htmlTitle guifg=#eceff4 ctermfg=255 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi markdownBlockquote guifg=#5c6370 ctermfg=241 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi markdownBold guifg=#88c0d0 ctermfg=110 guibg=NONE ctermbg=NONE gui=bold cterm=bold +hi markdownCode guifg=#a3be8c ctermfg=144 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi markdownCodeBlock guifg=#a3be8c ctermfg=144 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi markdownCodeDelimiter guifg=#a3be8c ctermfg=144 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi markdownH1 guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi markdownH2 guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi markdownH3 guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi markdownH4 guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi markdownH5 guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi markdownH6 guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi markdownHeadingDelimiter guifg=#bf616a ctermfg=131 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi markdownHeadingRule guifg=#5c6370 ctermfg=241 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi markdownId guifg=#b48ead ctermfg=139 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi markdownIdDeclaration guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi markdownIdDelimiter guifg=#b48ead ctermfg=139 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi markdownItalic guifg=#b48ead ctermfg=139 guibg=NONE ctermbg=NONE gui=italic cterm=italic +hi markdownLinkDelimiter guifg=#b48ead ctermfg=139 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi markdownLinkText guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi markdownListMarker guifg=#bf616a ctermfg=131 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi markdownOrdenord11ListMarker guifg=#bf616a ctermfg=131 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi markdownRule guifg=#5c6370 ctermfg=241 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi markdownUrl guifg=#8fbcbb ctermfg=109 guibg=NONE ctermbg=NONE gui=underline cterm=underline +hi CocExplorerIndentLine guifg=#5c6370 ctermfg=241 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi CocExplorerBufferRoot guifg=#8fbcbb ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi CocExplorerFileRoot guifg=#8fbcbb ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi CocExplorerBufferFullPath guifg=#5c6370 ctermfg=241 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi CocExplorerFileFullPath guifg=#5c6370 ctermfg=241 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi CocExplorerBufferReadonly guifg=#b48ead ctermfg=139 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi CocExplorerBufferModified guifg=#b48ead ctermfg=139 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi CocExplorerBufferNameVisible guifg=#d08770 ctermfg=173 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi CocExplorerFileReadonly guifg=#b48ead ctermfg=139 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi CocExplorerFileModified guifg=#b48ead ctermfg=139 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi CocExplorerFileHidden guifg=#5c6370 ctermfg=241 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi CocExplorerHelpLine guifg=#b48ead ctermfg=139 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi EasyMotionTarget guifg=#bf616a ctermfg=131 guibg=NONE ctermbg=NONE gui=bold cterm=bold +hi EasyMotionTarget2First guifg=#bf616a ctermfg=131 guibg=NONE ctermbg=NONE gui=bold cterm=bold +hi EasyMotionTarget2Second guifg=#bf616a ctermfg=131 guibg=NONE ctermbg=NONE gui=bold cterm=bold +hi EasyMotionShade guifg=NONE ctermfg=NONE guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi StartifyNumber guifg=#b48ead ctermfg=139 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi StartifySelect guifg=#a3be8c ctermfg=144 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi StartifyBracket guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi StartifySpecial guifg=#8fbcbb ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi StartifyVar guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi StartifyPath guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi StartifyFile guifg=#8fbcbb ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi StartifySlash guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi StartifyHeader guifg=#a3be8c ctermfg=144 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi StartifySection guifg=#b48ead ctermfg=139 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi StartifyFooter guifg=#a3be8c ctermfg=144 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi WhichKey guifg=#b48ead ctermfg=139 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi WhichKeySeperator guifg=#a3be8c ctermfg=144 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi WhichKeyGroup guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi GitGutterAdd guifg=#a3be8c ctermfg=144 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi GitGutterChange guifg=#ebcb8b ctermfg=222 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi GitGutterChangeDelete guifg=#bf616a ctermfg=131 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi GitGutterDelete guifg=#bf616a ctermfg=131 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi gitcommitDiscardedFile guifg=#bf616a ctermfg=131 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi gitcommitSelectedFile guifg=#a3be8c ctermfg=144 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi gitcommitUntrackedFile guifg=#bf616a ctermfg=131 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi LSPDiagnosticsWarning guifg=#ebcb8b ctermfg=222 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi LspDiagnosticsDefaultError guifg=#bf616a ctermfg=131 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi LspDiagnosticsInformation guifg=#88c0d0 ctermfg=110 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi LspDiagnosticsHint guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi LspDiagnosticsUnderlineWarning guifg=#ebcb8b ctermfg=222 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi LspDiagnosticsUnderlineError guifg=#bf616a ctermfg=131 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi LspDiagnosticsUnderlineInformation guifg=#88c0d0 ctermfg=110 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi LspDiagnosticsUnderlineHint guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE From b6b08aa25eeaebe4b342c4fd1f9ccff4cba964f6 Mon Sep 17 00:00:00 2001 From: Ferran Jovell Date: Mon, 15 Mar 2021 19:06:58 +0100 Subject: [PATCH 21/28] PR Work (to be squashed): Removed non treesitter hi groups. --- colors/nord.vim | 178 ------------------------------------------------ 1 file changed, 178 deletions(-) diff --git a/colors/nord.vim b/colors/nord.vim index a12ef7e8..71c71c3d 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -803,99 +803,6 @@ function! NordPalette() abort endfunction " Treesitter -hi ColorColumn guifg=NONE ctermfg=NONE guibg=#3b4252 ctermbg=238 gui=NONE cterm=NONE -hi Cursor guifg=#2e3440 ctermfg=237 guibg=#d8dee9 ctermbg=254 gui=NONE cterm=NONE -hi CursorLine guifg=NONE ctermfg=NONE guibg=#3b4252 ctermbg=238 gui=NONE cterm=NONE -hi Error guifg=#d8dee9 ctermfg=254 guibg=#bf616a ctermbg=131 gui=NONE cterm=NONE -hi LineNr guifg=#4c566a ctermfg=240 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi MatchParen guifg=#88c0d0 ctermfg=110 guibg=#4c566a ctermbg=240 gui=NONE cterm=NONE -hi NonText guifg=#434c5e ctermfg=239 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Normal guifg=#d8dee9 ctermfg=254 guibg=#2e3440 ctermbg=237 gui=NONE cterm=NONE -hi Pmenu guifg=#d8dee9 ctermfg=254 guibg=#434c5e ctermbg=239 gui=NONE cterm=NONE -hi PmenuSbar guifg=#d8dee9 ctermfg=254 guibg=#434c5e ctermbg=239 gui=NONE cterm=NONE -hi PmenuSel guifg=#88c0d0 ctermfg=110 guibg=#4c566a ctermbg=240 gui=NONE cterm=NONE -hi PmenuThumb guifg=#88c0d0 ctermfg=110 guibg=#4c566a ctermbg=240 gui=NONE cterm=NONE -hi SpecialKey guifg=#4c566a ctermfg=240 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi SpellBad guifg=#bf616a ctermfg=131 guibg=#2e3440 ctermbg=237 gui=underline cterm=underline -hi SpellCap guifg=#ebcb8b ctermfg=222 guibg=#88c0d0 ctermbg=110 gui=underline cterm=underline -hi SpellLocal guifg=#e5e9f0 ctermfg=255 guibg=#2e3440 ctermbg=237 gui=underline cterm=underline -hi SpellRare guifg=#eceff4 ctermfg=255 guibg=#2e3440 ctermbg=237 gui=underline cterm=underline -hi Visual guifg=NONE ctermfg=NONE guibg=#434c5e ctermbg=239 gui=NONE cterm=NONE -hi VisualNOS guifg=NONE ctermfg=NONE guibg=#434c5e ctermbg=239 gui=NONE cterm=NONE -hi QuickFixLine guifg=#2e3440 ctermfg=237 guibg=#ebcb8b ctermbg=222 gui=NONE cterm=NONE -hi Terminal guifg=#eceff4 ctermfg=255 guibg=#2e3440 ctermbg=237 gui=NONE cterm=NONE -hi healthError guifg=#bf616a ctermfg=131 guibg=#3b4252 ctermbg=238 gui=NONE cterm=NONE -hi healthSuccess guifg=#a3be8c ctermfg=144 guibg=#3b4252 ctermbg=238 gui=NONE cterm=NONE -hi healthWarning guifg=#ebcb8b ctermfg=222 guibg=#3b4252 ctermbg=238 gui=NONE cterm=NONE -hi CursorColumn guifg=NONE ctermfg=NONE guibg=#3b4252 ctermbg=238 gui=NONE cterm=NONE -hi CursorLineNr guifg=#d8dee9 ctermfg=254 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Folded guifg=#4c566a ctermfg=240 guibg=#2e3440 ctermbg=237 gui=NONE cterm=NONE -hi FoldColumn guifg=#4c566a ctermfg=240 guibg=#2e3440 ctermbg=237 gui=NONE cterm=NONE -hi SignColumn guifg=#3b4252 ctermfg=238 guibg=#2e3440 ctermbg=237 gui=NONE cterm=NONE -hi Directory guifg=#88c0d0 ctermfg=110 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi EndOfBuffer guifg=#3b4252 ctermfg=238 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi ErrorMsg guifg=#d8dee9 ctermfg=254 guibg=#bf616a ctermbg=131 gui=NONE cterm=NONE -hi ModeMsg guifg=#d8dee9 ctermfg=254 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi MoreMsg guifg=#88c0d0 ctermfg=110 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Question guifg=#d8dee9 ctermfg=254 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi StatusLine guifg=#eceff4 ctermfg=255 guibg=#4c566a ctermbg=240 gui=NONE cterm=NONE -hi StatusLineNC guifg=#d8dee9 ctermfg=254 guibg=#4c566a ctermbg=240 gui=NONE cterm=NONE -hi StatusLineTerm guifg=#88c0d0 ctermfg=110 guibg=#4c566a ctermbg=240 gui=NONE cterm=NONE -hi StatusLineTermNC guifg=#d8dee9 ctermfg=254 guibg=#4c566a ctermbg=240 gui=NONE cterm=NONE -hi WarningMsg guifg=#2e3440 ctermfg=237 guibg=#ebcb8b ctermbg=222 gui=NONE cterm=NONE -hi WildMenu guifg=#88c0d0 ctermfg=110 guibg=#3b4252 ctermbg=238 gui=NONE cterm=NONE -hi IncSearch guifg=#2e3440 ctermfg=237 guibg=#ebcb8b ctermbg=222 gui=underline cterm=underline -hi Search guifg=#2e3440 ctermfg=237 guibg=#ebcb8b ctermbg=222 gui=NONE cterm=NONE -hi TabLine guifg=#d8dee9 ctermfg=254 guibg=#3b4252 ctermbg=238 gui=NONE cterm=NONE -hi TabLineFill guifg=#d8dee9 ctermfg=254 guibg=#3b4252 ctermbg=238 gui=NONE cterm=NONE -hi TabLineSel guifg=#88c0d0 ctermfg=110 guibg=#4c566a ctermbg=240 gui=NONE cterm=NONE -hi Title guifg=#d8dee9 ctermfg=254 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi VertSplit guifg=#434c5e ctermfg=239 guibg=#2e3440 ctermbg=237 gui=NONE cterm=NONE -hi Boolean guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Character guifg=#a3be8c ctermfg=144 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Comment guifg=#616e88 ctermfg=60 guibg=NONE ctermbg=NONE gui=italic cterm=italic -hi Conditional guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Constant guifg=#88c0d0 ctermfg=110 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Define guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Delimeter guifg=#eceff4 ctermfg=255 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Exception guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Float guifg=#b48ead ctermfg=139 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Function guifg=#88c0d0 ctermfg=110 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Identifier guifg=#d8dee9 ctermfg=254 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Include guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Keyword guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Label guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Number guifg=#b48ead ctermfg=139 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Operator guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi PreProc guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Repeat guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Special guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi SpecialChar guifg=#ebcb8b ctermfg=222 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi SpecialComment guifg=#88c0d0 ctermfg=110 guibg=NONE ctermbg=NONE gui=italic cterm=italic -hi Statement guifg=#b48ead ctermfg=139 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi StorageClass guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi String guifg=#a3be8c ctermfg=144 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Structure guifg=#ebcb8b ctermfg=222 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Tag guifg=#d8dee9 ctermfg=254 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Todo guifg=#ebcb8b ctermfg=222 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Type guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Typedef guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Macro guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi PreCondit guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi DiffAdd guifg=#a3be8c ctermfg=144 guibg=#3b4252 ctermbg=238 gui=NONE cterm=NONE -hi DiffChange guifg=#ebcb8b ctermfg=222 guibg=#3b4252 ctermbg=238 gui=NONE cterm=NONE -hi DiffDelete guifg=#bf616a ctermfg=131 guibg=#3b4252 ctermbg=238 gui=NONE cterm=NONE -hi DiffText guifg=#81a1c1 ctermfg=109 guibg=#3b4252 ctermbg=238 gui=NONE cterm=NONE -hi diffAdded guifg=#a3be8c ctermfg=144 guibg=#3b4252 ctermbg=238 gui=NONE cterm=NONE -hi diffChanged guifg=#ebcb8b ctermfg=222 guibg=#3b4252 ctermbg=238 gui=NONE cterm=NONE -hi diffRemoved guifg=#bf616a ctermfg=131 guibg=#3b4252 ctermbg=238 gui=NONE cterm=NONE -hi diffFileId guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=bold,reverse cterm=bold,reverse -hi diffFile guifg=#3b4048 ctermfg=238 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi diffNewFile guifg=#a3be8c ctermfg=144 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi diffOldFile guifg=#bf616a ctermfg=131 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi gitconfigVariable guifg=#8fbcbb ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi debugPc guifg=NONE ctermfg=NONE guibg=#8fbcbb ctermbg=109 gui=NONE cterm=NONE -hi debugBreakpoint guifg=#bf616a ctermfg=131 guibg=NONE ctermbg=NONE gui=reverse cterm=reverse hi TSError guifg=#bf616a ctermfg=131 guibg=NONE ctermbg=NONE gui=underline cterm=underline hi TSPunctDelimiter guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi TSPunctBracket guifg=#eceff4 ctermfg=255 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE @@ -945,88 +852,3 @@ hi TSLiteral guifg=#D8DEE9 ctermfg=226 guibg=NONE ctermbg=NONE gui=NONE cterm=NO hi TSURI guifg=#D8DEE9 ctermfg=226 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi TSTag guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi TSTagDelimiter guifg=#5c6370 ctermfg=241 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi htmlArg guifg=#88c0d0 ctermfg=110 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi htmlBold guifg=#88c0d0 ctermfg=110 guibg=NONE ctermbg=NONE gui=bold cterm=bold -hi htmlEndTag guifg=#eceff4 ctermfg=255 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi htmlH1 guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi htmlH2 guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi htmlH3 guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi htmlH4 guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi htmlH5 guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi htmlH6 guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi htmlItalic guifg=#b48ead ctermfg=139 guibg=NONE ctermbg=NONE gui=italic cterm=italic -hi htmlLink guifg=#8fbcbb ctermfg=109 guibg=NONE ctermbg=NONE gui=underline cterm=underline -hi htmlSpecialChar guifg=#88c0d0 ctermfg=110 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi htmlSpecialTagName guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi htmlTag guifg=#eceff4 ctermfg=255 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi htmlTagN guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi htmlTagName guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi htmlTitle guifg=#eceff4 ctermfg=255 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi markdownBlockquote guifg=#5c6370 ctermfg=241 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi markdownBold guifg=#88c0d0 ctermfg=110 guibg=NONE ctermbg=NONE gui=bold cterm=bold -hi markdownCode guifg=#a3be8c ctermfg=144 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi markdownCodeBlock guifg=#a3be8c ctermfg=144 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi markdownCodeDelimiter guifg=#a3be8c ctermfg=144 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi markdownH1 guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi markdownH2 guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi markdownH3 guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi markdownH4 guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi markdownH5 guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi markdownH6 guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi markdownHeadingDelimiter guifg=#bf616a ctermfg=131 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi markdownHeadingRule guifg=#5c6370 ctermfg=241 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi markdownId guifg=#b48ead ctermfg=139 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi markdownIdDeclaration guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi markdownIdDelimiter guifg=#b48ead ctermfg=139 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi markdownItalic guifg=#b48ead ctermfg=139 guibg=NONE ctermbg=NONE gui=italic cterm=italic -hi markdownLinkDelimiter guifg=#b48ead ctermfg=139 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi markdownLinkText guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi markdownListMarker guifg=#bf616a ctermfg=131 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi markdownOrdenord11ListMarker guifg=#bf616a ctermfg=131 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi markdownRule guifg=#5c6370 ctermfg=241 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi markdownUrl guifg=#8fbcbb ctermfg=109 guibg=NONE ctermbg=NONE gui=underline cterm=underline -hi CocExplorerIndentLine guifg=#5c6370 ctermfg=241 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi CocExplorerBufferRoot guifg=#8fbcbb ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi CocExplorerFileRoot guifg=#8fbcbb ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi CocExplorerBufferFullPath guifg=#5c6370 ctermfg=241 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi CocExplorerFileFullPath guifg=#5c6370 ctermfg=241 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi CocExplorerBufferReadonly guifg=#b48ead ctermfg=139 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi CocExplorerBufferModified guifg=#b48ead ctermfg=139 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi CocExplorerBufferNameVisible guifg=#d08770 ctermfg=173 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi CocExplorerFileReadonly guifg=#b48ead ctermfg=139 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi CocExplorerFileModified guifg=#b48ead ctermfg=139 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi CocExplorerFileHidden guifg=#5c6370 ctermfg=241 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi CocExplorerHelpLine guifg=#b48ead ctermfg=139 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi EasyMotionTarget guifg=#bf616a ctermfg=131 guibg=NONE ctermbg=NONE gui=bold cterm=bold -hi EasyMotionTarget2First guifg=#bf616a ctermfg=131 guibg=NONE ctermbg=NONE gui=bold cterm=bold -hi EasyMotionTarget2Second guifg=#bf616a ctermfg=131 guibg=NONE ctermbg=NONE gui=bold cterm=bold -hi EasyMotionShade guifg=NONE ctermfg=NONE guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi StartifyNumber guifg=#b48ead ctermfg=139 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi StartifySelect guifg=#a3be8c ctermfg=144 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi StartifyBracket guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi StartifySpecial guifg=#8fbcbb ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi StartifyVar guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi StartifyPath guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi StartifyFile guifg=#8fbcbb ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi StartifySlash guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi StartifyHeader guifg=#a3be8c ctermfg=144 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi StartifySection guifg=#b48ead ctermfg=139 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi StartifyFooter guifg=#a3be8c ctermfg=144 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi WhichKey guifg=#b48ead ctermfg=139 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi WhichKeySeperator guifg=#a3be8c ctermfg=144 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi WhichKeyGroup guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi GitGutterAdd guifg=#a3be8c ctermfg=144 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi GitGutterChange guifg=#ebcb8b ctermfg=222 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi GitGutterChangeDelete guifg=#bf616a ctermfg=131 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi GitGutterDelete guifg=#bf616a ctermfg=131 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi gitcommitDiscardedFile guifg=#bf616a ctermfg=131 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi gitcommitSelectedFile guifg=#a3be8c ctermfg=144 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi gitcommitUntrackedFile guifg=#bf616a ctermfg=131 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi LSPDiagnosticsWarning guifg=#ebcb8b ctermfg=222 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi LspDiagnosticsDefaultError guifg=#bf616a ctermfg=131 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi LspDiagnosticsInformation guifg=#88c0d0 ctermfg=110 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi LspDiagnosticsHint guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi LspDiagnosticsUnderlineWarning guifg=#ebcb8b ctermfg=222 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi LspDiagnosticsUnderlineError guifg=#bf616a ctermfg=131 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi LspDiagnosticsUnderlineInformation guifg=#88c0d0 ctermfg=110 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi LspDiagnosticsUnderlineHint guifg=#5e81ac ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE From 26c3b28999681a13cff464923b5d2a5c4e6bf83e Mon Sep 17 00:00:00 2001 From: Ferran Jovell Date: Sat, 27 Mar 2021 12:15:11 +0100 Subject: [PATCH 22/28] PR Work - Added if guards to only load them when in nvim and if treesitter is loaded - Changed color definitions for varialbes defined at the top - Using local s:hi function --- colors/nord.vim | 102 +++++++++++++++++++++++++----------------------- 1 file changed, 53 insertions(+), 49 deletions(-) diff --git a/colors/nord.vim b/colors/nord.vim index 71c71c3d..a4cd8b90 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -803,52 +803,56 @@ function! NordPalette() abort endfunction " Treesitter -hi TSError guifg=#bf616a ctermfg=131 guibg=NONE ctermbg=NONE gui=underline cterm=underline -hi TSPunctDelimiter guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSPunctBracket guifg=#eceff4 ctermfg=255 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSPunctSpecial guifg=#eceff4 ctermfg=255 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSConstant guifg=#88c0d0 ctermfg=110 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSConstBuiltin guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSConstMacro guifg=#8fbcbb ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSStringRegex guifg=#a3be8c ctermfg=144 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSString guifg=#a3be8c ctermfg=144 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSStringEscape guifg=#88c0d0 ctermfg=110 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSCharacter guifg=#a3be8c ctermfg=144 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSNumber guifg=#b48ead ctermfg=139 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSBoolean guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSFloat guifg=#b48ead ctermfg=139 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSAnnotation guifg=#d08770 ctermfg=173 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSAttribute guifg=#8fbcbb ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSNamespace guifg=#8FBCBB ctermfg=201 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSFuncBuiltin guifg=#88c0d0 ctermfg=110 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSFunction guifg=#88c0d0 ctermfg=110 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSFuncMacro guifg=#88c0d0 ctermfg=110 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSParameter guifg=#e5e9f0 ctermfg=255 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSParameterReference guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSMethod guifg=#88c0d0 ctermfg=110 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSField guifg=#e5e9f0 ctermfg=255 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSProperty guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSConstructor guifg=#8fbcbb ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSConditional guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSRepeat guifg=#b48ead ctermfg=139 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSLabel guifg=#88c0d0 ctermfg=110 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSKeyword guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSKeywordFunction guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSKeywordOperator guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSOperator guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSException guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSType guifg=#8fbcbb ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSTypeBuiltin guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSStructure guifg=#8FBCBB ctermfg=201 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSInclude guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSVariable guifg=#e5e9f0 ctermfg=255 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSVariableBuiltin guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSText guifg=#D8DEE9 ctermfg=226 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSStrong guifg=#D8DEE9 ctermfg=226 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSEmphasis guifg=#D8DEE9 ctermfg=226 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSUnderline guifg=#D8DEE9 ctermfg=226 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSTitle guifg=#D8DEE9 ctermfg=226 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSLiteral guifg=#D8DEE9 ctermfg=226 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSURI guifg=#D8DEE9 ctermfg=226 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSTag guifg=#81a1c1 ctermfg=109 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSTagDelimiter guifg=#5c6370 ctermfg=241 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +if has('nvim') + if exists('g:loaded_nvim_treesitter') + call s:hi("TSError", s:nord11_gui, 131, "", "", "underline", "underline") + call s:hi("TSPunctDelimiter", s:nord9_gui, 109, "", "", "", "") + call s:hi("TSPunctBracket", s:nord6_gui,255, "", "", "", "") + call s:hi("TSPunctSpecial", s:nord6_gui,255, "", "", "", "") + call s:hi("TSConstant", s:nord8_gui, 110, "", "", "", "") + call s:hi("TSConstBuiltin", s:nord9_gui, 109, "", "", "", "") + call s:hi("TSConstMacro", s:nord7_gui, 109, "", "", "", "") + call s:hi("TSStringRegex", s:nord14_gui, 144, "", "", "", "") + call s:hi("TSString", s:nord14_gui, 144, "", "", "", "") + call s:hi("TSStringEscape", s:nord8_gui, 110, "", "", "", "") + call s:hi("TSCharacter", s:nord14_gui, 144, "", "", "", "") + call s:hi("TSNumber", s:nord15_gui, 139, "", "", "", "") + call s:hi("TSBoolean", s:nord9_gui, 109, "", "", "", "") + call s:hi("TSFloat", s:nord15_gui, 139, "", "", "", "") + call s:hi("TSAnnotation", s:nord12_gui, 173, "", "", "", "") + call s:hi("TSAttribute", s:nord7_gui, 109, "", "", "", "") + call s:hi("TSNamespace", s:nord7_gui, 201, "", "", "", "") + call s:hi("TSFuncBuiltin", s:nord8_gui, 110, "", "", "", "") + call s:hi("TSFunction", s:nord8_gui, 110, "", "", "", "") + call s:hi("TSFuncMacro", s:nord8_gui, 110, "", "", "", "") + call s:hi("TSParameter", s:nord15_gui, 255, "", "", "", "") + call s:hi("TSParameterReference", s:nord9_gui, 109, "", "", "", "") + call s:hi("TSMethod", s:nord8_gui, 110, "", "", "", "") + call s:hi("TSField", s:nord5_gui, 255, "", "", "", "") + call s:hi("TSProperty", s:nord9_gui, 109, "", "", "", "") + call s:hi("TSConstructor", s:nord7_gui, 109, "", "", "", "") + call s:hi("TSConditional", s:nord9_gui, 109, "", "", "", "") + call s:hi("TSRepeat", s:nord15_gui, 139, "", "", "", "") + call s:hi("TSLabel", s:nord8_gui, 110, "", "", "", "") + call s:hi("TSKeyword", s:nord9_gui, 109, "", "", "", "") + call s:hi("TSKeywordFunction", s:nord9_gui, 109, "", "", "", "") + call s:hi("TSKeywordOperator", s:nord9_gui, 109, "", "", "", "") + call s:hi("TSOperator", s:nord9_gui, 109, "", "", "", "") + call s:hi("TSException", s:nord9_gui, 109, "", "", "", "") + call s:hi("TSType", s:nord7_gui, 109, "", "", "", "") + call s:hi("TSTypeBuiltin", s:nord9_gui, 109, "", "", "", "") + call s:hi("TSStructure", s:nord7_gui, 201, "", "", "", "") + call s:hi("TSInclude", s:nord9_gui, 109, "", "", "", "") + call s:hi("TSVariable", s:nord5_gui, 255, "", "", "", "") + call s:hi("TSVariableBuiltin", s:nord9_gui, 109, "", "", "", "") + call s:hi("TSText", s:nord4_gui, 226, "", "", "", "") + call s:hi("TSStrong", s:nord4_gui, 226, "", "", "", "") + call s:hi("TSEmphasis", s:nord4_gui, 226, "", "", "", "") + call s:hi("TSUnderline", s:nord4_gui, 226, "", "", "", "") + call s:hi("TSTitle", s:nord4_gui, 226, "", "", "", "") + call s:hi("TSLiteral", s:nord4_gui, 226, "", "", "", "") + call s:hi("TSURI", s:nord4_gui, 226, "", "", "", "") + call s:hi("TSTag", s:nord9_gui, 109, "", "", "", "") + call s:hi("TSTagDelimiter", s:nord3_gui, 241, "", "", "", "") + endif +endif From e6480eeb59e66076ee00e3c0860e2a629048cc43 Mon Sep 17 00:00:00 2001 From: Ferran Jovell Date: Mon, 10 May 2021 22:48:35 +0200 Subject: [PATCH 23/28] More progress. --- colors/nord.vim | 102 ++++++++++++++++++++++++------------------------ 1 file changed, 50 insertions(+), 52 deletions(-) diff --git a/colors/nord.vim b/colors/nord.vim index a4cd8b90..c8c7e803 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -803,56 +803,54 @@ function! NordPalette() abort endfunction " Treesitter -if has('nvim') - if exists('g:loaded_nvim_treesitter') - call s:hi("TSError", s:nord11_gui, 131, "", "", "underline", "underline") - call s:hi("TSPunctDelimiter", s:nord9_gui, 109, "", "", "", "") - call s:hi("TSPunctBracket", s:nord6_gui,255, "", "", "", "") - call s:hi("TSPunctSpecial", s:nord6_gui,255, "", "", "", "") - call s:hi("TSConstant", s:nord8_gui, 110, "", "", "", "") - call s:hi("TSConstBuiltin", s:nord9_gui, 109, "", "", "", "") - call s:hi("TSConstMacro", s:nord7_gui, 109, "", "", "", "") - call s:hi("TSStringRegex", s:nord14_gui, 144, "", "", "", "") - call s:hi("TSString", s:nord14_gui, 144, "", "", "", "") - call s:hi("TSStringEscape", s:nord8_gui, 110, "", "", "", "") - call s:hi("TSCharacter", s:nord14_gui, 144, "", "", "", "") - call s:hi("TSNumber", s:nord15_gui, 139, "", "", "", "") - call s:hi("TSBoolean", s:nord9_gui, 109, "", "", "", "") - call s:hi("TSFloat", s:nord15_gui, 139, "", "", "", "") - call s:hi("TSAnnotation", s:nord12_gui, 173, "", "", "", "") - call s:hi("TSAttribute", s:nord7_gui, 109, "", "", "", "") - call s:hi("TSNamespace", s:nord7_gui, 201, "", "", "", "") - call s:hi("TSFuncBuiltin", s:nord8_gui, 110, "", "", "", "") - call s:hi("TSFunction", s:nord8_gui, 110, "", "", "", "") - call s:hi("TSFuncMacro", s:nord8_gui, 110, "", "", "", "") - call s:hi("TSParameter", s:nord15_gui, 255, "", "", "", "") - call s:hi("TSParameterReference", s:nord9_gui, 109, "", "", "", "") - call s:hi("TSMethod", s:nord8_gui, 110, "", "", "", "") - call s:hi("TSField", s:nord5_gui, 255, "", "", "", "") - call s:hi("TSProperty", s:nord9_gui, 109, "", "", "", "") - call s:hi("TSConstructor", s:nord7_gui, 109, "", "", "", "") - call s:hi("TSConditional", s:nord9_gui, 109, "", "", "", "") - call s:hi("TSRepeat", s:nord15_gui, 139, "", "", "", "") - call s:hi("TSLabel", s:nord8_gui, 110, "", "", "", "") - call s:hi("TSKeyword", s:nord9_gui, 109, "", "", "", "") - call s:hi("TSKeywordFunction", s:nord9_gui, 109, "", "", "", "") - call s:hi("TSKeywordOperator", s:nord9_gui, 109, "", "", "", "") - call s:hi("TSOperator", s:nord9_gui, 109, "", "", "", "") - call s:hi("TSException", s:nord9_gui, 109, "", "", "", "") - call s:hi("TSType", s:nord7_gui, 109, "", "", "", "") - call s:hi("TSTypeBuiltin", s:nord9_gui, 109, "", "", "", "") - call s:hi("TSStructure", s:nord7_gui, 201, "", "", "", "") - call s:hi("TSInclude", s:nord9_gui, 109, "", "", "", "") - call s:hi("TSVariable", s:nord5_gui, 255, "", "", "", "") - call s:hi("TSVariableBuiltin", s:nord9_gui, 109, "", "", "", "") - call s:hi("TSText", s:nord4_gui, 226, "", "", "", "") - call s:hi("TSStrong", s:nord4_gui, 226, "", "", "", "") - call s:hi("TSEmphasis", s:nord4_gui, 226, "", "", "", "") - call s:hi("TSUnderline", s:nord4_gui, 226, "", "", "", "") - call s:hi("TSTitle", s:nord4_gui, 226, "", "", "", "") - call s:hi("TSLiteral", s:nord4_gui, 226, "", "", "", "") - call s:hi("TSURI", s:nord4_gui, 226, "", "", "", "") - call s:hi("TSTag", s:nord9_gui, 109, "", "", "", "") - call s:hi("TSTagDelimiter", s:nord3_gui, 241, "", "", "", "") - endif +if has('nvim') && exists("g:nord_enable_treesitter") + call s:hi("TSError", s:nord11_gui, 131, "", "", "underline", "underline") + call s:hi("TSPunctDelimiter", s:nord9_gui, 109, "", "", "", "") + call s:hi("TSPunctBracket", s:nord6_gui,255, "", "", "", "") + call s:hi("TSPunctSpecial", s:nord6_gui,255, "", "", "", "") + call s:hi("TSConstant", s:nord8_gui, 110, "", "", "", "") + call s:hi("TSConstBuiltin", s:nord9_gui, 109, "", "", "", "") + call s:hi("TSConstMacro", s:nord7_gui, 109, "", "", "", "") + call s:hi("TSStringRegex", s:nord14_gui, 144, "", "", "", "") + call s:hi("TSString", s:nord14_gui, 144, "", "", "", "") + call s:hi("TSStringEscape", s:nord8_gui, 110, "", "", "", "") + call s:hi("TSCharacter", s:nord14_gui, 144, "", "", "", "") + call s:hi("TSNumber", s:nord15_gui, 139, "", "", "", "") + call s:hi("TSBoolean", s:nord9_gui, 109, "", "", "", "") + call s:hi("TSFloat", s:nord15_gui, 139, "", "", "", "") + call s:hi("TSAnnotation", s:nord12_gui, 173, "", "", "", "") + call s:hi("TSAttribute", s:nord7_gui, 109, "", "", "", "") + call s:hi("TSNamespace", s:nord7_gui, 201, "", "", "", "") + call s:hi("TSFuncBuiltin", s:nord8_gui, 110, "", "", "", "") + call s:hi("TSFunction", s:nord8_gui, 110, "", "", "", "") + call s:hi("TSFuncMacro", s:nord8_gui, 110, "", "", "", "") + call s:hi("TSParameter", s:nord15_gui, 255, "", "", "", "") + call s:hi("TSParameterReference", s:nord9_gui, 109, "", "", "", "") + call s:hi("TSMethod", s:nord8_gui, 110, "", "", "", "") + call s:hi("TSField", s:nord5_gui, 255, "", "", "", "") + call s:hi("TSProperty", s:nord9_gui, 109, "", "", "", "") + call s:hi("TSConstructor", s:nord7_gui, 109, "", "", "", "") + call s:hi("TSConditional", s:nord9_gui, 109, "", "", "", "") + call s:hi("TSRepeat", s:nord15_gui, 139, "", "", "", "") + call s:hi("TSLabel", s:nord8_gui, 110, "", "", "", "") + call s:hi("TSKeyword", s:nord9_gui, 109, "", "", "", "") + call s:hi("TSKeywordFunction", s:nord9_gui, 109, "", "", "", "") + call s:hi("TSKeywordOperator", s:nord9_gui, 109, "", "", "", "") + call s:hi("TSOperator", s:nord9_gui, 109, "", "", "", "") + call s:hi("TSException", s:nord9_gui, 109, "", "", "", "") + call s:hi("TSType", s:nord7_gui, 109, "", "", "", "") + call s:hi("TSTypeBuiltin", s:nord9_gui, 109, "", "", "", "") + call s:hi("TSStructure", s:nord7_gui, 201, "", "", "", "") + call s:hi("TSInclude", s:nord9_gui, 109, "", "", "", "") + call s:hi("TSVariable", s:nord5_gui, 255, "", "", "", "") + call s:hi("TSVariableBuiltin", s:nord9_gui, 109, "", "", "", "") + call s:hi("TSText", s:nord4_gui, 226, "", "", "", "") + call s:hi("TSStrong", s:nord4_gui, 226, "", "", "", "") + call s:hi("TSEmphasis", s:nord4_gui, 226, "", "", "", "") + call s:hi("TSUnderline", s:nord4_gui, 226, "", "", "", "") + call s:hi("TSTitle", s:nord4_gui, 226, "", "", "", "") + call s:hi("TSLiteral", s:nord4_gui, 226, "", "", "", "") + call s:hi("TSURI", s:nord4_gui, 226, "", "", "", "") + call s:hi("TSTag", s:nord9_gui, 109, "", "", "", "") + call s:hi("TSTagDelimiter", s:nord3_gui, 241, "", "", "", "") endif From 7712376e91151e9b9dca3ff9d0eda36ca26c01d7 Mon Sep 17 00:00:00 2001 From: Ferran Jovell Date: Mon, 10 May 2021 23:03:53 +0200 Subject: [PATCH 24/28] Linking Hi groups to existing base groups. --- colors/nord.vim | 100 ++++++++++++++++++++++++------------------------ 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/colors/nord.vim b/colors/nord.vim index c8c7e803..01d74f56 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -803,54 +803,54 @@ function! NordPalette() abort endfunction " Treesitter -if has('nvim') && exists("g:nord_enable_treesitter") - call s:hi("TSError", s:nord11_gui, 131, "", "", "underline", "underline") - call s:hi("TSPunctDelimiter", s:nord9_gui, 109, "", "", "", "") - call s:hi("TSPunctBracket", s:nord6_gui,255, "", "", "", "") - call s:hi("TSPunctSpecial", s:nord6_gui,255, "", "", "", "") - call s:hi("TSConstant", s:nord8_gui, 110, "", "", "", "") - call s:hi("TSConstBuiltin", s:nord9_gui, 109, "", "", "", "") - call s:hi("TSConstMacro", s:nord7_gui, 109, "", "", "", "") - call s:hi("TSStringRegex", s:nord14_gui, 144, "", "", "", "") - call s:hi("TSString", s:nord14_gui, 144, "", "", "", "") - call s:hi("TSStringEscape", s:nord8_gui, 110, "", "", "", "") - call s:hi("TSCharacter", s:nord14_gui, 144, "", "", "", "") - call s:hi("TSNumber", s:nord15_gui, 139, "", "", "", "") - call s:hi("TSBoolean", s:nord9_gui, 109, "", "", "", "") - call s:hi("TSFloat", s:nord15_gui, 139, "", "", "", "") - call s:hi("TSAnnotation", s:nord12_gui, 173, "", "", "", "") - call s:hi("TSAttribute", s:nord7_gui, 109, "", "", "", "") - call s:hi("TSNamespace", s:nord7_gui, 201, "", "", "", "") - call s:hi("TSFuncBuiltin", s:nord8_gui, 110, "", "", "", "") - call s:hi("TSFunction", s:nord8_gui, 110, "", "", "", "") - call s:hi("TSFuncMacro", s:nord8_gui, 110, "", "", "", "") - call s:hi("TSParameter", s:nord15_gui, 255, "", "", "", "") - call s:hi("TSParameterReference", s:nord9_gui, 109, "", "", "", "") - call s:hi("TSMethod", s:nord8_gui, 110, "", "", "", "") - call s:hi("TSField", s:nord5_gui, 255, "", "", "", "") - call s:hi("TSProperty", s:nord9_gui, 109, "", "", "", "") - call s:hi("TSConstructor", s:nord7_gui, 109, "", "", "", "") - call s:hi("TSConditional", s:nord9_gui, 109, "", "", "", "") - call s:hi("TSRepeat", s:nord15_gui, 139, "", "", "", "") - call s:hi("TSLabel", s:nord8_gui, 110, "", "", "", "") - call s:hi("TSKeyword", s:nord9_gui, 109, "", "", "", "") - call s:hi("TSKeywordFunction", s:nord9_gui, 109, "", "", "", "") - call s:hi("TSKeywordOperator", s:nord9_gui, 109, "", "", "", "") - call s:hi("TSOperator", s:nord9_gui, 109, "", "", "", "") - call s:hi("TSException", s:nord9_gui, 109, "", "", "", "") - call s:hi("TSType", s:nord7_gui, 109, "", "", "", "") - call s:hi("TSTypeBuiltin", s:nord9_gui, 109, "", "", "", "") - call s:hi("TSStructure", s:nord7_gui, 201, "", "", "", "") - call s:hi("TSInclude", s:nord9_gui, 109, "", "", "", "") - call s:hi("TSVariable", s:nord5_gui, 255, "", "", "", "") - call s:hi("TSVariableBuiltin", s:nord9_gui, 109, "", "", "", "") - call s:hi("TSText", s:nord4_gui, 226, "", "", "", "") - call s:hi("TSStrong", s:nord4_gui, 226, "", "", "", "") - call s:hi("TSEmphasis", s:nord4_gui, 226, "", "", "", "") - call s:hi("TSUnderline", s:nord4_gui, 226, "", "", "", "") - call s:hi("TSTitle", s:nord4_gui, 226, "", "", "", "") - call s:hi("TSLiteral", s:nord4_gui, 226, "", "", "", "") - call s:hi("TSURI", s:nord4_gui, 226, "", "", "", "") - call s:hi("TSTag", s:nord9_gui, 109, "", "", "", "") - call s:hi("TSTagDelimiter", s:nord3_gui, 241, "", "", "", "") +if has("nvim") && exists("g:nord_enable_treesitter") + !hi link TSError Error + !hi link TSPunctDelimiter Delimiter + !hi link TSPunctBracket Delimiter + !hi link TSPunctSpecial Delimiter + !hi link TSConstant Constant + !hi link TSConstBuiltin Constant + !hi link TSConstMacro Constant + !hi link TSStringRegex SpecialChar + !hi link TSString String + !hi link TSStringEscape String + !hi link TSCharacter Character + !hi link TSNumber Number + !hi link TSBoolean Boolean + !hi link TSFloat Float + !hi link TSAnnotation Structure + !hi link TSAttribute Attributes + !hi link TSNamespace Structure + !hi link TSFuncBuiltin Function + !hi link TSFunction Function + !hi link TSFuncMacro Function + !hi link TSParameter Operator + !hi link TSParameterReferenc Operator + !hi link TSMethod Function + !hi link TSField Attributes + !hi link TSProperty Attributes + !hi link TSConstructor Function + !hi link TSConditional Conditional + !hi link TSRepeat Repeat + !hi link TSLabel Label + !hi link TSKeyword Keyword + !hi link TSKeywordFunction Function + !hi link TSKeywordOperator Operator + !hi link TSOperator Operator + !hi link TSException Exception + !hi link TSType Type + !hi link TSTypeBuiltin Type + !hi link TSStructure Structure + !hi link TSInclude Include + !hi link TSVariable Variable + !hi link TSVariableBuiltin Variable + !hi link TSText String + !hi link TSStrong Bold + !hi link TSEmphasis Italic + !hi link TSUnderline Underline + !hi link TSTitle Comment + !hi link TSLiteral String + !hi link TSURI Underline + !hi link TSTag Tag + !hi link TSTagDelimiter Tag endif From 5bcdfce23e0e07e8f67eebb4fd99269c5bad8d4b Mon Sep 17 00:00:00 2001 From: Ferran Jovell Date: Mon, 5 Jul 2021 20:07:15 +0200 Subject: [PATCH 25/28] PR Wrk: removed redundant highlights --- colors/nord.vim | 4 ---- 1 file changed, 4 deletions(-) diff --git a/colors/nord.vim b/colors/nord.vim index 01d74f56..06e162d9 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -568,10 +568,6 @@ 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:hi("CocWarningSign", s:nord13_gui, "", s:nord13_term, "", "", "") -call s:hi("CocErrorSign" , s:nord11_gui, "", s:nord11_term, "", "", "") -call s:hi("CocWarningSign", s:nord13_gui, "", s:nord13_term, "", "", "") -call s:hi("CocErrorSign" , s:nord11_gui, "", s:nord11_term, "", "", "") " Neovim LSP " > neovim/nvim-lspconfig From 134785b0f97bfae76a216982743b9092e4c0e5e6 Mon Sep 17 00:00:00 2001 From: Ferran Jovell <3410779+mrswats@users.noreply.github.com> Date: Wed, 7 Jul 2021 09:53:39 +0200 Subject: [PATCH 26/28] More PR Work --- colors/nord.vim | 64 +++++++++++-------------------------------------- 1 file changed, 14 insertions(+), 50 deletions(-) diff --git a/colors/nord.vim b/colors/nord.vim index 06e162d9..86149cdd 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -799,54 +799,18 @@ function! NordPalette() abort endfunction " Treesitter -if has("nvim") && exists("g:nord_enable_treesitter") - !hi link TSError Error - !hi link TSPunctDelimiter Delimiter - !hi link TSPunctBracket Delimiter - !hi link TSPunctSpecial Delimiter - !hi link TSConstant Constant - !hi link TSConstBuiltin Constant - !hi link TSConstMacro Constant - !hi link TSStringRegex SpecialChar - !hi link TSString String - !hi link TSStringEscape String - !hi link TSCharacter Character - !hi link TSNumber Number - !hi link TSBoolean Boolean - !hi link TSFloat Float - !hi link TSAnnotation Structure - !hi link TSAttribute Attributes - !hi link TSNamespace Structure - !hi link TSFuncBuiltin Function - !hi link TSFunction Function - !hi link TSFuncMacro Function - !hi link TSParameter Operator - !hi link TSParameterReferenc Operator - !hi link TSMethod Function - !hi link TSField Attributes - !hi link TSProperty Attributes - !hi link TSConstructor Function - !hi link TSConditional Conditional - !hi link TSRepeat Repeat - !hi link TSLabel Label - !hi link TSKeyword Keyword - !hi link TSKeywordFunction Function - !hi link TSKeywordOperator Operator - !hi link TSOperator Operator - !hi link TSException Exception - !hi link TSType Type - !hi link TSTypeBuiltin Type - !hi link TSStructure Structure - !hi link TSInclude Include - !hi link TSVariable Variable - !hi link TSVariableBuiltin Variable - !hi link TSText String - !hi link TSStrong Bold - !hi link TSEmphasis Italic - !hi link TSUnderline Underline - !hi link TSTitle Comment - !hi link TSLiteral String - !hi link TSURI Underline - !hi link TSTag Tag - !hi link TSTagDelimiter Tag +if has("nvim") + hi! link TSConstBuiltin Constant + hi! link TSStringRegex SpecialChar + hi! link TSAnnotation Annotation + hi! link TSFuncBuiltin Function + hi! link TSFuncMacro Function + hi! link TSConstructor Function + hi! link TSStructure Structure + hi! link TSVariable Variable + hi! link TSVariableBuiltin Keyword + hi! link TSStrong Bold + hi! link TSEmphasis Italic + hi! link TSUnderline Underline + hi! link TSTagDelimiter TSTag endif From 4a39d9de8562aa9a66e97b21b022358c750d39c6 Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Sat, 10 Jul 2021 11:49:33 +0200 Subject: [PATCH 27/28] Add language base highlighting groups for decorators and variables The new `Decorator` and `Annotation` groups can be used for decorators like `@observe` in TypeScript for annotations like `@Override` in Java. Additionally the new `Variable` group is a more clearly named group for the `Identifier` group. Co-authored-by: Sven Greb GH-253 --- colors/nord.vim | 3 +++ 1 file changed, 3 insertions(+) diff --git a/colors/nord.vim b/colors/nord.vim index 86149cdd..4c4b46fc 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -277,6 +277,7 @@ call s:hi("Comment", s:nord3_gui_bright, "", s:nord3_term, "", s:italicize_comme 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, "", "", "") @@ -301,8 +302,10 @@ 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, "", "", "") +hi! link Annotation Decorator hi! link Macro Define hi! link PreCondit PreProc +hi! link Variable Identifier "+-----------+ "+ Languages + From ee4cff5a5a74fb647850d1ce49897fbc50e4dac6 Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Sat, 10 Jul 2021 11:53:05 +0200 Subject: [PATCH 28/28] Fix ordering for plugin based tree-sitter definitions Co-authored-by: Sven Greb GH-253 --- colors/nord.vim | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/colors/nord.vim b/colors/nord.vim index 4c4b46fc..4a812a1c 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -690,6 +690,25 @@ hi! link jsNoise Delimiter hi! link jsPrototype Keyword hi! link jsRegexpString SpecialChar +" tree-sitter +" > nvim-treesitter/nvim-treesitter +if has("nvim") + hi! link TSAnnotation Annotation + hi! link TSConstBuiltin Constant + hi! link TSConstructor Function + hi! link TSEmphasis Italic + hi! link TSError Error + hi! link TSFuncBuiltin Function + hi! link TSFuncMacro Function + hi! link TSStringRegex SpecialChar + hi! link TSStrong Bold + hi! link TSStructure Structure + hi! link TSTagDelimiter TSTag + hi! link TSUnderline Underline + hi! link TSVariable Variable + hi! link TSVariableBuiltin Keyword +endif + " TypeScript " > HerringtonDarkholme/yats.vim call s:hi("typescriptBOMWindowMethod", s:nord8_gui, "", s:nord8_term, "", s:italic, "") @@ -800,20 +819,3 @@ function! NordPalette() abort let ret["nord3_bright"] = s:nord3_gui_bright return ret endfunction - -" Treesitter -if has("nvim") - hi! link TSConstBuiltin Constant - hi! link TSStringRegex SpecialChar - hi! link TSAnnotation Annotation - hi! link TSFuncBuiltin Function - hi! link TSFuncMacro Function - hi! link TSConstructor Function - hi! link TSStructure Structure - hi! link TSVariable Variable - hi! link TSVariableBuiltin Keyword - hi! link TSStrong Bold - hi! link TSEmphasis Italic - hi! link TSUnderline Underline - hi! link TSTagDelimiter TSTag -endif