From f01e404b2ec332d2d8b806379fd3a562e0f0da6f Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Sat, 5 Oct 2024 21:56:33 +0000 Subject: [PATCH 1/4] languages/elixir.nix: fix elixir-tools setup (#401) --- modules/plugins/languages/elixir.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/plugins/languages/elixir.nix b/modules/plugins/languages/elixir.nix index 1a57d78..145746a 100644 --- a/modules/plugins/languages/elixir.nix +++ b/modules/plugins/languages/elixir.nix @@ -114,12 +114,12 @@ in { (mkIf cfg.elixir-tools.enable { vim.startPlugins = ["elixir-tools"]; vim.pluginRC.elixir-tools = entryAnywhere '' - local elixir-tools = require("elixir") - local elixirls = require("elixir-tools.elixirls") + local elixir = require("elixir") + local elixirls = require("elixir.elixirls") -- disable imperative insstallations of various -- elixir related tools installed by elixir-tools - elixir-tools.setup { + elixir.setup { nextls = { enable = false -- defaults to false }, From 379d2a9f1647d9bb0111d5e33b57921af470234e Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sun, 6 Oct 2024 01:16:18 +0300 Subject: [PATCH 2/4] meta: improve github pull request template --- .github/pull_request_template.md | 69 +++++++++++++++++--------------- 1 file changed, 37 insertions(+), 32 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index ca65c8b..5f1e4b6 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,39 +1,44 @@ -# Description + -## Type of change +## Sanity Checking -Please delete any options that are not relevant. + -- Bug fix (non-breaking change which fixes an issue) -- New feature (non-breaking change which adds functionality) -- Breaking change (fix or feature that would cause existing functionality to not work as expected) -- Translation/Language update -- Docs -- Other +[editorconfig]: https://editorconfig.org -## Checklist +- Style and consistency + - [ ] I ran **Alejandra** to format my code (`nix fmt`). + - [ ] My code conforms to the [editorconfig] configuration of the project. + - [ ] My changes are consistent with the rest of the codebase. +- If new changes are particularly complex: + - [ ] My code includes comments in particularly complex areas + - [ ] I have added a section in the manual. + - [ ] _(For breaking changes)_ I have included a migration guide. +- Package(s) built: + - [ ] `.#nix` (default package) + - [ ] `.#maximal` + - [ ] `.#docs-html` +- Tested on platform(s) + - [ ] `x86_64-linux` + - [ ] `aarch64-linux` + - [ ] `x86_64-darwin` + - [ ] `aarch64-darwin` -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. - -- [ ] My code follows the style and contributing guidelines of this project. -- [ ] I ran Alejandra to format my code (`nix fmt`). -- [ ] I have performed a self-review of my own code and tested it. -- [ ] I have commented my code, particularly in hard-to-understand areas. -- [ ] My changes generate no new warnings. -- [ ] This change requires a documentation update. -- [ ] I have updated the documentation accordingly. - -## Screenshots & Logs - -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/). - -**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.** - -```console -# Paste your logs here -``` + From fdd0642c7d83bf43eb2b69c7a7ef3955223342ce Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sun, 6 Oct 2024 01:18:04 +0300 Subject: [PATCH 3/4] docs: update 0.7 release notes --- docs/release-notes/rl-0.7.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/release-notes/rl-0.7.md b/docs/release-notes/rl-0.7.md index 0be6ef3..7023371 100644 --- a/docs/release-notes/rl-0.7.md +++ b/docs/release-notes/rl-0.7.md @@ -89,7 +89,8 @@ everyone. - Add [new-file-template.nvim] to automatically fill new file contents using templates -- Make [neo-tree.nvim] display file icons properly by enabling `visuals.nvimWebDevicons` +- Make [neo-tree.nvim] display file icons properly by enabling + `visuals.nvimWebDevicons` [diniamo](https://github.com/diniamo): @@ -206,8 +207,12 @@ everyone. - Fixed `project-nvim` command and keybinding - Added default ikeybind/command for `Telescope resume` (`fr`) -[Soliprem](https://github.com/Soliprem) +[Soliprem](https://github.com/Soliprem): - Add LSP and Treesitter support for R under `vim.languages.R`. - Add Otter support under `vim.lsp.otter` and an assert to prevent conflict with ccc + +[Bloxx12](https://github.com/Bloxx12): + +- Fix internal breakage in `elixir-tools` setup. From 614ad33a60da7ce7dc61f09fad6afc45664a7cfd Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sun, 6 Oct 2024 01:46:59 +0300 Subject: [PATCH 4/4] meta: add changelog reminder to the pull request template --- .github/pull_request_template.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 5f1e4b6..7768d36 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -15,10 +15,16 @@ this comment. Please check all that apply. As before, this section is not a hard requirement but checklists with more checked items are likely to be merged faster. You may save some time in maintainer review by performing self-reviews here before submitting your pull request. + +If your pull request includes any change or unexpected behaviour not covered below, please do make sure to include +it above in your description. --> [editorconfig]: https://editorconfig.org +[changelog]: https://github.com/NotAShelf/nvf/tree/main/docs/release-notes +- [ ] I have updated the [changelog] as per my changes. +- [ ] I have tested, and self-reviewed my code. - Style and consistency - [ ] I ran **Alejandra** to format my code (`nix fmt`). - [ ] My code conforms to the [editorconfig] configuration of the project. @@ -42,3 +48,10 @@ If your changes touch upon a portion of the codebase that you do not understand the maintainers on your changes. In most cases, making an issue before creating your PR will help you avoid duplicate efforts in the long run. --> + +--- + +Add a :+1: [reaction] to [pull requests you find important]. + +[reaction]: https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/ +[pull requests you find important]: https://github.com/NixOS/nixpkgs/pulls?q=is%3Aopen+sort%3Areactions-%2B1-desc