NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-09-07 10:51:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

use ruff alongside other lsp servers

Browse source
This commit is contained in:
QuiNzX 2025-01-18 18:28:20 +01:00
commit 842e958777
2 changed files with 23 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configuration.nix
View file

@ -62,7 +62,7 @@ isMaximal: {
python = { python = {
enable = true; enable = true;
format.type = "ruff"; format.type = "ruff";
lsp.server = "ruff"; lsp.servers = ["ruff" "basedpyright"];
}; };
typst.enable = isMaximal; typst.enable = isMaximal;
rust = { rust = {

41
modules/plugins/languages/python.nix
View file

@ -14,7 +14,7 @@
cfg = config.vim.languages.python; cfg = config.vim.languages.python;
defaultServer = "basedpyright"; defaultServer = ["basedpyright"];
servers = { servers = {
pyright = { pyright = {
package = pkgs.pyright; package = pkgs.pyright;
@ -23,9 +23,9 @@
capabilities = capabilities; capabilities = capabilities;
on_attach = default_on_attach; on_attach = default_on_attach;
cmd = ${ cmd = ${
if isList cfg.lsp.package if isList cfg.lsp.packages.pyright
then expToLua cfg.lsp.package then expToLua cfg.lsp.packages.pyright
else ''{"${cfg.lsp.package}/bin/pyright-langserver", "--stdio"}'' else ''{"${cfg.lsp.packages.pyright}/bin/pyright-langserver", "--stdio"}''
} }
} }
''; '';
@ -38,9 +38,9 @@
capabilities = capabilities; capabilities = capabilities;
on_attach = default_on_attach; on_attach = default_on_attach;
cmd = ${ cmd = ${
if isList cfg.lsp.package if isList cfg.lsp.packages.basedpyright
then expToLua cfg.lsp.package then expToLua cfg.lsp.packages.basedpyright
else ''{"${cfg.lsp.package}/bin/basedpyright-langserver", "--stdio"}'' else ''{"${cfg.lsp.packages.basedpyright}/bin/basedpyright-langserver", "--stdio"}''
} }
} }
''; '';
@ -53,9 +53,9 @@
capabilities = capabilities; capabilities = capabilities;
on_attach = default_on_attach; on_attach = default_on_attach;
cmd = ${ cmd = ${
if isList cfg.lsp.package if isList cfg.lsp.packages.ruff
then expToLua cfg.lsp.package then expToLua cfg.lsp.packages.ruff
else ''{"${cfg.lsp.package}/bin/ruff", "server"}'' else ''{"${cfg.lsp.packages.ruff}/bin/ruff", "server"}''
} }
} }
''; '';
@ -68,9 +68,9 @@
capabilities = capabilities; capabilities = capabilities;
on_attach = default_on_attach; on_attach = default_on_attach;
cmd = ${ cmd = ${
if isList cfg.lsp.package if isList cfg.lsp.packages.pylsp
then expToLua cfg.lsp.package then expToLua cfg.lsp.packages.pylsp
else ''{"${cfg.lsp.package}/bin/pylsp"}'' else ''{"${cfg.lsp.packages}/bin/pylsp"}''
} }
} }
''; '';
@ -219,17 +219,17 @@ in {
lsp = { lsp = {
enable = mkEnableOption "Python LSP support" // {default = config.vim.languages.enableLSP;}; enable = mkEnableOption "Python LSP support" // {default = config.vim.languages.enableLSP;};
server = mkOption { servers = mkOption {
description = "Python LSP server to use"; description = "Python LSP server to use";
type = enum (attrNames servers); type = listOf (enum (attrNames servers));
default = defaultServer; default = defaultServer;
}; };
package = mkOption { packages = mkOption {
description = "python LSP server package, or the command to run as a list of strings"; description = "python LSP server package, or the command to run as a list of strings";
example = ''[lib.getExe pkgs.jdt-language-server "-data" "~/.cache/jdtls/workspace"]''; example = ''[lib.getExe pkgs.jdt-language-server "-data" "~/.cache/jdtls/workspace"]'';
type = either package (listOf str); type = lib.types.attrsOf (either package (listOf str));
default = servers.${cfg.lsp.server}.package; default = lib.genAttrs cfg.lsp.servers (name: servers.${name}.package);
}; };
}; };
@ -283,7 +283,10 @@ in {
(mkIf cfg.lsp.enable { (mkIf cfg.lsp.enable {
vim.lsp.lspconfig.enable = true; vim.lsp.lspconfig.enable = true;
vim.lsp.lspconfig.sources.python-lsp = servers.${cfg.lsp.server}.lspConfig; vim.lsp.lspconfig.sources =
lib.genAttrs
cfg.lsp.servers
(name: servers.${name}.lspConfig);
}) })
(mkIf cfg.format.enable { (mkIf cfg.format.enable {