diff --git a/lazy-lock.json b/lazy-lock.json index b4a1ccd..6b1cb72 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -5,7 +5,7 @@ "auto-conform.nvim": { "branch": "main", "commit": "d04389f955dd0990e85a269b226199f458de32a6" }, "auto-lint.nvim": { "branch": "main", "commit": "aff13cb8eaa055e66e940d43b7d83166397e5413" }, "bigfile.nvim": { "branch": "main", "commit": "33eb067e3d7029ac77e081cfe7c45361887a311a" }, - "bufferline.nvim": { "branch": "main", "commit": "81820cac7c85e51e4cf179f8a66d13dbf7b032d9" }, + "bufferline.nvim": { "branch": "main", "commit": "aa16dafdc642594c7ade7e88d31a6119feb189d6" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, @@ -13,7 +13,7 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "code_runner.nvim": { "branch": "main", "commit": "6c5bfe44a6c7523350cd706e6b3b8101166eed99" }, - "codeium.nvim": { "branch": "main", "commit": "d3b88eb3aa1de6da33d325c196b8a41da2bcc825" }, + "codeium.nvim": { "branch": "main", "commit": "f6a2ef32a9e923cb0104a19d3e426b0e40e49505" }, "conform.nvim": { "branch": "master", "commit": "60e6fbddbdf37d7790de07dc7420beefaf650e5e" }, "darcula-dark.nvim": { "branch": "main", "commit": "cce636860dc5151b6980a35dd378f54a238e0f0e" }, "dressing.nvim": { "branch": "master", "commit": "71349f24c6e07b39f33600985843c289ca735308" }, @@ -29,7 +29,7 @@ "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, "mini.indentscope": { "branch": "main", "commit": "1222393d9c5e8d92b913ccab6701a7164b21781c" }, "neoscroll.nvim": { "branch": "master", "commit": "a731f66f1d39ec6175fd201c5bf849e54abda99c" }, - "noice.nvim": { "branch": "main", "commit": "55e6cc74d1c8a985ae83cb7ce80785c357ec551e" }, + "noice.nvim": { "branch": "main", "commit": "1cbf3a4c81c7f519f177182f541e7b0514cde3c3" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "78a4507bb9ffc9b00f11ae0ac48243d00cb9194d" }, "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, @@ -41,14 +41,14 @@ "nvim-lspconfig": { "branch": "master", "commit": "0b8165cf95806bc4bb8f745bb0c92021b2ed4b98" }, "nvim-material-icon": { "branch": "main", "commit": "38fc13fe4811c4bf62533180ff5e7bbd237c5ef5" }, "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, - "nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" }, + "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-scrollview": { "branch": "main", "commit": "30ca6e18265928eb4ea7402346b4dfddbd8ce41e" }, - "nvim-tree.lua": { "branch": "master", "commit": "2086e564c4d23fea714e8a6d63b881e551af2f41" }, - "nvim-treesitter": { "branch": "master", "commit": "c1ad655b6a0c83ab48e55240f367e2bc0c15af31" }, + "nvim-tree.lua": { "branch": "master", "commit": "f9ff00bc06d7cb70548a3847d7a2a05e928bc988" }, + "nvim-treesitter": { "branch": "master", "commit": "972aa544efb56e2f2f53c5f3c2537e43467dd5cb" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, "nvim-ts-autotag": { "branch": "main", "commit": "323a3e16ed603e2e17b26b1c836d1e86c279f726" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "f1905136b99b5d706858d4c9274a3b152b4359ed" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "6b5f95aa4d24f2c629a74f2c935c702b08dbde62" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, "playground": { "branch": "master", "commit": "bcfab84f98a33f2ad34dda6c842046dca70aabf6" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, @@ -62,6 +62,6 @@ "vim-startuptime": { "branch": "master", "commit": "97a88e688482a09c3c4b777d07b509b328a5ec29" }, "vim-visual-multi": { "branch": "master", "commit": "38b0e8d94a5499ccc17d6159763d32c79f53417b" }, "virt-column.nvim": { "branch": "master", "commit": "b62b4ef0774d19452d4ed18e473e824c7a756f2f" }, - "which-key.nvim": { "branch": "main", "commit": "0539da005b98b02cf730c1d9da82b8e8edb1c2d2" }, + "which-key.nvim": { "branch": "main", "commit": "a86e9d3c0023f985344014bf2b7cb15e0be8fa2b" }, "yanky.nvim": { "branch": "main", "commit": "9268018e92d02650a94e39dd5f5903c542f7ea11" } } \ No newline at end of file diff --git a/lua/plugins/_lsp.lua b/lua/plugins/_lsp.lua index 3705e32..771be48 100644 --- a/lua/plugins/_lsp.lua +++ b/lua/plugins/_lsp.lua @@ -133,5 +133,21 @@ return { }) require("user.lsp.handlers").setup() end, + keys = { + { "l", "", desc = "  LSP", mode = "n" }, + { "la", "lua vim.lsp.buf.code_action()", desc = "Code Action", mode = "n" }, + { "ld", "Telescope diagnostics bufnr=0", desc = "Document Diagnostics", mode = "n" }, + { "lw", "Telescope diagnostics", desc = "Workspace Diagnostics", mode = "n" }, + { "lf", "lua vim.lsp.buf.format{async=true}", desc = "Format", mode = "n" }, + { "li", "LspInfo", desc = "Info", mode = "n" }, + { "lI", "Mason", desc = "Mason", mode = "n" }, + { "lj", "lua vim.lsp.diagnostic.goto_next()", desc = "Next Diagnostic", mode = "n" }, + { "lk", "lua vim.lsp.diagnostic.goto_prev()", desc = "Prev Diagnostic", mode = "n" }, + { "ll", "lua vim.lsp.codelens.run()", desc = "Code Lens Action", mode = "n" }, + { "lq", "lua vim.diagnostic.setloclist()", desc = "Quickfix", mode = "n" }, + { "lr", "lua vim.lsp.buf.rename()", desc = "Rename", mode = "n" }, + { "ls", "Telescope lsp_document_symbols", desc = "Document Symbols", mode = "n" }, + { "lS", "Telescope lsp_dynamic_workspace_symbols", desc = "Workspace Symbols", mode = "n" }, + }, }, } diff --git a/lua/plugins/codeium.lua b/lua/plugins/codeium.lua index 2333265..dfbbddf 100644 --- a/lua/plugins/codeium.lua +++ b/lua/plugins/codeium.lua @@ -31,6 +31,9 @@ if pcode.codeium then return vim.fn["codeium#Clear"]() end, { expr = true, silent = true }) end, + keys = { + { "c", ":call codeium#Chat()", desc = "󰭹 Codeium Chat", mode = "n" }, + }, } else M.codeium = {} diff --git a/lua/plugins/coderunner.lua b/lua/plugins/coderunner.lua index de239fd..fe040cb 100644 --- a/lua/plugins/coderunner.lua +++ b/lua/plugins/coderunner.lua @@ -55,4 +55,18 @@ return { config = function(_, opts) require("code_runner").setup(opts) end, + keys = { + { "r", "", desc = "  Run", mode = "n" }, + { + "rs", + 'autocmd bufwritepost [^_]*.sass,[^_]*.scss silent exec "!sass %:p %:r.css"', + desc = "Auto Compile Sass", + mode = "n", + }, + { "rr", "RunCode", desc = "Run Code", mode = "n" }, + { "rf", "RunFile", desc = "Run File", mode = "n" }, + { "rp", "RunProject", desc = "Run Project", mode = "n" }, + { "rg", "terminalgradle run", desc = "Run Gradle", mode = "n" }, + { "rm", "terminal mvn package", desc = "MVN Build", mode = "n" }, + }, } diff --git a/lua/plugins/comment.lua b/lua/plugins/comment.lua index 6d37cbe..c1d5e73 100644 --- a/lua/plugins/comment.lua +++ b/lua/plugins/comment.lua @@ -6,6 +6,22 @@ return { pre_hook = require("ts_context_commentstring.integrations.comment_nvim").create_pre_hook(), } end, + keys = { + { + "/", + function() + require("Comment.api").toggle.linewise.current() + end, + desc = "󰆈 Coment line", + mode = "n", + }, + { + "/", + "lua require('Comment.api').toggle.linewise(vim.fn.visualmode())", + desc = "󰆈 Coment line", + mode = "v", + }, + }, config = function(_, opts) require("Comment").setup(opts) end, diff --git a/lua/plugins/gitsigns.lua b/lua/plugins/gitsigns.lua index 7efaa0d..9c6b699 100644 --- a/lua/plugins/gitsigns.lua +++ b/lua/plugins/gitsigns.lua @@ -72,4 +72,90 @@ return { config = function(_, opts) require("gitsigns").setup(opts) end, + keys = { + { "g", "", desc = "  Git" }, + { + "gg", + function() + require("user.utils.whichkey")._LAZYGIT_TOGGLE() + end, + desc = "Lazygit", + }, + { + "gj", + function() + require("gitsigns").next_hunk() + end, + desc = "Next Hunk", + }, + { + "gk", + function() + require("gitsigns").prev_hunk() + end, + desc = "Prev Hunk", + }, + { + "gl", + function() + require("gitsigns").blame_line() + end, + desc = "Blame", + }, + { + "gp", + function() + require("gitsigns").preview_hunk() + end, + desc = "Preview Hunk", + }, + { + "gr", + function() + require("gitsigns").reset_hunk() + end, + desc = "Reset Hunk", + }, + { + "gR", + function() + require("gitsigns").reset_buffer() + end, + desc = "Reset Buffer", + }, + { + "gs", + function() + require("gitsigns").stage_hunk() + end, + desc = "Stage Hunge", + }, + { + "gu", + function() + require("gitsigns").undo_stage_hunk() + end, + desc = "Undo Stage Hunge", + }, + { + "go", + "Telescope git_status", + desc = "Opened Changed File", + }, + { + "gb", + "Telescope git_branches", + desc = "Checkout Branch", + }, + { + "gc", + "Telescope git_commits", + desc = "Checkout Commit", + }, + { + "gd", + "Gitsigns diffthis HEAD", + desc = "Diff", + }, + }, } diff --git a/lua/plugins/nvimtree.lua b/lua/plugins/nvimtree.lua index 2fd955c..604d126 100644 --- a/lua/plugins/nvimtree.lua +++ b/lua/plugins/nvimtree.lua @@ -186,8 +186,8 @@ return { }, }, notify = { - threshold = vim.log.levels.INFO, - -- threshold = vim.log.levels.ERROR, + -- threshold = vim.log.levels.INFO, + threshold = vim.log.levels.ERROR, }, log = { enable = false, @@ -208,6 +208,9 @@ return { args = {}, }, }, + keys = { + { "e", "NvimTreeToggle", desc = "󰙅 Explorer" }, + }, config = function(_, opts) require("nvim-tree").setup(opts) local api = require("nvim-tree.api") diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index b9ad9b4..fc145b8 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -188,4 +188,15 @@ return { end end) end, + keys = { + { "s", "", desc = "  Search", mode = "n" }, + { "sb", "Telescope git_branches", desc = "Checkout branch", mode = "n" }, + { "sc", "Telescope colorscheme", desc = "Colorscheme", mode = "n" }, + { "sh", "Telescope help_tags", desc = "Find Help", mode = "n" }, + { "sM", "Telescope man_pages", desc = "Man Pages", mode = "n" }, + { "sr", "Telescope oldfiles", desc = "Open Recent File", mode = "n" }, + { "sR", "Telescope registers", desc = "Registers", mode = "n" }, + { "sk", "Telescope keymaps", desc = "Keymaps", mode = "n" }, + { "sC", "Telescope commands", desc = "Commands", mode = "n" }, + }, } diff --git a/lua/plugins/toggleterm.lua b/lua/plugins/toggleterm.lua index 4e8bfb4..dd5e827 100644 --- a/lua/plugins/toggleterm.lua +++ b/lua/plugins/toggleterm.lua @@ -46,4 +46,26 @@ return { end vim.cmd("autocmd! TermOpen term://* lua set_terminal_keymaps()") end, + keys = { + { "t", "", desc = "  Terminal", mode = "n" }, + { "tl", "terminal live-server", desc = "Live Server", mode = "n" }, + { "tP", "lua require('user.utils.whichkey')._NEWTAB_TOGGLE()", desc = "Power Shell", mode = "n" }, + { "tx", "ToggleTermToggleAll!", desc = "Close Tab", mode = "n" }, + { "tn", "lua require('user.utils.whichkey')._NODE_TOGGLE()", desc = "Node", mode = "n" }, + { "tb", "lua require('user.utils.whichkey')._BTOP_TOGGLE()", desc = "Btop", mode = "n" }, + { "tp", "lua require('user.utils.whichkey')._PYTHON_TOGGLE()", desc = "Python", mode = "n" }, + { "tf", "ToggleTerm direction=float", desc = "Float", mode = "n" }, + { "th", "ToggleTerm size=10 direction=horizontal", desc = "Horizontal", mode = "n" }, + { "tv", "ToggleTerm size=80 direction=vertical", desc = "Vertical", mode = "n" }, + { "ts", "ToggleTerm direction=tab", desc = "New Tab", mode = "n" }, + { "ta", "lua require('user.utils.whichkey')._OPEN_ALACRITTY()", desc = "Open Alacritty", mode = "n" }, + { "tw", "lua require('user.utils.whichkey')._OPEN_WEZTERM()", desc = "Open Wezterm", mode = "n" }, + { + "tt", + "lua require('user.utils.whichkey')._OPEN_WEZTERM_TAB()", + desc = "Open Tab Wezterm", + mode = "n", + }, + { "tj", "lua _SET_TAB_TITLE()", desc = "Set Tab Title", mode = "n" }, + }, } diff --git a/lua/plugins/whichkey.lua b/lua/plugins/whichkey.lua index 4aef781..c6d37c4 100644 --- a/lua/plugins/whichkey.lua +++ b/lua/plugins/whichkey.lua @@ -35,6 +35,7 @@ return { -- [""] = "TAB", }, icons = { + rules = false, breadcrumb = icons.ui.DoubleChevronRight, -- symbol used in the command line area that shows your active key combo separator = icons.ui.BoldArrowRight, -- symbol used between a key and it's label group = icons.ui.Plus, -- symbol prepended to a group @@ -43,12 +44,21 @@ return { scroll_down = "", -- binding to scroll down inside the popup scroll_up = "", -- binding to scroll up inside the popup }, - window = { - border = "rounded", -- none, single, double, shadow - position = "bottom", -- bottom, top - margin = { 1, 1, 1, 1 }, -- extra window margin [top, right, bottom, left] - padding = { 2, 2, 2, 2 }, -- extra window padding [top, right, bottom, left] - winblend = 0, + win = { + -- width = 1, + -- height = { min = 4, max = 25 }, + -- col = 0, + row = -1, + border = "single", -- none, single, double, shadow + padding = { 1, 2 }, -- extra window padding [top/bottom, right/left] + title = true, + title_pos = "center", + zindex = 1000, + -- Additional vim.wo and vim.bo options + bo = {}, + wo = { + -- winblend = 10, -- value between 0-100 0 for fully opaque and 100 for fully transparent + }, }, layout = { height = { min = 4, max = 25 }, -- min and max height of the columns @@ -77,29 +87,92 @@ return { } end, config = function(_, opts) - local opt = { - mode = "n", -- NORMAL mode - prefix = "", - buffer = nil, -- Global mappings. Specify a buffer number for buffer local mappings - silent = true, -- use `silent` when creating keymaps - noremap = true, -- use `noremap` when creating keymaps - nowait = true, -- use `nowait` when creating keymaps - } - - local opt2 = { - mode = "v", -- NORMAL mode - prefix = "", - buffer = nil, -- Global mappings. Specify a buffer number for buffer local mappings - silent = true, -- use `silent` when creating keymaps - noremap = true, -- use `noremap` when creating keymaps - nowait = true, -- use `nowait` when creating keymaps - } - - local wkey = pcode.whichkey or {} + -- local opt = { + -- mode = "n", -- NORMAL mode + -- prefix = "", + -- buffer = nil, -- Global mappings. Specify a buffer number for buffer local mappings + -- silent = true, -- use `silent` when creating keymaps + -- noremap = true, -- use `noremap` when creating keymaps + -- nowait = true, -- use `nowait` when creating keymaps + -- } + -- + -- local opt2 = { + -- mode = "v", -- NORMAL mode + -- prefix = "", + -- buffer = nil, -- Global mappings. Specify a buffer number for buffer local mappings + -- silent = true, -- use `silent` when creating keymaps + -- noremap = true, -- use `noremap` when creating keymaps + -- nowait = true, -- use `nowait` when creating keymaps + -- } + -- + -- local wkey = pcode.whichkey or {} local which_key = require("which-key") which_key.setup(opts) - which_key.register(require("user.utils.whichkey").mappings, opt) - which_key.register(wkey, opt) - which_key.register(require("user.utils.whichkey").mappings2, opt2) + which_key.add({ + { "a", "Alpha", desc = "󰕮 Alpha", mode = "n" }, + { "w", "w!", desc = "󰆓 Save", mode = "n" }, + { "q", "q!", desc = "󰿅 Quit", mode = "n" }, + { + "o", + function() + require("user.utils.whichkey")._OPEN_EXPLORER() + end, + desc = "󱏒 Open Explorer", + mode = "n", + }, + { "h", "nohlsearch", desc = "󱪿 No Highlight", mode = "n" }, + { "f", "Telescope find_files", desc = " Find files", mode = "n" }, + { "F", "Telescope live_grep", desc = " Find Text", mode = "n" }, + { "b", "", desc = "  Buffers", mode = "n" }, + { + "bb", + function() + require("telescope.builtin").buffers(require("telescope.themes").get_dropdown({ previewer = false })) + end, + desc = "All Buffer", + mode = "n", + }, + { + "bc", + function() + require("user.utils.bufferline").bufremove() + end, + desc = "Close current buffer", + mode = "n", + }, + { + "bd", + "BufferLineCloseLeft", + desc = "Close Buffer Left", + mode = "n", + }, + { + "bD", + "BufferLineCloseRight", + desc = "Close Buffer Right", + mode = "n", + }, + { + "ba", + "BufferLineCloseOthers", + desc = "Close Buffer Other", + mode = "n", + }, + { + "bA", + "BufferLineCloseOthersbd!", + desc = "Close Buffer All", + mode = "n", + }, + { "z", "", desc = " 󱑠 Plugins(Lazy)", mode = "n" }, + { "zi", "Lazy install", desc = "Install", mode = "n" }, + { "zs", "Lazy sync", desc = "Sync", mode = "n" }, + { "zS", "Lazy clear", desc = "Status", mode = "n" }, + { "zc", "Lazy clean", desc = "Clean", mode = "n" }, + { "zu", "Lazy update", desc = "Update", mode = "n" }, + { "zp", "Lazy profile", desc = "Profile", mode = "n" }, + { "zl", "Lazy log", desc = "Log", mode = "n" }, + { "zd", "Lazy debug", desc = "Debug", mode = "n" }, + }) end, } diff --git a/lua/user/utils/whichkey.lua b/lua/user/utils/whichkey.lua index 3ef065a..17988dd 100644 --- a/lua/user/utils/whichkey.lua +++ b/lua/user/utils/whichkey.lua @@ -88,174 +88,174 @@ function M._CLOSE_ALL_BUFFER() end M.mappings = { - ["a"] = { "Alpha", "󰕮 Alpha" }, - ["e"] = { "NvimTreeToggle", "󰙅 Explorer" }, - ["w"] = { "w!", "󰆓 Save" }, - ["q"] = { "q!", "󰿅 Quit" }, + -- ["a"] = { "Alpha", "󰕮 Alpha" }, + -- ["e"] = { "NvimTreeToggle", "󰙅 Explorer" }, + -- ["w"] = { "w!", "󰆓 Save" }, + -- ["q"] = { "q!", "󰿅 Quit" }, -- open exloler and close toggleterm - ["o"] = { - "lua require('user.utils.whichkey')._OPEN_EXPLORER()", - "󱏒 Open Explorer", - }, - ["h"] = { "nohlsearch", "󱪿 No Highlight" }, - ["f"] = { - "Telescope find_files ", - " Find files", - }, + -- ["o"] = { + -- "lua require('user.utils.whichkey')._OPEN_EXPLORER()", + -- "󱏒 Open Explorer", + -- }, + -- ["h"] = { "nohlsearch", "󱪿 No Highlight" }, + -- ["f"] = { + -- "Telescope find_files ", + -- " Find files", + -- }, -- ["F"] = { "Telescope live_grep theme=ivy", " Find Text" }, - ["F"] = { "Telescope live_grep", " Find Text" }, - ["/"] = { - function() - require("Comment.api").toggle.linewise.current() - end, - "󰆈 Coment line", - }, - b = { - name = "  Buffers", - -- show all buffers with telescope - b = { - "lua require('telescope.builtin').buffers(require('telescope.themes').get_dropdown{previewer = false})", - "All Buffer", - }, - -- close current active buffer - c = { "lua require('user.utils.bufferline').bufremove()", "Close current buffer" }, - -- bufferline close left - d = { - "BufferLineCloseLeft", - "Buffer close left", - }, - -- bufferline close right - D = { - "BufferLineCloseRight", - "Buffer close right", - }, - -- bufferline close others - a = { - "BufferLineCloseOthers", - "Buffer close others", - }, - -- close all bufferline - A = { - "BufferLineCloseOthersbd!", - "Buffer close All Buffer", - }, - }, + -- ["F"] = { "Telescope live_grep", " Find Text" }, + -- ["/"] = { + -- function() + -- require("Comment.api").toggle.linewise.current() + -- end, + -- "󰆈 Coment line", + -- }, + -- b = { + -- name = "  Buffers", + -- show all buffers with telescope + -- b = { + -- "lua require('telescope.builtin').buffers(require('telescope.themes').get_dropdown{previewer = false})", + -- "All Buffer", + -- }, + -- close current active buffer + -- c = { "lua require('user.utils.bufferline').bufremove()", "Close current buffer" }, + -- bufferline close left + -- d = { + -- "BufferLineCloseLeft", + -- "Buffer close left", + -- }, + -- bufferline close right + -- D = { + -- "BufferLineCloseRight", + -- "Buffer close right", + -- }, + -- bufferline close others + -- a = { + -- "BufferLineCloseOthers", + -- "Buffer close others", + -- }, + -- close all bufferline + -- A = { + -- "BufferLineCloseOthersbd!", + -- "Buffer close All Buffer", + -- }, + -- }, - g = { - name = "  Git", - g = { "lua require('user.utils.whichkey')._LAZYGIT_TOGGLE()", "Lazygit" }, - j = { "lua require 'gitsigns'.next_hunk()", "Next Hunk" }, - k = { "lua require 'gitsigns'.prev_hunk()", "Prev Hunk" }, - l = { "lua require 'gitsigns'.blame_line()", "Blame" }, - p = { "lua require 'gitsigns'.preview_hunk()", "Preview Hunk" }, - r = { "lua require 'gitsigns'.reset_hunk()", "Reset Hunk" }, - R = { "lua require 'gitsigns'.reset_buffer()", "Reset Buffer" }, - s = { "lua require 'gitsigns'.stage_hunk()", "Stage Hunk" }, - u = { - "lua require 'gitsigns'.undo_stage_hunk()", - "Undo Stage Hunk", - }, - o = { "Telescope git_status", "Open changed file" }, - b = { "Telescope git_branches", "Checkout branch" }, - c = { "Telescope git_commits", "Checkout commit" }, - d = { - "Gitsigns diffthis HEAD", - "Diff", - }, - }, + -- g = { + -- name = "  Git", + -- g = { "lua require('user.utils.whichkey')._LAZYGIT_TOGGLE()", "Lazygit" }, + -- j = { "lua require 'gitsigns'.next_hunk()", "Next Hunk" }, + -- k = { "lua require 'gitsigns'.prev_hunk()", "Prev Hunk" }, + -- l = { "lua require 'gitsigns'.blame_line()", "Blame" }, + -- p = { "lua require 'gitsigns'.preview_hunk()", "Preview Hunk" }, + -- r = { "lua require 'gitsigns'.reset_hunk()", "Reset Hunk" }, + -- R = { "lua require 'gitsigns'.reset_buffer()", "Reset Buffer" }, + -- s = { "lua require 'gitsigns'.stage_hunk()", "Stage Hunk" }, + -- u = { + -- "lua require 'gitsigns'.undo_stage_hunk()", + -- "Undo Stage Hunk", + -- }, + -- o = { "Telescope git_status", "Open changed file" }, + -- b = { "Telescope git_branches", "Checkout branch" }, + -- c = { "Telescope git_commits", "Checkout commit" }, + -- d = { + -- "Gitsigns diffthis HEAD", + -- "Diff", + -- }, + -- }, - l = { - name = "  LSP", - a = { "lua vim.lsp.buf.code_action()", "Code Action" }, - d = { - "Telescope diagnostics bufnr=0", - "Document Diagnostics", - }, - w = { - "Telescope diagnostics", - "Workspace Diagnostics", - }, - f = { "lua vim.lsp.buf.format{async=true}", "Format" }, - i = { "LspInfo", "Info" }, - I = { "Mason", "Installer Info" }, - j = { - "lua vim.lsp.diagnostic.goto_next()", - "Next Diagnostic", - }, - k = { - "lua vim.lsp.diagnostic.goto_prev()", - "Prev Diagnostic", - }, - l = { "lua vim.lsp.codelens.run()", "CodeLens Action" }, - q = { "lua vim.diagnostic.setloclist()", "Quickfix" }, - r = { "lua vim.lsp.buf.rename()", "Rename" }, - s = { "Telescope lsp_document_symbols", "Document Symbols" }, - S = { - "Telescope lsp_dynamic_workspace_symbols", - "Workspace Symbols", - }, - }, - s = { - name = "  Search", - b = { "Telescope git_branches", "Checkout branch" }, - c = { "Telescope colorscheme", "Colorscheme" }, - h = { "Telescope help_tags", "Find Help" }, - M = { "Telescope man_pages", "Man Pages" }, - r = { "Telescope oldfiles", "Open Recent File" }, - R = { "Telescope registers", "Registers" }, - k = { "Telescope keymaps", "Keymaps" }, - C = { "Telescope commands", "Commands" }, - }, + -- l = { + -- name = "  LSP", + -- a = { "lua vim.lsp.buf.code_action()", "Code Action" }, + -- d = { + -- "Telescope diagnostics bufnr=0", + -- "Document Diagnostics", + -- }, + -- w = { + -- "Telescope diagnostics", + -- "Workspace Diagnostics", + -- }, + -- f = { "lua vim.lsp.buf.format{async=true}", "Format" }, + -- i = { "LspInfo", "Info" }, + -- I = { "Mason", "Installer Info" }, + -- j = { + -- "lua vim.lsp.diagnostic.goto_next()", + -- "Next Diagnostic", + -- }, + -- k = { + -- "lua vim.lsp.diagnostic.goto_prev()", + -- "Prev Diagnostic", + -- }, + -- l = { "lua vim.lsp.codelens.run()", "CodeLens Action" }, + -- q = { "lua vim.diagnostic.setloclist()", "Quickfix" }, + -- r = { "lua vim.lsp.buf.rename()", "Rename" }, + -- s = { "Telescope lsp_document_symbols", "Document Symbols" }, + -- S = { + -- "Telescope lsp_dynamic_workspace_symbols", + -- "Workspace Symbols", + -- }, + -- }, + -- s = { + -- name = "  Search", + -- b = { "Telescope git_branches", "Checkout branch" }, + -- c = { "Telescope colorscheme", "Colorscheme" }, + -- h = { "Telescope help_tags", "Find Help" }, + -- M = { "Telescope man_pages", "Man Pages" }, + -- r = { "Telescope oldfiles", "Open Recent File" }, + -- R = { "Telescope registers", "Registers" }, + -- k = { "Telescope keymaps", "Keymaps" }, + -- C = { "Telescope commands", "Commands" }, + -- }, - t = { - name = "  Terminal", - l = { "terminal live-server", "Live Server" }, - P = { "lua require('user.utils.whichkey')._NEWTAB_TOGGLE()", "Power Shell" }, - x = { "ToggleTermToggleAll!", "Close Tab" }, - n = { "lua require('user.utils.whichkey')._NODE_TOGGLE()", "Node" }, - b = { "lua require('user.utils.whichkey')._BTOP_TOGGLE()", "Btop" }, - p = { "lua require('user.utils.whichkey')._PYTHON_TOGGLE()", "Python" }, - f = { "ToggleTerm direction=float", "Float" }, - h = { "ToggleTerm size=10 direction=horizontal", "Horizontal" }, - v = { "ToggleTerm size=80 direction=vertical", "Vertical" }, - s = { "ToggleTerm direction=tab", "New Tab" }, - a = { "lua require('user.utils.whichkey')._OPEN_ALACRITTY()", "Open Alacritty" }, - w = { "lua require('user.utils.whichkey')._OPEN_WEZTERM()", "Open Wezterm" }, - t = { "lua require('user.utils.whichkey')._OPEN_WEZTERM_TAB()", "Open Tab Wezterm" }, - j = { "lua _SET_TAB_TITLE()", "Set Tab Title" }, - }, - r = { - name = "  Run", - -- l = { "edit term://live-server", "Live Server" }, - s = { - 'autocmd bufwritepost [^_]*.sass,[^_]*.scss silent exec "!sass %:p %:r.css"', - "Auto Compile Sass", - }, - r = { "RunCode", "Run Code" }, - f = { "RunFile", "Run File" }, - p = { "RunProject", "Run Project" }, - g = { "terminalgradle run", "Run Gradle" }, - m = { - "terminal mvn package", - "MVN Build", - }, - }, - z = { - name = " 󱑠 Plugins(Lazy)", - i = { "Lazy install", "Install" }, - s = { "Lazy sync", "Sync" }, - S = { "Lazy clear", "Status" }, - c = { "Lazy clean", "Clean" }, - u = { "Lazy update", "Update" }, - p = { "Lazy profile", "Profile" }, - l = { "Lazy log", "Log" }, - d = { "Lazy debug", "Debug" }, - }, + -- t = { + -- name = "  Terminal", + -- l = { "terminal live-server", "Live Server" }, + -- P = { "lua require('user.utils.whichkey')._NEWTAB_TOGGLE()", "Power Shell" }, + -- x = { "ToggleTermToggleAll!", "Close Tab" }, + -- n = { "lua require('user.utils.whichkey')._NODE_TOGGLE()", "Node" }, + -- b = { "lua require('user.utils.whichkey')._BTOP_TOGGLE()", "Btop" }, + -- p = { "lua require('user.utils.whichkey')._PYTHON_TOGGLE()", "Python" }, + -- f = { "ToggleTerm direction=float", "Float" }, + -- h = { "ToggleTerm size=10 direction=horizontal", "Horizontal" }, + -- v = { "ToggleTerm size=80 direction=vertical", "Vertical" }, + -- s = { "ToggleTerm direction=tab", "New Tab" }, + -- a = { "lua require('user.utils.whichkey')._OPEN_ALACRITTY()", "Open Alacritty" }, + -- w = { "lua require('user.utils.whichkey')._OPEN_WEZTERM()", "Open Wezterm" }, + -- t = { "lua require('user.utils.whichkey')._OPEN_WEZTERM_TAB()", "Open Tab Wezterm" }, + -- j = { "lua _SET_TAB_TITLE()", "Set Tab Title" }, + -- }, + -- r = { + -- name = "  Run", + -- -- l = { "edit term://live-server", "Live Server" }, + -- s = { + -- 'autocmd bufwritepost [^_]*.sass,[^_]*.scss silent exec "!sass %:p %:r.css"', + -- "Auto Compile Sass", + -- }, + -- r = { "RunCode", "Run Code" }, + -- f = { "RunFile", "Run File" }, + -- p = { "RunProject", "Run Project" }, + -- g = { "terminalgradle run", "Run Gradle" }, + -- m = { + -- "terminal mvn package", + -- "MVN Build", + -- }, + -- }, + -- z = { + -- name = " 󱑠 Plugins(Lazy)", + -- i = { "Lazy install", "Install" }, + -- s = { "Lazy sync", "Sync" }, + -- S = { "Lazy clear", "Status" }, + -- c = { "Lazy clean", "Clean" }, + -- u = { "Lazy update", "Update" }, + -- p = { "Lazy profile", "Profile" }, + -- l = { "Lazy log", "Log" }, + -- d = { "Lazy debug", "Debug" }, + -- }, } -if pcode.codeium then - table.insert(M.mappings, { ["c"] = { ":call codeium#Chat()", "󰭹 Codeium Chat" } }) -end +-- if pcode.codeium then +-- table.insert(M.mappings, { ["c"] = { ":call codeium#Chat()", "󰭹 Codeium Chat" } }) +-- end -- if pcode.database then -- table.insert(M.mappings, { @@ -271,8 +271,8 @@ end -- }) -- end -M.mappings2 = { - ["/"] = { "lua require('Comment.api').toggle.linewise(vim.fn.visualmode())", " 󰆈 Commet Block" }, -} +-- M.mappings2 = { +-- ["/"] = { "lua require('Comment.api').toggle.linewise(vim.fn.visualmode())", " 󰆈 Commet Block" }, +-- } return M