diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 567e4e6e..03d4d010 100644 --- a/docs/release-notes/rl-0.8.md +++ b/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. diff --git a/modules/plugins/languages/zig.nix b/modules/plugins/languages/zig.nix index 1b9a588b..3618d6d8 100644 --- 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 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 = { - enable = true; - grammars = [cfg.treesitter.package]; - }; + vim.treesitter.enable = true; + vim.treesitter.grammars = [cfg.treesitter.package]; }) (mkIf cfg.lsp.enable { - vim = { - lsp.lspconfig = { - enable = true; - sources.zig-lsp = servers.${cfg.lsp.server}.lspConfig; - }; - - # nvf handles autosaving already - globals.zig_fmt_autosave = mkDefault 0; - }; + vim.lsp.lspconfig.enable = true; + vim.lsp.lspconfig.sources.zig-lsp = servers.${cfg.lsp.server}.lspConfig; }) ]); }