From e0bc23e45b5d866f7f958e09a2160a28b5981f13 Mon Sep 17 00:00:00 2001
From: talksik <patel.arjun50@gmai.com>
Date: Sun, 6 Aug 2023 13:56:31 -0700
Subject: [PATCH] fixing conflicts with keymaps

---
 .config/nvim/after/plugin/harpoon.lua | 7 +++----
 .config/nvim/lua/talksik/remap.lua    | 5 +++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.config/nvim/after/plugin/harpoon.lua b/.config/nvim/after/plugin/harpoon.lua
index b43e576..3268126 100644
--- a/.config/nvim/after/plugin/harpoon.lua
+++ b/.config/nvim/after/plugin/harpoon.lua
@@ -9,7 +9,6 @@ harpoon.setup({
 vim.keymap.set("n", "<C-a>", mark.add_file)
 vim.keymap.set("n", "<C-e>", ui.toggle_quick_menu)
 
-vim.keymap.set("n", "<C-h>", function() ui.nav_file(1) end)
-vim.keymap.set("n", "<C-j>", function() ui.nav_file(2) end)
-vim.keymap.set("n", "<C-k>", function() ui.nav_file(3) end)
-vim.keymap.set("n", "<C-l>", function() ui.nav_file(4) end)
+vim.keymap.set("n", "<leader>j", function() ui.nav_file(1) end)
+vim.keymap.set("n", "<leader>k", function() ui.nav_file(2) end)
+vim.keymap.set("n", "<leader>l", function() ui.nav_file(3) end)
diff --git a/.config/nvim/lua/talksik/remap.lua b/.config/nvim/lua/talksik/remap.lua
index d0ad305..4722c4d 100755
--- a/.config/nvim/lua/talksik/remap.lua
+++ b/.config/nvim/lua/talksik/remap.lua
@@ -40,8 +40,9 @@ vim.keymap.set("n", "<C-f>", "<cmd>silent !tmux neww tmux-sessionizer<CR>")
 
 vim.keymap.set("n", "<C-k>", "<cmd>cnext<CR>zz")
 vim.keymap.set("n", "<C-j>", "<cmd>cprev<CR>zz")
-vim.keymap.set("n", "<leader>k", "<cmd>lnext<CR>zz")
-vim.keymap.set("n", "<leader>j", "<cmd>lprev<CR>zz")
+-- using for harpoon instead
+-- vim.keymap.set("n", "<leader>k", "<cmd>lnext<CR>zz")
+-- vim.keymap.set("n", "<leader>j", "<cmd>lprev<CR>zz")
 
 vim.keymap.set("n", "<leader>x", "<cmd>!chmod +x %<CR>", { silent = true })