From 0573f0717181bdb56d01b73f057bb9bd2d1f499c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20La=C3=ADn?= Date: Tue, 24 Oct 2023 00:42:54 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=80=20perf(nvim):=20cmd=20mappings=20a?= =?UTF-8?q?nd=20some=20overriding=20code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .config/nvim/lua/plugins/conform.lua | 2 +- .config/nvim/lua/plugins/extras/refactor.lua | 20 +------------ .config/nvim/lua/plugins/gitsigns.lua | 30 +++++--------------- .config/nvim/lua/plugins/telescope.lua | 7 +++-- .config/nvim/lua/plugins/vim-be-good.lua | 8 +++--- .config/nvim/lua/plugins/wakatime.lua | 2 +- 6 files changed, 18 insertions(+), 51 deletions(-) diff --git a/.config/nvim/lua/plugins/conform.lua b/.config/nvim/lua/plugins/conform.lua index a13ff34b..7129db35 100644 --- a/.config/nvim/lua/plugins/conform.lua +++ b/.config/nvim/lua/plugins/conform.lua @@ -4,7 +4,7 @@ return { keys = { { "cC", - ":ConformInfo", + "ConformInfo", mode = { "n", "v" }, desc = "Conform Info", }, diff --git a/.config/nvim/lua/plugins/extras/refactor.lua b/.config/nvim/lua/plugins/extras/refactor.lua index fb1d54ed..3f57eb51 100644 --- a/.config/nvim/lua/plugins/extras/refactor.lua +++ b/.config/nvim/lua/plugins/extras/refactor.lua @@ -8,25 +8,7 @@ return { opts = {}, -- stylua: ignore keys = { - { "Rs", function() require("telescope").extensions.refactoring.refactors() end, mode = { "v" }, desc = "Refactor Options", }, - { "cRi", function() require("refactoring").refactor("Inline Variable") end, mode = {"n","v"}, desc = "Inline Variable" }, - { "cRb", function() require('refactoring').refactor('Exract Block') end, mode = {"n"}, desc = "Extract Block" }, - { "cRf", function() require('refactoring').refactor('Exract Block To File') end, mode = {"n"}, desc = "Extract Block to File" }, - { "cRP", function() require('refactoring').debug.printf({below = false}) end, mode = {"n"}, desc = "Debug Print" }, - { "cRp", function() require('refactoring').debug.print_var({normal = true}) end, mode = {"n"}, desc = "Debug Print Variable" }, - { "cRc", function() require('refactoring').debug.cleanup({}) end, mode = {"n"}, desc = "Debug Cleanup" }, - { "cRf", function() require('refactoring').refactor('Extract Function') end, mode = {"v"}, desc = "Extract Function" }, - { "cRF", function() require('refactoring').refactor('Extract Function to File') end, mode = {"v"}, desc = "Extract Function to File" }, - { "cRx", function() require('refactoring').refactor('Extract Variable') end, mode = {"v"}, desc = "Extract Variable" }, - { "cRp", function() require('refactoring').debug.print_var({}) end, mode = {"v"}, desc = "Debug Print Variable" }, - }, - }, - { - "folke/which-key.nvim", - opts = { - defaults = { - ["cR"] = { name = "+refactor" }, - }, + { "r", function() require('telescope').extensions.refactoring.refactors() end, mode = { "n", "x" }, desc = "Refactor" }, }, }, { diff --git a/.config/nvim/lua/plugins/gitsigns.lua b/.config/nvim/lua/plugins/gitsigns.lua index f2cb89ec..2c5fd7c7 100644 --- a/.config/nvim/lua/plugins/gitsigns.lua +++ b/.config/nvim/lua/plugins/gitsigns.lua @@ -10,29 +10,13 @@ return { delay = 5, ignore_whitespace = false, }, - - on_attach = function(buffer) - local gs = package.loaded.gitsigns - - local function map(mode, l, r, desc) - vim.keymap.set(mode, l, r, { buffer = buffer, desc = desc }) - end - - -- stylua: ignore start - map("n", "]h", gs.next_hunk, "Next Hunk") - map("n", "[h", gs.prev_hunk, "Prev Hunk") - map("n", "ub", "Gitsigns toggle_current_line_blame", "Toggle Line Blame") - map({ "n", "v" }, "ghs", ":Gitsigns stage_hunk", "Stage Hunk") - map({ "n", "v" }, "ghr", ":Gitsigns reset_hunk", "Reset Hunk") - map("n", "ghS", gs.stage_buffer, "Stage Buffer") - map("n", "ghu", gs.undo_stage_hunk, "Undo Stage Hunk") - map("n", "ghR", gs.reset_buffer, "Reset Buffer") - map("n", "ghp", gs.preview_hunk, "Preview Hunk") - map("n", "ghb", function() gs.blame_line({ full = true }) end, "Blame Line") - map("n", "ghd", gs.diffthis, "Diff This") - map("n", "ghD", function() gs.diffthis("~") end, "Diff This ~") - map({ "o", "x" }, "ih", ":Gitsigns select_hunk", "GitSigns Select Hunk") - end, + }, + keys = { + { + "ub", + "Gitsigns toggle_current_line_blame", + desc = "Toggle Line Blame", + }, }, }, } diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua index 32a813c4..3b970839 100644 --- a/.config/nvim/lua/plugins/telescope.lua +++ b/.config/nvim/lua/plugins/telescope.lua @@ -154,9 +154,10 @@ return { "Telescope dap variables", desc = "Variables", }, - { "si", ":Telescope import", desc = "Imports" }, - { "sz", ":Telescope zoxide list", desc = "Zoxide" }, - { "sp", ":Telescope lazy", desc = "Plugins (Lazy)" }, + { "si", "Telescope import", desc = "Imports" }, + { "sz", "Telescope zoxide list", desc = "Zoxide" }, + { "sp", "Telescope lazy", desc = "Plugins (Lazy)" }, + { "sl", "Telescope luasnip", desc = "Luasnip (Snippets)" }, { "sN", "Nerdy", desc = "Nerd Fonts" }, { "gC", "Telescope git_commits", desc = "Commits" }, diff --git a/.config/nvim/lua/plugins/vim-be-good.lua b/.config/nvim/lua/plugins/vim-be-good.lua index e6d17a4a..372dabd6 100644 --- a/.config/nvim/lua/plugins/vim-be-good.lua +++ b/.config/nvim/lua/plugins/vim-be-good.lua @@ -1,6 +1,6 @@ return { - { - "ThePrimeagen/vim-be-good", - cmd = "VimBeGood", - }, + { + "ThePrimeagen/vim-be-good", + cmd = "VimBeGood", + }, } diff --git a/.config/nvim/lua/plugins/wakatime.lua b/.config/nvim/lua/plugins/wakatime.lua index 1b3474e8..83b5793c 100644 --- a/.config/nvim/lua/plugins/wakatime.lua +++ b/.config/nvim/lua/plugins/wakatime.lua @@ -1,3 +1,3 @@ return { - { "wakatime/vim-wakatime", lazy = false } + { "wakatime/vim-wakatime", lazy = false }, }