From 4bc173f6b225bf1ac410a4d5d62ec47292e217bd Mon Sep 17 00:00:00 2001 From: Pratik Tripathy Date: Thu, 26 Dec 2024 21:21:39 +0530 Subject: [PATCH] chore(neovim): Re-rationalize Neovim keybindings --- common/.config/nvim/lua/plugins/ai.lua | 11 ++++++++ .../.config/nvim/lua/plugins/code-generic.lua | 13 +++------- common/.config/nvim/lua/plugins/code-git.lua | 10 +++----- common/.config/nvim/lua/plugins/code-lsp.lua | 5 ++-- .../nvim/lua/plugins/navigate-files.lua | 23 +++++++++-------- .../nvim/lua/plugins/utility-plugs.lua | 25 ++++++++++--------- 6 files changed, 46 insertions(+), 41 deletions(-) diff --git a/common/.config/nvim/lua/plugins/ai.lua b/common/.config/nvim/lua/plugins/ai.lua index 91d9147..267d633 100644 --- a/common/.config/nvim/lua/plugins/ai.lua +++ b/common/.config/nvim/lua/plugins/ai.lua @@ -18,7 +18,18 @@ return { }, }, config = function() + -- Setup basic configuration require("codeium").setup({}) + + vim.keymap.set("n", "aa", function() + vim.cmd("Codeium Enable") + vim.notify("Codeium enabled", vim.log.levels.INFO) + end, { desc = "Enable Codeium" }) + + vim.keymap.set("n", "ax", function() + vim.cmd("Codeium Disable") + vim.notify("Codeium disabled", vim.log.levels.INFO) + end, { desc = "Disable Codeium" }) end, }, } diff --git a/common/.config/nvim/lua/plugins/code-generic.lua b/common/.config/nvim/lua/plugins/code-generic.lua index c328996..e896e15 100644 --- a/common/.config/nvim/lua/plugins/code-generic.lua +++ b/common/.config/nvim/lua/plugins/code-generic.lua @@ -146,13 +146,6 @@ return { -- - ci' - [C]hange [I]nside [']quote 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 require("mini.comment").setup() @@ -242,9 +235,9 @@ return { desc = "Previous todo comment", }, - { "df", "TodoTelescope keywords=FIX,FIXME", desc = "TODO: FIXME Tags" }, - { "dt", "TodoTelescope keywords=TODO", desc = "TODO: Project Todos" }, - { "dT", "TodoTelescope", desc = "TODO: All" }, + { "df", "TodoTelescope keywords=FIX,FIXME", desc = "FIXME: Tags" }, + { "dt", "TodoTelescope keywords=TODO", desc = "Project TODOs" }, + { "dT", "TodoTelescope", desc = "All tags: FIX, NOTE, TIP, TODO, WARN" }, }, }, diff --git a/common/.config/nvim/lua/plugins/code-git.lua b/common/.config/nvim/lua/plugins/code-git.lua index 5770857..6156e68 100644 --- a/common/.config/nvim/lua/plugins/code-git.lua +++ b/common/.config/nvim/lua/plugins/code-git.lua @@ -11,7 +11,7 @@ return { config = true, keys = { { "gg", "Neogit", desc = "Git: Open Neogit", mode = { "n" } }, - { "gL", "Neogit log", desc = "Git: Open Log", mode = { "n" } }, + { "gl", "Neogit log", desc = "Git: Log", mode = { "n" } }, }, }, @@ -23,7 +23,7 @@ return { { "gd", "DiffviewOpen", desc = "Git: Open Diffview", mode = { "n" } }, { "gD", "DiffviewOpen", desc = "Git: Open Diffview against master", mode = { "n" } }, - { "gh", "DiffviewFileHistory", desc = "Git: Show file history", mode = { "n" } }, + { "gf", "DiffviewFileHistory", desc = "Git: Show file history", mode = { "n" } }, }, -- TODO: -- Toggle Diffview keymap @@ -80,7 +80,7 @@ return { map("n", "gsh", gs.stage_hunk, { desc = "Git: Stage Hunk" }) map("n", "gsu", gs.undo_stage_hunk, { desc = "Git: Undo Stage Hunk" }) map("n", "gsb", gs.stage_buffer, { desc = "Git: Stage Current File" }) - map("n", "gb", function() + map("n", "gK", function() gs.blame_line({ full = true }) end, { desc = "Git: Hover blame-line" }) @@ -94,10 +94,6 @@ return { -- normal mode map("n", "gp", gs.preview_hunk, { desc = "Git: Preview hunk" }) - -- map("n", "gD", gs.diffthis, { desc = "Git: diff against index" }) - -- map("n", "gd", function() - -- gs.diffthis("~") - -- end, { desc = "Git: diff against last commit" }) -- Toggles map("n", "gtb", gs.toggle_current_line_blame, { desc = "Git: toggle blame line" }) diff --git a/common/.config/nvim/lua/plugins/code-lsp.lua b/common/.config/nvim/lua/plugins/code-lsp.lua index 3555dfc..0ebdb9f 100644 --- a/common/.config/nvim/lua/plugins/code-lsp.lua +++ b/common/.config/nvim/lua/plugins/code-lsp.lua @@ -33,8 +33,6 @@ return { map("", vim.lsp.buf.rename, "Rename Symbol") map("", "Lspsaga code_action", "Code Actions") map("ca", "Lspsaga code_action", "Code Actions") - -- e to jump to the symbol under cursor; q to quit - map("o", "Lspsaga outline", "Outline Panel on Left") map("cr", "Lspsaga finder", "Goto References") map("cpf", "Lspsaga peek_definition", "Peek definition: Function") map("cpt", "Lspsaga peek_type_definition", "Peek definition: Class") @@ -51,10 +49,13 @@ return { -- Fuzzy find all the symbols in your current document. -- Symbols are things like variables, functions, types, etc. + map("o", require("telescope.builtin").lsp_document_symbols, "Search Document Symbols") map("cs", require("telescope.builtin").lsp_document_symbols, "Search Document Symbols") map("cS", require("telescope.builtin").lsp_dynamic_workspace_symbols, "Search Workspace Symbols") map("ci", require("telescope.builtin").lsp_implementations, "Goto Implementation") map("ct", require("telescope.builtin").lsp_type_definitions, "Goto Type Definition") + -- e to jump to the symbol under cursor; q to quit + map("co", "Lspsaga outline", "Outline Panel on Left") map("cd", require("telescope.builtin").diagnostics, "List Diagnostics") diff --git a/common/.config/nvim/lua/plugins/navigate-files.lua b/common/.config/nvim/lua/plugins/navigate-files.lua index 078416d..7948ea3 100644 --- a/common/.config/nvim/lua/plugins/navigate-files.lua +++ b/common/.config/nvim/lua/plugins/navigate-files.lua @@ -170,23 +170,26 @@ return { end, { desc = "Live Grep Open Buffers" }) vim.keymap.set("n", "bl", require("telescope.builtin").buffers, { desc = "List Buffers" }) - vim.keymap.set("n", "", 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", "", require("telescope.builtin").live_grep, { desc = "Search/LiveGrep the Project" }) + vim.keymap.set("n", "sg", require("telescope.builtin").live_grep, { desc = "Search/LiveGrep the Project" }) vim.keymap.set("n", "sw", require("telescope.builtin").grep_string, { desc = "Search current Word in Project" }) -- List - vim.keymap.set("n", "", require("telescope.builtin").find_files, { desc = "List & Search Files" }) - vim.keymap.set("n", "dQ", require("telescope.builtin").quickfixhistory, { desc = "List Quickfix History" }) + -- Needs terminal configured to send correct key code to NeoVim: \x1b[80;5u + vim.keymap.set("n", "", require("telescope.builtin").find_files, { desc = "Search Files" }) + vim.keymap.set("n", "bf", require("telescope.builtin").find_files, { desc = "Search Files" }) -- Git - vim.keymap.set("n", "gfb", require("telescope.builtin").git_branches, { desc = "List Git Branches" }) - vim.keymap.set("n", "gfc", require("telescope.builtin").git_commits, { desc = "List Git Commits" }) + vim.keymap.set("n", "gc", require("telescope.builtin").git_commits, { desc = "Git: Commits" }) + vim.keymap.set("n", "gb", require("telescope.builtin").git_branches, { desc = "Git: Branches" }) -- Neovim Things - vim.keymap.set("n", "ns", require("telescope.builtin").search_history, { desc = "List Search History" }) - vim.keymap.set("n", "nn", require("telescope.builtin").help_tags, { desc = "List & Search NeoVIM Help" }) - vim.keymap.set("n", "nc", require("telescope.builtin").command_history, { desc = "List NeoVIM Command History" }) - vim.keymap.set("n", "nC", require("telescope.builtin").colorscheme, { desc = "List Neovim Colorschemes (with preview)" }) - vim.keymap.set("n", "nn", "Telescope notify", { desc = "List past notifications" }) + vim.keymap.set("n", "ns", require("telescope.builtin").search_history, { desc = "Search History" }) + vim.keymap.set("n", "nn", require("telescope.builtin").help_tags, { desc = "Search NeoVIM Help" }) + vim.keymap.set("n", "nc", require("telescope.builtin").command_history, { desc = "Command History" }) + vim.keymap.set("n", "nC", require("telescope.builtin").colorscheme, { desc = "Colorschemes (with preview)" }) + vim.keymap.set("n", "nn", "Telescope notify", { desc = "Past notifications" }) -- Help vim.keymap.set("n", "hk", require("telescope.builtin").keymaps, { desc = "Help: NeoVIM Keymaps" }) diff --git a/common/.config/nvim/lua/plugins/utility-plugs.lua b/common/.config/nvim/lua/plugins/utility-plugs.lua index eae34d7..748079b 100644 --- a/common/.config/nvim/lua/plugins/utility-plugs.lua +++ b/common/.config/nvim/lua/plugins/utility-plugs.lua @@ -60,20 +60,21 @@ return { "echasnovski/mini.icons", }, opts = { + preset = "helix", + warning = true, -- Document existing key chains spec = { - { "c", group = "Code" }, - { "b", group = "Buffer Operations" }, - { "d", group = "Diagnostics" }, - { "f", group = "File Operations" }, - { "g", group = "Git" }, - { "f", group = "Find and List Things" }, - { "h", group = "Help" }, - { "n", group = "NVIM Things" }, - { "q", group = "Database" }, - { "s", group = "Search/Grep Things" }, - { "t", group = "Unit Test Operations" }, - { "x", group = "Delete/Remove Something" }, + { "a", group = "AI" }, + { "c", group = "Code", icon = { icon = "", color = "orange" } }, + { "b", group = "Buffer Operations", icon = { icon = "", color = "orange" } }, + { "d", group = "Diagnostics", icon = { icon = "", color = "orange" } }, + { "g", group = "Git", icon = { icon = "", color = "orange" } }, + { "h", group = "Help", icon = { icon = "󰞋", color = "orange" } }, + { "n", group = "Neovim Things", icon = { icon = "", color = "orange" } }, + { "q", group = "Database", icon = { icon = "", color = "orange" } }, + { "s", group = "Search/Grep", icon = { icon = "", color = "orange" } }, + { "t", group = "Unit Test" }, + { "x", group = "Delete/Disable/Remove", icon = { icon = "", color = "orange" } }, }, }, },