NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-02-05 03:15:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'main' into languages/fish

Browse source
This commit is contained in:
raf 2026-01-27 10:21:01 +03:00 • committed by GitHub
commit 8c80081d79
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 34 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/plugins/languages/lua.nix
View file

@ -9,7 +9,7 @@
inherit (lib.modules) mkIf mkMerge;
inherit (lib.meta) getExe;
inherit (lib.types) bool enum listOf;
inherit (lib.nvim.types) diagnostics mkGrammarOption deprecatedSingleOrListOf;
inherit (lib.nvim.types) diagnostics mkGrammarOption;
inherit (lib.nvim.dag) entryBefore;
inherit (lib.nvim.attrsets) mapListToAttrs;
@ -46,6 +46,9 @@
luacheck = {
package = pkgs.luajitPackages.luacheck;
};
selene = {
package = pkgs.selene;
};
};
in {
imports = [
@ -79,7 +82,7 @@ in {
description = "Enable Lua formatting";
};
type = mkOption {
type = deprecatedSingleOrListOf "vim.language.lua.format.type" (enum (attrNames formats));
type = listOf (enum (attrNames formats));
default = defaultFormat;
description = "Lua formatter to use";
};

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

@ -169,6 +169,22 @@
".git"
];
};
zuban = {
enable = true;
cmd = [(getExe pkgs.zuban) "server"];
filetypes = ["python"];
root_markers = [
"pyproject.toml"
"setup.py"
"setup.cfg"
"requirements.txt"
"Pipfile"
".git"
"mypy.ini"
".mypy.ini"
];
};
};
defaultFormat = ["black"];

4
modules/plugins/languages/rust.nix
View file

@ -11,7 +11,7 @@
inherit (lib.lists) isList;
inherit (lib.attrsets) attrNames;
inherit (lib.types) bool package str listOf either enum int;
inherit (lib.nvim.lua) expToLua toLuaObject;
inherit (lib.nvim.lua) toLuaObject;
inherit (lib.nvim.attrsets) mapListToAttrs;
inherit (lib.nvim.types) mkGrammarOption mkPluginSetupOption deprecatedSingleOrListOf;
inherit (lib.nvim.dag) entryAfter entryAnywhere;
@ -169,7 +169,7 @@ in {
server = {
cmd = ${
if isList cfg.lsp.package
then expToLua cfg.lsp.package
then toLuaObject cfg.lsp.package
else ''{"${cfg.lsp.package}/bin/rust-analyzer"}''
},
default_settings = {