Compare commits

..

1 commit

Author SHA1 Message Date
ksonj
a9daced808
Merge 7c5122abb0 into cc14a1c1f6 2024-10-05 14:18:56 +00:00
3 changed files with 28 additions and 50 deletions

View file

@ -1,56 +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)
## Type of change
<!--
Please check all that apply. This section is not a hard requirement, but it helps prioritize critical pull requests
for reviewers and contributors.
-->
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
- [ ] Changes to module documentation or the nvf manual (`docs/manual`)
- [ ] Other
- 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
## Sanity Checking
## Checklist
<!--
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 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`).
- [ ] My code conforms to the `Editorconfig` styles in the project root.
- [ ] I have performed a self-review of my own code and tested it.
- Package(s) built:
- [ ] `.#nix`
- [ ] `.#maximal`
- [ ] `.#docs-html`
- [ ] I have commented my code, particularly in hard-to-understand areas.
- [ ] My changes generate no new errors or warnings.
- [ ] My changes generate no new warnings.
- [ ] This change requires a documentation update.
- [ ] I have have added a change-log entry (see `docs/manual/release-notes`).
- If new changes are particularly complex:
- [ ] I have added a section in the manual.
- [ ] (For breaking changes) I have included a migration guide..
- [ ] 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
```

View file

@ -89,8 +89,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):
@ -207,12 +206,8 @@ 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
ccc
[Bloxx12](https://github.com/Bloxx12):
- Fix internal breakage in `elixir-tools` setup.

View file

@ -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
},