mirror of
https://github.com/NotAShelf/nvf.git
synced 2024-11-22 05:10:44 +00:00
lsp/otter: init (#385)
* r: implementing lsp * r: version bump to context fixes treesitter bug * r: changing treesitter package definition to mkGrammarOption * added changelog entry * created otter file * created otter file * update * update * otter: fixing fixing input * committing flake.lock * fixed typo * configuration: disabling ccc and enabling otter * added assertion to make sure ccc and otter aren't enabled at the same time * configuration: otter set for isMaximal * otter: changelog * otter: better changelog * otter-nvim: renamed from otter to otter-nvim * otter: added setupopts --------- Co-authored-by: raf <raf@notashelf.dev>
This commit is contained in:
parent
bce45d4eeb
commit
69cd77630b
9 changed files with 137 additions and 2 deletions
|
@ -19,6 +19,7 @@ isMaximal: {
|
|||
lspsaga.enable = false;
|
||||
trouble.enable = true;
|
||||
lspSignature.enable = true;
|
||||
otter-nvim.enable = isMaximal;
|
||||
lsplines.enable = isMaximal;
|
||||
nvim-docs-view.enable = isMaximal;
|
||||
};
|
||||
|
@ -155,7 +156,7 @@ isMaximal: {
|
|||
};
|
||||
|
||||
utility = {
|
||||
ccc.enable = isMaximal;
|
||||
ccc.enable = false;
|
||||
vim-wakatime.enable = false;
|
||||
icon-picker.enable = isMaximal;
|
||||
surround.enable = isMaximal;
|
||||
|
|
|
@ -202,3 +202,5 @@ everyone.
|
|||
[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
|
||||
|
|
17
flake.lock
17
flake.lock
|
@ -1373,6 +1373,22 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"plugin-otter-nvim": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1724585935,
|
||||
"narHash": "sha256-euHwoK2WHLF/hrjLY2P4yGrIbYyBN38FL3q4CKNZmLY=",
|
||||
"owner": "jmbuhr",
|
||||
"repo": "otter.nvim",
|
||||
"rev": "ca9ce67d0399380b659923381b58d174344c9ee7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "jmbuhr",
|
||||
"repo": "otter.nvim",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"plugin-oxocarbon": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
@ -1861,6 +1877,7 @@
|
|||
"plugin-obsidian-nvim": "plugin-obsidian-nvim",
|
||||
"plugin-onedark": "plugin-onedark",
|
||||
"plugin-orgmode-nvim": "plugin-orgmode-nvim",
|
||||
"plugin-otter-nvim": "plugin-otter-nvim",
|
||||
"plugin-oxocarbon": "plugin-oxocarbon",
|
||||
"plugin-plenary-nvim": "plugin-plenary-nvim",
|
||||
"plugin-project-nvim": "plugin-project-nvim",
|
||||
|
|
|
@ -156,6 +156,11 @@
|
|||
flake = false;
|
||||
};
|
||||
|
||||
plugin-otter-nvim = {
|
||||
url = "github:jmbuhr/otter.nvim";
|
||||
flake = false;
|
||||
};
|
||||
|
||||
# Language support
|
||||
plugin-sqls-nvim = {
|
||||
url = "github:nanotee/sqls.nvim";
|
||||
|
|
|
@ -226,7 +226,7 @@ in {
|
|||
{
|
||||
assertion = cfg.lsp.enable -> cfg.lsp.server != "tsserver";
|
||||
message = ''
|
||||
As of a recent lspconfig update, he `tsserver` configuration has been renamed
|
||||
As of a recent lspconfig update, the `tsserver` configuration has been renamed
|
||||
to `ts_ls` to match upstream behaviour of `lspconfig`, and the name `tsserver`
|
||||
is no longer considered valid by nvf. Please set `vim.languages.ts.lsp.server`
|
||||
to `"ts_ls"` instead of to `${cfg.lsp.server}`
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
./trouble
|
||||
./lsp-signature
|
||||
./lightbulb
|
||||
./otter
|
||||
./lspkind
|
||||
./lsplines
|
||||
./nvim-docs-view
|
||||
|
|
39
modules/plugins/lsp/otter/config.nix
Normal file
39
modules/plugins/lsp/otter/config.nix
Normal file
|
@ -0,0 +1,39 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
inherit (lib.modules) mkIf mkMerge;
|
||||
inherit (lib.nvim.dag) entryAnywhere;
|
||||
inherit (lib.nvim.lua) toLuaObject;
|
||||
inherit (lib.nvim.binds) addDescriptionsToMappings mkSetBinding;
|
||||
|
||||
cfg = config.vim.lsp;
|
||||
|
||||
self = import ./otter.nix {inherit lib;};
|
||||
mappingDefinitions = self.options.vim.lsp.otter-nvim.mappings;
|
||||
mappings = addDescriptionsToMappings cfg.otter-nvim.mappings mappingDefinitions;
|
||||
in {
|
||||
config = mkIf (cfg.enable && cfg.otter-nvim.enable) {
|
||||
assertions = [
|
||||
{
|
||||
assertion = !config.vim.utility.ccc.enable;
|
||||
message = ''
|
||||
ccc and otter have a breaking conflict. It's been reported upstream. Until it's fixed, disable one of them
|
||||
'';
|
||||
}
|
||||
];
|
||||
vim = {
|
||||
startPlugins = ["otter-nvim"];
|
||||
|
||||
maps.normal = mkMerge [
|
||||
(mkSetBinding mappings.toggle "<cmd>lua require'otter'.activate()<CR>")
|
||||
];
|
||||
|
||||
pluginRC.otter-nvim = entryAnywhere ''
|
||||
-- Enable otter diagnostics viewer
|
||||
require("otter").setup({${toLuaObject cfg.otter-nvim.setupOpts}})
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
6
modules/plugins/lsp/otter/default.nix
Normal file
6
modules/plugins/lsp/otter/default.nix
Normal file
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
imports = [
|
||||
./otter.nix
|
||||
./config.nix
|
||||
];
|
||||
}
|
64
modules/plugins/lsp/otter/otter.nix
Normal file
64
modules/plugins/lsp/otter/otter.nix
Normal file
|
@ -0,0 +1,64 @@
|
|||
{lib, ...}: let
|
||||
inherit (lib.options) mkOption mkEnableOption;
|
||||
inherit (lib.nvim.binds) mkMappingOption;
|
||||
inherit (lib.types) bool str listOf;
|
||||
inherit (lib.nvim.types) mkPluginSetupOption;
|
||||
in {
|
||||
options.vim.lsp = {
|
||||
otter-nvim = {
|
||||
enable = mkEnableOption ''
|
||||
lsp features and a code completion source for code embedded in other documents [otter-nvim]
|
||||
'';
|
||||
mappings = {
|
||||
toggle = mkMappingOption "Activate LSP on Cursor Position [otter-nvim]" "<leader>lo";
|
||||
};
|
||||
setupOpts = mkPluginSetupOption "otter.nvim" {
|
||||
lsp = {
|
||||
diagnostic_update_event = mkOption {
|
||||
type = listOf str;
|
||||
default = ["BufWritePost"];
|
||||
description = ''
|
||||
`:h events` that cause the diagnostic to update.
|
||||
Set to: {"BufWritePost", "InsertLeave", "TextChanged" }
|
||||
for less performant but more instant diagnostic updates
|
||||
'';
|
||||
};
|
||||
};
|
||||
buffers = {
|
||||
set_filetype = mkOption {
|
||||
type = bool;
|
||||
default = false;
|
||||
description = ''
|
||||
if set to true, the filetype of the otterbuffers will be set. Other wide only
|
||||
the autocommand of lspconfig that attaches the language server will be
|
||||
executed without stting the filetype
|
||||
'';
|
||||
};
|
||||
write_to_disk = mkOption {
|
||||
type = bool;
|
||||
default = false;
|
||||
description = ''
|
||||
write <path>.otter.<embedded language extension> files to disk on save of main buffer.
|
||||
Useful for some linters that require actual files.
|
||||
Otter files are deleted on quit or main buffer close
|
||||
'';
|
||||
};
|
||||
};
|
||||
strip_wrapping_quote_characters = mkOption {
|
||||
type = listOf str;
|
||||
default = ["'" ''"'' "`"];
|
||||
description = ''
|
||||
'';
|
||||
};
|
||||
handle_leading_whitespace = mkOption {
|
||||
type = bool;
|
||||
default = false;
|
||||
description = ''
|
||||
otter may not work the way you expect when entire code blocks are indented
|
||||
(eg. in Org files) When true, otter handles these cases fully.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
Loading…
Reference in a new issue