mirror of
https://github.com/NotAShelf/nvf.git
synced 2026-01-17 23:58:40 +00:00
Compare commits
No commits in common. "da7961f09bf3a72f6b9986087658836ffaad2e56" and "bd2b9daa360cf98125217229b1bad3596b05a511" have entirely different histories.
da7961f09b
...
bd2b9daa36
1 changed files with 8 additions and 5 deletions
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
cfg = config.vim.languages.python;
|
||||
|
||||
defaultServer = "basedpyright";
|
||||
defaultServer = ["basedpyright"];
|
||||
servers = {
|
||||
pyright = {
|
||||
package = pkgs.pyright;
|
||||
|
|
@ -220,8 +220,8 @@ in {
|
|||
enable = mkEnableOption "Python LSP support" // {default = config.vim.languages.enableLSP;};
|
||||
|
||||
server = mkOption {
|
||||
description = "Python LSP server to use either as a single server or a list of servers";
|
||||
type = either (enum (attrNames servers)) (listOf (enum (attrNames servers)));
|
||||
description = "Python LSP server to use";
|
||||
type = listOf (enum (attrNames servers));
|
||||
default = defaultServer;
|
||||
};
|
||||
|
||||
|
|
@ -229,7 +229,7 @@ in {
|
|||
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"]'';
|
||||
type = lib.types.attrsOf (either package (listOf str));
|
||||
default = lib.genAttrs (lib.toList cfg.lsp.server) (name: servers.${name}.package);
|
||||
default = lib.genAttrs cfg.lsp.server (name: servers.${name}.package);
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -283,7 +283,10 @@ in {
|
|||
|
||||
(mkIf cfg.lsp.enable {
|
||||
vim.lsp.lspconfig.enable = true;
|
||||
vim.lsp.lspconfig.sources = lib.genAttrs (lib.toList cfg.lsp.server) (name: servers.${name}.lspConfig);
|
||||
vim.lsp.lspconfig.sources =
|
||||
lib.genAttrs
|
||||
cfg.lsp.server
|
||||
(name: servers.${name}.lspConfig);
|
||||
})
|
||||
|
||||
(mkIf cfg.format.enable {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue