From b26feec89937cdfb95b8576fcb8383cdaf076fcd Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@zoriya.dev>
Date: Tue, 14 Mar 2023 17:26:50 +0900
Subject: [PATCH] Fix missing descriptions on keymaps

---
 modules/home/nvim/lua/plugins/git.lua | 12 ++++++------
 modules/home/nvim/lua/plugins/ui.lua  | 27 +++++++++++++++------------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/modules/home/nvim/lua/plugins/git.lua b/modules/home/nvim/lua/plugins/git.lua
index 93fcffa..72043c6 100644
--- a/modules/home/nvim/lua/plugins/git.lua
+++ b/modules/home/nvim/lua/plugins/git.lua
@@ -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,
diff --git a/modules/home/nvim/lua/plugins/ui.lua b/modules/home/nvim/lua/plugins/ui.lua
index 39ee92d..ed1d4b4 100644
--- a/modules/home/nvim/lua/plugins/ui.lua
+++ b/modules/home/nvim/lua/plugins/ui.lua
@@ -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,