feat: remap organization and cleanup

2026-03-03 11:11:38 +01:00
parent 92c9f02ab2
commit a7c14ff0ae
4 changed files with 60 additions and 93 deletions
--- a/init.lua
+++ b/init.lua
@@ -47,7 +47,6 @@ vim.opt.listchars = {
 	trail = " ",
 	nbsp = "+",
 }
-
 vim.fn.sign_define("DiagnosticSignError", { text = " ", texthl = "DiagnosticSignError" })
 vim.fn.sign_define("DiagnosticSignWarn", { text = " ", texthl = "DiagnosticSignWarn" })
 vim.fn.sign_define("DiagnosticSignInfo", { text = " ", texthl = "DiagnosticSignInfo" })
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -6,25 +6,20 @@
  "blueprints": { "branch": "main", "commit": "e5825c30464f98e77e8b5ffb88d59fd98df6c802" },
  "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
  "conform.nvim": { "branch": "master", "commit": "363243c03102a531a8203311d4f2ae704c620d9b" },
-  "copilot.lua": { "branch": "master", "commit": "3faffefbd6ddeb52578535ec6b730e0b72d7fd1a" },
  "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
-  "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
+  "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" },
  "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
-  "fzf-lua": { "branch": "main", "commit": "fb8c50ba62a0daa433b7ac2b78834f318322b879" },
  "gitsigns.nvim": { "branch": "main", "commit": "d8918f06624dd53b9a82bd0e29c31bcfd541b40d" },
  "gruvbox.nvim": { "branch": "main", "commit": "5e0a460d8e0f7f669c158dedd5f9ae2bcac31437" },
-  "img-clip.nvim": { "branch": "main", "commit": "b6ddfb97b5600d99afe3452d707444afda658aca" },
  "indent-blankline.nvim": { "branch": "master", "commit": "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78" },
  "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" },
  "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
  "mini.clue": { "branch": "main", "commit": "2d361459de6a5fd7ea20a14ee4b95c6caec383b9" },
  "mini.icons": { "branch": "main", "commit": "910db5df9724d65371182948f921fce23c2c881e" },
-  "mini.pick": { "branch": "main", "commit": "4ad37ade984e69c43227b82ccdca5a92a22886de" },
  "neo-tree.nvim": { "branch": "main", "commit": "521bb4253b1adc2a1ff6c584bc839eba9bc99c0b" },
  "no-neck-pain.nvim": { "branch": "main", "commit": "860462dd8b3d36861a81724a7b473db279f673f2" },
  "noice.nvim": { "branch": "main", "commit": "eaed6cc9c06aa2013b5255349e4f26a6b17ab70f" },
  "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
-  "nvim-cmp": { "branch": "main", "commit": "da88697d7f45d16852c6b2769dc52387d1ddc45f" },
  "nvim-scrollbar": { "branch": "main", "commit": "5b103ef0fd2e8b9b4be3878ed38d224522192c6c" },
  "nvim-treesitter": { "branch": "master", "commit": "d34e62afd3e483fe0fa2f24b6323f3bb1d35ddcc" },
  "nvim-treesitter-context": { "branch": "master", "commit": "41847d3dafb5004464708a3db06b14f12bde548a" },
@@ -33,7 +28,6 @@
  "nvim-window-picker": { "branch": "main", "commit": "0dfef64eaf063e1cd27983ab11a30e7bc5b74fac" },
  "overseer.nvim": { "branch": "master", "commit": "36298eab791cca87ac3a228933413d094423400e" },
  "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" },
-  "render-markdown.nvim": { "branch": "main", "commit": "48b4175dbca8439d30c1f52231cbe5a712c8f9d9" },
  "smear-cursor.nvim": { "branch": "main", "commit": "aff844fc1483fd673f721a41affcd7e2fcb885f5" },
  "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
  "telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" },
--- a/lua/config/remap.lua
+++ b/lua/config/remap.lua
@@ -2,15 +2,16 @@ vim.g.mapleader = " "
 local map = vim.keymap.set

 ---- Bufferline ----
