chore(neovim): Re-rationalize Neovim keybindings

This commit is contained in:
Pratik Tripathy
2024-12-26 21:21:39 +05:30
parent 614e22dd67
commit 4bc173f6b2
6 changed files with 46 additions and 41 deletions

View File

@@ -18,7 +18,18 @@ return {
}, },
}, },
config = function() config = function()
-- Setup basic configuration
require("codeium").setup({}) require("codeium").setup({})
vim.keymap.set("n", "<leader>aa", function()
vim.cmd("Codeium Enable")
vim.notify("Codeium enabled", vim.log.levels.INFO)
end, { desc = "Enable Codeium" })
vim.keymap.set("n", "<leader>ax", function()
vim.cmd("Codeium Disable")
vim.notify("Codeium disabled", vim.log.levels.INFO)
end, { desc = "Disable Codeium" })
end, end,
}, },
} }

View File

@@ -146,13 +146,6 @@ return {
-- - ci' - [C]hange [I]nside [']quote -- - ci' - [C]hange [I]nside [']quote
require("mini.ai").setup({ n_lines = 500 }) require("mini.ai").setup({ n_lines = 500 })
-- Add/delete/replace surroundings (brackets, quotes, etc.)
--
-- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren
-- - sd' - [S]urround [D]elete [']quotes
-- - sr)' - [S]urround [R]eplace [)] [']
require("mini.surround").setup()
-- gc -- gc
require("mini.comment").setup() require("mini.comment").setup()
@@ -242,9 +235,9 @@ return {
desc = "Previous todo comment", desc = "Previous todo comment",
}, },
{ "<leader>df", "<cmd>TodoTelescope keywords=FIX,FIXME<cr>", desc = "TODO: FIXME Tags" }, { "<leader>df", "<cmd>TodoTelescope keywords=FIX,FIXME<cr>", desc = "FIXME: Tags" },
{ "<leader>dt", "<cmd>TodoTelescope keywords=TODO<cr>", desc = "TODO: Project Todos" }, { "<leader>dt", "<cmd>TodoTelescope keywords=TODO<cr>", desc = "Project TODOs" },
{ "<leader>dT", "<cmd>TodoTelescope<cr>", desc = "TODO: All" }, { "<leader>dT", "<cmd>TodoTelescope<cr>", desc = "All tags: FIX, NOTE, TIP, TODO, WARN" },
}, },
}, },

View File

