2024-04-08 09:26:41 +00:00
|
|
|
require "nvchad.mappings"
|
|
|
|
|
|
|
|
|
|
-- add yours here
|
|
|
|
|
|
|
|
|
|
local map = vim.keymap.set
|
|
|
|
|
|
|
|
|
|
map("n", ";", ":", { desc = "CMD enter command mode" })
|
2024-04-16 11:55:29 +00:00
|
|
|
map("i", "jk", "<esc>")
|
|
|
|
|
map("n", "<leader>gr", "<cmd> Gitsigns reset_hunk <cr>", { desc = "Reset hunk" })
|
|
|
|
|
map("n", "<leader>gp", "<cmd> Gitsigns preview_hunk <cr>", { desc = "See preview hunk" })
|
|
|
|
|
map("n", "<leader>gd", "<cmd> Gitsigns diffthis <cr>", { desc = "See diff" })
|
|
|
|
|
map("n", "<leader>gco", "<cmd> GitConflictChooseOurs <cr>", { desc = "Git conflict ours" })
|
|
|
|
|
map("n", "<leader>gct", "<cmd> GitConflictChooseTheirs <cr>", { desc = "Git conflict theirs" })
|
|
|
|
|
map("n", "<leader>gcb", "<cmd> GitConflictChooseBoth <cr>", { desc = "Git conflict both" })
|
|
|
|
|
map("n", "<leader>gc0", "<cmd> GitConflictChooseNone <cr>", { desc = "Git conflict none" })
|
|
|
|
|
map("n", "<leader>gcp", "<cmd> GitConflictPrevConflict <cr>", { desc = "Git conflict preview conflict" })
|
|
|
|
|
map("n", "<leader>gcn", "<cmd> GitConflictNextConflict <cr>", { desc = "Git conflict next conflict" })
|
|
|
|
|
map({ "n", "i", "v" }, "<C-s>", "<cmd> w <cr>", { desc = "Save" })
|
|
|
|
|
map({ "n", "i", "v" }, "<C-x>", "<cmd> qall <cr>", { desc = "Quit" })
|
|
|
|
|
map({ "n", "i", "v" }, "<C-X>", "<cmd> qall! <cr>", { desc = "Force quit" })
|
