mirror of
https://github.com/ksyasuda/dotfiles.git
synced 2025-12-05 02:53:38 -08:00
fix bug in whichkey converter function
This commit is contained in:
@@ -12,10 +12,14 @@ local nosilent = { noremap = true }
|
|||||||
vim.g.mapleader = " "
|
vim.g.mapleader = " "
|
||||||
vim.g.maplocalleader = ","
|
vim.g.maplocalleader = ","
|
||||||
|
|
||||||
|
function create_custom_command(trigger, command, description)
|
||||||
|
-- Create a custom command with the given trigger, command, and description
|
||||||
|
vim.api.nvim_create_user_command(trigger, command, { desc = description })
|
||||||
|
end
|
||||||
-- Custom commands
|
-- Custom commands
|
||||||
vim.api.nvim_create_user_command("Config", "edit ~/.config/nvim", {})
|
create_custom_command("Config", "edit ~/.config/nvim", "Edit nvim configuration")
|
||||||
vim.api.nvim_create_user_command("Keymaps", "edit ~/.config/nvim/lua/core/keymaps.lua", {})
|
create_custom_command("Keymaps", "edit ~/.config/nvim/lua/core/keymaps.lua", "Edit Hyprland keybindings")
|
||||||
vim.api.nvim_create_user_command("Hypr", "edit ~/.config/hypr/hyprland.conf", {})
|
create_custom_command("Hypr", "edit ~/.config/hypr/hyprland.conf", "Edit Hyprland configuration")
|
||||||
|
|
||||||
-- {{{ Basic Mappings
|
-- {{{ Basic Mappings
|
||||||
local basic_mappings = {
|
local basic_mappings = {
|
||||||
@@ -34,10 +38,10 @@ local basic_mappings = {
|
|||||||
local buffer_navigation_mappings = {
|
local buffer_navigation_mappings = {
|
||||||
{ key = "<C-J>", cmd = ":bnext<CR>", desc = "Next buffer", mode = "n" },
|
{ key = "<C-J>", cmd = ":bnext<CR>", desc = "Next buffer", mode = "n" },
|
||||||
{ key = "<C-K>", cmd = ":bprev<CR>", desc = "Previous buffer", mode = "n" },
|
{ key = "<C-K>", cmd = ":bprev<CR>", desc = "Previous buffer", mode = "n" },
|
||||||
{ key = "<leader>bb", cmd = ":Telescope buffers<CR>", desc = "List buffers", mode = "n", group = "Buffers" },
|
{ key = "<leader>bb", cmd = ":Telescope buffers<CR>", desc = "List buffers", mode = "n" },
|
||||||
{ key = "<leader>bk", cmd = ":bdelete<CR>", desc = "Delete buffer", mode = "n", group = "Buffers" },
|
{ key = "<leader>bk", cmd = ":bdelete<CR>", desc = "Delete buffer", mode = "n" },
|
||||||
{ key = "<leader>bn", cmd = ":bnext<CR>", desc = "Next buffer", mode = "n", group = "Buffers" },
|
{ key = "<leader>bn", cmd = ":bnext<CR>", desc = "Next buffer", mode = "n" },
|
||||||
{ key = "<leader>bp", cmd = ":bprev<CR>", desc = "Previous buffer", mode = "n", group = "Buffers" },
|
{ key = "<leader>bp", cmd = ":bprev<CR>", desc = "Previous buffer", mode = "n" },
|
||||||
}
|
}
|
||||||
--}}}
|
--}}}
|
||||||
|
|
||||||
@@ -68,84 +72,72 @@ local terminal_mappings = {
|
|||||||
cmd = ":ToggleTerm name=toggleterm<CR>",
|
cmd = ":ToggleTerm name=toggleterm<CR>",
|
||||||
desc = "Toggle terminal",
|
desc = "Toggle terminal",
|
||||||
mode = "n",
|
mode = "n",
|
||||||
group = "Toggle",
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key = "<leader>tT",
|
key = "<leader>tT",
|
||||||
cmd = ":ToggleTerm name=toggleterm-full direction=tab<CR>",
|
cmd = ":ToggleTerm name=toggleterm-full direction=tab<CR>",
|
||||||
desc = "Toggle full terminal",
|
desc = "Toggle full terminal",
|
||||||
mode = "n",
|
mode = "n",
|
||||||
group = "Toggle",
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key = "<leader>ot",
|
key = "<leader>ot",
|
||||||
cmd = ":ToggleTerm name=toggleterm<CR>",
|
cmd = ":ToggleTerm name=toggleterm<CR>",
|
||||||
desc = "Open terminal",
|
desc = "Open terminal",
|
||||||
mode = "n",
|
mode = "n",
|
||||||
group = "Open",
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key = "<leader>oT",
|
key = "<leader>oT",
|
||||||
cmd = ":ToggleTerm name=toggleterm-full direction=tab<CR>",
|
cmd = ":ToggleTerm name=toggleterm-full direction=tab<CR>",
|
||||||
desc = "Open full terminal",
|
desc = "Open full terminal",
|
||||||
mode = "n",
|
mode = "n",
|
||||||
group = "Open",
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key = "<leader>ts",
|
key = "<leader>ts",
|
||||||
cmd = ":TermSelect<CR>",
|
cmd = ":TermSelect<CR>",
|
||||||
desc = "Select terminal",
|
desc = "Select terminal",
|
||||||
mode = "n",
|
mode = "n",
|
||||||
group = "Terminal",
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key = "<leader>tv",
|
key = "<leader>tv",
|
||||||
cmd = ":ToggleTerm direction=vertical name=toggleterm-vert<CR>",
|
cmd = ":ToggleTerm direction=vertical name=toggleterm-vert<CR>",
|
||||||
desc = "Toggle vertical terminal",
|
desc = "Toggle vertical terminal",
|
||||||
mode = "n",
|
mode = "n",
|
||||||
group = "Terminal",
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key = "<leader>th",
|
key = "<leader>th",
|
||||||
cmd = ":ToggleTerm direction=horizontal name=toggleterm-hori<CR>",
|
cmd = ":ToggleTerm direction=horizontal name=toggleterm-hori<CR>",
|
||||||
desc = "Toggle horizontal terminal",
|
desc = "Toggle horizontal terminal",
|
||||||
mode = "n",
|
mode = "n",
|
||||||
group = "Terminal",
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key = "<leader>ov",
|
key = "<leader>ov",
|
||||||
cmd = ":ToggleTerm direction=vertical name=toggleterm-vert<CR>",
|
cmd = ":ToggleTerm direction=vertical name=toggleterm-vert<CR>",
|
||||||
desc = "Open vertical terminal",
|
desc = "Open vertical terminal",
|
||||||
mode = "n",
|
mode = "n",
|
||||||
group = "Open",
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key = "<leader>oh",
|
key = "<leader>oh",
|
||||||
cmd = ":ToggleTerm direction=horizontal name=toggleterm-hori<CR>",
|
cmd = ":ToggleTerm direction=horizontal name=toggleterm-hori<CR>",
|
||||||
desc = "Open horizontal terminal",
|
desc = "Open horizontal terminal",
|
||||||
mode = "n",
|
mode = "n",
|
||||||
group = "Open",
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key = "<leader>tf",
|
key = "<leader>tf",
|
||||||
cmd = ":ToggleTerm name=toggleterm<CR>",
|
cmd = ":ToggleTerm name=toggleterm<CR>",
|
||||||
desc = "Toggle terminal",
|
desc = "Toggle terminal",
|
||||||
mode = "n",
|
mode = "n",
|
||||||
group = "Terminal",
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key = "<leader>-",
|
key = "<leader>-",
|
||||||
cmd = ":ToggleTerm direction='horizontal'<CR>",
|
cmd = ":ToggleTerm direction='horizontal'<CR>",
|
||||||
desc = "Toggle horizontal terminal",
|
desc = "Toggle horizontal terminal",
|
||||||
mode = "n",
|
mode = "n",
|
||||||
group = "Horizontal Terminal",
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key = "<leader>|",
|
key = "<leader>|",
|
||||||
cmd = ":ToggleTerm direction='vertical'<CR>",
|
cmd = ":ToggleTerm direction='vertical'<CR>",
|
||||||
desc = "Toggle vertical terminal",
|
desc = "Toggle vertical terminal",
|
||||||
mode = "n",
|
mode = "n",
|
||||||
group = "Vertical Terminal",
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
--}}}
|
--}}}
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ vim.notify = require("notify")
|
|||||||
---@usage addToWhichKey(mappings, group)
|
---@usage addToWhichKey(mappings, group)
|
||||||
---@example addToWhichKey({{key = "n", cmd = "next", mode = "n", desc = "Next Line", group = "Navigation"}, {key = "t", group = "example"})
|
---@example addToWhichKey({{key = "n", cmd = "next", mode = "n", desc = "Next Line", group = "Navigation"}, {key = "t", group = "example"})
|
||||||
function M.addToWhichKey(mappings, group)
|
function M.addToWhichKey(mappings, group)
|
||||||
local wk_mappings = {}
|
|
||||||
if group then
|
if group then
|
||||||
whichkey.add({ group.key, group = group.group })
|
whichkey.add({ group.key, group = group.group })
|
||||||
end
|
end
|
||||||
@@ -21,6 +20,7 @@ function M.addToWhichKey(mappings, group)
|
|||||||
return
|
return
|
||||||
end
|
end
|
||||||
for _, mapping in ipairs(mappings) do
|
for _, mapping in ipairs(mappings) do
|
||||||
|
local wk_mappings = {}
|
||||||
if not mapping.key or mapping.key == "" then
|
if not mapping.key or mapping.key == "" then
|
||||||
vim.notify("Error: Key is empty or nil", "error")
|
vim.notify("Error: Key is empty or nil", "error")
|
||||||
return
|
return
|
||||||
@@ -38,9 +38,11 @@ function M.addToWhichKey(mappings, group)
|
|||||||
|
|
||||||
wk_mappings[1] = mapping.key
|
wk_mappings[1] = mapping.key
|
||||||
wk_mappings[2] = mapping.cmd
|
wk_mappings[2] = mapping.cmd
|
||||||
wk_mappings.mode = mapping.mode
|
wk_mappings.mode = mapping.mode or "n"
|
||||||
wk_mappings.desc = mapping.desc or "No Description"
|
wk_mappings.desc = mapping.desc
|
||||||
wk_mappings.group = mapping.group or "No Group"
|
if mapping.group then
|
||||||
|
wk_mappings.group = mapping.group
|
||||||
|
end
|
||||||
whichkey.add(wk_mappings)
|
whichkey.add(wk_mappings)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user