-map("n", "bg", "<CMD>BufferLinePick<CR>")
-map("n", "<leader>bpx", "<CMD>BufferLinePickClose<CR>")
+-- Not used but maybe in the future
+-- map("n", "bg", "<CMD>BufferLinePick<CR>")
+-- map("n", "<leader>bpx", "<CMD>BufferLinePickClose<CR>")
 map("n", "<leader>box", "<CMD>BufferLineCloseOthers<CR>")
 map("n", "<Tab>", "<CMD>BufferLineCycleNext<CR>")
 map("n", "<S-Tab>", "<CMD>BufferLineCyclePrev<CR>")
-map("n", "bsd", "<CMD>BufferLineSortByDirectory<CR>")
-map("n", "bse", "<CMD>BufferLineSortByExtension<CR>")
-map("n", "bsr", "<CMD>BufferLineSortByRelativeDirectory<CR>")
-map("n", "bst", "<CMD>BufferLineSortByTabs<CR>")
+map("n", "<leader>bsd", "<CMD>BufferLineSortByDirectory<CR>")
+map("n", "<leader>bse", "<CMD>BufferLineSortByExtension<CR>")
+map("n", "<leader>bsr", "<CMD>BufferLineSortByRelativeDirectory<CR>")
+map("n", "<leader>bst", "<CMD>BufferLineSortByTabs<CR>")
 -- buffers
 map("n", "<S-h>", "<cmd>BufferLineMovePrev<cr>", { desc = "Move buffer to left" })
 map("n", "<S-l>", "<cmd>BufferLineMoveNext<cr>", { desc = "Move buffer to right" })
@@ -31,63 +32,40 @@ map("n", "<leader>nt", "<cmd>:tabnew<cr>", { desc = "Create new tabpage" })
 ---------------------------------------------------------------------------

 -- Treesitter context
-map("n", "<leader>tc", "<cmd>TSContextToggle<CR>", { desc = "Toggle treesitter context" })
-
-- Regex search and replace
-map("n", "<leader>S", '<cmd>lua require("spectre").toggle()<CR>', {
-	desc = "Toggle Spectre",
-})
-map("n", "<leader>sw", '<cmd>lua require("spectre").open_visual({select_word=true})<CR>', {
-	desc = "Search current word",
-})
-map("v", "<leader>sw", '<esc><cmd>lua require("spectre").open_visual()<CR>', {
-	desc = "Search current word",
-})
-map("n", "<leader>sp", '<cmd>lua require("spectre").open_file_search({select_word=true})<CR>', {
-	desc = "Search on current file",
-})
+map("n", "<leader>tc", "<cmd>TSContext toggle<CR>", { desc = "Toggle treesitter context" })

 -- Blueprints
 map("n", "<leader>ct", "<cmd>lua require('blueprints').createFromTemplateTelescope()<CR>", { desc = "Nvim blueprints" })

 ---- Git ----
