From c86613b65b508ae4ece53cd94bed826115b35e90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maurice=20Gr=C3=B6nwoldt?= Date: Mon, 5 Jan 2026 21:22:45 +0100 Subject: [PATCH] chore: workflow improvments --- lazy-lock.json | 42 +++++++++++++++++++++-------------------- lua/lsp/init.lua | 17 +++++++++++++---- lua/plugins/calcium.lua | 24 +++++++++++++++++++++++ lua/plugins/conform.lua | 1 + lua/plugins/lsp.lua | 2 +- lua/plugins/term.lua | 30 +++++++++++++++++++++++++++++ 6 files changed, 91 insertions(+), 25 deletions(-) create mode 100644 lua/plugins/calcium.lua create mode 100644 lua/plugins/term.lua diff --git a/lazy-lock.json b/lazy-lock.json index a1b344d..d574d06 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,30 +1,32 @@ { - "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" }, - "conform.nvim": { "branch": "master", "commit": "fbcb4fa7f34bfea9be702ffff481a8e336ebf6ed" }, - "fidget.nvim": { "branch": "main", "commit": "3f5475949679953af6d78654db29b944fa826e6a" }, + "blink.cmp": { "branch": "main", "commit": "b19413d214068f316c78978b08264ed1c41830ec" }, + "calcium.nvim": { "branch": "main", "commit": "7a7d3740083fa5669e1a0f25d133705624a23f0d" }, + "conform.nvim": { "branch": "master", "commit": "8314f4c9e205e7f30b62147069729f9a1227d8bf" }, + "fidget.nvim": { "branch": "main", "commit": "64463022a1f2ff1318ab22a2ea4125ed9313a483" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, - "fzf-lua": { "branch": "main", "commit": "83e4080ae886a42ec48c5c26ce5892ceb557c425" }, + "fzf-lua": { "branch": "main", "commit": "a03d68e40eea835a1cdbd9f93049708dab3621e6" }, "kanagawa.nvim": { "branch": "master", "commit": "aef7f5cec0a40dbe7f3304214850c472e2264b10" }, - "lazy.nvim": { "branch": "main", "commit": "1ea3c4085785f460fb0e46d2fe1ee895f5f9e7c1" }, - "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "6bdb14f230de0904229ec367b410fb817e59b072" }, + "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, + "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "4cfe411526a7a99c18281135e8b4765ae6330d15" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" }, - "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" }, - "mini.diff": { "branch": "main", "commit": "ec8a5ae365c5d15920721ea42b1351dbc9e61f2d" }, - "mini.icons": { "branch": "main", "commit": "284798619aed9f4c1ac1b9417b9a5e3b4b85ef3a" }, - "mini.misc": { "branch": "main", "commit": "165c34e43de9ae62cf8b72bd33bc90f4edde8e67" }, - "neoconf.nvim": { "branch": "main", "commit": "8786f12ca22cdf2a022bbad1af3650e9f8d2613a" }, - "noice.nvim": { "branch": "main", "commit": "38c702be0d8fea81527ee6a73e1e834e72481193" }, + "mason.nvim": { "branch": "main", "commit": "57e5a8addb8c71fb063ee4acda466c7cf6ad2800" }, + "mini.diff": { "branch": "main", "commit": "fbb93ea1728e7c9d0944df8bd022a68402bd2e7e" }, + "mini.icons": { "branch": "main", "commit": "efc85e42262cd0c9e1fdbf806c25cb0be6de115c" }, + "mini.misc": { "branch": "main", "commit": "b647b64321c34d4868d158282bb89e49f0d6838b" }, + "neoconf.nvim": { "branch": "main", "commit": "f2fd6a4f009d378b419cb5fd46377a2284b65aa7" }, + "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, - "nvim-jdtls": { "branch": "master", "commit": "380ac148f989e1291aac002dc959ecc68c5243d0" }, - "nvim-lspconfig": { "branch": "master", "commit": "ac98db2f9f06a56498ec890a96928774eae412c3" }, + "nvim-jdtls": { "branch": "master", "commit": "f73731b543f5971e0da9665eb1d7ceffe1fde71f" }, + "nvim-lspconfig": { "branch": "master", "commit": "0b38bc74487e73489624d61396af7805af9cc75f" }, "nvim-tree.lua": { "branch": "master", "commit": "321bc61580fd066b76861c32de3319c3a6d089e7" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" }, - "nvim-web-devicons": { "branch": "master", "commit": "b8221e42cf7287c4dcde81f232f58d7b947c210d" }, - "oil.nvim": { "branch": "master", "commit": "71948729cda5fc1b761d6ae60ff774b5525f1d50" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" }, + "nvim-web-devicons": { "branch": "master", "commit": "6788013bb9cb784e606ada44206b0e755e4323d7" }, + "oil.nvim": { "branch": "master", "commit": "81b8a91735ad5cd24a6b3137f14a89f19176364f" }, "showkeys": { "branch": "main", "commit": "cb0a50296f11f1e585acffba8c253b9e8afc1f84" }, - "snacks.nvim": { "branch": "main", "commit": "454ba02d69347c0735044f159b95d2495fc79a73" }, + "snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" }, + "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" }, "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }, - "which-key.nvim": { "branch": "main", "commit": "b4177e3eaf15fe5eb8357ebac2286d488be1ed00" } + "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" } } diff --git a/lua/lsp/init.lua b/lua/lsp/init.lua index 183560e..eeda0a7 100644 --- a/lua/lsp/init.lua +++ b/lua/lsp/init.lua @@ -1,6 +1,15 @@ +vim.lsp.handlers["$/progress"] = function() end +vim.lsp.handlers["window/showMessage"] = function(_, result, ctx, config) + local severity = vim.lsp.protocol.MessageType + if result.type == severity.Error then + vim.notify(result.message, vim.log.levels.ERROR) + end + -- ignore Info, Log, and Warning +end + return { - lua_ls = require("lsp.lua"), - jdtls = require("lsp.java"), - clangd = require("lsp.clangd"), - ts_ls = require("lsp.ts_ls"), + lua_ls = require("lsp.lua"), + jdtls = require("lsp.java"), + clangd = require("lsp.clangd"), + ts_ls = require("lsp.ts_ls"), } diff --git a/lua/plugins/calcium.lua b/lua/plugins/calcium.lua new file mode 100644 index 0000000..b181e12 --- /dev/null +++ b/lua/plugins/calcium.lua @@ -0,0 +1,24 @@ +return { + "necrom4/calcium.nvim", + cmd = { "Calcium" }, + opts = { + notifications = false, + default_mode = "append", + }, + keys = { + { + "cc", + ":Calcium", + desc = "Calculate", + mode = { "n", "v" }, + silent = true, + }, + { + "cr", + ":Calcium replace", + desc = "Calculate Replace", + mode = { "n", "v" }, + silent = true, + }, + }, +} diff --git a/lua/plugins/conform.lua b/lua/plugins/conform.lua index e52777b..e9b9a6a 100644 --- a/lua/plugins/conform.lua +++ b/lua/plugins/conform.lua @@ -11,6 +11,7 @@ return { rust = { "rustfmt", lsp_format = "fallback" }, java = { "spotless", "google-java-format" }, lua = { "stylua" }, + php = { "php_cs_fixer", lsp_format = "fallback", stop_after_first = true }, cpp = { "clang-format" }, }, formatters = { diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 4228d34..ba9a2d5 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -1,5 +1,5 @@ if not table.unpack then - table.unpack = unpack + table.unpack = unpack end return { diff --git a/lua/plugins/term.lua b/lua/plugins/term.lua new file mode 100644 index 0000000..ad9fde2 --- /dev/null +++ b/lua/plugins/term.lua @@ -0,0 +1,30 @@ +return { + "akinsho/toggleterm.nvim", + version = "*", + config = true, + config = function() + function _G.set_terminal_keymaps() + local opts = { buffer = 0 } + vim.keymap.set("t", "", [[]], opts) + vim.keymap.set("t", "jk", [[]], opts) + vim.keymap.set("t", "", [[wincmd h]], opts) + vim.keymap.set("t", "", [[wincmd j]], opts) + vim.keymap.set("t", "", [[wincmd k]], opts) + vim.keymap.set("t", "", [[wincmd l]], opts) + vim.keymap.set("t", "", [[]], opts) + end + + -- if you only want these mappings for toggle term use term://*toggleterm#* instead + vim.cmd("autocmd! TermOpen term://*toggleterm#* lua set_terminal_keymaps()") + require("toggleterm").setup() + end, + keys = { + { + "tt", + ":ToggleTerm direction=float", + desc = "Toggle Terminal", + mode = { "n" }, + silent = true, + }, + }, +}