Skip to content

Commit f1d942c

Browse files
patnrpatnr
committed
Merge remote-tracking branch 'upstream/main'
* upstream/main: (264 commits) chore(build): auto-generate docs chore(build): auto-generated build files fix(tmux): use 24h format (folke#624) refactor(render-markdown): rename markdown.nvim to new name render-ma… (folke#620) fix(mini_tabline): make MiniTablineTabpagesection more visible (folke#621) chore(build): auto-generate docs chore(main): release 4.8.0 (folke#612) chore(build): auto-generated build files feat: inline code style for markdown.nvim chore(build): auto-generate docs fix(markdown.nvim): link chore(build): auto-generate docs chore(build): auto-generated build files feat: added support for markdown.nvim feat: grug-far ci: update chore(build): auto-generate docs chore(build): auto-generated build files feat(extras): add fuzzel theme (folke#611) chore(main): release 4.7.0 (folke#605) ...
2 parents 2ef21b6 + 4b386e6 commit f1d942c

File tree

246 files changed

+11263
-5843
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

246 files changed

+11263
-5843
lines changed

‎.editorconfig

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
root = true
2+
3+
[*]
4+
insert_final_newline = true
5+
indent_style = space
6+
indent_size = 2
7+
charset = utf-8

‎.github/.release-please-manifest.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
".": "4.8.0"
3+
}

‎.github/ISSUE_TEMPLATE/bug_report.yml

