talksik/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing conflicts with keymaps

Browse Source
This commit is contained in:
talksik
2023-08-06 13:56:31 -07:00
parent e9cde6e881
commit e0bc23e45b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.config/nvim/after/plugin/harpoon.lua
+3 -4
View File
@@ -9,7 +9,6 @@ harpoon.setup({
vim.keymap.set("n", "<C-a>", mark.add_file) vim.keymap.set("n", "<C-a>", mark.add_file)
vim.keymap.set("n", "<C-e>", ui.toggle_quick_menu) 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", "<leader>j", function() ui.nav_file(1) end)
vim.keymap.set("n", "<C-j>", function() ui.nav_file(2) end) vim.keymap.set("n", "<leader>k", function() ui.nav_file(2) end)
vim.keymap.set("n", "<C-k>", function() ui.nav_file(3) end) vim.keymap.set("n", "<leader>l", function() ui.nav_file(3) end)
vim.keymap.set("n", "<C-l>", function() ui.nav_file(4) end)
.config/nvim/lua/talksik/remap.lua
+3 -2
View File
@@ -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-k>", "<cmd>cnext<CR>zz")
vim.keymap.set("n", "<C-j>", "<cmd>cprev<CR>zz") vim.keymap.set("n", "<C-j>", "<cmd>cprev<CR>zz")
vim.keymap.set("n", "<leader>k", "<cmd>lnext<CR>zz") -- using for harpoon instead
vim.keymap.set("n", "<leader>j", "<cmd>lprev<CR>zz") -- 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 }) vim.keymap.set("n", "<leader>x", "<cmd>!chmod +x %<CR>", { silent = true })