2 files changed, 10 insertions, 4 deletions

diff --git a/nvim/lua/config/options.lua b/nvim/lua/config/options.lua
index 409c620..7d6a2fb 100644
--- a/nvim/lua/config/options.lua
+++ b/nvim/lua/config/options.lua
@@ -72,9 +72,6 @@ opt.completeopt = { "longest", "menuone", "noselect", "popup" }
 opt.makeprg = "gmake"
 opt.autowrite = true
 
--- Guifont
-opt.guifont = "JetBrains Mono Semibold:h12"
-
 -- Swap files und Undo
 opt.swapfile = false
 opt.undofile = true
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 .. " "