NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-09-05 18:01:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #1061 from Soliprem/otter-cleanup
Some checks failed
Set up binary cache / cachix (default) (push) Has been cancelled
Details
Set up binary cache / cachix (maximal) (push) Has been cancelled
Details
Set up binary cache / cachix (nix) (push) Has been cancelled
Details
Treewide Checks / Validate flake (push) Has been cancelled
Details
Treewide Checks / Check formatting (push) Has been cancelled
Details
Treewide Checks / Check source tree for typos (push) Has been cancelled
Details
Treewide Checks / Validate documentation builds (push) Has been cancelled
Details
Treewide Checks / Validate hyperlinks in documentation sources (push) Has been cancelled
Details
Treewide Checks / Validate Editorconfig conformance (push) Has been cancelled
Details
Build and deploy documentation / Check latest commit (push) Has been cancelled
Details
Build and deploy documentation / publish (push) Has been cancelled
Details

Browse source 
lsp/otter: remove conflict warning since 0.11 is now common
This commit is contained in:
raf 2025-08-02 15:19:06 +03:00 • committed by GitHub
commit 16d396f039
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 1 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/release-notes/rl-0.8.md
View file

@ -476,6 +476,7 @@
[soliprem](https://github.com/soliprem): [soliprem](https://github.com/soliprem):
- fix broken `neorg` grammars - fix broken `neorg` grammars
- remove obsolete warning in the `otter` module
[Cool-Game-Dev](https://github.com/Cool-Game-Dev): [Cool-Game-Dev](https://github.com/Cool-Game-Dev):

7
modules/plugins/lsp/otter/config.nix
View file

@ -15,13 +15,6 @@
mappings = addDescriptionsToMappings cfg.otter-nvim.mappings mappingDefinitions; mappings = addDescriptionsToMappings cfg.otter-nvim.mappings mappingDefinitions;
in { in {
config = mkIf (cfg.enable && cfg.otter-nvim.enable) { config = mkIf (cfg.enable && cfg.otter-nvim.enable) {
warnings = [
# TODO: remove warning when we update to nvim 0.11
(mkIf config.vim.utility.ccc.enable ''
ccc and otter occasionally have small conflicts that will disappear with nvim 0.11.
In the meantime, otter handles it by throwing a warning, but both plugins will work.
'')
];
vim = { vim = {
startPlugins = ["otter-nvim"]; startPlugins = ["otter-nvim"];