Merge 8154c3e68f into 3299facbaa

.github/pull_request_template.md

@@ -1,57 +1,39 @@
-<!--
-^ Please include a clear and concise description of the aim of your Pull Request above this line ^
+# Description
 
-For plugin dependency/module additions, please make sure to link the source link of the added plugin
-or dependency in this section.
+A clear and concise description of the aim of your Pull Request.
 
-If your pull request aims to fix an open issue or a please bug, please also link the relevant issue
-below this line. You may attach an issue to your pull request with `Fixes #<issue number>` outside
-this comment.
--->
+**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**
+Fixes #(issue)
 
-## Sanity Checking
+## Type of change
 
-<!--
-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.
+Please delete any options that are not relevant.
 
-If your pull request includes any change or unexpected behaviour not covered below, please do make sure to include
-it above in your description.
--->
+- 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
-[changelog]: https://github.com/NotAShelf/nvf/tree/main/docs/release-notes
+## Checklist
 
-- [ ] 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.
-  - [ ] 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.
 
-<!--
-If your changes touch upon a portion of the codebase that you do not understand well, please make sure to consult
-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.
--->
+- [ ] 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
 
-Add a :+1: [reaction] to [pull requests you find important].
+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/).
 
-[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
+**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
+```

docs/release-notes/rl-0.7.md

@@ -115,8 +115,7 @@ 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):
 
@@ -235,7 +234,7 @@ everyone.
   - Fixed `project-nvim` command and keybinding
   - Added default ikeybind/command for `Telescope resume` (`<leader>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
@@ -245,5 +244,3 @@ everyone.
 
 - Add support for [base16 theming](https://github.com/RRethy/base16-nvim) under
   `vim.theme`
-- Fix internal breakage in `elixir-tools` setup.
-

flake.lock

@@ -207,11 +207,11 @@
     "plugin-catppuccin": {
       "flake": false,
       "locked": {
-        "lastModified": 1728131011,
-        "narHash": "sha256-j6F078taxuGzr3jngrc+Pc5I1kDdxTLMETgq6Xn4w/4=",
+        "lastModified": 1716704960,
+        "narHash": "sha256-UDPS+1o8FQGkfqiG4GX4DNUI2pU5hIvagmfnWTKDb44=",
         "owner": "catppuccin",
         "repo": "nvim",
-        "rev": "7be452ee067978cdc8b2c5f3411f0c71ffa612b9",
+        "rev": "5215ea59df6d0a7e27da9a5cd1165e06d1b04cbe",
         "type": "github"
       },
       "original": {

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 = require("elixir")
-        local elixirls = require("elixir.elixirls")
+        local elixir-tools = require("elixir")
+        local elixirls = require("elixir-tools.elixirls")
 
         -- disable imperative insstallations of various
         -- elixir related tools installed by elixir-tools
-        elixir.setup {
+        elixir-tools.setup {
           nextls = {
             enable = false -- defaults to false
           },