From 6ed21eb729560dab639b1fb7b04ee4c12965981b Mon Sep 17 00:00:00 2001 From: matt1432 <matt@nelim.org> Date: Sat, 17 May 2025 02:06:10 -0400 Subject: [PATCH] feat(nvim): edit jinja syntax highlighting --- .../neovim/langs/web/default.nix | 19 ++++++++++++++++--- .../neovim/theme/treesitter.nix | 2 +- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/homeManagerModules/neovim/langs/web/default.nix b/homeManagerModules/neovim/langs/web/default.nix index 6bd9882a..e95065c9 100644 --- a/homeManagerModules/neovim/langs/web/default.nix +++ b/homeManagerModules/neovim/langs/web/default.nix @@ -35,7 +35,16 @@ in { end; vim.api.nvim_create_autocmd('FileType', { - pattern = { 'javascript', 'javascriptreact', 'javascript.jsx', 'typescript', 'typescriptreact', 'typescript.tsx', 'css', 'scss' }, + pattern = { + 'javascript', + 'javascriptreact', + 'javascript.jsx', + 'typescript', + 'typescriptreact', + 'typescript.tsx', + 'css', + 'scss', + }, callback = function() vim.cmd[[setlocal ts=4 sw=4 sts=0 expandtab]]; @@ -44,8 +53,11 @@ in { end, }); - vim.api.nvim_create_autocmd('FileType', { - pattern = 'html', + vim.api.nvim_create_autocmd({ 'FileType', 'BufEnter' }, { + pattern = { + 'html', + 'j2', + }, callback = function() vim.cmd[[setlocal ts=4 sw=4 expandtab]]; @@ -157,6 +169,7 @@ in { lsp.html.setup({ capabilities = html_caps, autostart = false, + filetypes = { 'html', 'templ', 'j2', }, settings = { configurationSection = { "html", "css", "javascript" }, diff --git a/homeManagerModules/neovim/theme/treesitter.nix b/homeManagerModules/neovim/theme/treesitter.nix index c1c788ed..74fde521 100644 --- a/homeManagerModules/neovim/theme/treesitter.nix +++ b/homeManagerModules/neovim/theme/treesitter.nix @@ -52,7 +52,7 @@ in { -- vim.api.nvim_create_autocmd('BufEnter', { pattern = '*.j2', - command = "TSBufDisable highlight | LspStop", + command = "TSBufDisable highlight", }); ''; }