mirror of
https://github.com/NotAShelf/nvf.git
synced 2024-11-26 15:06:45 +00:00
Merge pull request #112 from NotAShelf/feature/lsp-lines
This commit is contained in:
commit
fe36dbf6e1
9 changed files with 63 additions and 1 deletions
|
@ -34,9 +34,10 @@ inputs: let
|
||||||
lspkind.enable = false;
|
lspkind.enable = false;
|
||||||
lightbulb.enable = true;
|
lightbulb.enable = true;
|
||||||
lspsaga.enable = false;
|
lspsaga.enable = false;
|
||||||
nvimCodeActionMenu.enable = true;
|
nvimCodeActionMenu.enable = isMaximal;
|
||||||
trouble.enable = true;
|
trouble.enable = true;
|
||||||
lspSignature.enable = true;
|
lspSignature.enable = true;
|
||||||
|
lsplines.enable = isMaximal;
|
||||||
};
|
};
|
||||||
|
|
||||||
vim.debugger = {
|
vim.debugger = {
|
||||||
|
|
|
@ -35,3 +35,5 @@ https://github.com/notashelf[notashelf]:
|
||||||
* Addeed nvim-navic integration for catppuccin theme
|
* Addeed nvim-navic integration for catppuccin theme
|
||||||
|
|
||||||
* Fixed mismatching zig language description
|
* Fixed mismatching zig language description
|
||||||
|
|
||||||
|
* Added lsp_lines plugin for showing diagnostic messages
|
||||||
|
|
17
flake.lock
17
flake.lock
|
@ -613,6 +613,22 @@
|
||||||
"type": "github"
|
"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": {
|
"lsp-signature": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
|
@ -1421,6 +1437,7 @@
|
||||||
"indent-blankline": "indent-blankline",
|
"indent-blankline": "indent-blankline",
|
||||||
"kommentary": "kommentary",
|
"kommentary": "kommentary",
|
||||||
"leap-nvim": "leap-nvim",
|
"leap-nvim": "leap-nvim",
|
||||||
|
"lsp-lines": "lsp-lines",
|
||||||
"lsp-signature": "lsp-signature",
|
"lsp-signature": "lsp-signature",
|
||||||
"lspkind": "lspkind",
|
"lspkind": "lspkind",
|
||||||
"lspsaga": "lspsaga",
|
"lspsaga": "lspsaga",
|
||||||
|
|
|
@ -108,6 +108,11 @@
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
lsp-lines = {
|
||||||
|
url = "sourcehut:~whynothugo/lsp_lines.nvim";
|
||||||
|
flake = false;
|
||||||
|
};
|
||||||
|
|
||||||
null-ls = {
|
null-ls = {
|
||||||
url = "github:jose-elias-alvarez/null-ls.nvim";
|
url = "github:jose-elias-alvarez/null-ls.nvim";
|
||||||
flake = false;
|
flake = false;
|
||||||
|
|
|
@ -90,6 +90,7 @@ with lib; let
|
||||||
"nvim-navic"
|
"nvim-navic"
|
||||||
"nvim-navbuddy"
|
"nvim-navbuddy"
|
||||||
"copilot-cmp"
|
"copilot-cmp"
|
||||||
|
"lsp-lines"
|
||||||
];
|
];
|
||||||
# You can either use the name of the plugin or a package.
|
# You can either use the name of the plugin or a package.
|
||||||
pluginType = with types;
|
pluginType = with types;
|
||||||
|
|
|
@ -15,5 +15,6 @@ _: {
|
||||||
./lsp-signature
|
./lsp-signature
|
||||||
./lightbulb
|
./lightbulb
|
||||||
./lspkind
|
./lspkind
|
||||||
|
./lsplines
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
20
modules/lsp/lsplines/config.nix
Normal file
20
modules/lsp/lsplines/config.nix
Normal 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,
|
||||||
|
})
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
}
|
6
modules/lsp/lsplines/default.nix
Normal file
6
modules/lsp/lsplines/default.nix
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
_: {
|
||||||
|
imports = [
|
||||||
|
./config.nix
|
||||||
|
./lsplines.nix
|
||||||
|
];
|
||||||
|
}
|
9
modules/lsp/lsplines/lsplines.nix
Normal file
9
modules/lsp/lsplines/lsplines.nix
Normal 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]";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
Loading…
Reference in a new issue