Skip to content

Commit 48e0caf

Browse files
committed
Merge upstream
1 parent c51b719 commit 48e0caf

File tree

550 files changed

+20969
-9405
lines changed

Some content is hidden

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

550 files changed

+20969
-9405
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ indent_style = space
1414
indent_size = 2
1515
trim_trailing_whitespace = false
1616

17-
[*.{nix,yml,yaml}]
17+
[*.{js,nix,yml,yaml}]
1818
indent_style = space
1919
indent_size = 2
2020
tab_width = 2

.github/CONTRIBUTING.md

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,42 @@
88

99
## Welcome
1010

11-
I'm glad you are thinking about contributing to neovim-flake! If you're unsure about anything, just ask - or submit the issue or pull request anyway. The worst that can happen is you'll be politely asked to change something. Friendly contributions are always welcome.
11+
I'm glad you are thinking about contributing to nvf! If you're unsure about
12+
anything, just ask - or submit the issue or pull request anyway. The worst that
13+
can happen is you'll be politely asked to change something. Friendly
14+
contributions are always welcome.
1215

13-
Before you contribute, I encourage you to read this project's CONTRIBUTING policy (you are here), its [LICENSE](LICENSE.md), and its [README](README.md).
16+
Before you contribute, I encourage you to read this project's CONTRIBUTING
17+
policy (you are here) and its [LICENSE](../LICENSE) to understand how your
18+
contributions are licensed.
1419

15-
If you have any questions regarding those files, feel free to open an issue or [shoot me an email](mailto:[email protected]). Discussions tab is also available for more informal discussions.
20+
If you have any questions regarding those files, feel free to open an issue or
21+
[shoot me an email](mailto:[email protected]). Discussions tab is also available
22+
for more informal discussions.
1623

1724
## Contributing
1825

19-
The contribution process is mostly documented in the [pull request template](.github/pull_request_template.md). You will find a checklist of items to complete before submitting a pull request. Please make sure you complete it before submitting a pull request. If you are unsure about any of the items, please ask.
26+
The contribution process is mostly documented in the
27+
[pull request template](PULL_REQUEST_TEMPLATE/pull_request_template.md). You
28+
will find a checklist of items to complete before submitting a pull request.
29+
Please make sure you complete it before submitting a pull request. If you are
30+
unsure about any of the items, please ask.
2031

2132
### Guidelines
2233

