From 78477ffd834fbb71563c04f18572f1838b5b3d7c Mon Sep 17 00:00:00 2001
From: Thomas Schmucker <ts@its1.de>
Date: Mon, 31 Aug 2026 17:19:43 +0200
Subject: neovim: Support für Ansible
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nvim/lua/plugins/lsp.lua | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'nvim/lua/plugins')

diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua
index b301b68..d4bb9fd 100644
--- a/nvim/lua/plugins/lsp.lua
+++ b/nvim/lua/plugins/lsp.lua
@@ -109,7 +109,23 @@ return {
         },
       }
 
+      vim.lsp.config.ansiblels = {
+        capabilities = capabilities,
+        filetypes = { require("config.filetypes").ANSIBLE_YAML },
+        settings = {
+          ansible = {
+            validation = {
+              lint = {
+                enabled = true,
+                path = "ansible-lint",
+              },
+            },
+          },
+        },
+      }
+
       vim.lsp.enable({
+        "ansiblels", -- npm install -g @ansible/ansible-language-server & (brew install ansible-lint, pkg install py-ansible-lint)
         "basedpyright", -- npm install -g basedpyright, brew install basedpyright
         "bashls", -- npm install -g bash-language-server, pkg install hs-ShellCheck
         "clangd", -- pkg install llvm
-- 
cgit v1.3


From f63403e394c3fb52827b9362cd31a0a3bdbf08ec Mon Sep 17 00:00:00 2001
From: Thomas Schmucker <ts@its1.de>
Date: Mon, 7 Sep 2026 11:31:58 +0200
Subject: Unterstützung für jsonc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nvim/ftplugin/json.lua         | 8 +++-----
 nvim/ftplugin/jsonc.lua        | 5 +++++
 nvim/lua/config/filetypes.lua  | 1 +
 nvim/lua/config/treesitter.lua | 3 ++-
 nvim/lua/plugins/format.lua    | 1 +
 5 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 nvim/ftplugin/jsonc.lua

(limited to 'nvim/lua/plugins')

diff --git a/nvim/ftplugin/json.lua b/nvim/ftplugin/json.lua
index a6321ff..73b5935 100644
--- a/nvim/ftplugin/json.lua
+++ b/nvim/ftplugin/json.lua
@@ -1,5 +1,3 @@
-local opt = vim.opt_local
-
-opt.expandtab = true
-opt.shiftwidth = 2
-opt.tabstop = 2
+-- Standard-Dateityp für .json-Dateien ist "jsonc" (siehe lua/config/filetypes.lua).
+-- Buffer, deren Dateityp explizit "json" ist, erben dieselben Einstellungen.
+vim.cmd("runtime! ftplugin/jsonc.lua")
diff --git a/nvim/ftplugin/jsonc.lua b/nvim/ftplugin/jsonc.lua
new file mode 100644
index 0000000..a6321ff
--- /dev/null
+++ b/nvim/ftplugin/jsonc.lua
@@ -0,0 +1,5 @@
+local opt = vim.opt_local
+
+opt.expandtab = true
+opt.shiftwidth = 2
+opt.tabstop = 2
diff --git a/nvim/lua/config/filetypes.lua b/nvim/lua/config/filetypes.lua
index 3161d40..37b1b65 100644
--- a/nvim/lua/config/filetypes.lua
+++ b/nvim/lua/config/filetypes.lua
@@ -37,6 +37,7 @@ vim.treesitter.language.register("yaml", M.ANSIBLE_YAML)
 vim.filetype.add({
   extension = {
     j2 = "jinja",
+    json = "jsonc",
   },
 })
 
diff --git a/nvim/lua/config/treesitter.lua b/nvim/lua/config/treesitter.lua
index f122f37..de71d50 100644
--- a/nvim/lua/config/treesitter.lua
+++ b/nvim/lua/config/treesitter.lua
@@ -10,7 +10,8 @@ M.languages = {
   -- "jinja",
   -- "jinja_inline",
   "jq",
-  "json",
+  "json", -- weiterhin nötig für Injections, z.B. ```json in Markdown
+  "jsonc",
   "lua",
   "make",
   "markdown",
diff --git a/nvim/lua/plugins/format.lua b/nvim/lua/plugins/format.lua
index 8b40229..ce3f4e7 100644
--- a/nvim/lua/plugins/format.lua
+++ b/nvim/lua/plugins/format.lua
@@ -33,6 +33,7 @@ return {
       javascript = prettier,
       jinja = djlint,
       json = jq,
+      jsonc = prettier,
       lua = stylua,
       python = ruff,
       sh = shfmt,
-- 
cgit v1.3


From 5e96d26780a13a10e318b517d292fbc315de15ca Mon Sep 17 00:00:00 2001
From: Thomas Schmucker <ts@its1.de>
Date: Mon, 7 Sep 2026 12:00:01 +0200
Subject: Unterstützung für jsonc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nvim/lua/plugins/format.lua | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'nvim/lua/plugins')

diff --git a/nvim/lua/plugins/format.lua b/nvim/lua/plugins/format.lua
index ce3f4e7..714e887 100644
--- a/nvim/lua/plugins/format.lua
+++ b/nvim/lua/plugins/format.lua
@@ -11,6 +11,15 @@ local stylua = { "stylua" } -- brew install stylua, pkg install stylua
 local xmllint = { "xmllint" } -- xmllint ist Teil von libxml2 (standardmäßig installiert unter MacOS; pkg install libxml2)
 local yamlfmt = { "yamlfmt" } -- brew install yamlfmt, pkg install yamlfmt
 
+-- prettier leitet den Parser aus dem Dateinamen ab: .json landet beim strikten
+-- json-Parser, der Kommentare ablehnt. Im Filetype jsonc erzwingen wir deshalb
+-- den kommentartoleranten jsonc-Parser (prettier >= 3.0).
+local function prettier_parser_args(_, ctx)
+  if vim.bo[ctx.buf].filetype == "jsonc" then return { "--parser", "jsonc" } end
+
+  return {}
+end
+
 return {
   "stevearc/conform.nvim",
   event = { "BufReadPre", "BufNewFile" },
@@ -42,6 +51,11 @@ return {
       xsd = xmllint,
       yaml = yamlfmt,
     },
+    formatters = {
+      prettier = {
+        prepend_args = prettier_parser_args,
+      },
+    },
     default_format_opts = {
       lsp_format = "fallback",
     },
-- 
cgit v1.3


From 8c43ebd619d724133e1063e3b686907d5aa56abe Mon Sep 17 00:00:00 2001
From: Thomas Schmucker <ts@its1.de>
Date: Mon, 7 Sep 2026 16:14:59 +0200
Subject: Unterstützung für jsonc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nvim/lua/plugins/format.lua | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

(limited to 'nvim/lua/plugins')

diff --git a/nvim/lua/plugins/format.lua b/nvim/lua/plugins/format.lua
index 714e887..476e513 100644
--- a/nvim/lua/plugins/format.lua
+++ b/nvim/lua/plugins/format.lua
@@ -5,21 +5,13 @@ local djlint = { "djlint" } -- pipx install djlint (macOS & FreeBSD); unter Wind
 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
+local prettier_jsonc = { "prettier_jsonc" } -- prettier-Variante, konfiguriert unter opts.formatters
 local ruff = { "ruff_format" } -- brew install ruff, pkg install ruff
 local shfmt = { "shfmt" } -- brew install shfmt, pkg install shfmt
 local stylua = { "stylua" } -- brew install stylua, pkg install stylua
 local xmllint = { "xmllint" } -- xmllint ist Teil von libxml2 (standardmäßig installiert unter MacOS; pkg install libxml2)
 local yamlfmt = { "yamlfmt" } -- brew install yamlfmt, pkg install yamlfmt
 
--- prettier leitet den Parser aus dem Dateinamen ab: .json landet beim strikten
--- json-Parser, der Kommentare ablehnt. Im Filetype jsonc erzwingen wir deshalb
--- den kommentartoleranten jsonc-Parser (prettier >= 3.0).
-local function prettier_parser_args(_, ctx)
-  if vim.bo[ctx.buf].filetype == "jsonc" then return { "--parser", "jsonc" } end
-
-  return {}
-end
-
 return {
   "stevearc/conform.nvim",
   event = { "BufReadPre", "BufNewFile" },
@@ -42,7 +34,7 @@ return {
       javascript = prettier,
       jinja = djlint,
       json = jq,
-      jsonc = prettier,
+      jsonc = prettier_jsonc,
       lua = stylua,
       python = ruff,
       sh = shfmt,
@@ -52,8 +44,9 @@ return {
       yaml = yamlfmt,
     },
     formatters = {
-      prettier = {
-        prepend_args = prettier_parser_args,
+      prettier_jsonc = {
+        inherit = "prettier",
+        prepend_args = { "--parser", "jsonc" },
       },
     },
     default_format_opts = {
-- 
cgit v1.3


From 3da4c7f9209707af194de9538b2308be4e702e73 Mon Sep 17 00:00:00 2001
From: Thomas Schmucker <ts@its1.de>
Date: Tue, 8 Sep 2026 07:14:29 +0200
Subject: Konfiguration vereinfacht

---
 nvim/ftplugin/c.lua             |  3 +++
 nvim/ftplugin/cpp.lua           |  1 +
 nvim/ftplugin/json.lua          |  2 +-
 nvim/init.lua                   |  1 -
 nvim/lua/config/colorscheme.lua | 18 --------------
 nvim/lua/config/options.lua     | 16 +++---------
 nvim/lua/config/statusline.lua  | 55 +++++------------------------------------
 nvim/lua/plugins/lsp.lua        | 22 ++++-------------
 nvim/lua/plugins/ui.lua         | 22 +++++++++++++++++
 9 files changed, 42 insertions(+), 98 deletions(-)
 create mode 100644 nvim/ftplugin/c.lua
 create mode 100644 nvim/ftplugin/cpp.lua
 delete mode 100644 nvim/lua/config/colorscheme.lua

(limited to 'nvim/lua/plugins')

diff --git a/nvim/ftplugin/c.lua b/nvim/ftplugin/c.lua
new file mode 100644
index 0000000..0f49bf6
--- /dev/null
+++ b/nvim/ftplugin/c.lua
@@ -0,0 +1,3 @@
+local opt = vim.opt_local
+
+opt.cindent = true
diff --git a/nvim/ftplugin/cpp.lua b/nvim/ftplugin/cpp.lua
new file mode 100644
index 0000000..de0f9de
--- /dev/null
+++ b/nvim/ftplugin/cpp.lua
@@ -0,0 +1 @@
+vim.cmd.runtime("ftplugin/c.lua")
diff --git a/nvim/ftplugin/json.lua b/nvim/ftplugin/json.lua
index 73b5935..341b728 100644
--- a/nvim/ftplugin/json.lua
+++ b/nvim/ftplugin/json.lua
@@ -1,3 +1,3 @@
 -- Standard-Dateityp für .json-Dateien ist "jsonc" (siehe lua/config/filetypes.lua).
 -- Buffer, deren Dateityp explizit "json" ist, erben dieselben Einstellungen.
-vim.cmd("runtime! ftplugin/jsonc.lua")
+vim.cmd.runtime("ftplugin/jsonc.lua")
diff --git a/nvim/init.lua b/nvim/init.lua
index 3535671..146ae6c 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -7,4 +7,3 @@ keymaps.global()
 require("config.autocmds")
 require("config.usercmds")
 require("config.lazy")
-require("config.colorscheme")
diff --git a/nvim/lua/config/colorscheme.lua b/nvim/lua/config/colorscheme.lua
deleted file mode 100644
index ddd1d6a..0000000
--- a/nvim/lua/config/colorscheme.lua
+++ /dev/null
@@ -1,18 +0,0 @@
--- Fix: Farbschema für Rechtschreibfehler
-vim.api.nvim_set_hl(0, "SpellBad", { fg = "#ffffff", bg = "#5f0000" })
-vim.api.nvim_set_hl(0, "SpellCap", { fg = "#000000", bg = "#ffaf00" })
-vim.api.nvim_set_hl(0, "SpellRare", { fg = "#000000", bg = "#5fd7ff" })
-vim.api.nvim_set_hl(0, "SpellLocal", { fg = "#000000", bg = "#5fff87" })
-vim.api.nvim_set_hl(0, "CursorLine", { bg = "#252526" })
-vim.api.nvim_set_hl(0, "CursorColumn", { bg = "#252526" })
-
--- Statusline Farben
-vim.api.nvim_set_hl(0, "StatuslineModeNormal", { fg = "#1e222a", bg = "#61afef", bold = true })
-vim.api.nvim_set_hl(0, "StatuslineModeInsert", { fg = "#1e222a", bg = "#98c379", bold = true })
-vim.api.nvim_set_hl(0, "StatuslineModeVisual", { fg = "#1e222a", bg = "#c678dd", bold = true })
-vim.api.nvim_set_hl(0, "StatuslineModeReplace", { fg = "#1e222a", bg = "#e86671", bold = true })
-vim.api.nvim_set_hl(0, "StatuslineModeCommand", { fg = "#1e222a", bg = "#e5c07b", bold = true })
-
--- NVim-Tree
-vim.api.nvim_set_hl(0, "NvimTreeOpenedFile", { bold = true })
-vim.api.nvim_set_hl(0, "NvimTreeCursorLine", { bg = "#2A2D2E" })
diff --git a/nvim/lua/config/options.lua b/nvim/lua/config/options.lua
index 227475a..b1d2104 100644
--- a/nvim/lua/config/options.lua
+++ b/nvim/lua/config/options.lua
@@ -12,6 +12,9 @@ opt.signcolumn = "yes"
 opt.termguicolors = true
 opt.showcmd = false
 
+-- Rahmen für alle Floating Windows (ersetzt manuelles Setzen von 'border')
+opt.winborder = "rounded"
+
 -- Texte umbrechen
 opt.wrap = false
 opt.linebreak = true
@@ -56,10 +59,8 @@ opt.tabstop = 4
 opt.shiftwidth = 4
 opt.softtabstop = 0
 
--- Einrückungen
-opt.smartindent = true
+-- Einrückungen (cindent nur für C/C++, siehe ftplugin/c.lua)
 opt.autoindent = true
-opt.cindent = true
 
 -- Faltungen
 opt.foldlevel = 1000
@@ -95,7 +96,6 @@ opt.fileformat = "unix"
 -- Provider deaktivieren (alle Plugins sind reines Lua, kein Provider noetig)
 g.loaded_ruby_provider = 0
 g.loaded_perl_provider = 0
-g.loaded_luarocks_provider = 0
 g.loaded_python3_provider = 0
 g.loaded_node_provider = 0
 
@@ -114,11 +114,3 @@ vim.diagnostic.config({
   severity_sort = true,
   float = { border = "rounded" },
 })
-
-vim.lsp.util.open_floating_preview = (function(orig)
-  return function(contents, syntax, opts, ...)
-    opts = opts or {}
-    opts.border = opts.border or "rounded"
-    return orig(contents, syntax, opts, ...)
-  end
-end)(vim.lsp.util.open_floating_preview)
diff --git a/nvim/lua/config/statusline.lua b/nvim/lua/config/statusline.lua
index 8a9c75a..01339d0 100644
--- a/nvim/lua/config/statusline.lua
+++ b/nvim/lua/config/statusline.lua
@@ -16,61 +16,18 @@ local function mode()
   return string.format("%%#%s# %s %%#StatusLine#", entry[2], entry[1])
 end
 
-----------------------------------------------------------------------
--- Git branch (buffer-lokal, gecached, kein redraw-spam)
-----------------------------------------------------------------------
-
--- /dev/null gibt es unter Windows nicht (cmd.exe versteht das nicht als
--- Pfad und meldet "Das System kann den angegebenen Pfad nicht finden").
-local devnull = vim.fn.has("win32") == 1 and "NUL" or "/dev/null"
-
-local function update_git_branch(bufnr)
-  bufnr = bufnr or 0
-
-  -- nur in echten Dateien
-  if vim.bo[bufnr].buftype ~= "" then
-    vim.b[bufnr].git_branch = ""
-    return
-  end
-
-  -- kein Git → nichts tun
-  if vim.fn.executable("git") ~= 1 then
-    vim.b[bufnr].git_branch = ""
-    return
-  end
-
-  local branch = vim.fn.systemlist("git rev-parse --abbrev-ref HEAD 2>" .. devnull)[1]
-  if branch then
-    -- unter Windows bleibt an systemlist()-Zeilen mitunter ein
-    -- trailing \r haengen (^M in der Statuszeile sichtbar)
-    branch = branch:gsub("\r$", "")
-  end
-
-  if branch and branch ~= "" then
-    vim.b[bufnr].git_branch = "  " .. branch .. " "
-  else
-    vim.b[bufnr].git_branch = ""
-  end
-end
-
-----------------------------------------------------------------------
--- Autocmd: Git nur bei Bedarf aktualisieren
-----------------------------------------------------------------------
-
-vim.api.nvim_create_autocmd({ "BufEnter", "FocusGained" }, {
-  callback = function(args)
-    update_git_branch(args.buf)
-  end,
-})
-
 ----------------------------------------------------------------------
 -- Statusline-Sektionen (reine Darstellung, keine IO)
 ----------------------------------------------------------------------
 
--- Git-Branch (buffer-lokal, gecached, kein redraw-spam)
+-- Git-Branch (gitsigns setzt vim.b.gitsigns_head asynchron pro Buffer)
 
 local function git()
-  return vim.b.git_branch or ""
+  local head = vim.b.gitsigns_head
+
+  if not head or head == "" then return "" end
+
+  return "  " .. head .. " "
 end
 
 -- Git-Diff (buffer-lokal, kein redraw-spam)
diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua
index d4bb9fd..76bbaeb 100644
--- a/nvim/lua/plugins/lsp.lua
+++ b/nvim/lua/plugins/lsp.lua
@@ -6,8 +6,12 @@ return {
     config = function()
       local capabilities = require("blink.cmp").get_lsp_capabilities(vim.lsp.protocol.make_client_capabilities())
 
-      vim.lsp.config.lua_ls = {
+      -- gilt fuer alle Server und wird mit den serverspezifischen Configs gemerged
+      vim.lsp.config("*", {
         capabilities = capabilities,
+      })
+
+      vim.lsp.config.lua_ls = {
         settings = {
           Lua = {
             runtime = {
@@ -31,12 +35,10 @@ return {
       }
 
       vim.lsp.config.bashls = {
-        capabilities = capabilities,
         filetypes = { "sh", "bash" },
       }
 
       vim.lsp.config.clangd = {
-        capabilities = capabilities,
         cmd = {
           "clangd",
           "--background-index",
@@ -52,20 +54,7 @@ return {
         },
       }
 
-      vim.lsp.config.prismals = {
-        capabilities = capabilities,
-      }
-
-      vim.lsp.config.jsonls = {
-        capabilities = capabilities,
-      }
-
-      vim.lsp.config.html = {
-        capabilities = capabilities,
-      }
-
       vim.lsp.config.vtsls = {
-        capabilities = capabilities,
         settings = {
           typescript = {
             updateImportsOnFileMove = { enabled = "always" },
@@ -93,7 +82,6 @@ return {
       }
 
       vim.lsp.config.basedpyright = {
-        capabilities = capabilities,
         settings = {
           basedpyright = {
             analysis = {
diff --git a/nvim/lua/plugins/ui.lua b/nvim/lua/plugins/ui.lua
index 9794c38..39a8e28 100644
--- a/nvim/lua/plugins/ui.lua
+++ b/nvim/lua/plugins/ui.lua
@@ -16,6 +16,28 @@ return {
       })
 
       vscode.load()
+
+      -- eigene Anpassungen an der vscode-Palette; muessen nach vscode.load()
+      -- gesetzt werden, weil :colorscheme alle Highlight-Gruppen zuruecksetzt
+
+      -- Fix: Farbschema für Rechtschreibfehler
+      vim.api.nvim_set_hl(0, "SpellBad", { fg = "#ffffff", bg = "#5f0000" })
+      vim.api.nvim_set_hl(0, "SpellCap", { fg = "#000000", bg = "#ffaf00" })
+      vim.api.nvim_set_hl(0, "SpellRare", { fg = "#000000", bg = "#5fd7ff" })
+      vim.api.nvim_set_hl(0, "SpellLocal", { fg = "#000000", bg = "#5fff87" })
+      vim.api.nvim_set_hl(0, "CursorLine", { bg = "#252526" })
+      vim.api.nvim_set_hl(0, "CursorColumn", { bg = "#252526" })
+
+      -- Statusline Farben
+      vim.api.nvim_set_hl(0, "StatuslineModeNormal", { fg = "#1e222a", bg = "#61afef", bold = true })
+      vim.api.nvim_set_hl(0, "StatuslineModeInsert", { fg = "#1e222a", bg = "#98c379", bold = true })
+      vim.api.nvim_set_hl(0, "StatuslineModeVisual", { fg = "#1e222a", bg = "#c678dd", bold = true })
+      vim.api.nvim_set_hl(0, "StatuslineModeReplace", { fg = "#1e222a", bg = "#e86671", bold = true })
+      vim.api.nvim_set_hl(0, "StatuslineModeCommand", { fg = "#1e222a", bg = "#e5c07b", bold = true })
+
+      -- NVim-Tree
+      vim.api.nvim_set_hl(0, "NvimTreeOpenedFile", { bold = true })
+      vim.api.nvim_set_hl(0, "NvimTreeCursorLine", { bg = "#2A2D2E" })
     end,
   },
 
-- 
cgit v1.3


From dafb375026c30911dace5bd5d576d2f137f3c496 Mon Sep 17 00:00:00 2001
From: Thomas Schmucker <ts@its1.de>
Date: Tue, 8 Sep 2026 08:26:55 +0200
Subject: Dateityp-Erkennung verbessert

---
 nvim/lua/config/filetypes.lua | 33 ++++++++++++++++++---------------
 nvim/lua/plugins/lsp.lua      |  1 -
 2 files changed, 18 insertions(+), 16 deletions(-)

(limited to 'nvim/lua/plugins')

diff --git a/nvim/lua/config/filetypes.lua b/nvim/lua/config/filetypes.lua
index 56810d9..2537750 100644
--- a/nvim/lua/config/filetypes.lua
+++ b/nvim/lua/config/filetypes.lua
@@ -13,20 +13,26 @@ M.ANSIBLE_YAML = "yaml.ansible"
 -- Treesitter-Aktivierung).
 M.extra = { M.ANSIBLE_YAML, "jsonc" }
 
--- Ansible-Dateien haben die Endung .yml/.yaml wie normales YAML, sind aber
--- ueber ihren Pfad erkennbar.
+-- Ansible-Dateien haben die Endung .yml/.yaml wie normales YAML und sind nur
+-- am Dateinamen bzw. am Pfad erkennbar. Die Patterns sind mit "$" verankert,
+-- damit Jinja-Templates (z.B. tasks/main.yml.j2) weiter als jinja gelten.
 vim.filetype.add({
+  filename = {
+    ["playbook.yml"] = M.ANSIBLE_YAML,
+    ["playbook.yaml"] = M.ANSIBLE_YAML,
+    ["site.yml"] = M.ANSIBLE_YAML,
+    ["site.yaml"] = M.ANSIBLE_YAML,
+    ["requirements.yml"] = M.ANSIBLE_YAML,
+    ["requirements.yaml"] = M.ANSIBLE_YAML,
+  },
   pattern = {
-    [".*/roles/.*/tasks/.*%.ya?ml"] = M.ANSIBLE_YAML,
-    [".*/roles/.*/handlers/.*%.ya?ml"] = M.ANSIBLE_YAML,
-    [".*/tasks/.*%.ya?ml"] = M.ANSIBLE_YAML,
-    [".*/handlers/.*%.ya?ml"] = M.ANSIBLE_YAML,
-    [".*/group_vars/.*%.ya?ml"] = M.ANSIBLE_YAML,
-    [".*/host_vars/.*%.ya?ml"] = M.ANSIBLE_YAML,
-    [".*/playbooks/.*%.ya?ml"] = M.ANSIBLE_YAML,
-    ["playbook%.ya?ml"] = M.ANSIBLE_YAML,
-    ["site%.ya?ml"] = M.ANSIBLE_YAML,
-    ["requirements%.ya?ml"] = M.ANSIBLE_YAML,
+    [".*/roles/.*/tasks/.*%.ya?ml$"] = M.ANSIBLE_YAML,
+    [".*/roles/.*/handlers/.*%.ya?ml$"] = M.ANSIBLE_YAML,
+    [".*/tasks/.*%.ya?ml$"] = M.ANSIBLE_YAML,
+    [".*/handlers/.*%.ya?ml$"] = M.ANSIBLE_YAML,
+    [".*/group_vars/.*%.ya?ml$"] = M.ANSIBLE_YAML,
+    [".*/host_vars/.*%.ya?ml$"] = M.ANSIBLE_YAML,
+    [".*/playbooks/.*%.ya?ml$"] = M.ANSIBLE_YAML,
   },
   extension = {
     j2 = "jinja",
@@ -36,9 +42,6 @@ vim.filetype.add({
   },
 })
 
--- yaml.ansible soll den regulaeren yaml-Parser von Treesitter verwenden.
-vim.treesitter.language.register("yaml", M.ANSIBLE_YAML)
-
 -- nvim-treesitter stellt keinen eigenen jsonc-Parser bereit. Der json-Parser
 -- versteht // und /* */ Kommentare, deshalb wird er fuer jsonc mitbenutzt.
 vim.treesitter.language.register("json", "jsonc")
diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua
index 76bbaeb..a2b37d5 100644
--- a/nvim/lua/plugins/lsp.lua
+++ b/nvim/lua/plugins/lsp.lua
@@ -98,7 +98,6 @@ return {
       }
 
       vim.lsp.config.ansiblels = {
-        capabilities = capabilities,
         filetypes = { require("config.filetypes").ANSIBLE_YAML },
         settings = {
           ansible = {
-- 
cgit v1.3