From d10379f2edf3626191a43227dd5fd90a62d9b978 Mon Sep 17 00:00:00 2001 From: Thomas Schmucker Date: Fri, 5 Jun 2026 09:54:03 +0200 Subject: Neovim: Formatiere alles mit "stylua `find . -name '*.lua'`" --- nvim/lua/config/keymaps.lua | 20 +++++++++--- nvim/lua/config/lazy.lua | 2 +- nvim/lua/config/options.lua | 2 +- nvim/lua/config/statusline.lua | 71 ++++++++++++++---------------------------- nvim/lua/plugins/editing.lua | 2 +- nvim/lua/plugins/format.lua | 24 +++++++------- 6 files changed, 54 insertions(+), 67 deletions(-) (limited to 'nvim/lua') 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", "", function() run_in_terminal("gmake test") end, opts) + map("n", "", function() + run_in_terminal("gmake test") + end, opts) end local function set_python_bindings() - map("n", "", function() run_in_terminal("pytest") end, opts) + map("n", "", function() + run_in_terminal("pytest") + end, opts) end local function set_npm_bindings() - map("n", "", function() run_in_terminal("npm run build") end, opts) - map("n", "", function() run_in_terminal("npm test") end, opts) - map("n", "", function() run_in_terminal("npm start") end, opts) + map("n", "", function() + run_in_terminal("npm run build") + end, opts) + map("n", "", function() + run_in_terminal("npm test") + end, opts) + map("n", "", 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/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 3d6d5b0..9334465 100644 --- a/nvim/lua/plugins/format.lua +++ b/nvim/lua/plugins/format.lua @@ -12,19 +12,19 @@ return { }, opts = { formatters_by_ft = { - awk = { "gawk" }, -- pkg install gawk - bash = { "shfmt" }, - c = {}, -- clangd - cpp = {}, -- clangd + awk = { "gawk" }, -- pkg install gawk + bash = { "shfmt" }, + c = {}, -- clangd + cpp = {}, -- clangd javascript = { "prettier" }, - json = { "jq" }, -- brew install jq, pkg install jq - lua = { "stylua" }, -- brew install stylua, pkg install stylua - python = { "ruff_format" }, -- brew install ruff, pkg install ruff - sh = { "shfmt" }, -- brew install, pkg install shfmt - typescript = { "prettier" }, -- npm install -g prettier - xml = { "xmllint" }, -- xmllint ist Teil von libxml2 - xsd = { "xmllint" }, - yaml = { "yamlfmt" }, -- brew install yamlfmt, pkg install yamlfmt + json = { "jq" }, -- brew install jq, pkg install jq + lua = { "stylua" }, -- brew install stylua, pkg install stylua + python = { "ruff_format" }, -- brew install ruff, pkg install ruff + sh = { "shfmt" }, -- brew install, pkg install shfmt + typescript = { "prettier" }, -- npm install -g prettier + xml = { "xmllint" }, -- xmllint ist Teil von libxml2 + xsd = { "xmllint" }, + yaml = { "yamlfmt" }, -- brew install yamlfmt, pkg install yamlfmt }, default_format_opts = { lsp_format = "fallback", -- cgit v1.3