From 7c3289fded1f75f6e060f56bd06edc2a327744d9 Mon Sep 17 00:00:00 2001 From: Squibid Date: Tue, 6 May 2025 16:51:24 -0500 Subject: kitchen sink again :( --- lua/conf/plugins/gitsigns.lua | 64 +++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 32 deletions(-) (limited to 'lua/conf/plugins/gitsigns.lua') diff --git a/lua/conf/plugins/gitsigns.lua b/lua/conf/plugins/gitsigns.lua index a92264e..b420746 100644 --- a/lua/conf/plugins/gitsigns.lua +++ b/lua/conf/plugins/gitsigns.lua @@ -1,19 +1,19 @@ -local misc = require('core.misc') +local misc = require("core.misc") local map = misc.map -return { 'lewis6991/gitsigns.nvim', +return { "lewis6991/gitsigns.nvim", disable = not vim.fn.has("nvim-0.9.0"), function() local gs = require("gitsigns") gs.setup { signs = { - add = { text = '│' }, - change = { text = '│' }, - delete = { text = '-' }, - topdelete = { text = '‾' }, - changedelete = { text = '~' }, - untracked = { text = '┆' } + add = { text = "│" }, + change = { text = "│" }, + delete = { text = "-" }, + topdelete = { text = "‾" }, + changedelete = { text = "~" }, + untracked = { text = "┆" } }, signcolumn = true, @@ -27,51 +27,51 @@ return { 'lewis6991/gitsigns.nvim', }, attach_to_untracked = true, - current_line_blame_formatter = ', - ', + current_line_blame_formatter = ", - ", - preview_config = { border = 'solid' }, + preview_config = { border = vim.g.border_style }, on_attach = function(bufnr) local opts = { buffer = bufnr } -- Navigation - map('n', ']c', function() + map("n", "]c", function() if vim.wo.diff then - return ']c' + return "]c" end vim.schedule(function() gs.next_hunk() end) - return '' + return "" end, { expr = true, buffer = bufnr }) - map('n', '[c', function() + map("n", "[c", function() if vim.wo.diff then - return '[c' + return "[c" end vim.schedule(function() gs.prev_hunk() end) - return '' + return "" end, { expr = true, buffer = bufnr }) -- Actions - map('n', 'hs', gs.stage_hunk, opts) - map('n', 'hr', gs.reset_hunk, opts) - map('v', 'hs', function() - gs.stage_hunk { vim.fn.line('.'), vim.fn.line('v') } + map("n", "hs", gs.stage_hunk, opts) + map("n", "hr", gs.reset_hunk, opts) + map("v", "hs", function() + gs.stage_hunk { vim.fn.line("."), vim.fn.line("v") } end, opts) - map('v', 'hr', function() - gs.reset_hunk { vim.fn.line('.'), vim.fn.line('v') } + map("v", "hr", function() + gs.reset_hunk { vim.fn.line("."), vim.fn.line("v") } end, opts) - map('n', 'hS', gs.stage_buffer, opts) - map('n', 'hu', gs.undo_stage_hunk, opts) - map('n', 'hR', gs.reset_buffer, opts) - map('n', 'hp', gs.preview_hunk, opts) - map('n', 'hb', function() gs.blame_line { full=true } end, opts) - map('n', 'tb', gs.toggle_current_line_blame, opts) - map('n', 'hd', gs.diffthis, opts) - map('n', 'hD', function() gs.diffthis('~') end, opts) - map('n', 'td', gs.toggle_deleted, opts) + map("n", "hS", gs.stage_buffer, opts) + map("n", "hu", gs.undo_stage_hunk, opts) + map("n", "hR", gs.reset_buffer, opts) + map("n", "hp", gs.preview_hunk, opts) + map("n", "hb", function() gs.blame_line { full=true } end, opts) + map("n", "tb", gs.toggle_current_line_blame, opts) + map("n", "hd", gs.diffthis, opts) + map("n", "hD", function() gs.diffthis("~") end, opts) + map("n", "td", gs.toggle_deleted, opts) -- Text object - map({ 'o', 'x' }, 'ih', ':Gitsigns select_hunk', opts) + map({ "o", "x" }, "ih", ":Gitsigns select_hunk", opts) end } end -- cgit v1.2.1