From 8f7cf2f7d782fdb1d5594a1a078541e6da17e93d Mon Sep 17 00:00:00 2001 From: Solomon Laing Date: Mon, 12 Aug 2024 17:24:26 +0930 Subject: [PATCH] wip fix to which-key --- .config/nvim/lua/lazyvim/plugins/whichkey.lua | 282 ++++++++++++++++-- 1 file changed, 264 insertions(+), 18 deletions(-) diff --git a/.config/nvim/lua/lazyvim/plugins/whichkey.lua b/.config/nvim/lua/lazyvim/plugins/whichkey.lua index cd51a4f..4933bfc 100644 --- a/.config/nvim/lua/lazyvim/plugins/whichkey.lua +++ b/.config/nvim/lua/lazyvim/plugins/whichkey.lua @@ -53,14 +53,260 @@ return { nowait = true, -- use 'nowait' } + -- whichkey.add({ + -- mode = { "n", "v" }, + -- ["g"] = { name = "+goto" }, + -- ["m"] = { name = "+harpoon" }, + -- ["]"] = { name = "+next" }, + -- ["["] = { name = "+previous" }, + -- }) + whichkey.add({ mode = { "n", "v" }, - ["g"] = { name = "+goto" }, - ["m"] = { name = "+harpoon" }, - ["]"] = { name = "+next" }, - ["["] = { name = "+previous" }, + { "g", group = "goto" }, + { "m", group = "harpoon" }, + { "]", group = "next" }, + { "[", group = "previous" } }) + -- b = { name = "+buffer" }, + -- r = { name = "+replace" }, + -- s = { name = "+search" }, + -- h = { name = "+help" }, + -- gh = { name = "+hunks" }, + -- t = { name = "+todo" }, + -- N = { name = "+noice" }, + + whichkey.add({ + mode = { "n", "v" }, + { "b", group = "buffer" }, + { "r", group = "replace" }, + { "s", group = "search" }, + { "h", group = "help" }, + { "gh", group = "hunks" }, + { "t", group = "todo" }, + { "N", group = "noice" }, + }) + + -- Z = { "ZenMode", "Zen" }, + -- u = { "UndotreeToggle", "Undo Tree" }, + -- ["'"] = { "close", "Close split" }, + + whichkey.add({ + mode = { "n", "v" }, + { "Z", "ZenMode", desc = "Zen" }, + { "u", "UndotreeToggle", desc = "Undetree" }, + { "'", "close", desc = "Close Split" }, + }) + + -- n = { + -- name = "+neorg", + -- n = { "Neorg", "Open Neorg" }, + -- c = { "Neorg toggle-concealer", "Toggle Concealer" }, + -- t = { "Neorg tangle current-file", "Tangle Current File" }, + -- j = { "Neorg journal", "Open Neorg Journal" }, + -- w = { + -- function() + -- require("lazyvim.utils.neorg").workspace_switcher() + -- end, + -- "Workspace Switcher", + -- }, + -- }, + + whichkey.add({ + mode = { "n", "v" }, + { "n", group = "neorg" }, + { "nn", "Neorg", desc = "Open Neorg" }, + { "nc", "Neorg toggle-concealer", desc = "Toggle Concealer" }, + { "nt", "Neorg tangle current-file", desc = "Tangle Current File" }, + { "nj", "Neorg journal", desc = "Open Neorg Journal" }, + { + "nw", + function() + require("lazyvim.utils.neorg").workspace_switcher() + end + , + desc = "Workspace Switcher" + }, + + }) + + -- q = { + -- name = "+quit", + -- q = { "wq", "Save and Quit Current" }, + -- a = { "wqa", "Save and Quit all" }, + -- ['!'] = { "qa!", "Force Quit all" }, + -- }, + + whichkey.add({ + mode = { "n", "v" }, + { "", group = "" }, + { "", "", desc = "" }, + + }) + + -- l = { + -- name = "+lsp", + -- l = { "lopen", "Open Location List" }, + -- q = { "copen", "Open Quickfix List" }, + -- x = { "cclose", "Close Quickfix List" }, + -- }, + + whichkey.add({ + mode = { "n", "v" }, + { "", group = "" }, + { "", "", desc = "" }, + + }) + + -- C = { + -- name = "+compiler", + -- c = { "w! | !compiler %", "Compile File" }, + -- b = { "w! | !pandoc % -t beamer -o presentation.pdf", "Beamer Presentation" }, + -- p = { "!opout %", "Preview Document" }, + -- }, + + whichkey.add({ + mode = { "n", "v" }, + { "", group = "" }, + { "", "", desc = "" }, + + }) + + -- w = { + -- name = "+window", + -- w = { "p", "Other window" }, + -- d = { "c", "Delete Window" }, + -- h = { "s", "Split Below" }, + -- v = { "v", "Split Right" }, + -- }, + + whichkey.add({ + mode = { "n", "v" }, + { "", group = "" }, + { "", "", desc = "" }, + + }) + + -- o = { + -- name = "+option", + -- f = { + -- function() + -- require("lazyvim.plugins.lsp.format").toggle() + -- end, + -- "Toggle format on save", + -- }, + -- s = { + -- function() + -- utils.toggle("spell") + -- end, + -- "Toggle spelling", + -- }, + -- w = { + -- function() + -- utils.toggle("wrap") + -- end, + -- "Toggle word wrap", + -- }, + -- n = { + -- function() + -- utils.toggle("relativenumber", true) + -- utils.toggle("number") + -- end, + -- "Toggle line numbers", + -- }, + -- d = { + -- function() + -- utils.toggle_diagnostics() + -- end, + -- "Toggle Diagnostics", + -- }, + -- c = { + -- function() + -- local conceallevel = vim.o.conceallevel > 0 and vim.o.conceallevel or 3 + -- utils.toggle("conceallevel", false, { 0, conceallevel }) + -- end, + -- "Toggle conceal", + -- }, + -- h = { + -- function() + -- local sidescrolloff = vim.o.sidescrolloff > 0 and vim.o.sidescrolloff or 8 + -- utils.toggle("sidescrolloff", false, { 0, sidescrolloff }) + -- end, + -- "Toggle side scroll off", + -- }, + -- }, + + whichkey.add({ + mode = { "n", "v" }, + { "", group = "" }, + { "", "", desc = "" }, + + }) + + -- g = { + -- name = "+git", + -- g = { + -- function() + -- utils.float_term({ "lazygit" }) + -- end, + -- "Lazygit (cwd)", + -- }, + -- G = { + -- function() + -- utils.float_term({ "lazygit" }, { cwd = utils.get_root() }) + -- end, + -- "Lazygit (root dir)", + -- }, + -- }, + + whichkey.add({ + mode = { "n", "v" }, + { "", group = "" }, + { "", "", desc = "" }, + + }) + + -- z = { + -- name = "+zk", + -- I = { "ZkIndex", "Index Notebook" }, + -- n = { + -- "+new", + -- n = { "ZkNew { title = vim.fn.input('Title: ') }", "New Note (zk dir)" }, + -- N = { + -- "ZkNew { dir = vim.fn.expand('%:p:h'), title = vim.fn.input('Title: ') }", + -- "New Note (cwd)", + -- }, + -- t = { + -- "ZkNewFromTitleSelection { title = vim.fn.input('Title: ') }", + -- "New, Title from selection (zk dir)", + -- }, + -- T = { + -- "ZkNewFromTitleSelection { dir = vim.fn.expand('%:p:h') title = vim.fn.input('Title: ') }", + -- "New, Title from selection (cwd)", + -- }, + -- c = { + -- "ZkNewFromContentSelection { title = vim.fn.input('Title: ') }", + -- "New, Content from selection (zk dir)", + -- }, + -- C = { + -- "ZkNewFromContentSelection { dir = vim.fn.expand('%:p:h') title = vim.fn.input('Title: ') }", + -- "New, Content from selection (cwd)", + -- }, + -- }, + -- c = { "ZkCd", "cd 'root'" }, + -- s = { "ZkNotes", "List Notes" }, + -- b = { "ZkBacklinks", "Backlinks" }, + -- l = { "ZkLinks", "Links" }, + -- j = { + -- "ZkNew { dir = 'journal', date = 'today', title = vim.fn.input('Title: ') }", + -- "New Journal", + -- }, + -- i = { + -- { "ZkInsertLink", "Insert Link" }, + -- }, + -- }, + local leader_mappings = { b = { name = "+buffer" }, r = { name = "+replace" }, @@ -80,20 +326,20 @@ return { -- d = { "Copilot disable", "Disable Copilot" }, -- t = { "Copilot toggle", "Toggle Copilot" }, -- }, - - n = { - name = "+neorg", - n = { "Neorg", "Open Neorg" }, - c = { "Neorg toggle-concealer", "Toggle Concealer" }, - t = { "Neorg tangle current-file", "Tangle Current File" }, - j = { "Neorg journal", "Open Neorg Journal" }, - w = { - function() - require("lazyvim.utils.neorg").workspace_switcher() - end, - "Workspace Switcher", - }, - }, + -- + -- n = { + -- name = "+neorg", + -- n = { "Neorg", "Open Neorg" }, + -- c = { "Neorg toggle-concealer", "Toggle Concealer" }, + -- t = { "Neorg tangle current-file", "Tangle Current File" }, + -- j = { "Neorg journal", "Open Neorg Journal" }, + -- w = { + -- function() + -- require("lazyvim.utils.neorg").workspace_switcher() + -- end, + -- "Workspace Switcher", + -- }, + -- }, q = { name = "+quit",