diff options
| -rw-r--r-- | CHANGELOG.md | 35 | ||||
| -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 | 12 | ||||
| -rwxr-xr-x | autoload/lightline/colorscheme/nord.vim | 6 | ||||
| -rwxr-xr-x | colors/nord.vim | 69 |
8 files changed, 128 insertions, 18 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 44d0e0b..a4c466c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,35 @@ --- +# 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,7 +483,13 @@ Detailed information about features, supported plugins/languages and install ins  +[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 @@ -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.10.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.10.0/CHANGELOG.md#0100) [](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..e586921 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.10.0" let g:airline#themes#nord#palette = {} let s:nord0_gui = "#2E3440" @@ -66,3 +66,9 @@ let s:IAMain = [s:nord5_gui, s:nord3_gui, s:nord5_term, s:nord3_term] let s:IARight = [s:nord5_gui, s:nord3_gui, s:nord5_term, s:nord3_term] let s:IAMiddle = [s:nord5_gui, s:nord1_gui, s:nord5_term, s:nord1_term] let g:airline#themes#nord#palette.inactive = airline#themes#generate_color_map(s:IAMain, s:IARight, s:IAMiddle) + +let g:airline#themes#nord#palette.normal.airline_term = s:NMiddle +let g:airline#themes#nord#palette.insert.airline_term = s:IMiddle +let g:airline#themes#nord#palette.replace.airline_term = s:RMiddle +let g:airline#themes#nord#palette.visual.airline_term = s:VMiddle +let g:airline#themes#nord#palette.inactive.airline_term = s:IAMiddle diff --git a/autoload/lightline/colorscheme/nord.vim b/autoload/lightline/colorscheme/nord.vim index 778c21d..76e7ab2 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.10.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 143c382..af033de 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.10.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 @@ -466,7 +513,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 @@ -535,6 +582,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, "") |