23-
We provide instructions on a healthy contribution to neovim-flake - including styling, commit formats, how-to guides for adding new modules and options.
24-
You are very well recommended to read the contributing guideliner over at [the documentation](https://notashelf.github.io/neovim-flake#hacking)
34+
We provide instructions on a healthy contribution to neovim-flake - including
35+
styling, commit formats, how-to guides for adding new modules and options. You
36+
are very well recommended to read the contributing guidelines over at
37+
[the documentation](https://notashelf.github.io/nvf#hacking)
2538

2639
### Code of Conduct
2740

28-
This project does not quite have a code of conduct yet. And to be honest, I'm not sure if I want one or if it will ever have one. I'm not expecting this project to be a hotbed of activity, but I do want to make sure that everyone who does contribute feels welcome and safe. As such, I will do my best to make sure that those who distrupt the project are dealt with swiftly and appropriately.
41+
This project does not quite have a code of conduct yet. And to be perfectly
42+
honest, I'm not sure if I want one or if it will ever have one. I'm not
43+
expecting this project to be a hotbed of activity, but I do want to make sure
44+
that everyone who does contribute feels welcome and safe. As such, I will do my
45+
best to make sure that those who distrupt the project are dealt with swiftly and
46+
appropriately.
2947

30-
If you feel that you are not being treated with respect, please contact me directly.
48+
If you feel that you are not being treated with respect, please contact me
49+
directly.

.github/FUNDING.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
github: NotAShelf
2+
ko_fi: NotAShelf
3+
liberapay: NotAShelf
4+
Lines changed: 57 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,57 @@
1-
# Description
2-
3-
A clear and concise description of the aim of your Pull Request.
4-
5-
**If your pull request aims to fix an open issue or a present bug, please link the relevant issue below. If not, please remove this section**
6-
Fixes #(issue)
7-
8-
## Type of change
9-
10-
Please delete any options that are not relevant.
11-
12-
- Bug fix (non-breaking change which fixes an issue)
13-
- New feature (non-breaking change which adds functionality)
14-
- Breaking change (fix or feature that would cause existing functionality to not work as expected)
15-
- Translation/Language update
16-
- Docs
17-
- Other
18-
19-
## Checklist
20-
21-
Please try to check at least a majority of the checklist before opening your pull request. Exceptions to this will be reviewed on a case by case basis.
22-
23-
- [ ] My code follows the style and contributing guidelines of this project.
24-
- [ ] I ran Alejandra to format my code (`nix fmt`).
25-
- [ ] I have performed a self-review of my own code and tested it.
26-
- [ ] I have commented my code, particularly in hard-to-understand areas.
27-
- [ ] My changes generate no new warnings.
28-
- [ ] This change requires a documentation update.
29-
- [ ] I have updated the documentation accordingly.
30-
31-
## Screenshots & Logs
32-
33-
You are kindly requested to attach screenshots of your changes in actions and preferably your build/run logs for all available packages. If you are not sure how to do this, you can refer to the [documentation](https://notashelf.github.io/neovim-flake/).
34-
35-
**Please do not use any external image service. Instead, just paste in or drag and drop the image here, and it will be uploaded automatically.**
36-
37-
```console
38-
# Paste your logs here
39-
```
1+
<!--
2+
^ Please include a clear and concise description of the aim of your Pull Request above this line ^
3+
4+
For plugin dependency/module additions, please make sure to link the source link of the added plugin
5+
or dependency in this section.
6+
7+
If your pull request aims to fix an open issue or a please bug, please also link the relevant issue
8+
below this line. You may attach an issue to your pull request with `Fixes #<issue number>` outside
9+
this comment, and it will be closed when your pull request is merged.
10+
-->
11+
12+
## Sanity Checking
13+
14+
<!--
15+
Please check all that apply. As before, this section is not a hard requirement but checklists with more checked
16+
items are likely to be merged faster. You may save some time in maintainer review by performing self-reviews here
17+
before submitting your pull request.
18+
19+
If your pull request includes any change or unexpected behaviour not covered below, please do make sure to include
20+
it above in your description.
21+
-->
22+
23+
[editorconfig]: https://editorconfig.org
24+
[changelog]: https://github.com/NotAShelf/nvf/tree/main/docs/release-notes
25+
26+
- [ ] I have updated the [changelog] as per my changes
27+
- [ ] I have tested, and self-reviewed my code
28+
- Style and consistency
29+
- [ ] I ran **Alejandra** to format my code (`nix fmt`)
30+
- [ ] My code conforms to the [editorconfig] configuration of the project
31+
- [ ] My changes are consistent with the rest of the codebase
32+
- If new changes are particularly complex:
33+
- [ ] My code includes comments in particularly complex areas
34+
- [ ] I have added a section in the manual
35+
- [ ] _(For breaking changes)_ I have included a migration guide
36+
- Package(s) built:
37+
- [ ] `.#nix` (default package)
38+
- [ ] `.#maximal`
39+
- [ ] `.#docs-html` (manual, must build)
40+
- Tested on platform(s)
41+
- [ ] `x86_64-linux`
42+
- [ ] `aarch64-linux`
43+
- [ ] `x86_64-darwin`
44+
- [ ] `aarch64-darwin`
45+
46+
<!--
47+
If your changes touch upon a portion of the codebase that you do not understand well, please make sure to consult
48+
the maintainers on your changes. In most cases, making an issue before creating your PR will help you avoid duplicate
49+
efforts in the long run.
50+
-->
51+
52+
---
53+
54+
Add a :+1: [reaction] to [pull requests you find important].
55+
56+
[reaction]: https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/
57+
[pull requests you find important]: https://github.com/NixOS/nixpkgs/pulls?q=is%3Aopen+sort%3Areactions-%2B1-desc

0 commit comments

Comments
 (0)