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: update inline inherit statements

Browse source
This commit is contained in:
QuiNzX 2025-01-25 20:40:10 +01:00
commit cbda2a2379
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/release-notes/rl-0.8.md
View file

@ -126,7 +126,7 @@
[QuiNzX](https://github.com/QuiNzX): [QuiNzX](https://github.com/QuiNzX):
[ruff lsp]: (https://github.com/astral-sh/ruff) [ruff]: (https://github.com/astral-sh/ruff)
- Add ruff as lsp alongside other lsp servers in a list as an option. Under - Add ruff as lsp alongside other lsp servers in a list as an option. Under
`vim.languages.python.lsp.server`. `vim.languages.python.lsp.server`.

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

@ -8,9 +8,10 @@
inherit (lib.options) mkEnableOption mkOption literalExpression; inherit (lib.options) mkEnableOption mkOption literalExpression;
inherit (lib.meta) getExe; inherit (lib.meta) getExe;
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.lists) isList; inherit (lib.lists) isList toList;
inherit (lib.types) enum either listOf package str bool; inherit (lib.types) enum either listOf package str bool attrsOf;
inherit (lib.nvim.lua) expToLua; inherit (lib.nvim.lua) expToLua;
inherit (lib) genAttrs;
cfg = config.vim.languages.python; cfg = config.vim.languages.python;
@ -232,8 +233,8 @@ in {
package = mkOption { package = 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 = lib.types.attrsOf (either package (listOf str)); type = attrsOf (either package (listOf str));
default = lib.genAttrs (lib.toList cfg.lsp.server) (name: servers.${name}.package); default = genAttrs (toList cfg.lsp.server) (name: servers.${name}.package);
}; };
}; };
@ -287,7 +288,7 @@ in {
(mkIf cfg.lsp.enable { (mkIf cfg.lsp.enable {
vim.lsp.lspconfig.enable = true; vim.lsp.lspconfig.enable = true;
vim.lsp.lspconfig.sources = lib.genAttrs (lib.toList cfg.lsp.server) (name: servers.${name}.lspConfig); vim.lsp.lspconfig.sources = genAttrs (toList cfg.lsp.server) (name: servers.${name}.lspConfig);
}) })
(mkIf cfg.format.enable { (mkIf cfg.format.enable {