From d3ace6bbc8fef0301c6a0c18adcab807b545bf13 Mon Sep 17 00:00:00 2001 From: sudacode Date: Thu, 20 Feb 2025 19:20:54 -0800 Subject: [PATCH] update keymaps --- lua/core/keymaps.lua | 149 +++++++++++++++++++++++-------------------- 1 file changed, 81 insertions(+), 68 deletions(-) diff --git a/lua/core/keymaps.lua b/lua/core/keymaps.lua index c0c07ff..1b031f1 100644 --- a/lua/core/keymaps.lua +++ b/lua/core/keymaps.lua @@ -15,6 +15,7 @@ vim.g.maplocalleader = "," -- Custom commands vim.api.nvim_create_user_command("Config", "edit ~/.config/nvim", {}) vim.api.nvim_create_user_command("Keymaps", "edit ~/.config/nvim/lua/core/keymaps.lua", {}) +vim.api.nvim_create_user_command("Hypr", "edit ~/.config/hypr/hyprland.conf", {}) -- {{{ Basic Mappings local basic_mappings = { @@ -42,20 +43,20 @@ local buffer_navigation_mappings = { --{{{ Terminal Mappings local terminal_mappings = { - { - key = "op", - cmd = ":ToggleTerm name=ipython", - desc = "Open IPython", - mode = "v", - group = "Open", - }, - { - key = "oP", - cmd = ":ToggleTerm name=ipython-full", - desc = "Open full IPython", - mode = "v", - group = "Open", - }, + -- { + -- key = "op", + -- cmd = ":ToggleTerm name=ipython", + -- desc = "Open IPython", + -- mode = "v", + -- group = "Open", + -- }, + -- { + -- key = "oP", + -- cmd = ":ToggleTerm name=ipython-full", + -- desc = "Open full IPython", + -- mode = "v", + -- group = "Open", + -- }, { key = "", cmd = ":ToggleTerm name=toggleterm", @@ -224,116 +225,126 @@ local code_companion_mappings = { } -- }}} ---{{{ Telescope mappings +-- {{{ Telescope mappings local telescope_mappings = { - { mode = "n", key = "//", cmd = ":Telescope current_buffer_fuzzy_find previewer=false" }, - { mode = "n", key = "??", cmd = ":Telescope lsp_document_symbols theme=dropdown layout_config={width=0.5}" }, + { + mode = "n", + key = "//", + cmd = ":Telescope current_buffer_fuzzy_find previewer=false", + "Current buffer fuzzy find", + }, + { + mode = "n", + key = "??", + cmd = ":Telescope lsp_document_symbols theme=dropdown layout_config={width=0.5}", + group = "Lsp document symbols", + }, { mode = "n", key = "fc", cmd = ':Telescope color_names theme=dropdown layout_config={width=0.45,height=25,prompt_position="bottom"} layout_strategy=vertical', - group = "Find", + group = "Telescope color names", }, { mode = "n", key = "Tc", cmd = ":Telescope colorscheme", - group = "Telescope", + group = "Telescope colorscheme", }, { mode = "n", key = "TC", cmd = ':Telescope color_names theme=dropdown layout_config={width=0.45,height=25,prompt_position="bottom"} layout_strategy=vertical', - group = "Telescope", + group = "Telescope color names", }, { mode = "n", key = "Tn", cmd = ":Telescope notify theme=dropdown layout_config={width=0.75}", - group = "Telescope", + group = "Telescope notify", }, { mode = "n", key = "TN", cmd = ":Telescope noice theme=dropdown layout_config={width=0.75}", - group = "Telescope", + group = "Telescope Noice", }, { mode = "n", key = "ff", cmd = ":Telescope find_files find_command=rg,--ignore,--follow,--hidden,--files prompt_prefix=🔍", - group = "Find", + group = "Find files", }, - { mode = "n", key = "fg", cmd = ":Telescope live_grep", group = "Find" }, + { mode = "n", key = "fg", cmd = ":Telescope live_grep", group = "Live Grep" }, { mode = "n", key = "Tg", cmd = ':Telescope glyph theme=dropdown layout_config={width=0.45,height=35,prompt_position="bottom"} layout_strategy=vertical', - group = "Telecope", + group = "Telescope Glyph", }, { mode = "n", key = "fG", cmd = ':Telescope glyph theme=dropdown layout_config={width=0.45,height=35,prompt_position="bottom"} layout_strategy=vertical', - group = "Find", + group = "Glhph", }, - { mode = "n", key = "fb", cmd = ":Telescope file_browser", group = "Find" }, + { mode = "n", key = "fb", cmd = ":Telescope file_browser", group = "File browser" }, { mode = "n", key = "fr", cmd = ":Telescope oldfiles theme=dropdown layout_config={width=0.5}", - group = "Find", + group = "Oldfiles", }, { mode = "n", key = "hc", cmd = ":Telescope commands", - group = "Help", + group = "Commands", }, { mode = "n", key = "hv", cmd = ":Telescope vim_options", - group = "Help", + group = "Vim options", }, { mode = "n", key = "hk", cmd = ":Telescope keymaps", - group = "Help", + group = "Keymaps", }, { mode = "n", key = "hs", cmd = ":Telescope spell_suggest", - group = "Help", + group = "Spell suggest", }, { mode = "n", key = "ht", cmd = ":Telescope help_tags", - group = "Help", + group = "Help tags", }, { mode = "n", key = "hm", cmd = ":Telescope man_pages theme=dropdown layout_config={width=0.75}", - group = "Help", + group = "Man pages", }, { mode = "n", key = "sf", cmd = ":Telescope find_files find_command=rg,--ignore,--follow,--hidden,--files prompt_prefix=🔍", - group = "Search", + group = "Search files", }, - { mode = "n", key = "sF", cmd = ":Telescope fidget", group = "Search" }, - { mode = "n", key = "sg", cmd = ":Telescope live_grep", group = "Search" }, - { mode = "n", key = "sh", cmd = ":Telescope command_history", group = "Search" }, - { mode = "n", key = "sm", cmd = ":Telescope man_pages", group = "Search" }, - { mode = "n", key = "s/", cmd = ":Telescope search_history", group = "Search" }, - { mode = "n", key = "gc", cmd = ":Telescope git_commits", group = "Git" }, - { mode = "n", key = "gf", cmd = ":Telescope git_files", group = "Git" }, - { mode = "n", key = "Tr", cmd = ":Telescope reloader", group = "Telescope" }, + { mode = "n", key = "sF", cmd = ":Telescope fidget", group = "Fidget" }, + { mode = "n", key = "sg", cmd = ":Telescope live_grep", group = "Live grep" }, + { mode = "n", key = "sh", cmd = ":Telescope command_history", group = "Command history" }, + { mode = "n", key = "sm", cmd = ":Telescope man_pages", group = "Man pages" }, + { mode = "n", key = "s/", cmd = ":Telescope search_history", group = "Search history" }, + { mode = "n", key = "gc", cmd = ":Telescope git_commits", group = "Git commits" }, + { mode = "n", key = "gf", cmd = ":Telescope git_files", group = "Git files" }, + { mode = "n", key = "Tr", cmd = ":Telescope reloader", group = "Telescope reloader" }, } --}}} @@ -462,12 +473,20 @@ local diffview_mappings = { --{{{ Custom Terminals local programs_map = { - gg = { cmd = "lazygit", display_name = "lazygit", direction = "tab", hidden = true, group = "Git" }, - op = { cmd = "ipython", display_name = "ipython", direction = "vertical", hidden = true, group = "Open" }, - oP = { cmd = "ipython", display_name = "ipython-full", direction = "tab", hidden = true, group = "Open" }, - on = { cmd = "ncmpcpp", display_name = "ncmpcpp", direction = "tab", hidden = true, group = "Open" }, - ob = { cmd = "btop", display_name = "btop", direction = "tab", hidden = true, group = "Open" }, - od = { cmd = "lazydocker", display_name = "lazydocker", direction = "tab", hidden = true }, + gg = { cmd = "lazygit", display_name = "lazygit", direction = "tab", hidden = true, group = "Lazygit" }, + op = { cmd = "ipython", display_name = "ipython", direction = "vertical", hidden = true, group = "Ipython" }, + oP = { + cmd = "ipython", + display_name = "ipython-full", + direction = "tab", + hidden = true, + group = "Ipython Fullscreen", + }, + oi = { cmd = "sudo iotop", display_name = "ncmpcpp", direction = "tab", hidden = true, group = "Ncmpcpp" }, + on = { cmd = "ncmpcpp", display_name = "ncmpcpp", direction = "tab", hidden = true, group = "Ncmpcpp" }, + oN = { cmd = "nvtop", display_name = "nvtop", direction = "tab", hidden = true, group = "Nvtop" }, + ob = { cmd = "/usr/bin/btop", display_name = "btop", direction = "tab", hidden = true, group = "Btop" }, + od = { cmd = "lazydocker", display_name = "lazydocker", direction = "tab", hidden = true, group = "Lazydocker" }, } for key, value in pairs(programs_map) do @@ -478,24 +497,13 @@ end local tbl = {} for key, value in pairs(programs_map) do - local temp = {} - if key == "gg" then - temp = { - cmd = value.cmd, - key = "" .. key, - group = value.group, - mode = "n", - desc = "Open " .. value.display_name, - } - else - temp = { - cmd = value.cmd, - key = "" .. key, - group = value.group, - mode = "n", - desc = "Open " .. value.display_name, - } - end + local temp = { + cmd = value.cmd, + key = "" .. key, + group = value.group, + mode = "n", + desc = "Open " .. value.display_name, + } table.insert(tbl, temp) end add_to_whichkey(tbl, { key = "o", group = "Open" }) @@ -523,7 +531,12 @@ add_to_whichkey(nil, { key = "gg", group = "Lazygit" }) add_to_whichkey(nil, { key = "h", group = "Help" }) add_to_whichkey(nil, { key = "j", group = "AnyJump" }) add_to_whichkey(nil, { key = "N", group = "Noice" }) -add_to_whichkey(nil, { key = "o", group = "Open" }) +-- add_to_whichkey(nil, { key = "o", group = "Open" }) +add_to_whichkey(nil, { key = "ob", group = "Btop" }) +add_to_whichkey(nil, { key = "on", group = "Ncmpcpp" }) +add_to_whichkey(nil, { key = "od", group = "Lazydocker" }) +add_to_whichkey(nil, { key = "op", group = "Ipython" }) +add_to_whichkey(nil, { key = "oP", group = "Ipython Full" }) add_to_whichkey(nil, { key = "p", group = "Paste in Place" }) add_to_whichkey(nil, { key = "s", group = "Search" }) add_to_whichkey(nil, { key = "t", group = "Terminal" })