+13-27
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,19 @@ body:
66
- type: markdown
77
attributes:
88
value: |
9-
**Before** reporting an issue, make sure to read the [documentation](https://github.com/folke/tokyonight.nvim) and search [existing issues](https://github.com/folke/tokyonight.nvim/issues). Usage questions such as ***"How do I...?"*** belong in [Discussions](https://github.com/folke/tokyonight.nvim/discussions) and will be closed.
9+
**Before** reporting an issue, make sure to read the [documentation](https://github.com/folke/tokyonight.nvim)
10+
and search [existing issues](https://github.com/folke/tokyonight.nvim/issues).
11+
12+
Usage questions such as ***"How do I...?"*** belong in [Discussions](https://github.com/folke/tokyonight.nvim/discussions) and will be closed.
1013
- type: checkboxes
1114
attributes:
1215
label: Did you check docs and existing issues?
1316
description: Make sure you checked all of the below before submitting an issue
1417
options:
1518
- label: I have read all the tokyonight.nvim docs
1619
required: true
20+
- label: I have updated the plugin to the latest version before submitting this issue
21+
required: true
1722
- label: I have searched the existing issues of tokyonight.nvim
1823
required: true
1924
- label: I have searched the existing issues of plugins related to this issue
@@ -57,33 +62,14 @@ body:
5762
label: Repro
5863
description: Minimal `init.lua` to reproduce this issue. Save as `repro.lua` and run with `nvim -u repro.lua`
5964
value: |
60-
-- DO NOT change the paths and don't remove the colorscheme
61-
local root = vim.fn.fnamemodify("./.repro", ":p")
62-
63-
-- set stdpaths to use .repro
64-
for _, name in ipairs({ "config", "data", "state", "cache" }) do
65-
vim.env[("XDG_%s_HOME"):format(name:upper())] = root .. "/" .. name
66-
end
65+
vim.env.LAZY_STDPATH = ".repro"
66+
load(vim.fn.system("curl -s https://raw.githubusercontent.com/folke/lazy.nvim/main/bootstrap.lua"))()
6767
68-
-- bootstrap lazy
69-
local lazypath = root .. "/plugins/lazy.nvim"
70-
if not vim.loop.fs_stat(lazypath) then
71-
vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", lazypath, })
72-
end
73-
vim.opt.runtimepath:prepend(lazypath)
74-
75-
-- install plugins
76-
local plugins = {
77-
"folke/tokyonight.nvim",
78-
"folke/tokyonight.nvim",
79-
-- add any other plugins here
80-
}
81-
require("lazy").setup(plugins, {
82-
root = root .. "/plugins",
68+
require("lazy.minit").repro({
69+
spec = {
70+
-- add any other plugins here
71+
},
8372
})
84-
85-
vim.cmd.colorscheme("tokyonight")
86-
-- add anything else here
87-
render: Lua
73+
render: lua
8874
validations:
8975
required: false

‎.github/ISSUE_TEMPLATE/config.yml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Ask a question
4+
url: https://github.com/folke/tokyonight.nvim/discussions
5+
about: Use Github discussions instead

‎.github/PULL_REQUEST_TEMPLATE.md

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
## Description
2+
3+
<!-- Describe the big picture of your changes to communicate to the maintainers
4+
why we should accept this pull request. -->
5+
6+
## Related Issue(s)
7+
8+
<!--
9+
If this PR fixes any issues, please link to the issue here.
10+
- Fixes #<issue_number>
11+
-->
12+
13+
## Screenshots
14+
15+
<!-- Add screenshots of the changes if applicable. -->
16+

‎.github/dependabot.yml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"

‎.github/labeler.yml

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
core:
2+
- all:
3+
- changed-files:
4+
- any-glob-to-any-file: "lua/tokyonight/**"
5+
- all-globs-to-all-files:
6+
- "!lua/tokyonight/groups/**"
7+
- "!lua/tokyonight/colors/**"
8+
- "!lua/tokyonight/extra/**"
9+
10+
extras:
11+
- changed-files:
12+
- any-glob-to-any-file: "lua/tokyonight/extra/**"
13+
14+
groups:
15+
- changed-files:
16+
- any-glob-to-any-file: "lua/tokyonight/groups/**"
17+
18+
base:
19+
- changed-files:
20+
- any-glob-to-any-file:
21+
- "lua/tokyonight/groups/base.lua"
22+
- "lua/tokyonight/groups/kinds.lua"
23+
- "lua/tokyonight/groups/treesitter.lua"
24+
- "lua/tokyonight/groups/semantic_tokens.lua"
25+
26+
colors:
27+
- changed-files:
28+
- any-glob-to-any-file: "lua/tokyonight/colors/**"

‎.github/release-please-config.json

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json",
3+
"packages": {
4+
".": {
5+
"release-type": "simple",
6+
"extra-files": ["lua/tokyonight/config.lua"]
7+
}
8+
}
9+
}

‎.github/workflows/ci.yml

+8-93
Original file line numberDiff line numberDiff line change
@@ -1,99 +1,14 @@
11
name: CI
2+
23
on:
34
push:
5+
branches: [main, master]
46
pull_request:
57

68
jobs:
7-
extras:
8-
runs-on: ubuntu-latest
9-
if: ${{ github.ref == 'refs/heads/main' }}
10-
steps:
11-
- name: Install Neovim
12-
shell: bash
13-
run: |
14-
mkdir -p /tmp/nvim
15-
wget -q https://github.com/neovim/neovim/releases/download/nightly/nvim.appimage -O /tmp/nvim/nvim.appimage
16-
cd /tmp/nvim
17-
chmod a+x ./nvim.appimage
18-
./nvim.appimage --appimage-extract
19-
echo "/tmp/nvim/squashfs-root/usr/bin/" >> $GITHUB_PATH
20-
- uses: actions/checkout@v3
21-
- name: Build Extras
22-
run: |
23-
nvim -u NONE -E -R --headless --cmd "set rtp^=." --cmd "packloadall" --cmd "lua require('tokyonight.extra').setup()" --cmd qa
24-
- name: Push changes
25-
uses: stefanzweifel/git-auto-commit-action@v4
26-
with:
27-
commit_message: "chore(build): auto-generate extras"
28-
commit_user_name: "github-actions[bot]"
29-
commit_user_email: "github-actions[bot]@users.noreply.github.com"
30-
commit_author: "github-actions[bot] <github-actions[bot]@users.noreply.github.com>"
31-
tests:
32-
needs: extras
33-
if: always()
34-
strategy:
35-
matrix:
36-
# os: [ubuntu-latest, windows-latest]
37-
os: [ubuntu-latest]
38-
runs-on: ${{ matrix.os }}
39-
steps:
40-
- uses: actions/checkout@v3
41-
- name: Install Neovim
42-
shell: bash
43-
run: |
44-
mkdir -p /tmp/nvim
45-
wget -q https://github.com/neovim/neovim/releases/download/nightly/nvim.appimage -O /tmp/nvim/nvim.appimage
46-
cd /tmp/nvim
47-
chmod a+x ./nvim.appimage
48-
./nvim.appimage --appimage-extract
49-
echo "/tmp/nvim/squashfs-root/usr/bin/" >> $GITHUB_PATH
50-
- name: Run Tests
51-
run: |
52-
nvim --version
53-
[ ! -d tests ] && exit 0
54-
nvim --headless -u tests/init.lua -c "PlenaryBustedDirectory tests/ {minimal_init = 'tests/init.lua', sequential = true}"
55-
docs:
56-
runs-on: ubuntu-latest
57-
needs: tests
58-
if: ${{ github.ref == 'refs/heads/main' }}
59-
steps:
60-
- uses: actions/checkout@v3
61-
- run: git pull
62-
- name: panvimdoc
63-
uses: kdheepak/panvimdoc@main
64-
with:
65-
vimdoc: tokyonight.nvim
66-
version: "Neovim >= 0.8.0"
67-
demojify: true
68-
treesitter: true
69-
- name: Push changes
70-
uses: stefanzweifel/git-auto-commit-action@v4
71-
with:
72-
commit_message: "chore(build): auto-generate vimdoc"
73-
commit_user_name: "github-actions[bot]"
74-
commit_user_email: "github-actions[bot]@users.noreply.github.com"
75-
commit_author: "github-actions[bot] <github-actions[bot]@users.noreply.github.com>"
76-
release:
77-
name: release
78-
if: ${{ github.ref == 'refs/heads/main' }}
79-
needs:
80-
- docs
81-
- tests
82-
runs-on: ubuntu-latest
83-
steps:
84-
- uses: google-github-actions/release-please-action@v3
85-
id: release
86-
with:
87-
release-type: simple
88-
package-name: tokyonight.nvim
89-
- uses: actions/checkout@v3
90-
- name: tag stable versions
91-
if: ${{ steps.release.outputs.release_created }}
92-
run: |
93-
git config user.name github-actions[bot]
94-
git config user.email github-actions[bot]@users.noreply.github.com
95-
git remote add gh-token "https://${{ secrets.GITHUB_TOKEN }}@github.com/google-github-actions/release-please-action.git"
96-
git tag -d stable || true
97-
git push origin :stable || true
98-
git tag -a stable -m "Last Stable Release"
99-
git push origin stable
9+
ci:
10+
uses: folke/github/.github/workflows/ci.yml@main
11+
secrets: inherit
12+
with:
13+
plugin: tokyonight.nvim
14+
repo: folke/tokyonight.nvim

‎.github/workflows/labeler.yml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
name: "PR Labeler"
2+
on:
3+
- pull_request_target
4+
5+
jobs:
6+
labeler:
7+
uses: folke/github/.github/workflows/labeler.yml@main
8+
secrets: inherit

‎.github/workflows/pr.yml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: PR Title
2+
3+
on:
4+
pull_request_target:
5+
types:
6+
- opened
7+
- edited
8+
- synchronize
9+
- reopened
10+
- ready_for_review
11+
12+
permissions:
13+
pull-requests: read
14+
15+
jobs:
16+
pr-title:
17+
uses: folke/github/.github/workflows/pr.yml@main
18+
secrets: inherit

‎.github/workflows/stale.yml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: Stale Issues & PRs
2+
3+
on:
4+
schedule:
5+
- cron: "30 1 * * *"
6+
7+
jobs:
8+
stale:
9+
if: contains(fromJSON('["folke", "LazyVim"]'), github.repository_owner)
10+
uses: folke/github/.github/workflows/stale.yml@main
11+
secrets: inherit

‎.github/workflows/update.yml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: Update Repo
2+
3+
on:
4+
workflow_dispatch:
5+
schedule:
6+
# Run every hour
7+
- cron: "0 * * * *"
8+
9+
jobs:
10+
update:
11+
if: contains(fromJSON('["folke", "LazyVim"]'), github.repository_owner)
12+
uses: folke/github/.github/workflows/update.yml@main
13+
secrets: inherit

‎.gitignore

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
tt.*
2-
.tests
3-
doc/tags
4-
debug
5-
.repro
6-
foo.*
71
*.log
8-
data
2+
/.repro
3+
/.tests
4+
/build
5+
/debug
6+
/doc/tags
7+
foo.*
8+
node_modules
9+
tt.*

0 commit comments

Comments
 (0)