-map("n", "<leader>gb", "<CMD>Gitsigns blame<CR>")
-map("n", "<leader>gd", "<CMD>DiffviewOpen<CR>")
-map("n", "<leader>gx", "<CMD>DiffviewClose<CR>")
-map("n", "K", "<CMD>Gitsigns blame_line<CR>")
-map("n", "<leader>gh", "<CMD>Gitsigns preview_hunk_inline<CR>")
-map("n", "<leader>gtb", "<CMD>Gitsigns toggle_current_line_blame<CR>")
-map("n", "<leader>gtd", "<CMD>Gitsigns toggle_deleted")
-map("n", "<leader>gc", "<cmd>Telescope git_commits <CR>", { desc = "Git commits" })
-map("n", "<leader>gs", "<cmd>Telescope git_status <CR>", { desc = "Git status" })
+map("n", "<leader>gb", "<CMD>Gitsigns blame<CR>", { desc = "Git blame" })
+map("n", "]g", "<CMD>Gitsigns next_hunk<CR>", { desc = "Git next change" })
+map("n", "[g", "<CMD>Gitsigns prev_hunk<CR>", { desc = "Git prev change" })
+map("n", "<leader>gdo", "<CMD>DiffviewOpen<CR>", { desc = "Git diff view open" })
+map("n", "<leader>gdx", "<CMD>DiffviewClose<CR>", { desc = "Git diff view close" })
+map("n", "<leader>gh", "<CMD>Gitsigns preview_hunk_inline<CR>", { desc = "Git preview hunk inline" })
+map("n", "<leader>gtb", "<CMD>Gitsigns toggle_current_line_blame<CR>", { desc = "Git toggle line blame" })
+map("n", "<leader>gtd", "<CMD>Gitsigns toggle_deleted<CR>", { desc = "Git toggle deleted" })

 -- lazygit
 map("n", "<leader>gg", function()
-	Snacks.lazygit({ cwd = LazyVim.root.git() })
-end, { desc = "Lazygit (Root Dir)" })
-map("n", "<leader>gG", function()
 	Snacks.lazygit()
-end, { desc = "Lazygit (cwd)" })
-map("n", "<leader>gB", function()
-	Snacks.lazygit.browse()
-end, { desc = "Git Browse" })
-
+end, { desc = "Lazygit (Root Dir)" })
 map("n", "<leader>gf", function()
 	local git_path = vim.api.nvim_buf_get_name(0)
 	Snacks.lazygit({ args = { "-f", vim.trim(git_path) } })
 end, { desc = "Lazygit Current File History" })
-
 map("n", "<leader>gl", function()
-	Snacks.lazygit({ args = { "log" }, cwd = LazyVim.root.git() })
-end, { desc = "Lazygit Log" })
-map("n", "<leader>gL", function()
 	Snacks.lazygit({ args = { "log" } })
 end, { desc = "Lazygit Log (cwd)" })
+map("n", "<leader>gs", function()
+	Snacks.lazygit({ args = { "status" } })
+end, { desc = "Lazygit Log (cwd)" })

 ---------------------------------------------------------------------------

 -- Neotree
-map("n", "<C-n>", "<cmd>Neotree toggle<cr>", { desc = "Toggle Neotree open" })
+map("n", "<C-e>", "<cmd>Neotree toggle<cr>", { desc = "Toggle Neotree open" })
 map("n", "<leader>e", "<cmd>Neotree focus<cr>", { desc = "Focus neotree" })

 -- LSP
@@ -97,6 +75,9 @@ end, { desc = "LSP declaration" })
 map("n", "gd", function()
 	vim.lsp.buf.definition()
 end, { desc = "LSP definition" })
+map("n", "gT", function()
+	vim.lsp.buf.type_definition()
+end, { desc = "LSP type definition" })
 map("n", "gr", function()
 	vim.lsp.buf.references()
 end, { desc = "LSP references" })
@@ -112,9 +93,6 @@ end, { desc = "LSP signature help" })
 map("n", "<leader>lf", function()
 	vim.diagnostic.open_float({ border = "rounded" })
 end, { desc = "Floating diagnostics" })
-map("n", "<leader>D", function()
-	vim.lsp.buf.type_definition()
-end, { desc = "LSP type definition" })
 map("n", "<leader>ca", function()
 	vim.lsp.buf.code_action()
 end, { desc = "LSP code actions" })
@@ -130,20 +108,16 @@ end, { desc = "LSP code action" })
 map("n", "<leader>r", function()
 	vim.lsp.buf.rename()
 end, { desc = "LSP rename" })
