Skip to content

Commit f13f5df

Browse files
authored
Adapt remaining arcticicestudio "fade-out" changes (#342)
With the retirement of the "Arctic Ice Studio" personal & Nord project brand [1] various migrations to the `svengreb` GitHub account [2] of other projects were also completed within the last weeks. There are also changes in Nord projects like `nordtheme/web` that other projects depended on and can now be adapted as well. Therefore all Nord projects must adapt these changes which includes... - the migration and repository name change of `arcticicestudio/nord-docs`[2] - all references must be updated. - the migration of the `arcticicestudio/styleguide-git` repository to the `svengreb` "real-in-person" identity [3] - all references and used npm packages must be updated. - the migration of the `arcticicestudio/styleguide-javascript` repository to the `svengreb` "real-in-person" identity [4] - all references and used npm packages must be updated. - the migration of the `arcticicestudio/styleguide-markdown` repository to the `svengreb` "real-in-person" identity [5] - all references and used npm packages must be updated. [1]: https://github.com/orgs/nordtheme/discussions/183#retire-arctic-ice-studio-as-nord-brand [2]: nordtheme/web#241 [3]: svengreb/styleguide-git#12 [4]: svengreb/styleguide-javascript#88 [5]: svengreb/styleguide-markdown#63 GH-341
1 parent f725ac6 commit f13f5df

12 files changed

+1899
-1739
lines changed

.eslintignore

+1-3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,4 @@ node_modules/
1111
# ESLint automatically applies ignore pattern for "dotfiles" by default to prevent accidentally lint over paths like
1212
# `.git` or any other critical paths.
1313
!**/.eslintrc.js
14-
!.remarkrc.js
15-
!lint-staged.config.js
16-
!prettier.config.js
14+
!.remarkrc.mjs

.eslintrc.js

+10-4
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,26 @@
11
/*
22
* Copyright (c) 2016-present Sven Greb <[email protected]>
3-
* This source code is licensed under the MIT license found in the license file.
4-
* References:
3+
* This source code is licensed under the Creative Commons Attribution-ShareAlike 4.0 International license found in the license file.
54
*/
65

76
/**
87
* Configurations for ESLint.
98
* @see https://eslint.org/docs/latest/use/configure
109
* @see https://eslint.org/docs/latest/use/configure/#using-configuration-files
1110
* @see https://eslint.org/docs/latest/use/configure/#specifying-environments
12-
* @see https://eslint.org/docs/latest/use/configure/#configuring-plugins
1311
* @see https://eslint.org/docs/latest/rules
1412
*/
1513
module.exports = {
1614
root: true,
17-
extends: ["@arcticicestudio/eslint-config-base", "@arcticicestudio/eslint-config-base/prettier"],
15+
extends: [
16+
"@svengreb/eslint-config-base",
17+
/*
18+
* Enable support for projects using Prettier.
19+
* Note that this must always be placed after the `@svengreb/eslint-config-base` preset to take precedence, otherwise it won't prevent errors
20+
* due to useless and possibly conflicting rules!
21+
*/
22+
"@svengreb/eslint-config-base/prettier",
23+
],
1824
overrides: [
1925
{
2026
files: ["*.js"],

.husky/pre-commit

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
#!/bin/sh
22

33
# Copyright (c) 2016-present Sven Greb <[email protected]>
4-
# This source code is licensed under the MIT license found in the license file.
4+
# This source code is licensed under the Creative Commons Attribution-ShareAlike 4.0 International license found in the license file.
5+
6+
# Git "pre-commit" hook for husky.
7+
# References:
8+
# 1. https://github.com/typicode/husky
9+
# 2. https://git-scm.com/docs/githooks#_pre_commit
510

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

.npmrc

+7
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@
44
# Configurations for npm.
55
# See https://docs.npmjs.com/cli/v7/configuring-npm/npmrc for more details.
66

7+
# Disable the vulnerability auditing and checks which includes often way too many false-positives, insignificant
8+
# problems that are only for local development, and many other warnings that are overhelming.
9+
# Use dedicated vulnerability tools instead to filter and identify issue that really impact the project.
10+
# References:
11+
# 1. https://docs.npmjs.com/cli/v9/commands/npm-audit
12+
audit=false
13+
714
# Only use a lockfile for single-consumer projects, like applications, but not for multi-consumer projects like
815
# libraries.
916
# It helps to pin dependency versions, improves the security through integrity checksums, prevents possible errors

.remarkignore

+1
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55
# See https://github.com/unifiedjs/unified-engine/blob/HEAD/doc/ignore.md for more details.
66

77
node_modules/
8+
license

.remarkrc.js renamed to .remarkrc.mjs

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
* @see https://github.com/remarkjs/remark-lint
99
* @see https://remark.js.org
1010
*/
11-
module.exports = {
12-
plugins: ["@arcticicestudio/remark-preset-lint"],
11+
export default {
12+
plugins: ["@svengreb/remark-preset-lint"],
1313
};

changelog.md

+4-11
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<p align="center">
22
<a href="https://www.nordtheme.com/ports/vim" target="_blank">
33
<picture>
4-
<source srcset="https://raw.githubusercontent.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)" />
5-
<img src="https://raw.githubusercontent.com/arcticicestudio/nord-docs/main/assets/images/ports/vim/repository-hero.svg?sanitize=true" width="100%" />
4+
<source srcset="https://raw.githubusercontent.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)" />
5+
<img src="https://raw.githubusercontent.com/nordtheme/web/main/assets/images/ports/vim/repository-hero.svg?sanitize=true" width="100%" />
66
</picture>
77
</a>
88
</p>
@@ -990,11 +990,6 @@ let g:nord_italic_comments = 1
990990

991991
❯ 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)
992992

993-
### Documentation
994-
995-
❯ Added the new terminal emulator port project [Nord Hyper](https://github.com/arcticicestudio/nord-hyper)
996-
[![Nord Hyper](https://cdn.rawgit.com/nordtheme/nord/develop/src/assets/nord-hyper-banner.svg)](https://github.com/arcticicestudio/nord-hyper)
997-
998993
# 0.3.0
999994

1000995
![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)
@@ -1014,8 +1009,6 @@ This has been fixed by using `nord5` as foreground color. (@scottwillmoore, #11,
10141009

10151010
❯ Fixed a typo in the [README installation guide](https://github.com/nordtheme/vim#via-pluginruntimepath-manager) for Vundle. (@kepbod, #10, 29145bbb)
10161011

1017-
❯ 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)
1018-
10191012
# 0.2.0
10201013

10211014
![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)
@@ -1123,7 +1116,7 @@ otherwise Markdown elements are not parsed and rendered!
11231116
[16]: https://gist.github.com/XVilka/8346728
11241117
[17]: https://github.com/itchyny/lightline.vim/pull/257
11251118
[18]: http://lesscss.org/functions/#color-operations-lighten
1126-
[19]: https://github.com/arcticicestudio/nord-atom-syntax/pull/47
1119+
[19]: https://github.com/nordtheme/nord-atom-syntax/pull/47
11271120
[20]: https://github.com/junegunn/vim-plug
11281121
[21]: https://github.com/plasticboy/vim-markdown
11291122
[22]: https://github.com/tpope/vim-fugitive
@@ -1178,7 +1171,7 @@ otherwise Markdown elements are not parsed and rendered!
11781171

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

11841177
<!-- 0.13.0 -->

colors/nord.vim

+10-2
Original file line numberDiff line numberDiff line change
@@ -382,11 +382,19 @@ hi! link diffAdded DiffAdd
382382
hi! link diffChanged DiffChange
383383
hi! link diffRemoved DiffDelete
384384

385+
call s:hi("elixirModuleDeclaration", s:nord7_gui, "", s:nord7_term, "", "", "")
386+
call s:hi("elixirAlias", s:nord7_gui, "", s:nord7_term, "", "", "")
387+
call s:hi("elixirAtom", s:nord6_gui, "", s:nord6_term, "", s:bold, "")
388+
385389
call s:hi("gitconfigVariable", s:nord7_gui, "", s:nord7_term, "", "", "")
386390

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

394+
" fatih/vim-go
395+
call s:hi("gomodVersion", s:nord7_gui, "", s:nord7_term, "", "", "")
396+
call s:hi("gomodGoVersion", s:nord8_gui, "", s:nord8_term, "", "", "")
397+
390398
call s:hi("helpBar", s:nord3_gui, "", s:nord3_term, "", "", "")
391399
call s:hi("helpHyperTextJump", s:nord8_gui, "", s:nord8_term, "", s:underline, "")
392400

@@ -569,7 +577,7 @@ if has('nvim')
569577
call s:hi("LspDiagnosticsUnderlineInformation" , s:nord8_gui, "", s:nord8_term, "", "undercurl", "")
570578
call s:hi("LspDiagnosticsUnderlineHint" , s:nord10_gui, "", s:nord10_term, "", "undercurl", "")
571579
endif
572-
580+
573581
" Gitsigns
574582
" > lewis6991/gitsigns.nvim
575583
hi! link GitSignsCurrentLineBlame Comment
@@ -708,7 +716,7 @@ hi! link pandocSimpleTableHeader pandocAtxHeader
708716
hi! link pandocStrong markdownBold
709717
hi! link pandocTableHeaderWord pandocAtxHeader
710718
hi! link pandocUListItemBullet Operator
711-
719+
712720
if has('nvim')
713721
" tree-sitter
714722
" > nvim-treesitter/nvim-treesitter

lint-staged.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*/
1010
module.exports = {
1111
"*.json": "prettier --check --ignore-unknown --no-editorconfig",
12-
"*.js": ["eslint", "prettier --check --ignore-unknown --no-editorconfig"],
12+
"*.{js,mjs}": ["eslint", "prettier --check --ignore-unknown --no-editorconfig"],
1313
"*.md": ["remark --no-stdout", "prettier --check --ignore-unknown --no-editorconfig"],
1414
".husky/pre-*": "prettier --check --ignore-unknown --no-editorconfig",
1515
};

0 commit comments

Comments
 (0)