adding more git configs

lua/custom/plugins/git.lua

@@ -0,0 +1,36 @@
+return {
+  { -- LazyGit
+    'kdheepak/lazygit.nvim',
+    cmd = {
+      'LazyGit',
+      'LazyGitConfig',
+      'LazyGitCurrentFile',
+      'LazyGitFilter',
+      'LazyGitFilterCurrentFile',
+    },
+    -- optional for floating window border decoration
+    dependencies = {
+      'nvim-lua/plenary.nvim',
+    },
+    -- setting the keybinding for LazyGit with 'keys' is recommended in
+    -- order to load the plugin when the command is run for the first time
+    keys = {
+      { '<leader>lg', '<cmd>LazyGit<cr>', desc = 'LazyGit' },
+    },
+  },
+  {
+    'akinsho/git-conflict.nvim',
+    version = '*',
+    config = true,
+    opts = {
+      default_mappings = false, -- disable buffer local mapping created by this plugin
+      default_commands = true, -- disable commands created by this plugin
+      disable_diagnostics = false, -- This will disable the diagnostics in a buffer whilst it is conflicted
+      list_opener = 'copen', -- command or function to open the conflicts list
+      highlights = { -- They must have background color, otherwise the default color will be used
+        incoming = 'DiffAdd',
+        current = 'DiffText',
+      },
+    },
+  },
+}

lua/custom/plugins/lazygit.lua

@@ -1,21 +0,0 @@
-return {
-  {
-    'kdheepak/lazygit.nvim',
-    cmd = {
-      'LazyGit',
-      'LazyGitConfig',
-      'LazyGitCurrentFile',
-      'LazyGitFilter',
-      'LazyGitFilterCurrentFile',
-    },
-    -- optional for floating window border decoration
-    dependencies = {
-      'nvim-lua/plenary.nvim',
-    },
-    -- setting the keybinding for LazyGit with 'keys' is recommended in
-    -- order to load the plugin when the command is run for the first time
-    keys = {
-      { '<leader>lg', '<cmd>LazyGit<cr>', desc = 'LazyGit' },
-    },
-  },
-}

lua/custom/plugins/which-key.lua

@@ -22,17 +22,18 @@ return {
 
       -- Document existing key chains
       require('which-key').register {
-        ['<leader>c'] = { name = '[C]ode', _ = 'which_key_ignore' },
+        { '', group = 'Git [H]unk' },
-        ['<leader>d'] = { name = '[D]ocument', _ = 'which_key_ignore' },
+        { '', group = '[W]orkspace' },
-        ['<leader>r'] = { name = '[R]ename', _ = 'which_key_ignore' },
+        { '', group = '[S]earch' },
-        ['<leader>s'] = { name = '[S]earch', _ = 'which_key_ignore' },
+        { '', group = '[C]ode' },
-        ['<leader>w'] = { name = '[W]orkspace', _ = 'which_key_ignore' },
+        { '', group = '[R]ename' },
-        ['<leader>t'] = { name = '[T]oggle', _ = 'which_key_ignore' },
+        { '', group = '[T]oggle' },
-        ['<leader>h'] = { name = 'Git [H]unk', _ = 'which_key_ignore' },
+        { '', group = '[D]ocument' },
+        { '', desc = '', hidden = true, mode = { 'n', 'n', 'n', 'n', 'n', 'n', 'n' } },
       }
       -- visual mode
       require('which-key').register({
-        ['<leader>h'] = { 'Git [H]unk' },
+        { '', desc = '<leader>h', mode = 'v' },
       }, { mode = 'v' })
     end,
   },