NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-01-17 23:58:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: NotAShelf:bd2b9daa360cf98125217229b1bad3596b05a511
Branches Tags
NotAShelf:main
NotAShelf:gh-pages
NotAShelf:notashelf/push-tnxxqnkoyomy
NotAShelf:notashelf/push-tpxxmotmukwo
NotAShelf:fix-formatting
NotAShelf:v0.8
NotAShelf:notashelf/push-unvwonkswwyo
NotAShelf:notashelf/push-kxltupyypnpo
NotAShelf:machine-tests
NotAShelf:v0.8
NotAShelf:v0.7
NotAShelf:v0.6
NotAShelf:v0.5
NotAShelf:v0.4
NotAShelf:v0.3
NotAShelf:v0.2
..
compare: NotAShelf:da7961f09bf3a72f6b9986087658836ffaad2e56
Branches Tags
NotAShelf:main
NotAShelf:gh-pages
NotAShelf:notashelf/push-tnxxqnkoyomy
NotAShelf:notashelf/push-tpxxmotmukwo
NotAShelf:fix-formatting
NotAShelf:v0.8
NotAShelf:notashelf/push-unvwonkswwyo
NotAShelf:notashelf/push-kxltupyypnpo
NotAShelf:machine-tests
NotAShelf:v0.8
NotAShelf:v0.7
NotAShelf:v0.6
NotAShelf:v0.5
NotAShelf:v0.4
NotAShelf:v0.3
NotAShelf:v0.2

3 commits
bd2b9daa36 ... da7961f09b

Author SHA1 Message Date
QuiNzX
da7961f09b revert: python isMaximal 2025-01-23 18:53:29 +01:00
QuiNzX
507ac8e181 change: use toList instead of if-else statements 2025-01-23 18:51:37 +01:00
QuiNzX
81d489d8e1 change: handle both single and multiple servers 2025-01-23 18:24:50 +01:00
1 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
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;
@ -220,8 +220,8 @@ in {
enable = mkEnableOption "Python LSP support" // {default = config.vim.languages.enableLSP;}; enable = mkEnableOption "Python LSP support" // {default = config.vim.languages.enableLSP;};
server = mkOption { server = mkOption {
description = "Python LSP server to use"; description = "Python LSP server to use either as a single server or a list of servers";
type = listOf (enum (attrNames servers)); type = either (enum (attrNames servers)) (listOf (enum (attrNames servers)));
default = defaultServer; default = defaultServer;
}; };
@ -229,7 +229,7 @@ in {
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 = lib.types.attrsOf (either package (listOf str)); type = lib.types.attrsOf (either package (listOf str));
default = lib.genAttrs cfg.lsp.server (name: servers.${name}.package); default = lib.genAttrs (lib.toList cfg.lsp.server) (name: servers.${name}.package);
}; };
}; };
@ -283,10 +283,7 @@ in {
(mkIf cfg.lsp.enable { (mkIf cfg.lsp.enable {
vim.lsp.lspconfig.enable = true; vim.lsp.lspconfig.enable = true;
vim.lsp.lspconfig.sources = vim.lsp.lspconfig.sources = lib.genAttrs (lib.toList cfg.lsp.server) (name: servers.${name}.lspConfig);
lib.genAttrs
cfg.lsp.server
(name: servers.${name}.lspConfig);
}) })
(mkIf cfg.format.enable { (mkIf cfg.format.enable {