Konfiguration vereinfacht

5 files changed, 37 insertions, 96 deletions

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
@@ -17,60 +17,17 @@ local function mode()
 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 b301b68..8e50357 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,
   },