Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adapt remaining arcticicestudio "fade-out" changes #342

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,4 @@ node_modules/
# ESLint automatically applies ignore pattern for "dotfiles" by default to prevent accidentally lint over paths like
# `.git` or any other critical paths.
!**/.eslintrc.js
!.remarkrc.js
!lint-staged.config.js
!prettier.config.js
!.remarkrc.mjs
14 changes: 10 additions & 4 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,26 @@
/*
* Copyright (c) 2016-present Sven Greb <development@svengreb.de>
* This source code is licensed under the MIT license found in the license file.
* References:
* This source code is licensed under the Creative Commons Attribution-ShareAlike 4.0 International license found in the license file.
*/

/**
* Configurations for ESLint.
* @see https://eslint.org/docs/latest/use/configure
* @see https://eslint.org/docs/latest/use/configure/#using-configuration-files
* @see https://eslint.org/docs/latest/use/configure/#specifying-environments
* @see https://eslint.org/docs/latest/use/configure/#configuring-plugins
* @see https://eslint.org/docs/latest/rules
*/
module.exports = {
root: true,
extends: ["@arcticicestudio/eslint-config-base", "@arcticicestudio/eslint-config-base/prettier"],
extends: [
"@svengreb/eslint-config-base",
/*
* Enable support for projects using Prettier.
* Note that this must always be placed after the `@svengreb/eslint-config-base` preset to take precedence, otherwise it won't prevent errors
* due to useless and possibly conflicting rules!
*/
"@svengreb/eslint-config-base/prettier",
],
overrides: [
{
files: ["*.js"],
Expand Down
7 changes: 6 additions & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
#!/bin/sh

# Copyright (c) 2016-present Sven Greb <development@svengreb.de>
# This source code is licensed under the MIT license found in the license file.
# This source code is licensed under the Creative Commons Attribution-ShareAlike 4.0 International license found in the license file.

# Git "pre-commit" hook for husky.
# References:
# 1. https://github.com/typicode/husky
# 2. https://git-scm.com/docs/githooks#_pre_commit

. "$(dirname "$0")/_/husky.sh"

Expand Down
7 changes: 7 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@
# Configurations for npm.
# See https://docs.npmjs.com/cli/v7/configuring-npm/npmrc for more details.

# Disable the vulnerability auditing and checks which includes often way too many false-positives, insignificant
# problems that are only for local development, and many other warnings that are overhelming.
# Use dedicated vulnerability tools instead to filter and identify issue that really impact the project.
# References:
# 1. https://docs.npmjs.com/cli/v9/commands/npm-audit
audit=false

# Only use a lockfile for single-consumer projects, like applications, but not for multi-consumer projects like
# libraries.
# It helps to pin dependency versions, improves the security through integrity checksums, prevents possible errors
Expand Down
1 change: 1 addition & 0 deletions .remarkignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
# See https://github.com/unifiedjs/unified-engine/blob/HEAD/doc/ignore.md for more details.

node_modules/
license
4 changes: 2 additions & 2 deletions .remarkrc.js → .remarkrc.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
* @see https://github.com/remarkjs/remark-lint
* @see https://remark.js.org
*/
module.exports = {
plugins: ["@arcticicestudio/remark-preset-lint"],
export default {
plugins: ["@svengreb/remark-preset-lint"],
};
15 changes: 4 additions & 11 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<p align="center">
<a href="https://www.nordtheme.com/ports/vim" target="_blank">
<picture>
<source srcset="https://github.com/arcticicestudio/nord-docs/main/assets/images/ports/vim/repository-hero.svg?sanitize=true" width="100%" media="(prefers-color-scheme: light), (prefers-color-scheme: no-preference)" />
<img src="https://github.com/arcticicestudio/nord-docs/main/assets/images/ports/vim/repository-hero.svg?sanitize=true" width="100%" />
<source srcset="https://github.com/nordtheme/web/main/assets/images/ports/vim/repository-hero.svg?sanitize=true" width="100%" media="(prefers-color-scheme: light), (prefers-color-scheme: no-preference)" />
<img src="https://github.com/nordtheme/web/main/assets/images/ports/vim/repository-hero.svg?sanitize=true" width="100%" />
</picture>
</a>
</p>
Expand Down Expand Up @@ -990,11 +990,6 @@ let g:nord_italic_comments = 1

❯ 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)
[![Nord Hyper](https://cdn.rawgit.com/nordtheme/nord/develop/src/assets/nord-hyper-banner.svg)](https://github.com/arcticicestudio/nord-hyper)

# 0.3.0

![Release Date: 2017-01-24](https://img.shields.io/badge/Release_Date-2017--01--24-88C0D0.svg?style=flat-square) [![Project Board](https://img.shields.io/badge/Project_Board-0.3.0-88C0D0.svg?style=flat-square)](https://github.com/nordtheme/vim/projects/6) [![Milestone](https://img.shields.io/badge/Milestone-0.3.0-88C0D0.svg?style=flat-square)](https://github.com/nordtheme/vim/milestone/5)
Expand All @@ -1014,8 +1009,6 @@ This has been fixed by using `nord5` as foreground color. (@scottwillmoore, #11,

❯ Fixed a typo in the [README installation guide](https://github.com/nordtheme/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/nordthenme/nord/issues/9), 7a447b40)

# 0.2.0

![Release Date: 2017-01-02](https://img.shields.io/badge/Release_Date-2017--01--02-88C0D0.svg?style=flat-square) [![Project Board](https://img.shields.io/badge/Project_Board-0.2.0-88C0D0.svg?style=flat-square)](https://github.com/nordtheme/vim/projects/5) [![Milestone](https://img.shields.io/badge/Milestone-0.2.0-88C0D0.svg?style=flat-square)](https://github.com/nordtheme/vim/milestone/4)
Expand Down Expand Up @@ -1123,7 +1116,7 @@ otherwise Markdown elements are not parsed and rendered!
[16]: https://gist.github.com/XVilka/8346728
[17]: https://github.com/itchyny/lightline.vim/pull/257
[18]: http://lesscss.org/functions/#color-operations-lighten
[19]: https://github.com/arcticicestudio/nord-atom-syntax/pull/47
[19]: https://github.com/nordtheme/nord-atom-syntax/pull/47
[20]: https://github.com/junegunn/vim-plug
[21]: https://github.com/plasticboy/vim-markdown
[22]: https://github.com/tpope/vim-fugitive
Expand Down Expand Up @@ -1178,7 +1171,7 @@ otherwise Markdown elements are not parsed and rendered!

[58]: https://github.com/aborzunov
[59]: https://github.com/tobydeh
[60]: https://github.com/arcticicestudio/nord-docs/issues/143
[60]: https://github.com/nordtheme/web/issues/143
[61]: https://www.nordtheme.com/ports/vim/configuration#bold-styles

<!-- 0.13.0 -->
Expand Down
12 changes: 10 additions & 2 deletions colors/nord.vim
Original file line number Diff line number Diff line change
Expand Up @@ -382,11 +382,19 @@ hi! link diffAdded DiffAdd
hi! link diffChanged DiffChange
hi! link diffRemoved DiffDelete

call s:hi("elixirModuleDeclaration", s:nord7_gui, "", s:nord7_term, "", "", "")
call s:hi("elixirAlias", s:nord7_gui, "", s:nord7_term, "", "", "")
call s:hi("elixirAtom", s:nord6_gui, "", s:nord6_term, "", s:bold, "")

call s:hi("gitconfigVariable", s:nord7_gui, "", s:nord7_term, "", "", "")

call s:hi("goBuiltins", s:nord7_gui, "", s:nord7_term, "", "", "")
hi! link goConstants Keyword

" fatih/vim-go
call s:hi("gomodVersion", s:nord7_gui, "", s:nord7_term, "", "", "")
call s:hi("gomodGoVersion", s:nord8_gui, "", s:nord8_term, "", "", "")

call s:hi("helpBar", s:nord3_gui, "", s:nord3_term, "", "", "")
call s:hi("helpHyperTextJump", s:nord8_gui, "", s:nord8_term, "", s:underline, "")

Expand Down Expand Up @@ -569,7 +577,7 @@ if has('nvim')
call s:hi("LspDiagnosticsUnderlineInformation" , s:nord8_gui, "", s:nord8_term, "", "undercurl", "")
call s:hi("LspDiagnosticsUnderlineHint" , s:nord10_gui, "", s:nord10_term, "", "undercurl", "")
endif

" Gitsigns
" > lewis6991/gitsigns.nvim
hi! link GitSignsCurrentLineBlame Comment
Expand Down Expand Up @@ -708,7 +716,7 @@ hi! link pandocSimpleTableHeader pandocAtxHeader
hi! link pandocStrong markdownBold
hi! link pandocTableHeaderWord pandocAtxHeader
hi! link pandocUListItemBullet Operator

if has('nvim')
" tree-sitter
" > nvim-treesitter/nvim-treesitter
Expand Down
2 changes: 1 addition & 1 deletion lint-staged.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/
module.exports = {
"*.json": "prettier --check --ignore-unknown --no-editorconfig",
"*.js": ["eslint", "prettier --check --ignore-unknown --no-editorconfig"],
"*.{js,mjs}": ["eslint", "prettier --check --ignore-unknown --no-editorconfig"],
"*.md": ["remark --no-stdout", "prettier --check --ignore-unknown --no-editorconfig"],
".husky/pre-*": "prettier --check --ignore-unknown --no-editorconfig",
};
Loading