NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-10-31 11:02:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

change: use toList instead of if-else statements

Browse source
This commit is contained in:
QuiNzX 2025-01-23 18:51:37 +01:00
commit 507ac8e181
2 changed files with 6 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

5
configuration.nix
View file

@ -59,7 +59,10 @@ isMaximal: {
go.enable = isMaximal; go.enable = isMaximal;
lua.enable = isMaximal; lua.enable = isMaximal;
zig.enable = isMaximal; zig.enable = isMaximal;
python.enable = isMaximal; python = {
enable = true;
lsp.server = ["basedpyright" "ruff"];
};
typst.enable = isMaximal; typst.enable = isMaximal;
rust = { rust = {
enable = isMaximal; enable = isMaximal;

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

@ -229,13 +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 = let default = lib.genAttrs (lib.toList cfg.lsp.server) (name: servers.${name}.package);
serverList =
if isList cfg.lsp.server
then cfg.lsp.server
else [cfg.lsp.server];
in
lib.genAttrs serverList (name: servers.${name}.package);
}; };
}; };
@ -289,13 +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 = let vim.lsp.lspconfig.sources = lib.genAttrs (lib.toList cfg.lsp.server) (name: servers.${name}.lspConfig);
serverList =
if isList cfg.lsp.server
then cfg.lsp.server
else [cfg.lsp.server];
in
lib.genAttrs serverList (name: servers.${name}.lspConfig);
}) })
(mkIf cfg.format.enable { (mkIf cfg.format.enable {