mirror of
https://github.com/nordtheme/vim.git
synced 2026-09-10 07:36:23 -04:00
Merge branch 'develop' into fix-statusline
This commit is contained in:
Arctic Ice Studio
GitHub
commit
f62b96ad2c
37
README.md
37
README.md
|
|
@ -21,6 +21,8 @@ Nord Vim is a 16 colorspace theme build to run in GUI- and terminal mode with su
|
|||
- [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)
|
||||
|
|
@ -110,7 +112,8 @@ 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
|
||||
```
|
||||
|
|
@ -129,8 +132,36 @@ 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
|
||||
```
|
||||
|
||||
<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-default.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>
|
||||
|
|
@ -174,9 +205,9 @@ Please report issues/bugs, feature requests and suggestions for improvements to
|
|||
|
||||
<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>
|
||||
|
||||
[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
|
||||
|
|
|
|||
BIN
assets/scrot-config-uniform-diff-default.png
Executable file
BIN
assets/scrot-config-uniform-diff-default.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 82 KiB |
BIN
assets/scrot-config-uniform-diff.png
Executable file
BIN
assets/scrot-config-uniform-diff.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 74 KiB |
|
|
@ -48,12 +48,43 @@ 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
|
||||
|
||||
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)
|
||||
|
|
@ -94,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, "", "")
|
||||
|
|
@ -159,7 +191,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, "", "", "")
|
||||
|
|
@ -183,7 +215,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
|
||||
|
|
@ -242,15 +274,17 @@ 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
|
||||
|
||||
call s:hi("gitconfigVariable", s:nord7_gui, "", s:nord7_term, "", "", "")
|
||||
|
||||
|
|
@ -262,6 +296,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
|
||||
|
|
@ -295,7 +335,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
|
||||
|
|
@ -411,6 +451,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
|
||||
|
|
@ -421,3 +465,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
|
||||
|
|
|
|||
Loading…
Reference in a new issue