Merge branch 'main' into notashelf/push-qozvyzsvqtmk

languages/toml: add taplo (#1386) and make it default instead of tombi

.github/workflows/check.yml

@@ -119,7 +119,7 @@ jobs:
         run: echo "date=$(date +'%Y-%m-%d-%H%M%S')" >> ${GITHUB_OUTPUT}
 
       - name: Upload doc artifacts
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: "${{ matrix.package }}"
           path: result/share/doc/nvf

docs/manual/release-notes/rl-0.9.md

@@ -45,6 +45,9 @@
   allow valid options. `default` is no longer valid. `inline` and `split` are
   two new valid options.
 
+- Added [taplo](https://taplo.tamasfe.dev/) as the default formatter and lsp for
+  `languages.toml` so we don't default to AI-Slop.
+
 ## Changelog {#sec-release-0-9-changelog}
 
 [taylrfnt](https://github.com/taylrfnt)

modules/plugins/languages/toml.nix

@@ -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 = {