opdavies/opdavies.nvim
Archived
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Update gitsigns configuration

Browse source 
- Remove use of `pcall` to simplify requiring the plugin.
- Replace usages of custom keybinding functions with `vim.keymap.set()`.
This commit is contained in:
Oliver Davies 2024-05-16 17:46:45 +01:00
parent e7bcf62062
commit 085a54aefc
1 changed files with 19 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
after/plugin/gitsigns.lua
View file

@ -1,40 +1,30 @@
local gitsigns_status_ok, gitsigns = pcall(require, "gitsigns") local gitsigns = require "gitsigns"
if not gitsigns_status_ok then
return
end
gitsigns.setup { gitsigns.setup {
linehl = false, linehl = false,
numhl = true, numhl = true,
} }
local map = require("opdavies.keymap").map local set = vim.keymap.set
local nmap = require("opdavies.keymap").nmap
local vmap = require("opdavies.keymap").vmap
nmap { "[h", "<cmd>Gitsigns prev_hunk<CR>" } set("n", "[h", "<cmd>Gitsigns prev_hunk<CR>")
nmap { "]h", "<cmd>Gitsigns next_hunk<CR>" } set("n", "]h", "<cmd>Gitsigns next_hunk<CR>")
nmap { "<leader>hR", gitsigns.reset_buffer } set("n", "<leader>hR", gitsigns.reset_buffer)
nmap { "<leader>hS", gitsigns.stage_buffer } set("n", "<leader>hS", gitsigns.stage_buffer)
nmap { "<leader>hb", gitsigns.blame_line } set("n", "<leader>hb", gitsigns.blame_line)
nmap { "<leader>hp", gitsigns.preview_hunk } set("n", "<leader>hp", gitsigns.preview_hunk)
nmap { "<leader>hr", gitsigns.reset_hunk } set("n", "<leader>hr", gitsigns.reset_hunk)
nmap { "<leader>hs", gitsigns.stage_hunk } set("n", "<leader>hs", gitsigns.stage_hunk)
nmap { "<leader>hu", gitsigns.undo_stage_hunk } set("n", "<leader>hu", gitsigns.undo_stage_hunk)
vmap { set("v", "<leader>hr", function()
"<leader>hr", gitsigns.reset_hunk { vim.fn.line ".", vim.fn.line "v" }
function() end)
gitsigns.reset_hunk { vim.fn.line ".", vim.fn.line "v" }
end, set("v", "<leader>hs", function()
} gitsigns.stage_hunk { vim.fn.line ".", vim.fn.line "v" }
vmap { end)
"<leader>hs",
function()
gitsigns.stage_hunk { vim.fn.line ".", vim.fn.line "v" }
end,
}
-- Text object. -- Text object.
map { { "o", "x" }, "ih", ":<C-U>Gitsigns select_hunk<CR>" } set({ "o", "x" }, "ih", ":<C-U>Gitsigns select_hunk<CR>")