lua/mappings.lua

@@ -18,12 +18,11 @@ s("n", "<a-j>",     "<cmd> BufferNext <CR>",              { desc = "Next buffer"
 s("n", "<a-k>",     "<cmd> BufferPrevious <CR>",          { desc = "Previous buffer" })
 s('n', '<leader>p', "<cmd> BufferPin <cr>",               { desc = "Pin/Unpin buffer" })
 
-s('n', '<c-c><c-c>', '<cmd>wq<CR>', { desc = 'Write and exit'} )
+
 s("n", "ZZ", "<cmd> q! <CR>", { desc = "Quit without saving" })
 s("n", "q:", "<nop>")
 s('n', 'H', require('treesj').toggle)
 s('n', '<leader>ff', "<cmd> Telescope find_files follow=true <CR>")
-s('v', '<leader>ff', '"hy<ESC>:Telescope find_files follow=true  default_text=<c-r>h<CR>', default_opts)
 s('n', '<leader>fg', "<cmd> Telescope live_grep <CR>")
 s('v', '<leader>fg', '"hy<ESC>:Telescope live_grep default_text=<c-r>h<CR>', default_opts)
 s('n', '<leader>fF', "<cmd> Telescope find_files follow=true no_ignore=true hidden=true <CR>")
@@ -47,18 +46,8 @@ for _, key in ipairs({"A", "Z", "E", "Q", "S", "D"}) do
   s({ 'n' }, "<A-" .. string.lower(key) .. ">", "g'" .. key, { desc = "Jump to mark " .. key })
 end
 
-s("n", "<leader>tw", "<cmd> set wrap! <cr>", { desc = "toggle line wrap" })
-
-local toggle_lsp_virtual_text = function ()
-  vim.diagnostic.config({
-    virtual_text = not vim.diagnostic.config().virtual_text
-  })
-end
-s("n", "<leader>tv", toggle_lsp_virtual_text, { desc = "toggle virtual text for diagnostics" })
-
-
 function copy_filename_and_line ()
-  local filename = vim.fn.expand("%")
+  local filename = vim.fn.expand("%:t")
   local line = vim.fn.line(".")
   local text = filename .. ":" .. line
   vim.fn.setreg("+", text)
@@ -73,13 +62,11 @@ function moveCursorToMouse()
   vim.fn.setpos(".", { 0, mousePos.line, mousePos.column, 0 })
 end
 
-function dap_or(func)
+function hover()
-  return function ()
+  if dap.session() then
-    if dap.session() then
+    dapui.eval()
-      dapui.eval()
+  else
-    else
+    vim.lsp.buf.signature_help()
-      func()
-    end
   end
 end
 
@@ -109,10 +96,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'}, '<c-k>', dap_or(vim.lsp.buf.signature_help), { buffer = ev.buf, desc = "dap eval" })
+    s( {'n', 'v'}, '<c-k>', hover, { buffer = ev.buf, desc = "dap eval" })
     s(
       {'n', 'v'}, '<RightMouse>',
-      function() moveCursorToMouse() dap_or(vim.lsp.buf.hover)() end,
+      function() moveCursorToMouse() vim.lsp.buf.hover() end,
       { buffer = ev.buf, desc = "Hover" }
     )
     s('n', 'gi', telescope.lsp_implementations, { buffer = ev.buf, desc = "Goto implementation" })

lua/plugins.lua

@@ -267,7 +267,6 @@ local plugins = {
     "lewis6991/gitsigns.nvim",
     config = function()
       require('gitsigns').setup({
-        word_diff = true,
         on_attach = function(bufnr)
           local gs = package.loaded.gitsigns
 
@@ -557,17 +556,6 @@ local plugins = {
     'jakemason/ouroboros',
     dependencies = { "nvim-lua/plenary.nvim" }
   },
-  {
-    "folke/trouble.nvim",
-    config = function () require("trouble").setup() end,
-    cmd = "Trouble",
-  },
-  {
-    "andrewradev/linediff.vim",
-    config = function()
-      vim.keymap.set({ "n", "v" }, "<leader>d", ":Linediff <cr>", { desc = "Linediff" })
-    end
-  },
 }
 
 return plugins