From 8c8f8b016ce72dc1831aa267f928de0dd5550d78 Mon Sep 17 00:00:00 2001
From: TheSoeren <imhofabian@gmail.com>
Date: Thu, 6 Jun 2024 15:05:45 +0200
Subject: [PATCH] adjust key bindings

---
 lua/custom/plugins/harpoon.lua |  8 ++++----
 lua/remap.lua                  | 11 +++++------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/lua/custom/plugins/harpoon.lua b/lua/custom/plugins/harpoon.lua
index 41fa0b71..88956d13 100644
--- a/lua/custom/plugins/harpoon.lua
+++ b/lua/custom/plugins/harpoon.lua
@@ -33,16 +33,16 @@ return {
     vim.keymap.set('n', '<leader>a', function()
       harpoon:list():add()
     end)
-    vim.keymap.set('n', '<leader>1', function()
+    vim.keymap.set('n', '<C-h>', function()
       harpoon:list():select(1)
     end)
-    vim.keymap.set('n', '<leader>2', function()
+    vim.keymap.set('n', '<C-j>', function()
       harpoon:list():select(2)
     end)
-    vim.keymap.set('n', '<leader>3', function()
+    vim.keymap.set('n', '<C-k>', function()
       harpoon:list():select(3)
     end)
-    vim.keymap.set('n', '<leader>4', function()
+    vim.keymap.set('n', '<C-l>', function()
       harpoon:list():select(4)
     end)
 
diff --git a/lua/remap.lua b/lua/remap.lua
index 77a98f34..0ba1bf50 100644
--- a/lua/remap.lua
+++ b/lua/remap.lua
@@ -27,13 +27,12 @@ vim.keymap.set('n', '<up>', '<cmd>echo "Use k to move!!"<CR>')
 vim.keymap.set('n', '<down>', '<cmd>echo "Use j to move!!"<CR>')
 
 -- Keybinds to make split navigation easier.
---  Use CTRL+<hjkl> to switch between windows
---
 --  See `:help wincmd` for a list of all window commands
-vim.keymap.set('n', '<C-h>', '<C-w><C-h>', { desc = 'Move focus to the left window' })
-vim.keymap.set('n', '<C-l>', '<C-w><C-l>', { desc = 'Move focus to the right window' })
-vim.keymap.set('n', '<C-j>', '<C-w><C-j>', { desc = 'Move focus to the lower window' })
-vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the upper window' })
+--  THIS WOULD CLASH WITH HARPOON BUFFER SELECTION
+-- vim.keymap.set('n', '<C-h>', '<C-w><C-h>', { desc = 'Move focus to the left window' })
+-- vim.keymap.set('n', '<C-l>', '<C-w><C-l>', { desc = 'Move focus to the right window' })
+-- vim.keymap.set('n', '<C-j>', '<C-w><C-j>', { desc = 'Move focus to the lower window' })
+-- vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the upper window' })
 
 -- Enable moving highlighted lines
 vim.keymap.set('v', 'J', ":m '>+1<CR>gv=gv")