update: nvim: add gitsigns

This commit is contained in:
qwjyh 2023-03-13 17:34:04 +09:00
parent 5b5e9723eb
commit 47cf7360d7

View file

@ -15,18 +15,18 @@ vim.opt.rtp:prepend(lazypath)
-- Installing plugins -- Installing plugins
require('lazy').setup({ require('lazy').setup({
{ "catppuccin/nvim", name = "catppuccin" }, { "catppuccin/nvim", name = "catppuccin" }, -- Color scheme
{ { -- comment
'numToStr/Comment.nvim', 'numToStr/Comment.nvim',
config = function () config = function ()
require('Comment').setup() require('Comment').setup()
end, end,
}, },
-- lualine(statusline) { -- lualine(statusline)
{
'nvim-lualine/lualine.nvim', 'nvim-lualine/lualine.nvim',
dependencies = { 'kyazdani42/nvim-web-devicons', lazy = true } dependencies = { 'kyazdani42/nvim-web-devicons', lazy = true }
}, },
{ 'lewis6991/gitsigns.nvim', },
'neovim/nvim-lspconfig', 'neovim/nvim-lspconfig',
{ {
'hrsh7th/nvim-cmp', 'hrsh7th/nvim-cmp',
@ -125,6 +125,37 @@ end
local ft = require('Comment.ft') local ft = require('Comment.ft')
ft.set('satysfi', '%%s') ft.set('satysfi', '%%s')
-----------------------------------------------------------
-- gitsigns
require('gitsigns').setup {
on_attach = function(bufnr)
local gs = package.loaded.gitsigns
---custom mapping func
---@param mode string|string[]
---@param l string
---@param r any
---@param opts table?
local function map(mode, l, r, opts)
opts = opts or {}
opts.buffer = bufnr
vim.keymap.set(mode, l, r, opts)
end
-- Navigation
map('n', ']c', function()
if vim.wo.diff then return ']c' end
vim.schedule(function() gs.next_hunk() end)
return '<Ignore>'
end, {expr=true})
map('n', '[c', function()
if vim.wo.diff then return '[c' end
vim.schedule(function() gs.prev_hunk() end)
return '<Ignore>'
end, {expr=true})
end
}
----------------------------------------------------------- -----------------------------------------------------------
-- lualine -- lualine
require('lualine_setup') require('lualine_setup')