From 9ad2c6f4a774a2223beb9cc3e93cdfcabfe55e4b Mon Sep 17 00:00:00 2001 From: Antoine Vaure Date: Mon, 28 Jul 2025 17:27:05 +0200 Subject: [PATCH 1/9] telescope find files for visual selection --- lua/mappings.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/mappings.lua b/lua/mappings.lua index 5685114..95fcbf1 100644 --- a/lua/mappings.lua +++ b/lua/mappings.lua @@ -23,6 +23,7 @@ s("n", "ZZ", " q! ", { desc = "Quit without saving" }) s("n", "q:", "") s('n', 'H', require('treesj').toggle) s('n', 'ff', " Telescope find_files follow=true ") +s('v', 'ff', '"hy:Telescope find_files follow=true default_text=h', default_opts) s('n', 'fg', " Telescope live_grep ") s('v', 'fg', '"hy:Telescope live_grep default_text=h', default_opts) s('n', 'fF', " Telescope find_files follow=true no_ignore=true hidden=true ") From 27701b7ba419975d83f212837c68347a8c48aa55 Mon Sep 17 00:00:00 2001 From: Antoine Vaure Date: Mon, 28 Jul 2025 17:27:22 +0200 Subject: [PATCH 2/9] to write & exit --- lua/mappings.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/mappings.lua b/lua/mappings.lua index 95fcbf1..4a7c613 100644 --- a/lua/mappings.lua +++ b/lua/mappings.lua @@ -18,7 +18,7 @@ s("n", "", " BufferNext ", { desc = "Next buffer" s("n", "", " BufferPrevious ", { desc = "Previous buffer" }) s('n', 'p', " BufferPin ", { desc = "Pin/Unpin buffer" }) - +s('n', '', 'wq', { desc = 'Write and exit'} ) s("n", "ZZ", " q! ", { desc = "Quit without saving" }) s("n", "q:", "") s('n', 'H', require('treesj').toggle) From 91e49216196c1369667221f548297c5943c071f0 Mon Sep 17 00:00:00 2001 From: Antoine Vaure Date: Mon, 28 Jul 2025 17:27:55 +0200 Subject: [PATCH 3/9] keybind to toggle line wrap --- lua/mappings.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lua/mappings.lua b/lua/mappings.lua index 4a7c613..6804fb8 100644 --- a/lua/mappings.lua +++ b/lua/mappings.lua @@ -47,6 +47,8 @@ for _, key in ipairs({"A", "Z", "E", "Q", "S", "D"}) do s({ 'n' }, "", "g'" .. key, { desc = "Jump to mark " .. key }) end +s("n", "tw", " set wrap! ", { desc = "toggle line wrap" }) + function copy_filename_and_line () local filename = vim.fn.expand("%:t") local line = vim.fn.line(".") From 3b5da664eee6ff52486253cf3e6b95d141467bfe Mon Sep 17 00:00:00 2001 From: Antoine Vaure Date: Mon, 28 Jul 2025 17:28:23 +0200 Subject: [PATCH 4/9] keyind to toggle lsp diagnostic virtual text --- lua/mappings.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lua/mappings.lua b/lua/mappings.lua index 6804fb8..75e3825 100644 --- a/lua/mappings.lua +++ b/lua/mappings.lua @@ -49,6 +49,14 @@ end s("n", "tw", " set wrap! ", { desc = "toggle line wrap" }) +local toggle_lsp_virtual_text = function () + vim.diagnostic.config({ + virtual_text = not vim.diagnostic.config().virtual_text + }) +end +s("n", "tv", toggle_lsp_virtual_text, { desc = "toggle virtual text for diagnostics" }) + + function copy_filename_and_line () local filename = vim.fn.expand("%:t") local line = vim.fn.line(".") From 8ac78fdb52f8e016e000c2f78bd03e2d28b483c6 Mon Sep 17 00:00:00 2001 From: Antoine Vaure Date: Mon, 28 Jul 2025 17:28:44 +0200 Subject: [PATCH 5/9] fix copy_filename_and_line --- lua/mappings.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/mappings.lua b/lua/mappings.lua index 75e3825..4b67bf0 100644 --- a/lua/mappings.lua +++ b/lua/mappings.lua @@ -58,7 +58,7 @@ s("n", "tv", toggle_lsp_virtual_text, { desc = "toggle virtual text for function copy_filename_and_line () - local filename = vim.fn.expand("%:t") + local filename = vim.fn.expand("%") local line = vim.fn.line(".") local text = filename .. ":" .. line vim.fn.setreg("+", text) From bb81da36c4f5827e4fde0874286a8d5e65d9056d Mon Sep 17 00:00:00 2001 From: Antoine Vaure Date: Mon, 28 Jul 2025 17:29:17 +0200 Subject: [PATCH 6/9] enable word_diff in gitsigns --- lua/plugins.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/plugins.lua b/lua/plugins.lua index a2d6dea..aec76ae 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -267,6 +267,7 @@ local plugins = { "lewis6991/gitsigns.nvim", config = function() require('gitsigns').setup({ + word_diff = true, on_attach = function(bufnr) local gs = package.loaded.gitsigns From 8b98ae53992fb408b6f700a98b48c6a0926a0354 Mon Sep 17 00:00:00 2001 From: Antoine Vaure Date: Mon, 28 Jul 2025 17:29:36 +0200 Subject: [PATCH 7/9] add trouble.nvim --- lua/plugins.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lua/plugins.lua b/lua/plugins.lua index aec76ae..17783bb 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -557,6 +557,11 @@ local plugins = { 'jakemason/ouroboros', dependencies = { "nvim-lua/plenary.nvim" } }, + { + "folke/trouble.nvim", + config = function () require("trouble").setup() end, + cmd = "Trouble", + }, } return plugins From 7d5ea1ede1ed396da281a4d5d384d5e2513d69c3 Mon Sep 17 00:00:00 2001 From: Antoine Vaure Date: Mon, 28 Jul 2025 17:29:49 +0200 Subject: [PATCH 8/9] add linediff.vim --- lua/plugins.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lua/plugins.lua b/lua/plugins.lua index 17783bb..5eaa84d 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -562,6 +562,12 @@ local plugins = { config = function () require("trouble").setup() end, cmd = "Trouble", }, + { + "andrewradev/linediff.vim", + config = function() + vim.keymap.set({ "n", "v" }, "d", ":Linediff ", { desc = "Linediff" }) + end + }, } return plugins From 6090606df7b35ef5c49047039e4ca472b261d656 Mon Sep 17 00:00:00 2001 From: Antoine Vaure Date: Mon, 28 Jul 2025 17:30:11 +0200 Subject: [PATCH 9/9] change behaviour of hover for DAP --- lua/mappings.lua | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lua/mappings.lua b/lua/mappings.lua index 4b67bf0..1b69251 100644 --- a/lua/mappings.lua +++ b/lua/mappings.lua @@ -73,11 +73,13 @@ function moveCursorToMouse() vim.fn.setpos(".", { 0, mousePos.line, mousePos.column, 0 }) end -function hover() - if dap.session() then - dapui.eval() - else - vim.lsp.buf.signature_help() +function dap_or(func) + return function () + if dap.session() then + dapui.eval() + else + func() + end end end @@ -107,10 +109,10 @@ vim.api.nvim_create_autocmd('LspAttach', { s('n', 'gD', vim.lsp.buf.declaration, { buffer = ev.buf, desc = "Goto declaration" }) s('n', 'gd', telescope.lsp_definitions, { buffer = ev.buf, desc = "Goto definition" }) s( {'n', 'v'}, 'K', vim.lsp.buf.hover, { buffer = ev.buf, desc = "lsp Hover" }) - s( {'n', 'v'}, '', hover, { buffer = ev.buf, desc = "dap eval" }) + s( {'n', 'v'}, '', dap_or(vim.lsp.buf.signature_help), { buffer = ev.buf, desc = "dap eval" }) s( {'n', 'v'}, '', - function() moveCursorToMouse() vim.lsp.buf.hover() end, + function() moveCursorToMouse() dap_or(vim.lsp.buf.hover)() end, { buffer = ev.buf, desc = "Hover" } ) s('n', 'gi', telescope.lsp_implementations, { buffer = ev.buf, desc = "Goto implementation" })