2 files changed, 20 insertions, 3 deletions

diff --git a/nvim/lua/config/statusline.lua b/nvim/lua/config/statusline.lua
index 0ec6579..8a9c75a 100644
--- a/nvim/lua/config/statusline.lua
+++ b/nvim/lua/config/statusline.lua
@@ -20,6 +20,10 @@ 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
 
@@ -35,7 +39,12 @@ local function update_git_branch(bufnr)
     return
   end
 
-  local branch = vim.fn.systemlist("git rev-parse --abbrev-ref HEAD 2>/dev/null")[1]
+  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 .. " "
diff --git a/nvim/lua/config/usercmds.lua b/nvim/lua/config/usercmds.lua
index 9abc50f..529b370 100644
--- a/nvim/lua/config/usercmds.lua
+++ b/nvim/lua/config/usercmds.lua
@@ -66,8 +66,16 @@ local function enable_lsp()
   vim.cmd("edit") -- triggert Reattach bei vielen Setups
 end
 
-vim.api.nvim_create_user_command("SonarScan", run_sonar, {})
-vim.api.nvim_create_user_command("SonarIssues", load_sonar_issues, {})
+-- sonar-scanner/scripts/sonarqube.sh sind POSIX-only (kein Windows-Pendant),
+-- deshalb Kommandos unter Windows gar nicht erst registrieren statt sie
+-- dort fehlschlagen zu lassen.
+local is_windows = vim.fn.has("win32") == 1
+
+if not is_windows then
+  vim.api.nvim_create_user_command("SonarScan", run_sonar, {})
+  vim.api.nvim_create_user_command("SonarIssues", load_sonar_issues, {})
+end
+
 vim.api.nvim_create_user_command("LspOff", disable_lsp, {})
 vim.api.nvim_create_user_command("LspOffBuffer", disable_lsp_buffer, {})
 vim.api.nvim_create_user_command("LspOn", enable_lsp, {})