diff options
| -rw-r--r-- | LICENSE.md | 208 | ||||
| -rw-r--r-- | README.md | 54 | ||||
| -rwxr-xr-x | assets/scrot-config-uniform-diff-default.png | bin | 0 -> 84251 bytes | |||
| -rwxr-xr-x | assets/scrot-config-uniform-diff.png | bin | 0 -> 76274 bytes | |||
| -rwxr-xr-x | assets/scrot-config-uniform-status-lines-default.png | bin | 0 -> 39481 bytes | |||
| -rwxr-xr-x | assets/scrot-config-uniform-status-lines.png | bin | 0 -> 39095 bytes | |||
| -rwxr-xr-x | autoload/airline/themes/nord.vim | 15 | ||||
| -rwxr-xr-x | autoload/lightline/colorscheme/nord.vim | 15 | ||||
| -rwxr-xr-x | colors/nord.vim | 147 |
9 files changed, 206 insertions, 233 deletions
@@ -1,194 +1,22 @@ -Apache License -============== +MIT License (MIT) -*Version 2.0, January 2004* -*<<http://www.apache.org/licenses/>>* +Copyright (c) 2016-2017 Arctic Ice Studio <development@arcticicestudio.com> (http://arcticicestudio.com) +Copyright (c) 2016-2017 Sven Greb <code@svengreb.de> (http://svengreb.de) -### Terms and Conditions for use, reproduction, and distribution +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: -#### 1. Definitions +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. -"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. +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. @@ -20,6 +20,9 @@ Nord Vim is a 16 colorspace theme build to run in GUI- and terminal mode with su - [Activation](#activation) - [Configuration](#configuration) - [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) @@ -109,13 +112,56 @@ All options should be set **before** the [activation](#activation) command! Enable to use italic font for 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 ``` +### 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 +``` + +<align="center"><strong>Default status lines</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-vim/develop/assets/scrot-config-uniform-status-lines-default.png"/><br><strong>Uniform status lines</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-vim/develop/assets/scrot-config-uniform-status-lines.png"/></p> + +### Comment contrast +**This option should only be enabled if your terminal emulator supports 24bit true color (16 million colors)!** + +This option is only visible if `termguicolors` is enabled in your `~/.vimrc` or set 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 +``` + +To adhere to the Nord style guide this option uses `nord3` by default. + +More information about true color and the support in various terminals can be found in [this gist][gist-true-color]. + +### 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 +``` + +<p align="center"><strong>Colorful backgrounds (default)</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-vim/develop/assets/scrot-config-uniform-diff-default.png"/><br><strong>Uniform diff background</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-vim/develop/assets/scrot-config-uniform-diff.png"/> +</p> + ## 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 <p align="center"><a href="https://github.com/itchyny/lightline.vim">lightline</a><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-vim/develop/assets/scrot-plugin-support-ui-lightline.png"/><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-vim/develop/assets/scrot-plugin-support-ui-lightline-vsplit.png"/></p> @@ -157,11 +203,11 @@ Please report issues/bugs, feature requests and suggestions for improvements to <p align="center"> <img src="http://arcticicestudio.com/favicon.ico" width=16 height=16/> Copyright © 2017 Arctic Ice Studio</p> -<p align="center"><a href="http://www.apache.org/licenses/LICENSE-2.0"><img src="https://img.shields.io/badge/License-Apache_2.0-5E81AC.svg?style=flat-square"/></a> <a href="https://creativecommons.org/licenses/by-sa/4.0"><img src="https://img.shields.io/badge/License-CC_BY--SA_4.0-5E81AC.svg?style=flat-square"/></a></p> +<p align="center"><a href="https://github.com/arcticicestudio/nord-vim/blob/develop/LICENSE.md"><img src="https://img.shields.io/badge/License-MIT-5E81AC.svg?style=flat-square"/></a> <a href="https://creativecommons.org/licenses/by-sa/4.0"><img src="https://img.shields.io/badge/License-CC_BY--SA_4.0-5E81AC.svg?style=flat-square"/></a></p> +[gist-true-color]: https://gist.github.com/XVilka/8346728 [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 - [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 diff --git a/assets/scrot-config-uniform-diff-default.png b/assets/scrot-config-uniform-diff-default.png Binary files differnew file mode 100755 index 0000000..db96f9a --- /dev/null +++ b/assets/scrot-config-uniform-diff-default.png diff --git a/assets/scrot-config-uniform-diff.png b/assets/scrot-config-uniform-diff.png Binary files differnew file mode 100755 index 0000000..16b9aae --- /dev/null +++ b/assets/scrot-config-uniform-diff.png diff --git a/assets/scrot-config-uniform-status-lines-default.png b/assets/scrot-config-uniform-status-lines-default.png Binary files differnew file mode 100755 index 0000000..4784f71 --- /dev/null +++ b/assets/scrot-config-uniform-status-lines-default.png diff --git a/assets/scrot-config-uniform-status-lines.png b/assets/scrot-config-uniform-status-lines.png Binary files differnew file mode 100755 index 0000000..74b6b3d --- /dev/null +++ b/assets/scrot-config-uniform-status-lines.png diff --git a/autoload/airline/themes/nord.vim b/autoload/airline/themes/nord.vim index fe7a71b..9920e9f 100755 --- a/autoload/airline/themes/nord.vim +++ b/autoload/airline/themes/nord.vim @@ -1,11 +1,10 @@ -" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -" 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 + -" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +" Copyright (c) 2016-2017 Arctic Ice Studio <development@arcticicestudio.com> +" Copyright (c) 2016-2017 Sven Greb <code@svengreb.de> + +" Project: Nord Vim +" Repository: https://github.com/arcticicestudio/nord-vim +" License: MIT + let s:nord_vim_version="0.6.0" let g:airline#themes#nord#palette = {} diff --git a/autoload/lightline/colorscheme/nord.vim b/autoload/lightline/colorscheme/nord.vim index e5c5475..ba211d5 100755 --- a/autoload/lightline/colorscheme/nord.vim +++ b/autoload/lightline/colorscheme/nord.vim @@ -1,11 +1,10 @@ -" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -" 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 + -" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +" Copyright (c) 2016-2017 Arctic Ice Studio <development@arcticicestudio.com> +" Copyright (c) 2016-2017 Sven Greb <code@svengreb.de> + +" Project: Nord Vim +" Repository: https://github.com/arcticicestudio/nord-vim +" License: MIT + let s:nord_vim_version="0.6.0" let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}} diff --git a/colors/nord.vim b/colors/nord.vim index 24e1c52..4a7ad85 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 <development@arcticicestudio.com> +" Copyright (c) 2016-2017 Sven Greb <code@svengreb.de> + +" Project: Nord Vim +" Repository: https://github.com/arcticicestudio/nord-vim +" License: MIT + if version > 580 hi clear if exists("syntax_on") @@ -48,10 +47,46 @@ let s:nord13_term = "3" let s:nord14_term = "2" let s:nord15_term = "5" -if !exists('g:nord_italic_comments') +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_comments") let g:nord_italic_comments = 0 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) let l:attr = a:attr if g:nord_italic_comments == 0 && l:attr ==? 'italic' @@ -90,6 +125,7 @@ call s:hi("Underline", "", "", "", "", "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("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, "", "") @@ -111,6 +147,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,8 +183,13 @@ 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, "", "") @@ -150,7 +211,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, "", "italic", "") 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, "", "", "") @@ -174,7 +235,7 @@ 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 +294,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 +320,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,7 +359,7 @@ 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 markdownFootnoteDefinition markdownFootnote hi! link markdownH2 markdownH1 @@ -408,6 +481,10 @@ 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 @@ -418,3 +495,27 @@ 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 "CHECK +hi! link mkdLinkDef mkdLink +hi! link mkdLinkDefTarget mkdURL +hi! link mkdLinkTitle mkdInlineURL +hi! link mkdDelimiter Keyword |
