Merge branch 'master' of ssh://raspi2:/srv/git/dotfiles

9 files changed, 59 insertions, 60 deletions

diff --git a/git/config b/git/config
index 58c3f9f..1ea1370 100644
--- a/git/config
+++ b/git/config
@@ -29,6 +29,9 @@
 [diff]
         colorMoved = default
 
+[http]
+        sslVerify = false
+
 [alias]
         lg = log --color --graph --pretty=format:'%C(magenta)%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --branches
 
diff --git a/nvim/lua/config/keymaps.lua b/nvim/lua/config/keymaps.lua
index 558742d..b776697 100644
--- a/nvim/lua/config/keymaps.lua
+++ b/nvim/lua/config/keymaps.lua
@@ -28,17 +28,27 @@ function M.lsp(buffer, client)
       vim.cmd("cwindow")
     end, opts)
 
-    map("n", "<F6>", function() run_in_terminal("gmake test") end, opts)
+    map("n", "<F6>", function()
+      run_in_terminal("gmake test")
+    end, opts)
   end
 
   local function set_python_bindings()
-    map("n", "<F6>", function() run_in_terminal("pytest") end, opts)
+    map("n", "<F6>", function()
+      run_in_terminal("pytest")
+    end, opts)
   end
 
   local function set_npm_bindings()
-    map("n", "<F5>", function() run_in_terminal("npm run build") end, opts)
-    map("n", "<F6>", function() run_in_terminal("npm test") end, opts)
-    map("n", "<F7>", function() run_in_terminal("npm start") end, opts)
+    map("n", "<F5>", function()
+      run_in_terminal("npm run build")
+    end, opts)
+    map("n", "<F6>", function()
+      run_in_terminal("npm test")
+    end, opts)
+    map("n", "<F7>", function()
+      run_in_terminal("npm start")
+    end, opts)
   end
 
   if client then
diff --git a/nvim/lua/config/lazy.lua b/nvim/lua/config/lazy.lua
index edf2fc7..2c0226c 100644
--- a/nvim/lua/config/lazy.lua
+++ b/nvim/lua/config/lazy.lua
@@ -7,7 +7,7 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then
   if vim.v.shell_error ~= 0 then
     vim.api.nvim_echo({
       { "Failed to clone lazy.nvim:\n", "ErrorMsg" },
-      { out,                            "WarningMsg" },
+      { out, "WarningMsg" },
       { "\nPress any key to exit..." },
     }, true, {})
     vim.fn.getchar()
diff --git a/nvim/lua/config/options.lua b/nvim/lua/config/options.lua
index 848966b..1adcee0 100644
--- a/nvim/lua/config/options.lua
+++ b/nvim/lua/config/options.lua
@@ -37,7 +37,7 @@ opt.listchars = {
   trail = "-",
   extends = ">",
   precedes = "<",
-  nbsp = "+"
+  nbsp = "+",
 }
 opt.showbreak = "↪ "
 
diff --git a/nvim/lua/config/statusline.lua b/nvim/lua/config/statusline.lua
index 63c8ba8..fe27cd5 100644
--- a/nvim/lua/config/statusline.lua
+++ b/nvim/lua/config/statusline.lua
@@ -1,13 +1,13 @@
 local M = {}
 
 local modes = {
-  n     = { "NORMAL", "StatuslineModeNormal" },
-  i     = { "INSERT", "StatuslineModeInsert" },
-  v     = { "VISUAL", "StatuslineModeVisual" },
-  V     = { "V-LINE", "StatuslineModeVisual" },
+  n = { "NORMAL", "StatuslineModeNormal" },
+  i = { "INSERT", "StatuslineModeInsert" },
+  v = { "VISUAL", "StatuslineModeVisual" },
+  V = { "V-LINE", "StatuslineModeVisual" },
   [""] = { "V-BLOCK", "StatuslineModeVisual" },
-  R     = { "REPLACE", "StatuslineModeReplace" },
-  c     = { "COMMAND", "StatuslineModeCommand" },
+  R = { "REPLACE", "StatuslineModeReplace" },
+  c = { "COMMAND", "StatuslineModeCommand" },
 }
 
 local function mode()
@@ -35,9 +35,7 @@ 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>/dev/null")[1]
 
   if branch and branch ~= "" then
     vim.b[bufnr].git_branch = "  " .. branch .. " "
@@ -50,14 +48,11 @@ end
 -- Autocmd: Git nur bei Bedarf aktualisieren
 ----------------------------------------------------------------------
 
-vim.api.nvim_create_autocmd(
-  { "BufEnter", "FocusGained" },
-  {
-    callback = function(args)
-      update_git_branch(args.buf)
-    end,
-  }
-)
+vim.api.nvim_create_autocmd({ "BufEnter", "FocusGained" }, {
+  callback = function(args)
+    update_git_branch(args.buf)
+  end,
+})
 
 ----------------------------------------------------------------------
 -- Statusline-Sektionen (reine Darstellung, keine IO)
@@ -80,9 +75,7 @@ local function git_diff()
   if gsd.changed and gsd.changed > 0 then table.insert(parts, "~" .. gsd.changed) end
   if gsd.removed and gsd.removed > 0 then table.insert(parts, "-" .. gsd.removed) end
 
-  if #parts > 0 then
-    return " " .. table.concat(parts, " ") .. " "
-  end
+  if #parts > 0 then return " " .. table.concat(parts, " ") .. " " end
 
   return ""
 end
@@ -93,13 +86,9 @@ end
 
 local function filename()
   local name = vim.fn.expand("%:.")
-  if name == "" then
-    name = "[No Name]"
-  end
+  if name == "" then name = "[No Name]" end
 
