diff options
| -rw-r--r-- | CHANGELOG.md | 195 | ||||
| -rw-r--r-- | LICENSE.md | 4 | ||||
| -rw-r--r-- | README.md | 20 | ||||
| -rw-r--r-- | assets/scrot-config-bold-vertical-split-line-default.png | bin | 0 -> 20347 bytes | |||
| -rw-r--r-- | assets/scrot-config-bold-vertical-split-line.png | bin | 0 -> 20260 bytes | |||
| -rwxr-xr-x | autoload/airline/themes/nord.vim | 32 | ||||
| -rwxr-xr-x | autoload/lightline/colorscheme/nord.vim | 6 | ||||
| -rwxr-xr-x | colors/nord.vim | 83 |
8 files changed, 318 insertions, 22 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 44d0e0b..17835ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,151 @@ --- +# 0.11.0 + + [](https://github.com/arcticicestudio/nord-vim/projects/16) [](https://github.com/arcticicestudio/nord-vim/milestone/13) + +## Features + +### Syntax + +**Basic support for Asciidoc syntax highlighting** — #131 ⇄ #152 (⊶ 6e6025b9) by [@tidux][gh-user-tidux] +↠ Added basic syntax highlighting support for [Asciidoc][] that comes bundled with Vim 8. + +<p align="center"><img src="https://user-images.githubusercontent.com/7836623/56083880-1165ce00-5e2b-11e9-9389-f21435942464.png" /></p> + +**Basic syntax highlighting support for Rust** — #138 ⇄ #154 (⊶ b0ffc6b5) by [@TerminalWitchcraft][gh-user-terminalwitchcraft] +↠ Added basic syntax highlighting support for [Rust][]. + +[Traits][rustdoc-traits] and [enums][rustdoc-enums] are colorized with `nord7` and with bold font to make them visually stand out more. +Also [attributes][rustdoc-attributes] and [derives][rustdoc-derives] are colored with `nord10`. + +<p align="center"><strong>Before</strong><img src="https://user-images.githubusercontent.com/7836623/56096828-3a4e9780-5eed-11e9-9d74-02b498a78ab1.png" /></p> + +<p align="center"><strong>After</strong><img src="https://user-images.githubusercontent.com/7836623/56096827-3a4e9780-5eed-11e9-8275-c97b2569f959.png" /></p> + +[Macros][rustdoc-macros] are colorized with `nord8` and bold font to make them visually different from "normal" functions. + +<p align="center"><strong>Before</strong><img src="https://user-images.githubusercontent.com/7836623/56096834-463a5980-5eed-11e9-8d98-bbc814506779.png" /></p> + +<p align="center"><strong>After</strong><img src="https://user-images.githubusercontent.com/7836623/56096839-4df9fe00-5eed-11e9-8d8c-9a488105b0e9.png" /></p> + +[Escape][rustdoc-escapes] sequences are colored with `nord13`. + +<p align="center"><strong>Before</strong><img src="https://user-images.githubusercontent.com/7836623/56096843-58b49300-5eed-11e9-9bb2-5541b3d68689.png" /></p> + +<p align="center"><strong>After</strong><img src="https://user-images.githubusercontent.com/7836623/56096842-58b49300-5eed-11e9-9ab6-52b709119c81.png" /></p> + +Import statements and paths are correctly colored with keyword and type colors. + +<p align="center"><strong>Before</strong><img src="https://user-images.githubusercontent.com/7836623/56096847-623dfb00-5eed-11e9-91c3-cfe7621a2e5b.png" /></p> + +<p align="center"><strong>After</strong><img src="https://user-images.githubusercontent.com/7836623/56096846-623dfb00-5eed-11e9-9cce-30f14bdc7e57.png" /></p> + +#### Plugin Support + +**Haskell Syntax Plugin Support** — #104 ⇄ #150 (⊶ b0ffc6b5) by [@vabatta][gh-user-vabatta] +↠ Added support for Haskell syntax through the [neovimhaskell/haskell-vim][] plugin. +This includes better coloring for types/classes using `nord7` instead of highlighting them like keywords (`nord9`) and pre-processor and pragma elements are now colorized correctly with `nord10`. + +#### Pragma + +<p align="center"><strong>Before</strong><img src="https://user-images.githubusercontent.com/7836623/56079623-6ee02780-5df7-11e9-8cfc-f3f62b1a79d4.png"/></p> + +<p align="center"><strong>After</strong><img src="https://user-images.githubusercontent.com/7836623/56079622-6e479100-5df7-11e9-9b80-650875c7fd55.png"/></p> + +#### Pre-Processor + +<p align="center"><strong>Before</strong><img src="https://user-images.githubusercontent.com/7836623/56079625-6ee02780-5df7-11e9-9429-0ef098f31fb2.png"/></p> + +<p align="center"><strong>After</strong><img src="https://user-images.githubusercontent.com/7836623/56079624-6ee02780-5df7-11e9-8b85-33e624121d1e.png"/></p> + +#### Types/Classes + +<p align="center"><strong>Before</strong><img src="https://user-images.githubusercontent.com/7836623/56079627-6ee02780-5df7-11e9-94c7-68952bfc1600.png"/></p> + +<p align="center"><strong>After</strong><img src="https://user-images.githubusercontent.com/7836623/56079626-6ee02780-5df7-11e9-904f-6fd27129c0f7.png"/></p> + +### UI + +**Theme config for bolder vertical split line** — #132 ⇄ #153 (⊶ 9059d7d8) by [@huyvohcmc][gh-user-huyvohcmc] +↠ Previously the [`VertSplit`][vdoc-vsplit] (`:help VertSplit`) key used `nord1` as background color by default making the line appear to be very lumpy. This has now been changed to use `nord0` as background instead to visually merge with the background so only the separator characters are a visual indicator for the split line which makes it look more lightweight and declutters the overall appearance. + +<p align="center"><strong>With base editor background (default)</strong><img src="https://user-images.githubusercontent.com/7836623/56088648-8e259600-5e85-11e9-8a6f-2c03d26eff4b.png" /></p> + +<p align="center"><strong>With enabled bold <code>nord1</code> background</strong><img src="https://user-images.githubusercontent.com/7836623/56088647-8e259600-5e85-11e9-8be5-d86232ca8278.png" /></p> + +To allow user who liked the previous implementation to keep the style a new `nord_bold_vertical_split_line` theme config was also added that can be assigned to `1` to achieve the legacy design. + +```viml +let g:nord_bold_vertical_split_line = 1 +``` + +The README includes information and hints how to change the separator character by customizing Vim's [`fillchars`][vdoc-fchar] (`:help fillchars`) variable. + +#### Plugin Support + +**`:terminal` status line in airline** — #134 (⊶ be815f09) by [@meck][gh-user-meck] +↠ Added support for Vim's new `:terminal` mode in [airline][gh-src-airline]. + +<p align="center"><strong>Before: No <code>:terminal</code> support (before)</strong><img src="https://user-images.githubusercontent.com/7836623/56088997-ce881280-5e8b-11e9-9758-7c13c559b05c.png" /></p> + +<p align="center"><strong>After: Support for airline's new <code>_term</code> theme keys</strong><img src="https://user-images.githubusercontent.com/7836623/56088996-ce881280-5e8b-11e9-839b-bc282f1fea0b.png" /></p> + +## Improvements + +### Syntax + +**Better generator expressions in CMake** — #137 ⇄ #151 (⊶ d2774cbb) by [@markand][gh-user-markand] +↠ [CMake generator expressions][cmake-doc-genexpr] are now highlighted using `nord10` as foreground instead of `nord13` as background and `nord0` as foreground. + +<p align="center"><strong>Before</strong><img src="https://user-images.githubusercontent.com/7836623/56079970-99cc7a80-5dfb-11e9-9528-83bbe92c51d3.png"/></p> + +<p align="center"><strong>After</strong><img src="https://user-images.githubusercontent.com/7836623/56079969-99cc7a80-5dfb-11e9-8afa-68c7878521c4.png"/></p> + +### UI + +#### Plugin Support + +**airline warnings and errors** — #130 (⊶ e85dbe75) by [@axelitus][gh-user-axelitus] +↠ Added support for error and warning elements of [airline][gh-src-airline]. + +<p align="center"><strong>Before</strong><img src="https://user-images.githubusercontent.com/7836623/56093512-f7c79380-5ec9-11e9-8107-a2d59b306ee0.png" /></p> + +<p align="center"><strong>After</strong><img src="https://user-images.githubusercontent.com/7836623/56093511-f7c79380-5ec9-11e9-8be8-731fa0e52fc2.png" /></p> + +**ALE error and warning support** — #135 (⊶ 9d82b7a1) by [@meck][gh-user-meck] +↠ Added support highlighting and underlines for [ALE][plugin-ale] errors and warnings to also align the style with gutter signs. + +# 0.10.0 + + [](https://github.com/arcticicestudio/nord-vim/projects/15) [](https://github.com/arcticicestudio/nord-vim/milestone/12) + +## Features + +**Vim 8 terminal highlighting** — #125 ⇄ #126 (⊶ 83f8c260) by [@cg433n][gh-user-cg433n] +↠ Added support for the Vim's built-in terminal (`:terminal`) that comes with version 8.0.0 and higher. + +## Improvements + +**Comment Color Brightness** — #145 ⇄ #146 (⊶ 9e0249ca) +↠ Implemented the increase of the comment color (`nord3`) brightness by 10% from a lightness level of ~35% to ~45%. + +➜ **Please see [arcticicestudio/nord#94][gh-nord#94] for all details about this design change decision**! + +⚠ **NOTE**: This change also **deprecates the [comment contrast][readme-config-comment-brightness] configuration** that will be removed in Nord Vim version 1.0.0! +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. + +This has been fixed by using `nord5` as foreground color. …[#11][gh-11] was used as implementation reference since it fixed the same incompatibility for the [lightline.vim][gh-lightline.vim] plugin. + + + # 0.9.0  [](https://github.com/arcticicestudio/nord-vim/projects/13) [](https://github.com/arcticicestudio/nord-vim/milestone/11) @@ -454,13 +599,34 @@ Detailed information about features, supported plugins/languages and install ins  +<!-- ++------------------+ ++ Symbol Reference + ++------------------+ +↠ (U+21A0): Start of a log section description +— (U+2014): Separator between a log section title and the metadata +⇄ (U+21C4): Separator between a issue ID and pull request ID in a log metadata +⊶ (U+22B6): Icon prefix for the short commit SHA checksum in a log metadata +--> + +<!-- lint disable final-definition --> + +<!-- Base Links --> + +[asciidoc]: https://asciidoctor.org +[gh-11]: https://github.com/arcticicestudio/nord-vim/issues/11 [gh-55-arcticicestudio/nord]: https://github.com/arcticicestudio/nord/issues/55 +[gh-lightline.vim]: https://github.com/itchyny/lightline.vim +[gh-nord#94]: https://github.com/arcticicestudio/nord/issues/94 +[gh-src-airline]: https://github.com/arcticicestudio/nord-vim/blob/develop/autoload/airline/themes/nord.vim +[gh-tmuxline.vim]: https://github.com/edkolev/tmuxline.vim +[gh-user-cg433n]: https://github.com/cg433n [gist-colors-in-terminals]: https://gist.github.com/XVilka/8346728 -[itchyny/lightline.vim-gh-257]: https://github.com/itchyny/lightline.vim/pull/257 [itchyny/lightline-adv-config]: https://github.com/itchyny/lightline.vim#advanced-configuration +[itchyny/lightline.vim-gh-257]: https://github.com/itchyny/lightline.vim/pull/257 [lesscss-doc-fn-lighten]: http://lesscss.org/functions/#color-operations-lighten -[nord-gh]: https://github.com/arcticicestudio/nord [nord-atom-syntax-pr-47]: https://github.com/arcticicestudio/nord-atom-syntax/pull/47 +[nord-gh]: https://github.com/arcticicestudio/nord [nord-lightline]: https://github.com/arcticicestudio/nord-vim/blob/develop/autoload/lightline/colorscheme/nord.vim [plugin-ale]: https://github.com/w0rp/ale [plugin-ctrlp]: https://github.com/ctrlpvim/ctrlp.vim @@ -471,12 +637,33 @@ Detailed information about features, supported plugins/languages and install ins [plugin-stephpy/vim-yaml]: https://github.com/stephpy/vim-yaml [plugin-tpope/vim-fugitive]: https://github.com/tpope/vim-fugitive [plugin-vimwiki/vimwiki]: https://github.com/vimwiki/vimwiki -[readme-config]: https://github.com/arcticicestudio/nord-vim#configuration [readme-config-comment-brightness]: https://github.com/arcticicestudio/nord-vim#comment-contrast [readme-config-italic]: https://github.com/arcticicestudio/nord-vim#italic-support [readme-config-line-number-background]: https://github.com/arcticicestudio/nord-vim#line-number-background [readme-config-underline-support]: https://github.com/arcticicestudio/nord-vim#underline-support [readme-config-uniform-diff-background]: https://github.com/arcticicestudio/nord-vim#uniform-diff-background [readme-config-uniform-statusline-background]: https://github.com/arcticicestudio/nord-vim#uniform-status-lines -[vim-doc-diffAdd]: http://vimdoc.sourceforge.net/htmldoc/syntax.html#hl-DiffAdd +[readme-config]: https://github.com/arcticicestudio/nord-vim#configuration +[rust]: https://www.rust-lang.org +[vdoc-fchar]: http://vimdoc.sourceforge.net/htmldoc/options.html#'fillchars' +[vdoc-vsplit]: http://vimdoc.sourceforge.net/htmldoc/syntax.html#hl-VertSplit +[vim-doc-diffadd]: http://vimdoc.sourceforge.net/htmldoc/syntax.html#hl-DiffAdd [yaml]: http://yaml.org + +<!--v 0.11.0 --> + +[cmake-doc-genexpr]: https://cmake.org/cmake/help/latest/manual/cmake-generator-expressions.7.html +[gh-user-axelitus]: https://github.com/axelitus +[gh-user-huyvohcmc]: https://github.com/huyvohcmc +[gh-user-markand]: https://github.com/markand +[gh-user-meck]: https://github.com/meck +[gh-user-terminalwitchcraft]: https://github.com/terminalwitchcraft +[gh-user-tidux]: https://github.com/tidux +[gh-user-vabatta]: https://github.com/vabatta +[neovimhaskell/haskell-vim]: https://github.com/neovimhaskell/haskell-vim +[rustdoc-attributes]: https://doc.rust-lang.org/reference/attributes.html +[rustdoc-derives]: https://doc.rust-lang.org/edition-guide/rust-2018/macros/custom-derive.html +[rustdoc-enums]: https://doc.rust-lang.org/1.1.0/book/enums.html +[rustdoc-escapes]: https://doc.rust-lang.org/reference/tokens.html#ascii-escapes +[rustdoc-macros]: https://doc.rust-lang.org/1.8.0/book/macros.html +[rustdoc-traits]: https://doc.rust-lang.org/book/ch10-02-traits.html @@ -1,7 +1,7 @@ MIT License (MIT) -Copyright (c) 2016-present Arctic Ice Studio <development@arcticicestudio.com> (http://arcticicestudio.com) -Copyright (c) 2016-present Sven Greb <code@svengreb.de> (http://svengreb.de) +Copyright (C) 2016-present Arctic Ice Studio <development@arcticicestudio.com> (https://www.arcticicestudio.com) +Copyright (C) 2016-present Sven Greb <development@svengreb.de> (https://www.svengreb.de) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -26,6 +26,7 @@ Nord Vim is a 16 colorspace theme build to run in GUI- and terminal mode with su - [Comment Contrast](#comment-contrast) - [Uniform diff Background](#uniform-diff-background) - [Line number background](#line-number-background) + - [Bold Vertical Split Line](#bold-vertical-split-line) - [Plugin Support](#plugin-support) - [UI Plugins](#ui-plugins) - [Language Plugins](#language-plugins) @@ -91,7 +92,7 @@ Plug 'arcticicestudio/nord-vim', { 'branch': 'develop' } A explicit version can be installed via Git tags: ```vim -Plug 'arcticicestudio/nord-vim', { 'tag': 'v0.9.0' } +Plug 'arcticicestudio/nord-vim', { 'tag': 'v0.11.0' } ``` #### Manual @@ -259,6 +260,20 @@ let g:nord_cursor_line_number_background = 1 <p align="center"><strong>No background (default)</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-vim/develop/assets/scrot-config-cursor-line-number-background-default.png"/><br><strong>Enabled background</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-vim/develop/assets/scrot-config-cursor-line-number-background.png"/> </p> +### Bold Vertical Split Line + +Enables a bolder vertical split line by using `nord1` as background. + +```viml +let g:nord_bold_vertical_split_line = 1 +``` + +To change the separator character used to display the vertical line please see the documentation about Vim's [`fillchars`][vdoc-fillchars] variable: `:help fillchars` + +<p align="center"><strong>With base editor background (default)</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-vim/develop/assets/scrot-config-bold-vertical-split-line-default.png"/></p> + +<p align="center"><strong>With enabled bold <code>nord1</code> background</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-vim/develop/assets/scrot-config-bold-vertical-split-line.png"/></p> + ## Plugin Support Nord Vim provides support for many third-party language- and UI plugins. @@ -301,7 +316,7 @@ Detailed descriptions for supported languages can be found in the [project wiki] ## Development -[](https://github.com/arcticicestudio/nord-vim/blob/v0.9.0/CHANGELOG.md) [](http://nvie.com/posts/a-successful-git-branching-model) [](https://github.com/arcticicestudio/arcver) +[](https://github.com/arcticicestudio/nord-vim/blob/v0.11.0/CHANGELOG.md#0110) [](http://nvie.com/posts/a-successful-git-branching-model) [](https://github.com/arcticicestudio/arcver) ### Contribution @@ -332,3 +347,4 @@ Please report issues/bugs, feature requests and suggestions for improvements to [scrot-lang-ruby]: https://raw.githubusercontent.com/arcticicestudio/nord-vim/develop/assets/scrot-lang-ruby.png [scrot-readme-default-profile]: https://raw.githubusercontent.com/arcticicestudio/nord-vim/develop/assets/scrot-readme-default-profile.png [scrot-readme-lazy-profile-change]: https://raw.githubusercontent.com/arcticicestudio/nord-vim/develop/assets/scrot-readme-lazy-profile-change.png +[vdoc-fillchars]: http://vimdoc.sourceforge.net/htmldoc/options.html#'fillchars' diff --git a/assets/scrot-config-bold-vertical-split-line-default.png b/assets/scrot-config-bold-vertical-split-line-default.png Binary files differnew file mode 100644 index 0000000..bbda688 --- /dev/null +++ b/assets/scrot-config-bold-vertical-split-line-default.png diff --git a/assets/scrot-config-bold-vertical-split-line.png b/assets/scrot-config-bold-vertical-split-line.png Binary files differnew file mode 100644 index 0000000..05d9104 --- /dev/null +++ b/assets/scrot-config-bold-vertical-split-line.png diff --git a/autoload/airline/themes/nord.vim b/autoload/airline/themes/nord.vim index 560d32a..358b390 100755 --- a/autoload/airline/themes/nord.vim +++ b/autoload/airline/themes/nord.vim @@ -1,11 +1,11 @@ -" Copyright (c) 2016-present Arctic Ice Studio <development@arcticicestudio.com> -" Copyright (c) 2016-present Sven Greb <code@svengreb.de> +" Copyright (C) 2016-present Arctic Ice Studio <development@arcticicestudio.com> +" Copyright (C) 2016-present Sven Greb <development@svengreb.de> " Project: Nord Vim " Repository: https://github.com/arcticicestudio/nord-vim " License: MIT -let s:nord_vim_version="0.9.0" +let s:nord_vim_version="0.11.0" let g:airline#themes#nord#palette = {} let s:nord0_gui = "#2E3440" @@ -45,24 +45,50 @@ let s:nord6_term = "15" let s:NMain = [s:nord1_gui, s:nord8_gui, s:nord1_term, s:nord8_term] let s:NRight = [s:nord1_gui, s:nord9_gui, s:nord1_term, s:nord9_term] let s:NMiddle = [s:nord5_gui, s:nord3_gui, s:nord5_term, s:nord3_term] +let s:NWarn = [s:nord1_gui, s:nord13_gui, s:nord3_term, s:nord13_term] +let s:NError = [s:nord0_gui, s:nord11_gui, s:nord1_term, s:nord11_term] let g:airline#themes#nord#palette.normal = airline#themes#generate_color_map(s:NMain, s:NRight, s:NMiddle) +let g:airline#themes#nord#palette.normal.airline_warning = s:NWarn +let g:airline#themes#nord#palette.normal.airline_error = s:NError let s:IMain = [s:nord1_gui, s:nord14_gui, s:nord1_term, s:nord6_term] let s:IRight = [s:nord1_gui, s:nord9_gui, s:nord1_term, s:nord9_term] let s:IMiddle = [s:nord5_gui, s:nord3_gui, s:nord5_term, s:nord3_term] +let s:IWarn = [s:nord1_gui, s:nord13_gui, s:nord3_term, s:nord13_term] +let s:IError = [s:nord0_gui, s:nord11_gui, s:nord1_term, s:nord11_term] let g:airline#themes#nord#palette.insert = airline#themes#generate_color_map(s:IMain, s:IRight, s:IMiddle) +let g:airline#themes#nord#palette.insert.airline_warning = s:IWarn +let g:airline#themes#nord#palette.insert.airline_error = s:IError let s:RMain = [s:nord1_gui, s:nord14_gui, s:nord1_term, s:nord14_term] let s:RRight = [s:nord1_gui, s:nord9_gui, s:nord1_term, s:nord9_term] let s:RMiddle = [s:nord5_gui, s:nord3_gui, s:nord5_term, s:nord3_term] +let s:RWarn = [s:nord1_gui, s:nord13_gui, s:nord3_term, s:nord13_term] +let s:RError = [s:nord0_gui, s:nord11_gui, s:nord1_term, s:nord11_term] let g:airline#themes#nord#palette.replace = airline#themes#generate_color_map(s:RMain, s:RRight, s:RMiddle) +let g:airline#themes#nord#palette.replace.airline_warning = s:RWarn +let g:airline#themes#nord#palette.replace.airline_error = s:RError let s:VMain = [s:nord1_gui, s:nord7_gui, s:nord1_term, s:nord7_term] let s:VRight = [s:nord1_gui, s:nord9_gui, s:nord1_term, s:nord9_term] let s:VMiddle = [s:nord5_gui, s:nord3_gui, s:nord5_term, s:nord3_term] +let s:VWarn = [s:nord1_gui, s:nord13_gui, s:nord3_term, s:nord13_term] +let s:VError = [s:nord0_gui, s:nord11_gui, s:nord1_term, s:nord11_term] let g:airline#themes#nord#palette.visual = airline#themes#generate_color_map(s:VMain, s:VRight, s:VMiddle) +let g:airline#themes#nord#palette.visual.airline_warning = s:VWarn +let g:airline#themes#nord#palette.visual.airline_error = s:VError let s:IAMain = [s:nord5_gui, s:nord3_gui, s:nord5_term, s:nord3_term] let s:IARight = [s:nord5_gui, s:nord3_gui, s:nord5_term, s:nord3_term] let s:IAMiddle = [s:nord5_gui, s:nord1_gui, s:nord5_term, s:nord1_term] +let s:IAWarn = [s:nord1_gui, s:nord13_gui, s:nord3_term, s:nord13_term] +let s:IAError = [s:nord0_gui, s:nord11_gui, s:nord1_term, s:nord11_term] let g:airline#themes#nord#palette.inactive = airline#themes#generate_color_map(s:IAMain, s:IARight, s:IAMiddle) +let g:airline#themes#nord#palette.inactive.airline_warning = s:IAWarn +let g:airline#themes#nord#palette.inactive.airline_error = s:IAError + +let g:airline#themes#nord#palette.normal.airline_term = s:NMiddle +let g:airline#themes#nord#palette.insert.airline_term = s:IMiddle +let g:airline#themes#nord#palette.replace.airline_term = s:RMiddle +let g:airline#themes#nord#palette.visual.airline_term = s:VMiddle +let g:airline#themes#nord#palette.inactive.airline_term = s:IAMiddle diff --git a/autoload/lightline/colorscheme/nord.vim b/autoload/lightline/colorscheme/nord.vim index 778c21d..1181301 100755 --- a/autoload/lightline/colorscheme/nord.vim +++ b/autoload/lightline/colorscheme/nord.vim @@ -1,11 +1,11 @@ -" Copyright (c) 2016-present Arctic Ice Studio <development@arcticicestudio.com> -" Copyright (c) 2016-present Sven Greb <code@svengreb.de> +" Copyright (C) 2016-present Arctic Ice Studio <development@arcticicestudio.com> +" Copyright (C) 2016-present Sven Greb <development@svengreb.de> " Project: Nord Vim " Repository: https://github.com/arcticicestudio/nord-vim " License: MIT -let s:nord_vim_version="0.9.0" +let s:nord_vim_version="0.11.0" let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}} let s:nord0 = ["#2E3440", "NONE"] diff --git a/colors/nord.vim b/colors/nord.vim index 38a0f4c..0d0ccf1 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -1,5 +1,5 @@ -" Copyright (c) 2016-present Arctic Ice Studio <development@arcticicestudio.com> -" Copyright (c) 2016-present Sven Greb <code@svengreb.de> +" Copyright (C) 2016-present Arctic Ice Studio <development@arcticicestudio.com> +" Copyright (C) 2016-present Sven Greb <development@svengreb.de> " Project: Nord Vim " Repository: https://github.com/arcticicestudio/nord-vim @@ -13,13 +13,14 @@ if version > 580 endif let g:colors_name = "nord" -let s:nord_vim_version="0.9.0" +let s:nord_vim_version="0.11.0" set background=dark let s:nord0_gui = "#2E3440" let s:nord1_gui = "#3B4252" let s:nord2_gui = "#434C5E" let s:nord3_gui = "#4C566A" +let s:nord3_gui_bright = "#616E88" let s:nord4_gui = "#D8DEE9" let s:nord5_gui = "#E5E9F0" let s:nord6_gui = "#ECEFF4" @@ -100,8 +101,17 @@ if !exists('g:nord_uniform_status_lines') let g:nord_uniform_status_lines = 0 endif -if !exists("g:nord_comment_brightness") - let g:nord_comment_brightness = 0 +function! s:logWarning(msg) + echohl WarningMsg + echomsg 'nord: warning: ' . a:msg + echohl None +endfunction + +if exists("g:nord_comment_brightness") + call s:logWarning('Variable g:nord_comment_brightness has been deprecated and will be removed in version 1.0.0!' . + \' The comment color brightness has been increased by 10% by default.' . + \' Please see https://github.com/arcticicestudio/nord-vim/issues/145 for more details.') + let g:nord_comment_brightness = 10 endif if !exists("g:nord_uniform_diff_background") @@ -112,6 +122,10 @@ if !exists("g:nord_cursor_line_number_background") let g:nord_cursor_line_number_background = 0 endif +if !exists("g:nord_bold_vertical_split_line") + let g:nord_bold_vertical_split_line = 0 +endif + function! s:hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if a:guifg != "" exec "hi " . a:group . " guifg=" . a:guifg @@ -168,6 +182,11 @@ call s:hi("healthSuccess", s:nord14_gui, s:nord1_gui, s:nord14_term, s:nord1_ter call s:hi("healthWarning", s:nord13_gui, s:nord1_gui, s:nord13_term, s:nord1_term, "", "") call s:hi("TermCursorNC", "", s:nord1_gui, "", s:nord1_term, "", "") +"+- Vim 8 Terminal Colors -+ +if has('terminal') + let g:terminal_ansi_colors = [s:nord1_gui, s:nord11_gui, s:nord14_gui, s:nord13_gui, s:nord9_gui, s:nord15_gui, s:nord8_gui, s:nord5_gui, s:nord3_gui, s:nord11_gui, s:nord14_gui, s:nord13_gui, s:nord9_gui, s:nord15_gui, s:nord7_gui, s:nord6_gui] +endif + "+- Neovim Terminal Colors -+ if has('nvim') let g:terminal_color_0 = s:nord1_gui @@ -233,14 +252,19 @@ call s:hi("TabLineSel", s:nord8_gui, s:nord3_gui, s:nord8_term, s:nord3_term, "N "+--- Window ---+ call s:hi("Title", s:nord4_gui, "", "NONE", "", "NONE", "") -call s:hi("VertSplit", s:nord2_gui, s:nord1_gui, s:nord3_term, s:nord1_term, "NONE", "") + +if g:nord_bold_vertical_split_line == 0 + call s:hi("VertSplit", s:nord2_gui, s:nord0_gui, s:nord3_term, "NONE", "NONE", "") +else + call s:hi("VertSplit", s:nord2_gui, s:nord1_gui, s:nord3_term, s:nord1_term, "NONE", "") +endif "+----------------------+ "+ Language Base Groups + "+----------------------+ call s:hi("Boolean", s:nord9_gui, "", s:nord9_term, "", "", "") call s:hi("Character", s:nord14_gui, "", s:nord14_term, "", "", "") -call s:hi("Comment", s:nord3_gui_brightened[g:nord_comment_brightness], "", s:nord3_term, "", s:italicize_comments, "") +call s:hi("Comment", s:nord3_gui_bright, "", s:nord3_term, "", s:italicize_comments, "") call s:hi("Conditional", s:nord9_gui, "", s:nord9_term, "", "", "") call s:hi("Constant", s:nord4_gui, "", "NONE", "", "", "") call s:hi("Define", s:nord9_gui, "", s:nord9_term, "", "", "") @@ -273,6 +297,27 @@ hi! link PreCondit PreProc "+-----------+ "+ Languages + "+-----------+ +call s:hi("asciidocAttributeEntry", s:nord10_gui, "", s:nord10_term, "", "", "") +call s:hi("asciidocAttributeList", s:nord10_gui, "", s:nord10_term, "", "", "") +call s:hi("asciidocAttributeRef", s:nord10_gui, "", s:nord10_term, "", "", "") +call s:hi("asciidocHLabel", s:nord9_gui, "", s:nord9_term, "", "", "") +call s:hi("asciidocListingBlock", s:nord7_gui, "", s:nord7_term, "", "", "") +call s:hi("asciidocMacroAttributes", s:nord8_gui, "", s:nord8_term, "", "", "") +call s:hi("asciidocOneLineTitle", s:nord8_gui, "", s:nord8_term, "", "", "") +call s:hi("asciidocPassthroughBlock", s:nord9_gui, "", s:nord9_term, "", "", "") +call s:hi("asciidocQuotedMonospaced", s:nord7_gui, "", s:nord7_term, "", "", "") +call s:hi("asciidocTriplePlusPassthrough", s:nord7_gui, "", s:nord7_term, "", "", "") +hi! link asciidocAdmonition Keyword +hi! link asciidocAttributeRef markdownH1 +hi! link asciidocBackslash Keyword +hi! link asciidocMacro Keyword +hi! link asciidocQuotedBold Bold +hi! link asciidocQuotedEmphasized Italic +hi! link asciidocQuotedMonospaced2 asciidocQuotedMonospaced +hi! link asciidocQuotedUnconstrainedBold asciidocQuotedBold +hi! link asciidocQuotedUnconstrainedEmphasized asciidocQuotedEmphasized +hi! link asciidocURL markdownLinkText + call s:hi("awkCharClass", s:nord7_gui, "", s:nord7_term, "", "", "") call s:hi("awkPatterns", s:nord9_gui, "", s:nord9_term, "", "bold", "") hi! link awkArrayElement Identifier @@ -294,6 +339,8 @@ call s:hi("cIncluded", s:nord7_gui, "", s:nord7_term, "", "", "") hi! link cOperator Operator hi! link cPreCondit PreCondit +call s:hi("cmakeGeneratorExpression", s:nord10_gui, "", s:nord10_term, "", "", "") + hi! link csPreCondit PreCondit hi! link csType Type hi! link csXmlTag SpecialComment @@ -434,6 +481,18 @@ hi! link rubyLocalVariableOrMethod Function hi! link rubyPseudoVariable Keyword hi! link rubyRegexp SpecialChar +call s:hi("rustAttribute", s:nord10_gui, "", s:nord10_term, "", "", "") +call s:hi("rustEnum", s:nord7_gui, "", s:nord7_term, "", "bold", "") +call s:hi("rustMacro", s:nord8_gui, "", s:nord8_term, "", "bold", "") +call s:hi("rustModPath", s:nord7_gui, "", s:nord7_term, "", "", "") +call s:hi("rustPanic", s:nord9_gui, "", s:nord9_term, "", "bold", "") +call s:hi("rustTrait", s:nord7_gui, "", s:nord7_term, "", s:italic, "") +hi! link rustCommentLineDoc Comment +hi! link rustDerive rustAttribute +hi! link rustEnumVariant rustEnum +hi! link rustEscape SpecialChar +hi! link rustQuestionMark Keyword + call s:hi("sassClass", s:nord7_gui, "", s:nord7_term, "", "", "") call s:hi("sassId", s:nord7_gui, "", s:nord7_term, "", s:underline, "") hi! link sassAmpersand Keyword @@ -466,7 +525,7 @@ hi! link vimFunction Function hi! link vimUserFunc Function call s:hi("xmlAttrib", s:nord7_gui, "", s:nord7_term, "", "", "") -call s:hi("xmlCdataStart", s:nord3_gui, "", s:nord3_term, "", "bold", "") +call s:hi("xmlCdataStart", s:nord3_gui_bright, "", s:nord3_term, "", "bold", "") call s:hi("xmlNamespace", s:nord7_gui, "", s:nord7_term, "", "", "") hi! link xmlAttribPunct Delimiter hi! link xmlCdata Comment @@ -488,6 +547,8 @@ hi! link yamlDocumentStart Keyword " > w0rp/ale call s:hi("ALEWarningSign", s:nord13_gui, "", s:nord13_term, "", "", "") call s:hi("ALEErrorSign" , s:nord11_gui, "", s:nord11_term, "", "", "") +call s:hi("ALEWarning" , s:nord13_gui, "", s:nord13_term, "", "undercurl", "") +call s:hi("ALEError" , s:nord11_gui, "", s:nord11_term, "", "undercurl", "") " GitGutter " > airblade/vim-gitgutter @@ -533,6 +594,12 @@ call s:hi("plugDeleted", s:nord11_gui, "", "", s:nord11_term, "", "") call s:hi("SignatureMarkText", s:nord8_gui, "", s:nord8_term, "", "", "") "+--- Languages ---+ +" Haskell +" > neovimhaskell/haskell-vim +call s:hi("haskellPreProc", s:nord10_gui, "", s:nord10_term, "", "", "") +call s:hi("haskellType", s:nord7_gui, "", s:nord7_term, "", "", "") +hi! link haskellPragma haskellPreProc + " JavaScript " > pangloss/vim-javascript call s:hi("jsGlobalNodeObjects", s:nord8_gui, "", s:nord8_term, "", s:italic, "") |
