Merge branch 'main' into nvim-notify-explicit-function

NotAShelf · Dec 24, 2024 · edc887f · edc887f
2 parents f6a8cd9 + a34d104
commit edc887f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
@@ -18,3 +18,6 @@
 [diniamo](https://github.com/diniamo):
 
 - Add Odin support under `vim.languages.odin`.
+
+- Disable the built-in format-on-save feature of zls. Use `vim.lsp.formatOnSave`
+  instead.
diff --git a/modules/plugins/languages/zig.nix b/modules/plugins/languages/zig.nix
@@ -6,7 +6,7 @@
 }: let
   inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
-  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.modules) mkIf mkMerge mkDefault;
   inherit (lib.lists) isList;
   inherit (lib.types) either listOf package str enum;
   inherit (lib.nvim.lua) expToLua;
@@ -60,13 +60,22 @@ in {
 
   config = mkIf cfg.enable (mkMerge [
     (mkIf cfg.treesitter.enable {
-      vim.treesitter.enable = true;
-      vim.treesitter.grammars = [cfg.treesitter.package];
+      vim.treesitter = {
+        enable = true;
+        grammars = [cfg.treesitter.package];
+      };
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.lspconfig.enable = true;
-      vim.lsp.lspconfig.sources.zig-lsp = servers.${cfg.lsp.server}.lspConfig;
+      vim = {
+        lsp.lspconfig = {
+          enable = true;
+          sources.zig-lsp = servers.${cfg.lsp.server}.lspConfig;
+        };
+
+        # nvf handles autosaving already
+        globals.zig_fmt_autosave = mkDefault 0;
+      };
     })
   ]);
 }