-  if vim.bo.modified then
-    name = name .. " [+]"
-  end
+  if vim.bo.modified then name = name .. " [+]" end
 
   return " " .. name .. " "
 end
@@ -110,9 +99,7 @@ end
 
 local function treesitter()
   local ok = vim.treesitter.highlighter.active[vim.api.nvim_get_current_buf()]
-  if ok then
-    return " 🌳 "
-  end
+  if ok then return " 🌳 " end
   return ""
 end
 
@@ -123,9 +110,9 @@ end
 local function diagnostics()
   local counts = {
     error = #vim.diagnostic.get(0, { severity = vim.diagnostic.severity.ERROR }),
-    warn  = #vim.diagnostic.get(0, { severity = vim.diagnostic.severity.WARN }),
-    info  = #vim.diagnostic.get(0, { severity = vim.diagnostic.severity.INFO }),
-    hint  = #vim.diagnostic.get(0, { severity = vim.diagnostic.severity.HINT }),
+    warn = #vim.diagnostic.get(0, { severity = vim.diagnostic.severity.WARN }),
+    info = #vim.diagnostic.get(0, { severity = vim.diagnostic.severity.INFO }),
+    hint = #vim.diagnostic.get(0, { severity = vim.diagnostic.severity.HINT }),
   }
 
   local parts = {}
@@ -135,9 +122,7 @@ local function diagnostics()
   if counts.info > 0 then table.insert(parts, "  " .. counts.info) end
   if counts.hint > 0 then table.insert(parts, "  " .. counts.hint) end
 
-  if #parts > 0 then
-    return " " .. table.concat(parts, " ") .. " "
-  end
+  if #parts > 0 then return " " .. table.concat(parts, " ") .. " " end
 
   return ""
 end
@@ -165,21 +150,13 @@ end
 -------------------------------------------------------------------------
 
 local function copilot()
-  if vim.fn.exists("*copilot#Enabled") == 0 then
-    return ""
-  end
+  if vim.fn.exists("*copilot#Enabled") == 0 then return "" end
 
-  if vim.fn["copilot#Enabled"]() == 0 then
-    return "  OFF "
-  end
+  if vim.fn["copilot#Enabled"]() == 0 then return "  OFF " end
 
-  if vim.b.copilot_suggestion and vim.b.copilot_suggestion.is_visible then
-    return "  SUG "
-  end
+  if vim.b.copilot_suggestion and vim.b.copilot_suggestion.is_visible then return "  SUG " end
 
-  if vim.b.copilot_suggestion_auto_trigger == false then
-    return "  MAN "
-  end
+  if vim.b.copilot_suggestion_auto_trigger == false then return "  MAN " end
 
   return "  ON "
 end
diff --git a/nvim/lua/config/treesitter.lua b/nvim/lua/config/treesitter.lua
index fe4b261..6903914 100644
--- a/nvim/lua/config/treesitter.lua
+++ b/nvim/lua/config/treesitter.lua
@@ -19,6 +19,7 @@ M.languages = {
   "typescript",
   "vim",
   "vimdoc",
+  "xml",
   "yaml",
   "zsh",
 }
diff --git a/nvim/lua/plugins/editing.lua b/nvim/lua/plugins/editing.lua
index d1c3447..d2acd8e 100644
--- a/nvim/lua/plugins/editing.lua
+++ b/nvim/lua/plugins/editing.lua
@@ -20,6 +20,6 @@ return {
 
   {
     "preservim/vim-markdown",
-    ft = "markdown"
+    ft = "markdown",
   },
 }
diff --git a/nvim/lua/plugins/format.lua b/nvim/lua/plugins/format.lua
index b8b0256..9334465 100644
--- a/nvim/lua/plugins/format.lua
+++ b/nvim/lua/plugins/format.lua
@@ -5,18 +5,17 @@ return {
     {
       "<leader>cf",
       function()
-        require("conform").format({
-          async = true,
-          lsp_fallback = true,
-        })
+        require("conform").format({ async = true })
       end,
       desc = "Format file",
     },
   },
   opts = {
     formatters_by_ft = {
+      awk = { "gawk" }, -- pkg install gawk
       bash = { "shfmt" },
-      -- cpp  = { "clang_format" },
+      c = {}, -- clangd
+      cpp = {}, -- clangd
       javascript = { "prettier" },
       json = { "jq" }, -- brew install jq, pkg install jq
       lua = { "stylua" }, -- brew install stylua, pkg install stylua
@@ -27,6 +26,9 @@ return {
       xsd = { "xmllint" },
       yaml = { "yamlfmt" }, -- brew install yamlfmt, pkg install yamlfmt
     },
+    default_format_opts = {
+      lsp_format = "fallback",
+    },
   },
 
   config = function(_, opts)
diff --git a/zsh/zshrc b/zsh/zshrc
index 7d8a754..53fb25a 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -29,6 +29,7 @@ setopt   HIST_SAVE_NO_DUPS
 setopt   INC_APPEND_HISTORY
 setopt   SHARE_HISTORY
 setopt   HIST_IGNORE_ALL_DUPS
+setopt   HIST_IGNORE_SPACE
 
 source_file "$HOME/.opam/opam-init/init.zsh"
 
@@ -43,6 +44,11 @@ case "$OSTYPE" in
     ;;
 esac
 
+if (( ${+ZSH_HIGHLIGHT_STYLES} )); then
+  ZSH_HIGHLIGHT_STYLES[path]='none'
+  ZSH_HIGHLIGHT_STYLES[path_prefix]='none'
+fi
+
 bindkey -v
 export KEYTIMEOUT=1