@@ -11,7 +11,7 @@ return {
config = true, config = true,
keys = { keys = {
{ "<leader>gg", "<cmd>Neogit<cr>", desc = "Git: Open Neogit", mode = { "n" } }, { "<leader>gg", "<cmd>Neogit<cr>", desc = "Git: Open Neogit", mode = { "n" } },
{ "<leader>gL", "<cmd>Neogit log<cr>", desc = "Git: Open Log", mode = { "n" } }, { "<leader>gl", "<cmd>Neogit log<cr>", desc = "Git: Log", mode = { "n" } },
}, },
}, },
@@ -23,7 +23,7 @@ return {
{ "<leader>gd", "<cmd>DiffviewOpen<cr>", desc = "Git: Open Diffview", mode = { "n" } }, { "<leader>gd", "<cmd>DiffviewOpen<cr>", desc = "Git: Open Diffview", mode = { "n" } },
{ "<leader>gD", "<cmd>DiffviewOpen<cr>", desc = "Git: Open Diffview against master", mode = { "n" } }, { "<leader>gD", "<cmd>DiffviewOpen<cr>", desc = "Git: Open Diffview against master", mode = { "n" } },
{ "<leader>gh", "<cmd>DiffviewFileHistory<cr>", desc = "Git: Show file history", mode = { "n" } }, { "<leader>gf", "<cmd>DiffviewFileHistory<cr>", desc = "Git: Show file history", mode = { "n" } },
}, },
-- TODO: -- TODO:
-- Toggle Diffview keymap -- Toggle Diffview keymap
@@ -80,7 +80,7 @@ return {
map("n", "<leader>gsh", gs.stage_hunk, { desc = "Git: Stage Hunk" }) map("n", "<leader>gsh", gs.stage_hunk, { desc = "Git: Stage Hunk" })
map("n", "<leader>gsu", gs.undo_stage_hunk, { desc = "Git: Undo Stage Hunk" }) map("n", "<leader>gsu", gs.undo_stage_hunk, { desc = "Git: Undo Stage Hunk" })
map("n", "<leader>gsb", gs.stage_buffer, { desc = "Git: Stage Current File" }) map("n", "<leader>gsb", gs.stage_buffer, { desc = "Git: Stage Current File" })
map("n", "<leader>gb", function() map("n", "<leader>gK", function()
gs.blame_line({ full = true }) gs.blame_line({ full = true })
end, { desc = "Git: Hover blame-line" }) end, { desc = "Git: Hover blame-line" })
@@ -94,10 +94,6 @@ return {
-- normal mode -- normal mode
map("n", "<leader>gp", gs.preview_hunk, { desc = "Git: Preview hunk" }) map("n", "<leader>gp", gs.preview_hunk, { desc = "Git: Preview hunk" })
-- map("n", "<leader>gD", gs.diffthis, { desc = "Git: diff against index" })
-- map("n", "<leader>gd", function()
-- gs.diffthis("~")
-- end, { desc = "Git: diff against last commit" })
-- Toggles -- Toggles
map("n", "<leader>gtb", gs.toggle_current_line_blame, { desc = "Git: toggle blame line" }) map("n", "<leader>gtb", gs.toggle_current_line_blame, { desc = "Git: toggle blame line" })

View File

@@ -33,8 +33,6 @@ return {
map("<F2>", vim.lsp.buf.rename, "Rename Symbol") map("<F2>", vim.lsp.buf.rename, "Rename Symbol")
map("<C-.>", "<cmd>Lspsaga code_action<cr>", "Code Actions") map("<C-.>", "<cmd>Lspsaga code_action<cr>", "Code Actions")
map("<leader>ca", "<cmd>Lspsaga code_action<cr>", "Code Actions") map("<leader>ca", "<cmd>Lspsaga code_action<cr>", "Code Actions")
-- e to jump to the symbol under cursor; q to quit
map("<leader>o", "<cmd>Lspsaga outline<cr>", "Outline Panel on Left")
map("<leader>cr", "<cmd>Lspsaga finder<cr>", "Goto References") map("<leader>cr", "<cmd>Lspsaga finder<cr>", "Goto References")
map("<leader>cpf", "<cmd>Lspsaga peek_definition<cr>", "Peek definition: Function") map("<leader>cpf", "<cmd>Lspsaga peek_definition<cr>", "Peek definition: Function")
map("<leader>cpt", "<cmd>Lspsaga peek_type_definition<cr>", "Peek definition: Class") map("<leader>cpt", "<cmd>Lspsaga peek_type_definition<cr>", "Peek definition: Class")
@@ -51,10 +49,13 @@ return {
-- Fuzzy find all the symbols in your current document. -- Fuzzy find all the symbols in your current document.
-- Symbols are things like variables, functions, types, etc. -- Symbols are things like variables, functions, types, etc.
map("<leader>o", require("telescope.builtin").lsp_document_symbols, "Search Document Symbols")
map("<leader>cs", require("telescope.builtin").lsp_document_symbols, "Search Document Symbols") map("<leader>cs", require("telescope.builtin").lsp_document_symbols, "Search Document Symbols")
map("<leader>cS", require("telescope.builtin").lsp_dynamic_workspace_symbols, "Search Workspace Symbols") map("<leader>cS", require("telescope.builtin").lsp_dynamic_workspace_symbols, "Search Workspace Symbols")
map("<leader>ci", require("telescope.builtin").lsp_implementations, "Goto Implementation") map("<leader>ci", require("telescope.builtin").lsp_implementations, "Goto Implementation")
map("<leader>ct", require("telescope.builtin").lsp_type_definitions, "Goto Type Definition") map("<leader>ct", require("telescope.builtin").lsp_type_definitions, "Goto Type Definition")
-- e to jump to the symbol under cursor; q to quit
map("<leader>co", "<cmd>Lspsaga outline<cr>", "Outline Panel on Left")
map("<leader>cd", require("telescope.builtin").diagnostics, "List Diagnostics") map("<leader>cd", require("telescope.builtin").diagnostics, "List Diagnostics")

View File

@@ -170,23 +170,26 @@ return {
end, { desc = "Live Grep Open Buffers" }) end, { desc = "Live Grep Open Buffers" })
vim.keymap.set("n", "<leader>bl", require("telescope.builtin").buffers, { desc = "List Buffers" }) vim.keymap.set("n", "<leader>bl", require("telescope.builtin").buffers, { desc = "List Buffers" })
vim.keymap.set("n", "<C-a-f>", require("telescope.builtin").live_grep, { desc = "Search/LiveGrep the Project" }) -- Needs terminal configured to send correct key code to NeoVim: \x1b[70;5u
vim.keymap.set("n", "<C-S-f>", require("telescope.builtin").live_grep, { desc = "Search/LiveGrep the Project" })
vim.keymap.set("n", "<leader>sg", require("telescope.builtin").live_grep, { desc = "Search/LiveGrep the Project" })
vim.keymap.set("n", "<leader>sw", require("telescope.builtin").grep_string, { desc = "Search current Word in Project" }) vim.keymap.set("n", "<leader>sw", require("telescope.builtin").grep_string, { desc = "Search current Word in Project" })
-- List -- List
vim.keymap.set("n", "<C-a-p>", require("telescope.builtin").find_files, { desc = "List & Search Files" }) -- Needs terminal configured to send correct key code to NeoVim: \x1b[80;5u
vim.keymap.set("n", "<leader>dQ", require("telescope.builtin").quickfixhistory, { desc = "List Quickfix History" }) vim.keymap.set("n", "<C-S-p>", require("telescope.builtin").find_files, { desc = "Search Files" })
vim.keymap.set("n", "<leader>bf", require("telescope.builtin").find_files, { desc = "Search Files" })
-- Git -- Git
vim.keymap.set("n", "<leader>gfb", require("telescope.builtin").git_branches, { desc = "List Git Branches" }) vim.keymap.set("n", "<leader>gc", require("telescope.builtin").git_commits, { desc = "Git: Commits" })
vim.keymap.set("n", "<leader>gfc", require("telescope.builtin").git_commits, { desc = "List Git Commits" }) vim.keymap.set("n", "<leader>gb", require("telescope.builtin").git_branches, { desc = "Git: Branches" })
-- Neovim Things -- Neovim Things
vim.keymap.set("n", "<leader>ns", require("telescope.builtin").search_history, { desc = "List Search History" }) vim.keymap.set("n", "<leader>ns", require("telescope.builtin").search_history, { desc = "Search History" })
vim.keymap.set("n", "<leader>nn", require("telescope.builtin").help_tags, { desc = "List & Search NeoVIM Help" }) vim.keymap.set("n", "<leader>nn", require("telescope.builtin").help_tags, { desc = "Search NeoVIM Help" })
vim.keymap.set("n", "<leader>nc", require("telescope.builtin").command_history, { desc = "List NeoVIM Command History" }) vim.keymap.set("n", "<leader>nc", require("telescope.builtin").command_history, { desc = "Command History" })
vim.keymap.set("n", "<leader>nC", require("telescope.builtin").colorscheme, { desc = "List Neovim Colorschemes (with preview)" }) vim.keymap.set("n", "<leader>nC", require("telescope.builtin").colorscheme, { desc = "Colorschemes (with preview)" })
vim.keymap.set("n", "<leader>nn", "<cmd>Telescope notify<cr>", { desc = "List past notifications" }) vim.keymap.set("n", "<leader>nn", "<cmd>Telescope notify<cr>", { desc = "Past notifications" })
-- Help -- Help
vim.keymap.set("n", "<leader>hk", require("telescope.builtin").keymaps, { desc = "Help: NeoVIM Keymaps" }) vim.keymap.set("n", "<leader>hk", require("telescope.builtin").keymaps, { desc = "Help: NeoVIM Keymaps" })

View File

@@ -60,20 +60,21 @@ return {
"echasnovski/mini.icons", "echasnovski/mini.icons",
}, },
opts = { opts = {
preset = "helix",
warning = true,
-- Document existing key chains -- Document existing key chains
spec = { spec = {
{ "<leader>c", group = "Code" }, { "<leader>a", group = "AI" },
{ "<leader>b", group = "Buffer Operations" }, { "<leader>c", group = "Code", icon = { icon = "", color = "orange" } },
{ "<leader>d", group = "Diagnostics" }, { "<leader>b", group = "Buffer Operations", icon = { icon = "", color = "orange" } },
{ "<leader>f", group = "File Operations" }, { "<leader>d", group = "Diagnostics", icon = { icon = "", color = "orange" } },
{ "<leader>g", group = "Git" }, { "<leader>g", group = "Git", icon = { icon = "", color = "orange" } },
{ "<leader>f", group = "Find and List Things" }, { "<leader>h", group = "Help", icon = { icon = "󰞋", color = "orange" } },
{ "<leader>h", group = "Help" }, { "<leader>n", group = "Neovim Things", icon = { icon = "", color = "orange" } },
{ "<leader>n", group = "NVIM Things" }, { "<leader>q", group = "Database", icon = { icon = "", color = "orange" } },
{ "<leader>q", group = "Database" }, { "<leader>s", group = "Search/Grep", icon = { icon = "", color = "orange" } },
{ "<leader>s", group = "Search/Grep Things" }, { "<leader>t", group = "Unit Test" },
{ "<leader>t", group = "Unit Test Operations" }, { "<leader>x", group = "Delete/Disable/Remove", icon = { icon = "", color = "orange" } },
{ "<leader>x", group = "Delete/Remove Something" },
}, },
}, },
}, },