zoriya/flake
1
0
Fork 0
mirror of https://github.com/zoriya/flake.git synced 2026-06-01 10:15:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing descriptions on keymaps

Browse Source
This commit is contained in:
Zoe Roux
2023-03-14 17:26:50 +09:00
parent 71f113cfcc
commit b26feec899
2 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/home/nvim/lua/plugins/git.lua
+6 -6
View File
@@ -38,12 +38,12 @@ return {
"akinsho/git-conflict.nvim",
event = "VeryLazy",
keys = {
{ "gxo", "<Plug>(git-conflict-ours)", "Accept ours" },
{ "gxt", "<Plug>(git-conflict-theirs)", "Accept theirs" },
{ "gxb", "<Plug>(git-conflict-both)", "Accept both" },
{ "gx0", "<Plug>(git-conflict-none)", "Accept none" },
{ "]x", "<Plug>(git-conflict-prev-conflict)", "Previous conflict" },
{ "[x", "<Plug>(git-conflict-next-conflict)", "Next conflict" },
{ "gxo", "<Plug>(git-conflict-ours)", desc = "Accept ours" },
{ "gxt", "<Plug>(git-conflict-theirs)", desc = "Accept theirs" },
{ "gxb", "<Plug>(git-conflict-both)", desc = "Accept both" },
{ "gx0", "<Plug>(git-conflict-none)", desc = "Accept none" },
{ "]x", "<Plug>(git-conflict-prev-conflict)", desc = "Previous conflict" },
{ "[x", "<Plug>(git-conflict-next-conflict)", desc = "Next conflict" },
},
opts = {
default_mappings = false,
modules/home/nvim/lua/plugins/ui.lua
+15 -12
View File
@@ -80,18 +80,21 @@ return {
local wk = require("which-key")
wk.setup(opts)
wk.register({
mode = { "n", "v" },
["g"] = { name = "+goto" },
["]"] = { name = "+next" },
["["] = { name = "+prev" },
["<leader>g"] = { name = "+git" },
["<leader>l"] = { name = "+lsp" },
})
local uwk = require("unimpaired-which-key")
wk.register(uwk.normal_mode)
wk.register(uwk.normal_and_visual_mode, { mode = { "n", "v" } })
wk.register({
gx = "Git conflict",
})
wk.register({
mode = { "n", "v" },
["g"] = { name = "+goto" },
["]"] = { name = "+next" },
["["] = { name = "+prev" },
["<leader>g"] = { name = "+git" },
["<leader>l"] = { name = "+lsp" },
})
end,
},
@@ -138,9 +141,9 @@ return {
{
"folke/trouble.nvim",
keys = {
{ "<leader>ld", "<cmd>Trouble document_diagnostics<cr>", "Document Diagnostics" },
{ "<leader>lw", "<cmd>Trouble workspace_diagnostics<cr>", "Workspace Diagnostics" },
{ "<leader>lt", "<cmd>TroubleToggle<CR>", "Toogle trouble window" },
{ "<leader>ld", "<cmd>Trouble document_diagnostics<cr>", desc = "Document Diagnostics" },
{ "<leader>lw", "<cmd>Trouble workspace_diagnostics<cr>", desc = "Workspace Diagnostics" },
{ "<leader>lt", "<cmd>TroubleToggle<CR>", desc = "Toogle trouble window" },
},
opts = {
auto_close = true,