Merge 2dc1a7fd19 into 3a2edd1b75

docs/release-notes/rl-0.8.md

@@ -18,6 +18,3 @@
 [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.

modules/plugins/languages/zig.nix

@@ -6,7 +6,7 @@
 }: let
   inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
-  inherit (lib.modules) mkIf mkMerge mkDefault;
+  inherit (lib.modules) mkIf mkMerge;
   inherit (lib.lists) isList;
   inherit (lib.types) either listOf package str enum;
   inherit (lib.nvim.lua) expToLua;
@@ -60,22 +60,13 @@ in {
 
   config = mkIf cfg.enable (mkMerge [
     (mkIf cfg.treesitter.enable {
-      vim.treesitter = {
+      vim.treesitter.enable = true;
-        enable = true;
+      vim.treesitter.grammars = [cfg.treesitter.package];
-        grammars = [cfg.treesitter.package];
-      };
     })
 
     (mkIf cfg.lsp.enable {
-      vim = {
+      vim.lsp.lspconfig.enable = true;
-        lsp.lspconfig = {
+      vim.lsp.lspconfig.sources.zig-lsp = servers.${cfg.lsp.server}.lspConfig;
-          enable = true;
-          sources.zig-lsp = servers.${cfg.lsp.server}.lspConfig;
-        };
-
-        # nvf handles autosaving already
-        globals.zig_fmt_autosave = mkDefault 0;
-      };
     })
   ]);
 }