keep some gitsigns mappings only | rm 0.7v related stuff

This commit is contained in:
siduck 2022-10-04 06:37:48 +05:30 committed by Sidhanth Rathod
parent b142f4c99d
commit 00be26275e
4 changed files with 14 additions and 99 deletions

View file

@ -229,7 +229,7 @@ M.lspconfig = {
["<leader>fm"] = {
function()
vim.lsp.buf.formatting {}
vim.lsp.buf.format { async = true }
end,
"lsp formatting",
},
@ -408,7 +408,7 @@ M.gitsigns = {
plugin = true,
n = {
-- Navigation
-- Navigation through hunks
["]c"] = {
function()
if vim.wo.diff then
@ -422,6 +422,7 @@ M.gitsigns = {
"Jump to next hunk",
opts = { expr = true },
},
["[c"] = {
function()
if vim.wo.diff then
@ -437,103 +438,33 @@ M.gitsigns = {
},
-- Actions
["<leader>hs"] = {
function()
require("gitsigns").stage_hunk()
end,
"Stage hunk",
},
["<leader>hr"] = {
["<leader>rh"] = {
function()
require("gitsigns").reset_hunk()
end,
"Reset hunk",
},
["<leader>hS"] = {
function()
require("gitsigns").stage_buffer()
end,
"Stage buffer",
},
["<leader>hu"] = {
function()
require("gitsigns").undo_stage_hunk()
end,
"Undo stage hunk",
},
["<leader>hR"] = {
function()
require("gitsigns").reset_buffer()
end,
"Reset buffer",
},
["<leader>hp"] = {
["<leader>ph"] = {
function()
require("gitsigns").preview_hunk()
end,
"Preview hunk",
},
["<leader>hb"] = {
["<leader>gb"] = {
function()
package.loaded.gitsigns.blame_line { full = true }
package.loaded.gitsigns.blame_line()
end,
"Blame line",
},
["<leader>tb"] = {
function()
require("gitsigns").toggle_current_line_blame()
end,
"Toggle current line blame",
},
["<leader>td"] = {
function()
require("gitsigns").toggle_deleted()
end,
"Toggle deleted",
},
["<leader>hd"] = {
function()
require("gitsigns").diffthis()
end,
"Diff against the index",
},
["<leader>hD"] = {
function()
require("gitsigns").diffthis "~"
end,
"Diff against the last commit",
},
},
v = {
-- Actions
["<leader>hs"] = {
function()
require("gitsigns").stage_hunk()
end,
"Stage hunk",
},
["<leader>hr"] = {
function ()
require("gitsigns").reset_hunk()
end,
"Reset hunk",
},
},
x = {
["ih"] = {
function ()
require("gitsigns").select_hunk()
end,
"Reset hunk",
},
},
o = {
["ih"] = {
function ()
require("gitsigns").select_hunk()
end,
"Reset hunk",
},
},
}

View file

@ -2,18 +2,11 @@ local opt = vim.opt
local g = vim.g
local config = require("core.utils").load_config()
g.vim_version = vim.version().minor
g.nvchad_theme = config.ui.theme
g.toggle_theme_icon = ""
g.transparency = config.ui.transparency
g.theme_switcher_loaded = false
-- use filetype.lua instead of filetype.vim. it's enabled by default in neovim 0.8 (nightly)
if g.vim_version < 8 then
g.did_load_filetypes = 0
g.do_filetype_lua = 1
end
opt.laststatus = 3 -- global statusline
opt.showmode = false