Merge branch 'main' into notashelf/push-qozvyzsvqtmk

This commit is contained in:
raf 2026-03-02 13:28:35 +03:00 committed by GitHub
commit f103f18ca9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 28 additions and 4 deletions

View file

@ -8,12 +8,12 @@
inherit (lib.meta) getExe;
inherit (lib.modules) mkIf mkMerge;
inherit (lib.options) mkEnableOption mkOption;
inherit (lib.types) bool enum;
inherit (lib.types) enum;
inherit (lib.nvim.types) diagnostics mkGrammarOption deprecatedSingleOrListOf;
inherit (lib.nvim.attrsets) mapListToAttrs;
cfg = config.vim.languages.toml;
defaultServers = ["tombi"];
defaultServers = ["taplo"];
servers = {
tombi = {
enable = true;
@ -27,9 +27,21 @@
".git"
];
};
taplo = {
enable = true;
cmd = [
(getExe pkgs.taplo)
"lsp"
"stdio"
];
filetypes = ["toml"];
root_markers = [
".git"
];
};
};
defaultFormat = ["tombi"];
defaultFormat = ["taplo"];
formats = {
tombi = {
command = getExe pkgs.tombi;
@ -40,6 +52,15 @@
"-"
];
};
taplo = {
command = getExe pkgs.taplo;
args = [
"format"
"--stdin-filepath"
"$FILENAME"
"-"
];
};
};
defaultDiagnosticsProvider = ["tombi"];
diagnosticsProviders = {