diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf73b505..d073c122 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,19 +4,169 @@
---
+# 0.7.0
+
+ [](https://github.com/arcticicestudio/nord-vim/projects/10) [](https://github.com/arcticicestudio/nord-vim/milestone/9)
+
+## Features
+
+❯ Added a new [configuration to allow users to increase the comment brightness][readme-config-comment-brightness] by 1 - 20 percent. It can be enabled by setting the `g:nord_comment_brightness variable` to a number between `1` and `20`. (#48 in PR #56, @drzel, e18ab4e8)
+
+**This option should only be enabled if the terminal supports 24bit true color (16 million colors) and requires the `termguicolors` option to be set is in `~/.vimrc` or via `:set termguicolors`!**
+
+Default and 15% increased
+
+Default and 12% increased
+
+To adhere to the Nord design guidelines this option uses `nord3` by default.
+
+This is a reference table if users like to use the same increased contrast values as provided by the [Nord Atom Syntax accessibility custom comment contrast theme setting][nord-atom-syntax-pr-47] which are calculated using the LESSCSS [`lighten`][lesscss-doc-fn-lighten] function.
+
+| Increased by | Calculated value |
+| --- | --- |
+| 1% | `#4e586d` |
+| 2% | `#505b70` |
+| 3% | `#525d73` |
+| 4% | `#556076` |
+| 5% | `#576279` |
+| 6% | `#59647c` |
+| 7% | `#5b677f` |
+| 8% | `#5d6982` |
+| 9% | `#5f6c85` |
+| 10% | `#616e88` |
+| 11% | `#63718b` |
+| 12% | `#66738e` |
+| 13% | `#687591` |
+| 14% | `#6a7894` |
+| 15% | `#6d7a96` |
+| 16% | `#6f7d98` |
+| 17% | `#72809a` |
+| 18% | `#75829c` |
+| 19% | `#78859e` |
+| 20% | `#7b88a1` |
+
+More information about true color and the support in various terminals can be found in [this gist][gist-colors-in-terminals].
+
+❯ Added a new [configuration for a uniform *diff* background color][readme-config-uniform-diff-background]. (#60 in PR #61 #62 #65, @dylnmc @aidanharris @berkin, 958322d0)
+
+
+
+Setting `g:nord_uniform_diff_background` to `1` enables the uniform diff background using `nord1`:
+
+
+
+❯ Added a new [configuration to use uniform activate- and inactive status line backgrounds][readme-config-uniform-statusline-background]. (#37 in PR #58, @dylnmc @DenniJensen, 93056802)
+
+Default status lines
+
+Uniform status lines
+
+❯ Added a new [configuration to explicitly enable italic text formatting][readme-config-italic]. (#88 in PR #89, @lokesh-krishna @dylnmc, dbfc55ff)
+
+**Please note that this option should only be enabled if the used terminal supports italics!**
+
+With enabled option for italic comments
+
+Markdown syntax styling
+
+❯ Added support for NeoVim UI terminal colors. (#63, @meck, af01167b)
+
+### Plugin Support
+
+#### Syntax
+
+❯ Added support for the [plasticboy/vim-markdown][plugin-plasticboy/vim-markdown] syntax plugin to match the style of the built-in markdown syntax styles. (#45 in PR #57, @VVVFO, 09921268)
+
+
+
+
+
+#### UI
+
+❯ Added support for the `PlugClean` command of the [junegunn/vim-plug][plugin-junegunn/vim-plug] plugin which used the `Ignore` group by default for deleted directory listings resulting in unreadable text when `cursorline` has been set. (#43 in PR #59, @dylnmc, e532b5d6)
+
+Before
+
+After
+
+❯ Added basic support for [tpope/vim-fugitive][plugin-tpope/vim-fugitive]. (#76 in PR #77, @anhari, fa09c3b1)
+
+Filenames are now highlighted when using the `:Gstatus` command.
+
+
+
+## Improvements
+
+### Syntax
+
+❯ Added highlight support for legacy *diff* groups `diffAdded` and `diffRemoved` of the `git.vim` and `diff.vim` syntx definitions. (#66 in PR #67, @brandoniffert, 99e59e67)
+
+These groups are not in the [official vim documentation][vim-doc-diffAdd] but are still used by the syntax for example when run with `git commit --verbose`.
+
+Before
+
+After
+
+❯ Added highlighting support for Markdown *italic* and **bold** delimiter. (#90 in PR #92, 97c8aa24)
+
+Before
+
+After
+
+❯ Added missing Markdown *italic* and **bold** groups. (#84 in PR #91, @lokesh-krishna @dylnmc, 63b46125)
+
+❯ Improved the highlighting for matching parens. (#75 and #71 in PR #78, @vincentzhezhang @cryptomaniac512 @dylnmc, 8eb7b2a6)
+
+The background color intensity under the cursor was too bright and the cursor no more visible causing the user to be distracted to focus on the matching bracket instead of the bracket at the cursor position.
+
+To optimally improve the highlighting `nord3` will now be used as background color for the matching element which doesn't conflict with the `cursorline` color and also stands out in order to see the matching element.
+
+Before
+
+After with cursorline option
+
+After without cursorline option
+
+
+
+## Bug Fixes
+
+❯ *TODO* keywords are now highlighted correctly for Neovim and gVim (#52 in PR #53, @dylnmc, 063620f0)
+
+Before
+
+After
+
+❯ Fixed invisible inactive lightline bars (PR #73, @dylnmc, 788876b8)
+
+Before
+
+After
+
+❯ Fixed the `WildMenu` background color for current selection (tab completion) not being visible. (#64 in PR #80, @markand, 53fce0db)
+
+Before
+
+After
+
+## Tasks
+
+❯ Added the included [lightline theme to the official lightline repository][itchyny/lightline.vim-gh-257]. (#68 in [itchyny/lightline#257][itchyny/lightline.vim-gh-257], @lokesh-krishna, itchyny/lightline@e69081c1370a57647e05df21b60a4ef092c3ce91)
+
+### Documentation
+
+❯ Migrated to the MIT license to adapt to the migration of the main [Nord][nord-gh] project. Detailed information can be found in the [main task ticket][gh-55-arcticicestudio/nord]. (#69 in PR #70, fa55dc35)
+
# 0.6.0
-
- Version Details
-
- Release Date: *2017-08-03*
- Milestone
- Project Board
-
-
+
+ [](https://github.com/arcticicestudio/nord-vim/projects/9) [](https://github.com/arcticicestudio/nord-vim/milestone/8)
## Features
+
### Plugin Support
+
#### UI
+
❯ Added basic support for [CtrlP][plugin-ctrlp]. (PR #33, @syedelec)
* Matched characters are using the keyword color instead of the normal text color to make matched characters visible
@@ -28,7 +178,9 @@
* Error signs are colorized using a `nord11` foreground instead of a red background with a white foreground
## Improvements
+
### UI
+
❯ The fold marker foreground has been adjusted to match the comment color instead of `nord1` which has been too dark causing them to be unreadable in bright environments. The background color has also been changed to `nord1` to differ from normal comments and the font style is now bold for better legibility. (#38 in PR #40, @dylnmc)
@@ -38,20 +190,27 @@
#### Neovim
+
❯ Addded support for the Neovim specific `:CheckHealth` status highlight groups. (#31 in PR #42, @syedelec, Thanks to @dylnmc)
Before
After
## Bug Fixes
+
### UI
+
❯ Fixed unreadable text color on pending search result highlights. (#32 in PR #39, @syedelec)
Before
After
# 0.5.0
-*2017-04-17*
+
+ [](https://github.com/arcticicestudio/nord-vim/projects/8) [](https://github.com/arcticicestudio/nord-vim/milestone/7)
+
## Improvements
+
### Language Support
+
❯ Implemented optimized styles for Ruby (@hahuang65, #29, 085c1337)
- Symbols (`rubySymbol`) now have a bold font style
- Block parameter list symbols (`rubyBlockParameterList`) are now colorized as keywords
@@ -60,55 +219,75 @@
## Bug Fixes
+
### Documentation
+
❯ Fixed a typo in the project description. (@arcticicestudio, #28, b2134029)
# 0.4.0
-*2017-02-23*
+
+ [](https://github.com/arcticicestudio/nord-vim/projects/7) [](https://github.com/arcticicestudio/nord-vim/milestone/6)
+
## Features
-### [Configurations][readme-configuration]
+
+### [Configurations][readme-config]
+
❯ Added a configuration to enable [italic comments](https://github.com/arcticicestudio/nord-vim#italic-comments).
-To adhere to the Nord style guide this option is disabled by default. It can be enabled by setting the `g:nord_italic_comments` variable to `1`.
+To adhere to the Nord style guide this option is disabled by default. It can be enabled by setting the `g:nord_italic_comments` variable to `1`.
+
```vim
let g:nord_italic_comments = 1
```
+
(@kepbod, #13 (PR #16), dc6149f4)
## Improvements
+
### Plugin Support
+
❯ The method/function signature live preview of the [`jedi-vim`](https://github.com/davidhalter/jedi-vim) plugin is now colorized correctly. (@mkalinski, #14, a5c3459a)
Before
After
### Language Support
+
❯ Implemented optimized styles for the Python syntax group `pythonEscape`. (@mkalinski, #22, 360a76ea)
❯ Implemented optimized styles for the SQL syntax groups `sqlSpecial` which is now linked to the `sqlKeyword` group to colorize constants like `true`/`false` and `null` as keywords. (@mkalinski, #23, dcfb441e)
### Documentation
+
❯ Added the new terminal emulator port project [Nord Hyper](https://github.com/arcticicestudio/nord-hyper)
[](https://github.com/arcticicestudio/nord-hyper)
# 0.3.0
-*2017-01-24*
+
+ [](https://github.com/arcticicestudio/nord-vim/projects/6) [](https://github.com/arcticicestudio/nord-vim/milestone/5)
+
## Improvements
+
### Plugin Support
+
❯ The [Nord lightline.vim][nord-lightline] UI plugin theme now includes better support for the [tmuxline.vim](https://github.com/edkolev/tmuxline.vim) plugin. Before this implementation text shown in the main segment of the tmuxline, generated via the `:Tmuxline lightline` command, 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. (@scottwillmoore, #11, 4ea37f7e)
Before
After
With unicode separators
Without specified configurations (tmuxline.vim autodetect)
## Bug Fixes
+
### Documentation
+
❯ Fixed a typo in the [README installation guide](https://github.com/arcticicestudio/nord-vim#via-pluginruntimepath-manager) for Vundle. (@kepbod, #10, 29145bbb)
❯ Fixed the banner of the [Nord iTerm2](https://github.com/arcticicestudio/nord-iterm2) port project showing the [Nord GNOME Terminal](https://github.com/arcticicestudio/nord-gnome-terminal) banner instead. (@shvetsovdm, #8 / [nord/#9](https://github.com/arcticicestudio/nord/issues/9), 7a447b40)
# 0.2.0
-*2017-01-02*
+
+ [](https://github.com/arcticicestudio/nord-vim/projects/5) [](https://github.com/arcticicestudio/nord-vim/milestone/4)
## Improvements
+
❯ Characters under block cursors are now colored darker (`nord0`) while the block cursor is visible to achieve a optimal contrast and to avoid unreadability due to the same cursor- and foreground color (`nord4`). (@arcticicestudio / @scottwillmoore, #9, 30e1f7e3)
Before
After
@@ -120,20 +299,27 @@ This has been fixed by using `nord5` as foreground color. (@scottwillmoore, #11,
# 0.1.2
*2017-01-01*
+ [](https://github.com/arcticicestudio/nord-vim/projects/4) [](https://github.com/arcticicestudio/nord-vim/milestone/3)
+
## Bug Fixes
+
❯ Fixed a bug where the `g:colors_name` variable has been unset caused by the `syntax reset` call due to the execution
order. (@shuei72, #5, f8ffce24)
# 0.1.1
-*2016-12-26*
+
+ [](https://github.com/arcticicestudio/nord-vim/projects/3) [](https://github.com/arcticicestudio/nord-vim/milestone/2)
## Bug Fixes
+
❯ Fixed wrong color variables (`*_term` to `*_gui`) for the `guisp` attribute of all `Spell*` highlighting groups which caused error logs while loading `vim`/`gvim`/MacVim. (@kamwitsta, #4, 4d642b9b)
# 0.1.0
-*2016-12-25*
+
+ [](https://github.com/arcticicestudio/nord-vim/projects/2) [](https://github.com/arcticicestudio/nord-vim/milestone/1)
## Features
+
Detailed information about features, supported plugins/languages and install instructions can be found in the [README](https://github.com/arcticicestudio/nord-vim/blob/develop/README.md#installation) and in the [project wiki](https://github.com/arcticicestudio/nord-vim/wiki).
❯ Implemented the main color theme file [`nord.vim`](https://github.com/arcticicestudio/nord-vim/blob/develop/colors/nord.vim). (@arcticicestudio, #1, e2832b9)
@@ -148,11 +334,25 @@ Detailed information about features, supported plugins/languages and install ins
-# 0.0.0
-*2016-12-25*
-**Project Initialization**
+# Project Initialization
+
+
+[gh-55-arcticicestudio/nord]: https://github.com/arcticicestudio/nord/issues/55
+[gist-colors-in-terminals]: https://gist.github.com/XVilka/8346728
+[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-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
-[readme-configuration]: https://github.com/arcticicestudio/nord-vim#configuration
+[plugin-junegunn/vim-plug]: https://github.com/junegunn/vim-plug
+[plugin-plasticboy/vim-markdown]: https://github.com/plasticboy/vim-markdown
+[plugin-tpope/vim-fugitive]: https://github.com/tpope/vim-fugitive
+[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-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
diff --git a/LICENSE.md b/LICENSE.md
index 59506ed7..544df17a 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,194 +1,22 @@
-Apache License
-==============
-
-*Version 2.0, January 2004*
-*<>*
-
-### Terms and Conditions for use, reproduction, and distribution
-
-#### 1. Definitions
-
-"License" shall mean the terms and conditions for use, reproduction, and
-distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the copyright
-owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other entities
-that control, are controlled by, or are under common control with that entity.
-For the purposes of this definition, "control" means **(i)** the power, direct or
-indirect, to cause the direction or management of such entity, whether by
-contract or otherwise, or **(ii)** ownership of fifty percent (50%) or more of the
-outstanding shares, or **(iii)** beneficial ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising
-permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications, including
-but not limited to software source code, documentation source, and configuration
-files.
-
-"Object" form shall mean any form resulting from mechanical transformation or
-translation of a Source form, including but not limited to compiled object code,
-generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form, made
-available under the License, as indicated by a copyright notice that is included
-in or attached to the work (an example is provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form, that
-is based on (or derived from) the Work and for which the editorial revisions,
-annotations, elaborations, or other modifications represent, as a whole, an
-original work of authorship. For the purposes of this License, Derivative Works
-shall not include works that remain separable from, or merely link (or bind by
-name) to the interfaces of, the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original version
-of the Work and any modifications or additions to that Work or Derivative Works
-thereof, that is intentionally submitted to Licensor for inclusion in the Work
-by the copyright owner or by an individual or Legal Entity authorized to submit
-on behalf of the copyright owner. For the purposes of this definition,
-"submitted" means any form of electronic, verbal, or written communication sent
-to the Licensor or its representatives, including but not limited to
-communication on electronic mailing lists, source code control systems, and
-issue tracking systems that are managed by, or on behalf of, the Licensor for
-the purpose of discussing and improving the Work, but excluding communication
-that is conspicuously marked or otherwise designated in writing by the copyright
-owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
-of whom a Contribution has been received by Licensor and subsequently
-incorporated within the Work.
-
-#### 2. Grant of Copyright License
-
-Subject to the terms and conditions of this License, each Contributor hereby
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-irrevocable copyright license to reproduce, prepare Derivative Works of,
-publicly display, publicly perform, sublicense, and distribute the Work and such
-Derivative Works in Source or Object form.
-
-#### 3. Grant of Patent License
-
-Subject to the terms and conditions of this License, each Contributor hereby
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-irrevocable (except as stated in this section) patent license to make, have
-made, use, offer to sell, sell, import, and otherwise transfer the Work, where
-such license applies only to those patent claims licensable by such Contributor
-that are necessarily infringed by their Contribution(s) alone or by combination
-of their Contribution(s) with the Work to which such Contribution(s) was
-submitted. If You institute patent litigation against any entity (including a
-cross-claim or counterclaim in a lawsuit) alleging that the Work or a
-Contribution incorporated within the Work constitutes direct or contributory
-patent infringement, then any patent licenses granted to You under this License
-for that Work shall terminate as of the date such litigation is filed.
-
-#### 4. Redistribution
-
-You may reproduce and distribute copies of the Work or Derivative Works thereof
-in any medium, with or without modifications, and in Source or Object form,
-provided that You meet the following conditions:
-
-* **(a)** You must give any other recipients of the Work or Derivative Works a copy of
-this License; and
-* **(b)** You must cause any modified files to carry prominent notices stating that You
-changed the files; and
-* **(c)** You must retain, in the Source form of any Derivative Works that You distribute,
-all copyright, patent, trademark, and attribution notices from the Source form
-of the Work, excluding those notices that do not pertain to any part of the
-Derivative Works; and
-* **(d)** If the Work includes a "NOTICE" text file as part of its distribution, then any
-Derivative Works that You distribute must include a readable copy of the
-attribution notices contained within such NOTICE file, excluding those notices
-that do not pertain to any part of the Derivative Works, in at least one of the
-following places: within a NOTICE text file distributed as part of the
-Derivative Works; within the Source form or documentation, if provided along
-with the Derivative Works; or, within a display generated by the Derivative
-Works, if and wherever such third-party notices normally appear. The contents of
-the NOTICE file are for informational purposes only and do not modify the
-License. You may add Your own attribution notices within Derivative Works that
-You distribute, alongside or as an addendum to the NOTICE text from the Work,
-provided that such additional attribution notices cannot be construed as
-modifying the License.
-
-You may add Your own copyright statement to Your modifications and may provide
-additional or different license terms and conditions for use, reproduction, or
-distribution of Your modifications, or for any such Derivative Works as a whole,
-provided Your use, reproduction, and distribution of the Work otherwise complies
-with the conditions stated in this License.
-
-#### 5. Submission of Contributions
-
-Unless You explicitly state otherwise, any Contribution intentionally submitted
-for inclusion in the Work by You to the Licensor shall be under the terms and
-conditions of this License, without any additional terms or conditions.
-Notwithstanding the above, nothing herein shall supersede or modify the terms of
-any separate license agreement you may have executed with Licensor regarding
-such Contributions.
-
-#### 6. Trademarks
-
-This License does not grant permission to use the trade names, trademarks,
-service marks, or product names of the Licensor, except as required for
-reasonable and customary use in describing the origin of the Work and
-reproducing the content of the NOTICE file.
-
-#### 7. Disclaimer of Warranty
-
-Unless required by applicable law or agreed to in writing, Licensor provides the
-Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
-including, without limitation, any warranties or conditions of TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
-solely responsible for determining the appropriateness of using or
-redistributing the Work and assume any risks associated with Your exercise of
-permissions under this License.
-
-#### 8. Limitation of Liability
-
-In no event and under no legal theory, whether in tort (including negligence),
-contract, or otherwise, unless required by applicable law (such as deliberate
-and grossly negligent acts) or agreed to in writing, shall any Contributor be
-liable to You for damages, including any direct, indirect, special, incidental,
-or consequential damages of any character arising as a result of this License or
-out of the use or inability to use the Work (including but not limited to
-damages for loss of goodwill, work stoppage, computer failure or malfunction, or
-any and all other commercial damages or losses), even if such Contributor has
-been advised of the possibility of such damages.
-
-#### 9. Accepting Warranty or Additional Liability
-
-While redistributing the Work or Derivative Works thereof, You may choose to
-offer, and charge a fee for, acceptance of support, warranty, indemnity, or
-other liability obligations and/or rights consistent with this License. However,
-in accepting such obligations, You may act only on Your own behalf and on Your
-sole responsibility, not on behalf of any other Contributor, and only if You
-agree to indemnify, defend, and hold each Contributor harmless for any liability
-incurred by, or claims asserted against, such Contributor by reason of your
-accepting any such warranty or additional liability.
-
-*END OF TERMS AND CONDITIONS*
-
-### APPENDIX: How to apply the Apache License to your work
-
-To apply the Apache License to your work, attach the following boilerplate
-notice, with the fields enclosed by brackets `[]` replaced with your own
-identifying information. (Don't include the brackets!) The text should be
-enclosed in the appropriate comment syntax for the file format. We also
-recommend that a file or class name and description of purpose be included on
-the same "printed page" as the copyright notice for easier identification within
-third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+MIT License (MIT)
+
+Copyright (c) 2016-2017 Arctic Ice Studio (http://arcticicestudio.com)
+Copyright (c) 2016-2017 Sven Greb (http://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
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/README.md b/README.md
index 7c74a8ed..14533102 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Based on the Nord color pa
---
-Nord Vim is a 16 colorspace theme build to run in GUI- and terminal mode with support for many third-party plugins and styles for [lightline.vim](https://github.com/itchyny/lightline.vim) and [vim-airline](https://github.com/vim-airline/vim-airline).
+Nord Vim is a 16 colorspace theme build to run in GUI- and terminal mode with support for many third-party plugins and styles for [lightline.vim][gh-itchyny/lightline.vim] and [vim-airline][gh-vim-airline/vim-airline].
Font: Source Code Pro 20px
@@ -19,7 +19,11 @@ Nord Vim is a 16 colorspace theme build to run in GUI- and terminal mode with su
- [Manual](#manual)
- [Activation](#activation)
- [Configuration](#configuration)
- - [Italic comments](#italic-comments)
+ - [Italic Support](#italic-support)
+ - [Italic Comments](#italic-comments)
+ - [Uniform Status Lines](#uniform-status-lines)
+ - [Comment Contrast](#comment-contrast)
+ - [Uniform diff Background](#uniform-diff-background)
- [Plugin Support](#plugin-support)
- [UI Plugins](#ui-plugins)
- [Language Plugins](#language-plugins)
@@ -29,7 +33,9 @@ Nord Vim is a 16 colorspace theme build to run in GUI- and terminal mode with su
- [Contribution](#contribution)
## Getting started
+
### Installation
+
**NOTE**: Nord Vim in terminal mode **MUST** be used with the associated terminal emulator theme in order to work properly!
Make sure to install one of the currently supported terminal themes listed below **BEFORE** installing Nord Vim.
@@ -48,76 +54,188 @@ Make sure to install one of the currently supported terminal themes listed below
[](https://github.com/arcticicestudio/nord-xresources)
#### Via plugin/runtimepath manager
-I recommend to use [`vim-plug`](https://github.com/junegunn/vim-plug).
-Add Nord Vim to your `.vimrc`
-```vim
-Plug 'arcticicestudio/nord-vim'
-```
-and install via `:PlugInstall`.
-You can specify the `develop` branch to install the latest development version.
-```vim
-Plug 'arcticicestudio/nord-vim', { 'branch': 'develop' }
-```
+Add Nord Vim to your `.vimrc` for your favorite manager.
+
+* [`vim-plug`][gh-junegunn/vim-plug] (recommended):
+
+ ```vim
+ Plug 'arcticicestudio/nord-vim'
+ ```
+
+ and run `:PlugInstall`.
+
+* [`pathogen`](https://github.com/tpope/vim-pathogen):
+
+ ```sh
+ cd ~/.vim/bundle
+ git clone git://github.com/arcticicestudio/nord-vim.git
+ ```
+
+* [`Vundle`](https://github.com/VundleVim/Vundle.vim):
+
+ ```vim
+ Plugin 'arcticicestudio/nord-vim'
+ ```
+
+ and run `:PluginInstall`.
+
+To install the latest development version [`vim-plug`][gh-junegunn/vim-plug] support to specifiy the `develop` branch:
-A specific version can be installed via git tags.
```vim
-Plug 'arcticicestudio/nord-vim', { 'tag': 'v0.6.0' }
+Plug 'arcticicestudio/nord-vim', { 'branch': 'develop' }
```
-Of course it can be installed with any of your favorite tools:
-[`pathogen`](https://github.com/tpope/vim-pathogen)
-```sh
-cd ~/.vim/bundle
-git clone git://github.com/arcticicestudio/nord-vim.git
-```
+A explicit version can be installed via Git tags:
-[`Vundle`](https://github.com/VundleVim/Vundle.vim)
-Add Nord Vim to your `.vimrc`
```vim
-Plugin 'arcticicestudio/nord-vim'
+Plug 'arcticicestudio/nord-vim', { 'tag': 'v0.7.0' }
```
-and install via `:PluginInstall`.
#### Manual
+
[Download](https://github.com/arcticicestudio/nord-vim/releases/latest) the latest version or clone the repository and copy the [`nord.vim`](https://github.com/arcticicestudio/nord-vim/blob/develop/colors/nord.vim) theme file to your `~/.vim/colors` directory.
### Activation
+
Use Nord Vim as your default color theme by adding it to your `.vimrc`
+
```vim
colorscheme nord
```
+
or change it on-the-fly by running `:colorscheme nord`.
-[`vim-plug`](https://github.com/junegunn/vim-plug) also provides options to enable it on-demand for specific languages
+[`vim-plug`][gh-junegunn/vim-plug] also provides options to enable it on-demand for specific languages:
+
```vim
" Activate Nord Vim when editing Java files
Plug 'arcticicestudio/nord-vim', { 'for': 'java' }
```
-or on specific events.
+
+or on specific events:
+
```vim
" Activate Nord Vim when toggling the NERDTree
Plug 'arcticicestudio/nord-vim', { 'on': 'NERDTreeToggle' }
```
## Configuration
+
All options should be set **before** the [activation](#activation) command!
-### Italic comments
+### Italic Support
+
**This option should only be enabled if your terminal emulator supports italics!**
-Enable to use italic font for all comments.
+Can be enabled to support italic text.
+
+Most terminals don't handle italics right so Nord disables italics for terminals by default while in GUI mode this option is enabled by default.
+
+Set `g:nord_italic` to `1` to enforce displaying italics.
+
+```vim
+let g:nord_italic = 1
+```
+
+Italic formatting in Markdown
+
+### Italic Comments
+
+**This option only takes effect if the option for [italic text support](#italic-support) has been enabled!**
+
+Enable to italicize all comments.
To adhere to the Nord style guide this option is disabled by default.
-It can be enabled by setting the `g:nord_italic_comments` variable to `1`.
+It can be enabled by setting the `g:nord_italic_comments` variable to `1`.
+
```vim
let g:nord_italic_comments = 1
```
+![][scrot-config-italic-comments]
+
+### Uniform Status Lines
+
+Enables uniform activate- and inactive status lines using `nord3` as background.
+
+By default, Nord Vim uses a slightly brighter background for the current split buffer. This is designed to draw attention to the currently active buffer without being distracting.
+
+If the user desires the backgrounds to be a uniform color, `g:nord_uniform_status_lines` can be set to `1`:
+
+```vim
+let g:nord_uniform_status_lines = 1
+```
+
+Default status lines
Uniform status lines
+
+### Comment Contrast
+
+**This option should only be enabled if your terminal supports 24bit true color (16 million colors) and requires the `termguicolors` option to be set is in `~/.vimrc` or via `:set termguicolors`!**
+
+The comment brightness can be increased by 1 - 20 percent. It can be enabled by setting the `g:nord_comment_brightness`
+variable to a number between `1` and `20`.
+
+```vim
+let g:nord_comment_brightness = 12
+```
+
+Default and 15% increased
+
+Default and 12% increased
+
+To adhere to the Nord style guide this option uses `nord3` by default.
+
+This is a reference table if users like to use the same increased contrast values as provided by the [Nord Atom Syntax accessibility custom comment contrast theme setting][nord-atom-syntax-pr-47] which are calculated using the LESSCSS [`lighten`][lesscss-doc-fn-lighten] function.
+
+| Increased by | Calculated value |
+| --- | --- |
+| 1% | `#4e586d` |
+| 2% | `#505b70` |
+| 3% | `#525d73` |
+| 4% | `#556076` |
+| 5% | `#576279` |
+| 6% | `#59647c` |
+| 7% | `#5b677f` |
+| 8% | `#5d6982` |
+| 9% | `#5f6c85` |
+| 10% | `#616e88` |
+| 11% | `#63718b` |
+| 12% | `#66738e` |
+| 13% | `#687591` |
+| 14% | `#6a7894` |
+| 15% | `#6d7a96` |
+| 16% | `#6f7d98` |
+| 17% | `#72809a` |
+| 18% | `#75829c` |
+| 19% | `#78859e` |
+| 20% | `#7b88a1` |
+
+More information about true color and the support in various terminals can be found in [this gist][gist-true-color].
+
+Default and 15% increased
+
+Default and 12% increased
+
+### Uniform `diff` Background
+
+By default, Nord Vim provides colorful backgrounds when used in *diff* mode `vimdiff`/`vim -d`.
+
+This can be changed to `nord1` as uniform *diff* background color by setting the `g:nord_uniform_diff_background` variable to `1`.
+
+```vim
+let g:nord_uniform_diff_background = 1
+```
+
+Colorful backgrounds (default)
Uniform diff background
+
+
## Plugin Support
-Nord Vim provides support for many third-party language- and the UI plugins.
+
+Nord Vim provides support for many third-party language- and UI plugins.
### UI Plugins
+
lightline
airline
@@ -127,12 +245,15 @@ Nord Vim provides support for many third-party language- and the UI plugins.
NERDTree
### Language Plugins
+
#### JavaScript
+
[`vim-javascript`](https://github.com/pangloss/vim-javascript)
Detailed descriptions for supported plugins can be found in the [project wiki](https://github.com/arcticicestudio/nord-vim/wiki).
## Languages
+
Nord Vim contains optimized styles to achieve a consistent and uniform coloring across languages.
Detailed descriptions for supported languages can be found in the [project wiki](https://github.com/arcticicestudio/nord-vim/wiki) and in the [Plugin Support](#plugin-support) section.
@@ -148,20 +269,26 @@ Detailed descriptions for supported languages can be found in the [project wiki]
![][scrot-lang-ruby]
## Development
-[](https://github.com/arcticicestudio/nord-vim/blob/v0.6.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.7.0/CHANGELOG.md) [](http://nvie.com/posts/a-successful-git-branching-model) [](https://github.com/arcticicestudio/arcver)
### Contribution
+
Please report issues/bugs, feature requests and suggestions for improvements to the [issue tracker](https://github.com/arcticicestudio/nord-vim/issues).
Copyright © 2017 Arctic Ice Studio
-
-
-[scrot-readme-default-profile]: https://raw.githubusercontent.com/arcticicestudio/nord-vim/develop/src/assets/scrot-readme-default-profile.png
-[scrot-readme-lazy-profile-change]: https://raw.githubusercontent.com/arcticicestudio/nord-vim/develop/src/assets/scrot-readme-lazy-profile-change.png
+
+[gh-itchyny/lightline.vim]: https://github.com/itchyny/lightline.vim
+[gh-junegunn/vim-plug]: https://github.com/junegunn/vim-plug
+[gh-vim-airline/vim-airline]: https://github.com/vim-airline/vim-airline
+[gist-true-color]: https://gist.github.com/XVilka/8346728
+[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
+[scrot-config-italic-comments]: https://raw.githubusercontent.com/arcticicestudio/nord-vim/develop/assets/scrot-config-italic-comments.png
[scrot-lang-c]: https://raw.githubusercontent.com/arcticicestudio/nord-vim/develop/assets/scrot-lang-c.png
[scrot-lang-css]: https://raw.githubusercontent.com/arcticicestudio/nord-vim/develop/assets/scrot-lang-css.png
[scrot-lang-html]: https://raw.githubusercontent.com/arcticicestudio/nord-vim/develop/assets/scrot-lang-html.png
@@ -172,3 +299,5 @@ Please report issues/bugs, feature requests and suggestions for improvements to
[scrot-lang-php]: https://raw.githubusercontent.com/arcticicestudio/nord-vim/develop/assets/scrot-lang-php.png
[scrot-lang-python]: https://raw.githubusercontent.com/arcticicestudio/nord-vim/develop/assets/scrot-lang-python.png
[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/src/assets/scrot-readme-default-profile.png
+[scrot-readme-lazy-profile-change]: https://raw.githubusercontent.com/arcticicestudio/nord-vim/develop/src/assets/scrot-readme-lazy-profile-change.png
diff --git a/assets/scrot-config-comment-contrast-java-15-percent.png b/assets/scrot-config-comment-contrast-java-15-percent.png
new file mode 100755
index 00000000..63c5266a
Binary files /dev/null and b/assets/scrot-config-comment-contrast-java-15-percent.png differ
diff --git a/assets/scrot-config-comment-contrast-java-default.png b/assets/scrot-config-comment-contrast-java-default.png
new file mode 100755
index 00000000..d577b2a5
Binary files /dev/null and b/assets/scrot-config-comment-contrast-java-default.png differ
diff --git a/assets/scrot-config-comment-contrast-js-12-percent.png b/assets/scrot-config-comment-contrast-js-12-percent.png
new file mode 100755
index 00000000..0e5c1963
Binary files /dev/null and b/assets/scrot-config-comment-contrast-js-12-percent.png differ
diff --git a/assets/scrot-config-comment-contrast-js-default.png b/assets/scrot-config-comment-contrast-js-default.png
new file mode 100755
index 00000000..efee604b
Binary files /dev/null and b/assets/scrot-config-comment-contrast-js-default.png differ
diff --git a/assets/scrot-config-italic-comments.png b/assets/scrot-config-italic-comments.png
new file mode 100644
index 00000000..edd9d951
Binary files /dev/null and b/assets/scrot-config-italic-comments.png differ
diff --git a/assets/scrot-config-italic-markdown.png b/assets/scrot-config-italic-markdown.png
new file mode 100644
index 00000000..a1987ec5
Binary files /dev/null and b/assets/scrot-config-italic-markdown.png differ
diff --git a/assets/scrot-config-uniform-diff-default.png b/assets/scrot-config-uniform-diff-default.png
new file mode 100755
index 00000000..db96f9ad
Binary files /dev/null and b/assets/scrot-config-uniform-diff-default.png differ
diff --git a/assets/scrot-config-uniform-diff.png b/assets/scrot-config-uniform-diff.png
new file mode 100755
index 00000000..16b9aae8
Binary files /dev/null and b/assets/scrot-config-uniform-diff.png differ
diff --git a/assets/scrot-config-uniform-status-lines-default.png b/assets/scrot-config-uniform-status-lines-default.png
new file mode 100755
index 00000000..4784f715
Binary files /dev/null and b/assets/scrot-config-uniform-status-lines-default.png differ
diff --git a/assets/scrot-config-uniform-status-lines.png b/assets/scrot-config-uniform-status-lines.png
new file mode 100755
index 00000000..74b6b3d6
Binary files /dev/null and b/assets/scrot-config-uniform-status-lines.png differ
diff --git a/autoload/airline/themes/nord.vim b/autoload/airline/themes/nord.vim
index fe7a71b4..34a75e05 100755
--- a/autoload/airline/themes/nord.vim
+++ b/autoload/airline/themes/nord.vim
@@ -1,12 +1,11 @@
-" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-" title Nord Vim airline +
-" project nord-vim +
-" repository https://github.com/arcticicestudio/nord-vim +
-" author Arctic Ice Studio +
-" email development@arcticicestudio.com +
-" copyright Copyright (C) 2017 +
-" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-let s:nord_vim_version="0.6.0"
+" Copyright (c) 2016-2017 Arctic Ice Studio
+" Copyright (c) 2016-2017 Sven Greb
+
+" Project: Nord Vim
+" Repository: https://github.com/arcticicestudio/nord-vim
+" License: MIT
+
+let s:nord_vim_version="0.7.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 e5c54751..c6a4d970 100755
--- a/autoload/lightline/colorscheme/nord.vim
+++ b/autoload/lightline/colorscheme/nord.vim
@@ -1,12 +1,11 @@
-" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-" title Nord Vim lightline +
-" project nord-vim +
-" repository https://github.com/arcticicestudio/nord-vim +
-" author Arctic Ice Studio +
-" email development@arcticicestudio.com +
-" copyright Copyright (C) 2017 +
-" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-let s:nord_vim_version="0.6.0"
+" Copyright (c) 2016-2017 Arctic Ice Studio
+" Copyright (c) 2016-2017 Sven Greb
+
+" Project: Nord Vim
+" Repository: https://github.com/arcticicestudio/nord-vim
+" License: MIT
+
+let s:nord_vim_version="0.7.0"
let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}}
let s:nord0 = ["#2E3440", "NONE"]
@@ -33,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:nord0 ] ]
+let s:p.inactive.middle = [ [ s:nord5, s:nord1 ] ]
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 ] ]
diff --git a/colors/nord.vim b/colors/nord.vim
index 3b30d936..4c06aa62 100755
--- a/colors/nord.vim
+++ b/colors/nord.vim
@@ -1,11 +1,10 @@
-" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-" title Nord Vim +
-" project nord-vim +
-" repository https://github.com/arcticicestudio/nord-vim +
-" author Arctic Ice Studio +
-" email development@arcticicestudio.com +
-" copyright Copyright (C) 2017 +
-" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+" Copyright (c) 2016-2017 Arctic Ice Studio
+" Copyright (c) 2016-2017 Sven Greb
+
+" Project: Nord Vim
+" Repository: https://github.com/arcticicestudio/nord-vim
+" License: MIT
+
if version > 580
hi clear
if exists("syntax_on")
@@ -14,7 +13,7 @@ if version > 580
endif
let g:colors_name = "nord"
-let s:nord_vim_version="0.6.0"
+let s:nord_vim_version="0.7.0"
set background=dark
let s:nord0_gui = "#2E3440"
@@ -48,16 +47,63 @@ let s:nord13_term = "3"
let s:nord14_term = "2"
let s:nord15_term = "5"
-if !exists('g:nord_italic_comments')
- let g:nord_italic_comments = 0
+let s:nord3_gui_brightened = [
+ \ s:nord3_gui,
+ \ "#4e586d",
+ \ "#505b70",
+ \ "#525d73",
+ \ "#556076",
+ \ "#576279",
+ \ "#59647c",
+ \ "#5b677f",
+ \ "#5d6982",
+ \ "#5f6c85",
+ \ "#616e88",
+ \ "#63718b",
+ \ "#66738e",
+ \ "#687591",
+ \ "#6a7894",
+ \ "#6d7a96",
+ \ "#6f7d98",
+ \ "#72809a",
+ \ "#75829c",
+ \ "#78859e",
+ \ "#7b88a1",
+\ ]
+
+if !exists("g:nord_italic")
+ if has("gui_running") || $TERM_ITALICS == "true"
+ let g:nord_italic=1
+ else
+ let g:nord_italic=0
+ endif
+endif
+
+let s:italic = "italic,"
+if g:nord_italic == 0
+ let s:italic = ""
endif
-function! s:hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
- let l:attr = a:attr
- if g:nord_italic_comments == 0 && l:attr ==? 'italic'
- let l:attr= 'NONE'
+let s:italicize_comments = ""
+if exists("g:nord_italic_comments")
+ if g:nord_italic_comments == 1
+ let s:italicize_comments = s:italic
endif
+endif
+
+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
+endif
+if !exists("g:nord_uniform_diff_background")
+ let g:nord_uniform_diff_background = 0
+endif
+
+function! s:hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
if a:guifg != ""
exec "hi " . a:group . " guifg=" . a:guifg
endif
@@ -71,7 +117,7 @@ function! s:hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
exec "hi " . a:group . " ctermbg=" . a:ctermbg
endif
if a:attr != ""
- exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+ exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
endif
if a:guisp != ""
exec "hi " . a:group . " guisp=" . a:guisp
@@ -83,16 +129,17 @@ endfunction
"+---------------+
"+--- Attributes ---+
call s:hi("Bold", "", "", "", "", "bold", "")
-call s:hi("Italic", "", "", "", "", "italic", "")
+call s:hi("Italic", "", "", "", "", s:italic, "")
call s:hi("Underline", "", "", "", "", "underline", "")
"+--- Editor ---+
call s:hi("ColorColumn", "", s:nord1_gui, "NONE", s:nord1_term, "", "")
call s:hi("Cursor", s:nord0_gui, s:nord4_gui, "", "NONE", "", "")
call s:hi("CursorLine", "", s:nord1_gui, "NONE", s:nord1_term, "NONE", "")
+call s:hi("Error", s:nord0_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:nord0_gui, s:nord8_gui, s:nord1_term, s:nord8_term, "", "")
+call s:hi("MatchParen", s:nord8_gui, s:nord0_gui, s:nord8_term, s:nord3_term, "", "")
call s:hi("NonText", s:nord2_gui, "", s:nord3_term, "", "", "")
call s:hi("Normal", s:nord4_gui, s:nord0_gui, "NONE", "NONE", "", "")
call s:hi("PMenu", s:nord4_gui, s:nord2_gui, "NONE", s:nord1_term, "NONE", "")
@@ -111,6 +158,26 @@ call s:hi("healthError", s:nord11_gui, s:nord1_gui, s:nord11_term, s:nord1_term,
call s:hi("healthSuccess", s:nord14_gui, s:nord1_gui, s:nord14_term, s:nord1_term, "", "")
call s:hi("healthWarning", s:nord13_gui, s:nord1_gui, s:nord13_term, s:nord1_term, "", "")
+"+- Neovim Terminal Colors -+
+if has('nvim')
+ let g:terminal_color_0 = s:nord1_gui
+ let g:terminal_color_1 = s:nord11_gui
+ let g:terminal_color_2 = s:nord14_gui
+ let g:terminal_color_3 = s:nord13_gui
+ let g:terminal_color_4 = s:nord9_gui
+ let g:terminal_color_5 = s:nord15_gui
+ let g:terminal_color_6 = s:nord8_gui
+ let g:terminal_color_7 = s:nord5_gui
+ let g:terminal_color_8 = s:nord3_gui
+ let g:terminal_color_9 = s:nord11_gui
+ let g:terminal_color_10 = s:nord14_gui
+ let g:terminal_color_11 = s:nord13_gui
+ let g:terminal_color_12 = s:nord9_gui
+ let g:terminal_color_13 = s:nord15_gui
+ let g:terminal_color_14 = s:nord7_gui
+ let g:terminal_color_15 = s:nord6_gui
+endif
+
"+--- Gutter ---+
call s:hi("CursorColumn", "", s:nord1_gui, "NONE", s:nord1_term, "", "")
call s:hi("CursorLineNr", s:nord3_gui, s:nord0_gui, "NONE", "", "", "")
@@ -127,10 +194,15 @@ 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("Question", s:nord4_gui, "", "NONE", "", "", "")
-call s:hi("StatusLine", s:nord4_gui, s:nord0_gui, s:nord8_term, s:nord1_term, "NONE", "")
-call s:hi("StatusLineNC", s:nord4_gui, s:nord0_gui, s:nord8_term, "NONE", "NONE", "")
+if g:nord_uniform_status_lines == 0
+ call s:hi("StatusLine", s:nord8_gui, s:nord3_gui, s:nord8_term, s:nord3_term, "NONE", "")
+ call s:hi("StatusLineNC", s:nord4_gui, s:nord1_gui, "NONE", s:nord1_term, "NONE", "")
+else
+ call s:hi("StatusLine", s:nord8_gui, s:nord3_gui, s:nord8_term, s:nord3_term, "NONE", "")
+ call s:hi("StatusLineNC", s:nord4_gui, s:nord3_gui, "NONE", s:nord3_term, "NONE", "")
+endif
call s:hi("WarningMsg", s:nord0_gui, s:nord13_gui, s:nord1_term, s:nord13_term, "", "")
-call s:hi("WildMenu", s:nord8_gui, s:nord3_gui, s:nord8_term, s:nord3_term, "", "")
+call s:hi("WildMenu", s:nord8_gui, s:nord1_gui, s:nord8_term, s:nord1_term, "", "")
"+--- Search ---+
call s:hi("IncSearch", s:nord1_gui, s:nord8_gui, s:nord1_term, s:nord8_term, "underline", "")
@@ -150,7 +222,7 @@ call s:hi("VertSplit", s:nord2_gui, s:nord1_gui, s:nord3_term, s:nord1_term, "NO
"+----------------------+
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, "", s:nord3_term, "", "italic", "")
+call s:hi("Comment", s:nord3_gui_brightened[g:nord_comment_brightness], "", 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, "", "", "")
@@ -168,13 +240,13 @@ call s:hi("PreProc", s:nord9_gui, "", s:nord9_term, "", "NONE", "")
call s:hi("Repeat", s:nord9_gui, "", s:nord9_term, "", "", "")
call s:hi("Special", s:nord4_gui, "", "NONE", "", "", "")
call s:hi("SpecialChar", s:nord13_gui, "", s:nord13_term, "", "", "")
-call s:hi("SpecialComment", s:nord8_gui, "", s:nord8_term, "", "italic", "")
+call s:hi("SpecialComment", s:nord8_gui, "", s:nord8_term, "", s:italicize_comments, "")
call s:hi("Statement", s:nord9_gui, "", s:nord9_term, "", "", "")
call s:hi("StorageClass", s:nord9_gui, "", s:nord9_term, "", "", "")
call s:hi("String", s:nord14_gui, "", s:nord14_term, "", "", "")
call s:hi("Structure", s:nord9_gui, "", s:nord9_term, "", "", "")
call s:hi("Tag", s:nord4_gui, "", "", "", "", "")
-call s:hi("Todo", s:nord13_gui, "", s:nord13_term, "NONE", "", "")
+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 Macro Define
@@ -233,15 +305,21 @@ hi! link dtDelim Delimiter
hi! link dtLocaleValue Keyword
hi! link dtTypeValue Keyword
-call s:hi("diffAdded", s:nord14_gui, "", s:nord14_term, "", "", "")
-call s:hi("diffChanged", s:nord13_gui, "", s:nord13_term, "", "", "")
-call s:hi("diffNewFile", s:nord8_gui, "", s:nord8_term, "", "", "")
-call s:hi("diffOldFile", s:nord7_gui, "", s:nord7_term, "", "", "")
-call s:hi("diffRemoved", s:nord11_gui, "", s:nord11_term, "", "", "")
-call s:hi("DiffAdd", s:nord14_gui, "", s:nord14_term, "", "", "")
-call s:hi("DiffChange", s:nord13_gui, "", s:nord13_term, "", "", "")
-call s:hi("DiffDelete", s:nord11_gui, "", s:nord11_term, "", "", "")
-call s:hi("DiffText", s:nord4_gui, "", "NONE", "", "", "")
+if g:nord_uniform_diff_background == 0
+ call s:hi("DiffAdd", s:nord14_gui, s:nord0_gui, s:nord14_term, "NONE", "inverse", "")
+ call s:hi("DiffChange", s:nord13_gui, s:nord0_gui, s:nord13_term, "NONE", "inverse", "")
+ call s:hi("DiffDelete", s:nord11_gui, s:nord0_gui, s:nord11_term, "NONE", "inverse", "")
+ call s:hi("DiffText", s:nord13_gui, s:nord0_gui, s:nord13_term, "NONE", "inverse", "")
+else
+ call s:hi("DiffAdd", s:nord14_gui, s:nord1_gui, s:nord14_term, s:nord1_term, "", "")
+ call s:hi("DiffChange", s:nord13_gui, s:nord1_gui, s:nord13_term, s:nord1_term, "", "")
+ call s:hi("DiffDelete", s:nord11_gui, s:nord1_gui, s:nord11_term, s:nord1_term, "", "")
+ call s:hi("DiffText", s:nord13_gui, s:nord1_gui, s:nord13_term, s:nord1_term, "", "")
+endif
+" Legacy groups for official git.vim and diff.vim syntax
+hi! link diffAdded DiffAdd
+hi! link diffChanged DiffChange
+hi! link diffRemoved DiffDelete
call s:hi("gitconfigVariable", s:nord7_gui, "", s:nord7_term, "", "", "")
@@ -253,6 +331,12 @@ call s:hi("htmlLink", s:nord4_gui, "", "", "", "NONE", "NONE")
hi! link htmlBold Bold
hi! link htmlEndTag htmlTag
hi! link htmlItalic Italic
+hi! link htmlH1 markdownH1
+hi! link htmlH2 markdownH1
+hi! link htmlH3 markdownH1
+hi! link htmlH4 markdownH1
+hi! link htmlH5 markdownH1
+hi! link htmlH6 markdownH1
hi! link htmlSpecialChar SpecialChar
hi! link htmlTag Keyword
hi! link htmlTagN htmlTag
@@ -286,8 +370,10 @@ call s:hi("markdownFootnote", s:nord7_gui, "", s:nord7_term, "", "", "")
call s:hi("markdownId", s:nord7_gui, "", s:nord7_term, "", "", "")
call s:hi("markdownIdDeclaration", s:nord7_gui, "", s:nord7_term, "", "", "")
call s:hi("markdownH1", s:nord8_gui, "", s:nord8_term, "", "", "")
-call s:hi("markdownLinkText", s:nord7_gui, "", s:nord7_term, "", "", "")
+call s:hi("markdownLinkText", s:nord8_gui, "", s:nord8_term, "", "", "")
call s:hi("markdownUrl", s:nord4_gui, "", "NONE", "", "NONE", "")
+hi! link markdownBold Bold
+hi! link markdownBoldDelimiter Keyword
hi! link markdownFootnoteDefinition markdownFootnote
hi! link markdownH2 markdownH1
hi! link markdownH3 markdownH1
@@ -295,6 +381,8 @@ hi! link markdownH4 markdownH1
hi! link markdownH5 markdownH1
hi! link markdownH6 markdownH1
hi! link markdownIdDelimiter Keyword
+hi! link markdownItalic Italic
+hi! link markdownItalicDelimiter Keyword
hi! link markdownLinkDelimiter Keyword
hi! link markdownLinkTextDelimiter Keyword
hi! link markdownListMarker Keyword
@@ -387,6 +475,12 @@ call s:hi("GitGutterChange", s:nord13_gui, "", s:nord13_term, "", "", "")
call s:hi("GitGutterChangeDelete", s:nord11_gui, "", s:nord11_term, "", "", "")
call s:hi("GitGutterDelete", s:nord11_gui, "", s:nord11_term, "", "", "")
+" fugitive.vim
+" > tpope/vim-fugitive
+call s:hi("gitcommitDiscardedFile", s:nord11_gui, "", s:nord11_term, "", "", "")
+call s:hi("gitcommitUntrackedFile", s:nord11_gui, "", s:nord11_term, "", "", "")
+call s:hi("gitcommitSelectedFile", s:nord14_gui, "", s:nord14_term, "", "", "")
+
" davidhalter/jedi-vim
call s:hi("jediFunction", s:nord4_gui, s:nord3_gui, "", s:nord3_term, "", "")
call s:hi("jediFat", s:nord8_gui, s:nord3_gui, s:nord8_term, s:nord3_term, "bold,underline", "")
@@ -402,13 +496,41 @@ hi! link NERDTreeHelp Comment
hi! link CtrlPMatch Keyword
hi! link CtrlPBufferHid Normal
+" vim-plug
+" > junegunn/vim-plug
+call s:hi("plugDeleted", s:nord11_gui, "", "", s:nord11_term, "", "")
+
"+--- Languages ---+
" JavaScript
" > pangloss/vim-javascript
-call s:hi("jsGlobalNodeObjects", s:nord8_gui, "", s:nord8_term, "", "italic", "")
+call s:hi("jsGlobalNodeObjects", s:nord8_gui, "", s:nord8_term, "", s:italic, "")
hi! link jsBrackets Delimiter
hi! link jsFuncCall Function
hi! link jsFuncParens Delimiter
hi! link jsNoise Delimiter
hi! link jsPrototype Keyword
hi! link jsRegexpString SpecialChar
+
+" Markdown
+" > plasticboy/vim-markdown
+call s:hi("mkdCode", s:nord7_gui, "", s:nord7_term, "", "", "")
+call s:hi("mkdFootnote", s:nord8_gui, "", s:nord8_term, "", "", "")
+call s:hi("mkdRule", s:nord10_gui, "", s:nord10_term, "", "", "")
+call s:hi("mkdLineBreak", s:nord9_gui, "", s:nord9_term, "", "", "")
+hi! link mkdBold Bold
+hi! link mkdItalic Italic
+hi! link mkdString Keyword
+hi! link mkdCodeStart mkdCode
+hi! link mkdCodeEnd mkdCode
+hi! link mkdBlockquote Comment
+hi! link mkdListItem Keyword
+hi! link mkdListItemLine Normal
+hi! link mkdFootnotes mkdFootnote
+hi! link mkdLink markdownLinkText
+hi! link mkdURL markdownUrl
+hi! link mkdInlineURL mkdURL
+hi! link mkdID Identifier
+hi! link mkdLinkDef mkdLink
+hi! link mkdLinkDefTarget mkdURL
+hi! link mkdLinkTitle mkdInlineURL
+hi! link mkdDelimiter Keyword