Merge branch 'master' into add-ansible-support

3 files changed, 11 insertions, 0 deletions

diff --git a/nvim/lua/config/filetypes.lua b/nvim/lua/config/filetypes.lua
index a850028..3161d40 100644
--- a/nvim/lua/config/filetypes.lua
+++ b/nvim/lua/config/filetypes.lua
@@ -33,4 +33,11 @@ vim.filetype.add({
 -- yaml.ansible soll den regulaeren yaml-Parser von Treesitter verwenden.
 vim.treesitter.language.register("yaml", M.ANSIBLE_YAML)
 
+-- jinja support
+vim.filetype.add({
+  extension = {
+    j2 = "jinja",
+  },
+})
+
 return M
diff --git a/nvim/lua/config/treesitter.lua b/nvim/lua/config/treesitter.lua
index 1eee267..f122f37 100644
--- a/nvim/lua/config/treesitter.lua
+++ b/nvim/lua/config/treesitter.lua
@@ -7,6 +7,8 @@ M.languages = {
   "cpp",
   "html",
   "javascript",
+  -- "jinja",
+  -- "jinja_inline",
   "jq",
   "json",
   "lua",
diff --git a/nvim/lua/plugins/format.lua b/nvim/lua/plugins/format.lua
index 8ca7f1b..8b40229 100644
--- a/nvim/lua/plugins/format.lua
+++ b/nvim/lua/plugins/format.lua
@@ -1,6 +1,7 @@
 -- Verfügbare Formater: https://github.com/stevearc/conform.nvim/tree/master/lua/conform/formatters
 
 local clang = {}
+local djlint = { "djlint" } -- pipx install djlint (macOS & FreeBSD); unter Windows kein winget-Paket, siehe neovim-windows-setup.md
 local gawk = { "gawk" } -- brew install gawk, pkg install gawk
 local jq = { "jq" } -- brew install jq, pkg install jq
 local prettier = { "prettier" } -- npm install -g prettier
@@ -30,6 +31,7 @@ return {
       cpp = clang,
       html = prettier,
       javascript = prettier,
+      jinja = djlint,
       json = jq,
       lua = stylua,
       python = ruff,