-map("n", "<leader>wa", function()
-	vim.lsp.buf.add_workspace_folder()
-end, { desc = "Add workspace folder" })
-map("n", "<leader>wr", function()
-	vim.lsp.buf.remove_workspace_folder()
-end, { desc = "Remove workspace folder" })
-map("n", "<leader>wl", function()
-	print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
-end, { desc = "List workspace folders" })
-
---- Debugging with dap ----
-map("n", "<Leader>cdt", ":DapToggleBreakpoint<CR>")
-map("n", "<Leader>cdx", ":DapTerminate<CR>")
-map("n", "<Leader>cdo", ":DapStepOver<CR>")
+-- LSP workspace folders (not used at the moment)
+-- map("n", "<leader>wa", function()
+-- 	vim.lsp.buf.add_workspace_folder()
+-- end, { desc = "Add workspace folder" })
+-- map("n", "<leader>wr", function()
+-- 	vim.lsp.buf.remove_workspace_folder()
+-- end, { desc = "Remove workspace folder" })
+-- map("n", "<leader>wl", function()
+-- 	print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+-- end, { desc = "List workspace folders" })

 ---- Completion ----
 -- map({ "i", "s" }, "<Tab>", function()
@@ -165,6 +139,7 @@ map("n", "<leader><leader>", "<cmd> Telescope buffers <CR>", { desc = "Find buff
 map("n", "<leader>fh", "<cmd> Telescope help_tags <CR>", { desc = "Help page" })
 map("n", "<leader>fo", "<cmd> Telescope oldfiles <CR>", { desc = "Fild old files" })
 map("n", "<leader>fz", "<cmd> Telescope current_buffer_fuzzy_find <CR>", { desc = "Find in current buffer" })
+map("n", "<C-f>", "<cmd> Telescope current_buffer_fuzzy_find <CR>", { desc = "Find in current buffer" })

 -----------------------------------------------------------

@@ -244,7 +219,6 @@ map("n", "]w", diagnostic_goto(true, "WARN"), { desc = "Next Warning" })
 map("n", "[w", diagnostic_goto(false, "WARN"), { desc = "Prev Warning" })

 ---- Toggle options ----
-
 map("n", "<leader>um", function()
 	require("monkey-alert").enable() -- does not toggle :O
 end, { desc = "Toggle monkey alert" })
--- a/lua/plugins/opts/bufferline.lua
+++ b/lua/plugins/opts/bufferline.lua
@@ -53,31 +53,31 @@ local config = {
 				toggle_hidden_on_enter = true, -- when you re-enter a hidden group this options re-opens that group so the buffer is visible
 			},
 			items = {
+				-- {
+				-- 	name = "Tests",
+				-- 	-- icon = "󰙨 ",
+				-- 	highlight = { underline = false },
+				-- 	priority = 2,
+				-- 	matcher = function(buf)
+				-- 		return buf.path:match("%.test") or buf.path:match("%_test") or buf.path:match("%_spec")
+				-- 	end,
+				-- },
+				-- {
+				-- 	name = "Docs",
+				-- 	-- icon = "󰈙 ",
+				-- 	priority = 3,
+				-- 	-- highlight = { undercurl = false, sp = "grey" },
+				-- 	highlight = { undercurl = false },
+				-- 	auto_close = false,
+				-- 	matcher = function(buf)
+				-- 		return buf.path:match("%.md") or buf.path:match("%.txt")
+				-- 	end,
+				-- 	separator = {
+				-- 		style = require("bufferline.groups").separator.tab,
+				-- 	},
+				-- },
 				{
-					name = "Tests",
-					-- icon = "󰙨 ",
-					highlight = { underline = false },
-					priority = 2,
-					matcher = function(buf)
-						return buf.path:match("%.test") or buf.path:match("%_test") or buf.path:match("%_spec")
-					end,
-				},
-				{
-					name = "Docs",
-					-- icon = "󰈙 ",
-					priority = 3,
-					-- highlight = { undercurl = false, sp = "grey" },
-					highlight = { undercurl = false },
-					auto_close = false,
-					matcher = function(buf)
-						return buf.path:match("%.md") or buf.path:match("%.txt")
-					end,
-					separator = {
-						style = require("bufferline.groups").separator.tab,
-					},
-				},
-				{
-					name = "Shells",
+					name = "Sh",
 					-- icon = " ",
 					highlight = { undercurl = false },
 					auto_close = false,