diff --git a/flake.lock b/flake.lock index e0b8c2a4..c3c8e4c2 100644 --- a/flake.lock +++ b/flake.lock @@ -1830,6 +1830,7 @@ "ts-for-gir-src": "ts-for-gir-src", "tuya-local-src": "tuya-local-src", "vimplugin-easytables-src": "vimplugin-easytables-src", + "vimplugin-jinja-vim-src": "vimplugin-jinja-vim-src", "vimplugin-roslyn-nvim-src": "vimplugin-roslyn-nvim-src", "vimplugin-ts-error-translator-src": "vimplugin-ts-error-translator-src", "virtualkeyboard-adapter": "virtualkeyboard-adapter", @@ -2059,6 +2060,22 @@ "type": "github" } }, + "vimplugin-jinja-vim-src": { + "flake": false, + "locked": { + "lastModified": 1746986029, + "narHash": "sha256-o3nk0O6Dd2L2x7ALeXZaN5DaZPAXNtgg7tw2fyRgaUM=", + "owner": "HiPhish", + "repo": "jinja.vim", + "rev": "966cc763f35472ea1033743766688621d93a39af", + "type": "github" + }, + "original": { + "owner": "HiPhish", + "repo": "jinja.vim", + "type": "github" + } + }, "vimplugin-roslyn-nvim-src": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index f08f5421..9518b821 100644 --- a/flake.nix +++ b/flake.nix @@ -493,6 +493,12 @@ repo = "easytables.nvim"; type = "github"; }; + vimplugin-jinja-vim-src = { + flake = false; + owner = "HiPhish"; + repo = "jinja.vim"; + type = "github"; + }; vimplugin-roslyn-nvim-src = { flake = false; owner = "seblj"; diff --git a/homeManagerModules/neovim/theme/default.nix b/homeManagerModules/neovim/theme/default.nix index f077e659..47a215e5 100644 --- a/homeManagerModules/neovim/theme/default.nix +++ b/homeManagerModules/neovim/theme/default.nix @@ -11,7 +11,7 @@ self: { cfg = config.programs.neovim; in { - imports = [./treesitter.nix]; + imports = [(import ./treesitter.nix self)]; config = mkIf cfg.enable { programs.neovim = { diff --git a/homeManagerModules/neovim/theme/treesitter.nix b/homeManagerModules/neovim/theme/treesitter.nix index a8a374cb..c1c788ed 100644 --- a/homeManagerModules/neovim/theme/treesitter.nix +++ b/homeManagerModules/neovim/theme/treesitter.nix @@ -1,10 +1,12 @@ -{ +self: { config, lib, pkgs, ... }: let inherit (lib) mkIf; + inherit (self.inputs) vimplugin-jinja-vim-src; + inherit (self.lib.${pkgs.system}) buildPlugin; cfg = config.programs.neovim; in { @@ -40,6 +42,20 @@ in { }); ''; } + + { + plugin = buildPlugin "jinja-vim" vimplugin-jinja-vim-src; + type = "lua"; + config = + # lua + '' + -- + vim.api.nvim_create_autocmd('BufEnter', { + pattern = '*.j2', + command = "TSBufDisable highlight | LspStop", + }); + ''; + } ]; }; diff --git a/inputs/default.nix b/inputs/default.nix index 2900eecc..8722bc4f 100644 --- a/inputs/default.nix +++ b/inputs/default.nix @@ -329,6 +329,11 @@ let owner = "seblj"; repo = "roslyn.nvim"; } + { + owner = "HiPhish"; + repo = "jinja.vim"; + name = "vimplugin-jinja-vim-src"; + } { name = "nix-develop-nvim-src"; owner = "matt1432";