mirror of
https://github.com/NotAShelf/neovim-flake.git
synced 2025-01-09 17:49:49 +01:00
Merge da4ed05b87
into 3a2edd1b75
This commit is contained in:
commit
643b36ff6d
1 changed files with 14 additions and 5 deletions
|
@ -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;
|
||||
};
|
||||
})
|
||||
]);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue