Merge pull request #112 from NotAShelf/feature/lsp-lines

This commit is contained in:
raf 2023-07-31 13:40:33 +03:00 committed by GitHub
commit fe36dbf6e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 63 additions and 1 deletions

View file

@ -34,9 +34,10 @@ inputs: let
lspkind.enable = false;
lightbulb.enable = true;
lspsaga.enable = false;
nvimCodeActionMenu.enable = true;
nvimCodeActionMenu.enable = isMaximal;
trouble.enable = true;
lspSignature.enable = true;
lsplines.enable = isMaximal;
};
vim.debugger = {

View file

@ -35,3 +35,5 @@ https://github.com/notashelf[notashelf]:
* Addeed nvim-navic integration for catppuccin theme
* Fixed mismatching zig language description
* Added lsp_lines plugin for showing diagnostic messages

View file

@ -613,6 +613,22 @@
"type": "github"
}
},
"lsp-lines": {
"flake": false,
"locked": {
"lastModified": 1684163755,
"narHash": "sha256-Zhf2xitLWtE+dWqhvWtLM1K1WdtBvkqqoRLSYIO42oY=",
"owner": "~whynothugo",
"repo": "lsp_lines.nvim",
"rev": "f53af96d4789eef39a082dbcce078d2bfc384ece",
"type": "sourcehut"
},
"original": {
"owner": "~whynothugo",
"repo": "lsp_lines.nvim",
"type": "sourcehut"
}
},
"lsp-signature": {
"flake": false,
"locked": {
@ -1421,6 +1437,7 @@
"indent-blankline": "indent-blankline",
"kommentary": "kommentary",
"leap-nvim": "leap-nvim",
"lsp-lines": "lsp-lines",
"lsp-signature": "lsp-signature",
"lspkind": "lspkind",
"lspsaga": "lspsaga",

View file

@ -108,6 +108,11 @@
flake = false;
};
lsp-lines = {
url = "sourcehut:~whynothugo/lsp_lines.nvim";
flake = false;
};
null-ls = {
url = "github:jose-elias-alvarez/null-ls.nvim";
flake = false;

View file

@ -90,6 +90,7 @@ with lib; let
"nvim-navic"
"nvim-navbuddy"
"copilot-cmp"
"lsp-lines"
];
# You can either use the name of the plugin or a package.
pluginType = with types;

View file

@ -15,5 +15,6 @@ _: {
./lsp-signature
./lightbulb
./lspkind
./lsplines
];
}

View file

@ -0,0 +1,20 @@
{
config,
lib,
...
}:
with lib;
with builtins; let
cfg = config.vim.lsp;
in {
config = mkIf (cfg.enable && cfg.lsplines.enable) {
vim.startPlugins = ["lsp-lines"];
vim.luaConfigRC.lsplines = nvim.dag.entryAfter ["lspconfig"] ''
require("lsp_lines").setup()
vim.diagnostic.config({
virtual_text = false,
})
'';
};
}

View file

@ -0,0 +1,6 @@
_: {
imports = [
./config.nix
./lsplines.nix
];
}

View file

@ -0,0 +1,9 @@
{lib, ...}:
with lib;
with builtins; {
options.vim.lsp = {
lsplines = {
enable = mkEnableOption "diagnostics using virtual lines on top of the real line of code. [lsp_lines]";
};
};
}