Skip to content

chore: sort icons alphabetically #543

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

Merged
merged 10 commits into from
Jan 25, 2025
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
7 changes: 7 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,10 @@ end_of_line = lf
[*.lua]
indent_style = space
indent_size = 2

[*.sh]
indent_style = space
indent_size = 2

[.luarc.json]
indent_style = tab
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ jobs:
- uses: actions/checkout@v3

- name: stylua
uses: JohnnyMorganz/stylua-action@v3
uses: JohnnyMorganz/stylua-action@v4
with:
token: ${{ secrets.GITHUB_TOKEN }}
version: "0.19"
version: "v2.0.2"
args: --check lua scripts

colors:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.lua
.luarocks
/vim-colortemplate/
mini-align/
6 changes: 6 additions & 0 deletions .luacheckrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,9 @@ globals = {
"jit",
"bit",
}

read_globals = {
"MiniAlign",
}

files["lua/nvim-web-devicons/icons-*.lua"].max_line_length = 200
4 changes: 2 additions & 2 deletions .luarc.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"globals": [
"vim",
"jit",
"bit"
"bit",
"MiniAlign"
]
}
}

1 change: 1 addition & 0 deletions .styluaignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lua/nvim-web-devicons/icons-*.lua
13 changes: 12 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,22 +1,32 @@
VIM_COLORTEMPLATE_VERSION = 2.2.3
VIM_MINI_ALIGN_VERSION = 0.14.0

all: colors style-check lint filetypes

colors: vim-colortemplate
colors: vim-colortemplate mini-align
rm lua/nvim-web-devicons/icons-light.lua
cp lua/nvim-web-devicons/icons-default.lua lua/nvim-web-devicons/icons-light.lua
nvim \
--clean \
--headless \
--cmd "set rtp^=vim-colortemplate" \
--cmd "set rtp^=mini-align" \
-c 'source scripts/generate_colors.lua' \
-c 'source scripts/align_spaces.lua' \
-c 'qall'

colors-check: colors
git diff --exit-code lua/nvim-web-devicons/icons-default.lua
git diff --exit-code lua/nvim-web-devicons/icons-light.lua

vim-colortemplate:
mkdir -p vim-colortemplate
curl -L https://github.com/lifepillar/vim-colortemplate/archive/refs/tags/v$(VIM_COLORTEMPLATE_VERSION).tar.gz | tar zx --directory vim-colortemplate --strip-components=1

mini-align:
mkdir -p mini-align
curl -L https://github.com/echasnovski/mini.align/archive/refs/tags/v$(VIM_MINI_ALIGN_VERSION).tar.gz | tar zx --directory mini-align --strip-components=1

style-check:
stylua . --check

Expand All @@ -31,5 +41,6 @@ filetypes:

clean:
rm -rf vim-colortemplate
rm -rf mini-align

.PHONY: all colors style-check style-fix lint filetypes
Loading
Loading