wip fix to which-key

This commit is contained in:
Solomon Laing 2024-08-12 17:24:26 +09:30
parent 09e221169c
commit 8f7cf2f7d7

View File

@ -53,14 +53,260 @@ return {
nowait = true, -- use 'nowait' nowait = true, -- use 'nowait'
} }
-- whichkey.add({
-- mode = { "n", "v" },
-- ["g"] = { name = "+goto" },
-- ["m"] = { name = "+harpoon" },
-- ["]"] = { name = "+next" },
-- ["["] = { name = "+previous" },
-- })
whichkey.add({ whichkey.add({
mode = { "n", "v" }, mode = { "n", "v" },
["g"] = { name = "+goto" }, { "g", group = "goto" },
["m"] = { name = "+harpoon" }, { "m", group = "harpoon" },
["]"] = { name = "+next" }, { "]", group = "next" },
["["] = { name = "+previous" }, { "[", 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" },
{ "<leader>b", group = "buffer" },
{ "<leader>r", group = "replace" },
{ "<leader>s", group = "search" },
{ "<leader>h", group = "help" },
{ "<leader>gh", group = "hunks" },
{ "<leader>t", group = "todo" },
{ "<leader>N", group = "noice" },
})
-- Z = { "<cmd>ZenMode<cr>", "Zen" },
-- u = { "<cmd>UndotreeToggle<cr>", "Undo Tree" },
-- ["'"] = { "<cmd>close<CR>", "Close split" },
whichkey.add({
mode = { "n", "v" },
{ "<leader>Z", "<cmd>ZenMode<cr>", desc = "Zen" },
{ "<leader>u", "<cmd>UndotreeToggle<cr>", desc = "Undetree" },
{ "<leader>'", "<cmd>close<CR>", desc = "Close Split" },
})
-- n = {
-- name = "+neorg",
-- n = { "<cmd>Neorg<cr>", "Open Neorg" },
-- c = { "<cmd>Neorg toggle-concealer<cr>", "Toggle Concealer" },
-- t = { "<cmd>Neorg tangle current-file<cr>", "Tangle Current File" },
-- j = { "<cmd>Neorg journal<cr>", "Open Neorg Journal" },
-- w = {
-- function()
-- require("lazyvim.utils.neorg").workspace_switcher()
-- end,
-- "Workspace Switcher",
-- },
-- },
whichkey.add({
mode = { "n", "v" },
{ "<leader>n", group = "neorg" },
{ "<leader>nn", "<cmd>Neorg<cr>", desc = "Open Neorg" },
{ "<leader>nc", "<cmd>Neorg toggle-concealer<cr>", desc = "Toggle Concealer" },
{ "<leader>nt", "<cmd>Neorg tangle current-file<cr>", desc = "Tangle Current File" },
{ "<leader>nj", "<cmd>Neorg journal<cr>", desc = "Open Neorg Journal" },
{
"<leader>nw",
function()
require("lazyvim.utils.neorg").workspace_switcher()
end
,
desc = "Workspace Switcher"
},
})
-- q = {
-- name = "+quit",
-- q = { "<cmd>wq<CR>", "Save and Quit Current" },
-- a = { "<cmd>wqa<cr>", "Save and Quit all" },
-- ['!'] = { "<cmd>qa!<cr>", "Force Quit all" },
-- },
whichkey.add({
mode = { "n", "v" },
{ "<leader>", group = "" },
{ "<leader>", "", desc = "" },
})
-- l = {
-- name = "+lsp",
-- l = { "<cmd>lopen<cr>", "Open Location List" },
-- q = { "<cmd>copen<cr>", "Open Quickfix List" },
-- x = { "<cmd>cclose<cr>", "Close Quickfix List" },
-- },
whichkey.add({
mode = { "n", "v" },
{ "<leader>", group = "" },
{ "<leader>", "", desc = "" },
})
-- C = {
-- name = "+compiler",
-- c = { "<cmd>w! | !compiler %<cr>", "Compile File" },
-- b = { "<cmd>w! | !pandoc % -t beamer -o presentation.pdf<cr>", "Beamer Presentation" },
-- p = { "<cmd>!opout %<cr><cr>", "Preview Document" },
-- },
whichkey.add({
mode = { "n", "v" },
{ "<leader>", group = "" },
{ "<leader>", "", desc = "" },
})
-- w = {
-- name = "+window",
-- w = { "<C-W>p", "Other window" },
-- d = { "<C-W>c", "Delete Window" },
-- h = { "<C-W>s", "Split Below" },
-- v = { "<C-W>v", "Split Right" },
-- },
whichkey.add({
mode = { "n", "v" },
{ "<leader>", group = "" },
{ "<leader>", "", 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" },
{ "<leader>", group = "" },
{ "<leader>", "", 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" },
{ "<leader>", group = "" },
{ "<leader>", "", desc = "" },
})
-- z = {
-- name = "+zk",
-- I = { "<cmd>ZkIndex<cr>", "Index Notebook" },
-- n = {
-- "+new",
-- n = { "<cmd>ZkNew { title = vim.fn.input('Title: ') }<cr>", "New Note (zk dir)" },
-- N = {
-- "<cmd>ZkNew { dir = vim.fn.expand('%:p:h'), title = vim.fn.input('Title: ') }<cr>",
-- "New Note (cwd)",
-- },
-- t = {
-- "<cmd>ZkNewFromTitleSelection { title = vim.fn.input('Title: ') }<cr>",
-- "New, Title from selection (zk dir)",
-- },
-- T = {
-- "<cmd>ZkNewFromTitleSelection { dir = vim.fn.expand('%:p:h') title = vim.fn.input('Title: ') }<cr>",
-- "New, Title from selection (cwd)",
-- },
-- c = {
-- "<cmd>ZkNewFromContentSelection { title = vim.fn.input('Title: ') }<cr>",
-- "New, Content from selection (zk dir)",
-- },
-- C = {
-- "<cmd>ZkNewFromContentSelection { dir = vim.fn.expand('%:p:h') title = vim.fn.input('Title: ') }<cr>",
-- "New, Content from selection (cwd)",
-- },
-- },
-- c = { "<cmd>ZkCd<cr>", "cd 'root'" },
-- s = { "<cmd>ZkNotes<cr>", "List Notes" },
-- b = { "<cmd>ZkBacklinks<cr>", "Backlinks" },
-- l = { "<cmd>ZkLinks<cr>", "Links" },
-- j = {
-- "<cmd>ZkNew { dir = 'journal', date = 'today', title = vim.fn.input('Title: ') }<cr>",
-- "New Journal",
-- },
-- i = {
-- { "<cmd>ZkInsertLink<cr>", "Insert Link" },
-- },
-- },
local leader_mappings = { local leader_mappings = {
b = { name = "+buffer" }, b = { name = "+buffer" },
r = { name = "+replace" }, r = { name = "+replace" },
@ -80,20 +326,20 @@ return {
-- d = { "<cmd>Copilot disable<cr>", "Disable Copilot" }, -- d = { "<cmd>Copilot disable<cr>", "Disable Copilot" },
-- t = { "<cmd>Copilot toggle<cr>", "Toggle Copilot" }, -- t = { "<cmd>Copilot toggle<cr>", "Toggle Copilot" },
-- }, -- },
--
n = { -- n = {
name = "+neorg", -- name = "+neorg",
n = { "<cmd>Neorg<cr>", "Open Neorg" }, -- n = { "<cmd>Neorg<cr>", "Open Neorg" },
c = { "<cmd>Neorg toggle-concealer<cr>", "Toggle Concealer" }, -- c = { "<cmd>Neorg toggle-concealer<cr>", "Toggle Concealer" },
t = { "<cmd>Neorg tangle current-file<cr>", "Tangle Current File" }, -- t = { "<cmd>Neorg tangle current-file<cr>", "Tangle Current File" },
j = { "<cmd>Neorg journal<cr>", "Open Neorg Journal" }, -- j = { "<cmd>Neorg journal<cr>", "Open Neorg Journal" },
w = { -- w = {
function() -- function()
require("lazyvim.utils.neorg").workspace_switcher() -- require("lazyvim.utils.neorg").workspace_switcher()
end, -- end,
"Workspace Switcher", -- "Workspace Switcher",
}, -- },
}, -- },
q = { q = {
name = "+quit", name = "+quit",