From bf016055178e46f79b3ef836decd8aaedbedb02b Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Mon, 18 Dec 2023 14:19:34 +0100 Subject: [PATCH] neovim: Fix tree-sitter configuration This changes the used parsers from an allowlist to a denylist. --- users/simon/modules/neovim/default.nix | 26 ++------------------------ users/simon/modules/neovim/init.lua | 18 +++++++++++------- 2 files changed, 13 insertions(+), 31 deletions(-) diff --git a/users/simon/modules/neovim/default.nix b/users/simon/modules/neovim/default.nix index 733ceea..9d11fae 100644 --- a/users/simon/modules/neovim/default.nix +++ b/users/simon/modules/neovim/default.nix @@ -87,7 +87,7 @@ in nvim-jdtls nvim-lspconfig nvim-solarized-lua - nvim-treesitter + nvim-treesitter.withAllGrammars nvim-web-devicons plantuml-syntax plenary-nvim @@ -111,29 +111,7 @@ in xdg.configFile = { "nvim/lua/init.lua".source = ./init.lua; "nvim/lua/snippets.lua".source = pkgs.callPackage ./snippets.nix { }; - } // (lib.mapAttrs' - (name: path: lib.nameValuePair "nvim/parser/${lib.removePrefix "tree-sitter-" name}.so" { source = "${path}/parser"; }) - ({ - inherit (pkgs.tree-sitter.builtGrammars) - #tree-sitter-bash - tree-sitter-c - tree-sitter-cpp - tree-sitter-css - tree-sitter-dot - tree-sitter-go - tree-sitter-haskell - tree-sitter-html - tree-sitter-json - #tree-sitter-latex # incompatible with VimTeX - tree-sitter-lua - tree-sitter-nix - tree-sitter-perl - tree-sitter-python - tree-sitter-rust - tree-sitter-scss - tree-sitter-toml - tree-sitter-yaml; - })); + }; home.sessionVariables.EDITOR = "nvim"; } diff --git a/users/simon/modules/neovim/init.lua b/users/simon/modules/neovim/init.lua index bc7bef9..62aa7bd 100644 --- a/users/simon/modules/neovim/init.lua +++ b/users/simon/modules/neovim/init.lua @@ -421,13 +421,17 @@ require('trouble').setup {} -- Tree Sitter require('nvim-treesitter.configs').setup { - highlight = { - enable = true, - additional_vim_regex_highlighting = false, - }, - indent = { - enable = true, - }, + highlight = { + enable = true, + additional_vim_regex_highlighting = false, + disable = { + 'gitcommit', -- only for “conventional commits” + 'latex', -- incompatible with VimTeX + }, + }, + indent = { + enable = true, + }, } -- VimTeX