adding git stuff

This commit is contained in:
Daniel Weber 2024-04-15 22:50:55 -04:00
parent daed5f0c76
commit 74a3d549a8
3 changed files with 51 additions and 12 deletions

View File

@ -0,0 +1,48 @@
require('gitsigns').setup{
current_line_blame_opts = {
virt_text = true,
virt_text_pos = 'eol', -- 'eol' | 'overlay' | 'right_align'
delay = 200,
ignore_whitespace = false,
virt_text_priority = 100,
},
on_attach = function(bufnr)
local gitsigns = require('gitsigns')
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
vim.cmd.normal({']c', bang = true})
else
gitsigns.nav_hunk('next')
end
end)
map('n', '[c', function()
if vim.wo.diff then
vim.cmd.normal({'[c', bang = true})
else
gitsigns.nav_hunk('prev')
end
end)
-- Actions
map('n', '<leader>hs', gitsigns.stage_hunk)
map('n', '<leader>hr', gitsigns.reset_hunk)
map('n', '<leader>hS', gitsigns.stage_buffer)
map('n', '<leader>hu', gitsigns.undo_stage_hunk)
map('n', '<leader>hR', gitsigns.reset_buffer)
map('n', '<leader>hp', gitsigns.preview_hunk)
map('n', '<leader>hb', function() gitsigns.blame_line{full=true} end)
map('n', '<leader>tb', gitsigns.toggle_current_line_blame)
map('n', '<leader>hd', gitsigns.diffthis)
map('n', '<leader>hD', function() gitsigns.diffthis('~') end)
map('n', '<leader>td', gitsigns.toggle_deleted)
end
}

View File

@ -2,6 +2,7 @@ require('neo-tree').setup({
sources = { sources = {
"filesystem", "filesystem",
"buffers", "buffers",
"git_status",
}, },
filesystem = { filesystem = {
filtered_items = { filtered_items = {
@ -10,7 +11,7 @@ require('neo-tree').setup({
hide_hidden = false, hide_hidden = false,
hide_dotfiles = false, hide_dotfiles = false,
}, },
follow_current_file = follow_current_file =
{ {
enabled = true, enabled = true,
}, },

View File

@ -13,10 +13,8 @@ vim.opt.rtp:prepend(lazypath)
require("lazy").setup({ require("lazy").setup({
"folke/which-key.nvim", "folke/which-key.nvim",
{"nvim-treesitter/nvim-treesitter", build = ':TSUpdate'}, {"nvim-treesitter/nvim-treesitter", build = ':TSUpdate'},
"nvim-treesitter/playground", "nvim-treesitter/playground",
{ {
"nvim-neo-tree/neo-tree.nvim", "nvim-neo-tree/neo-tree.nvim",
branch = "v3.x", branch = "v3.x",
@ -26,17 +24,9 @@ require("lazy").setup({
"MunifTanjim/nui.nvim", "MunifTanjim/nui.nvim",
} }
}, },
-- { "catppuccin/nvim", name = "catppuccin", priority = 1000 },
"navarasu/onedark.nvim", "navarasu/onedark.nvim",
"mbbill/undotree", "mbbill/undotree",
{ 'nvim-lualine/lualine.nvim', requires = { 'nvim-tree/nvim-web-devicons', opt = true } }, { 'nvim-lualine/lualine.nvim', requires = { 'nvim-tree/nvim-web-devicons', opt = true } },
-- { 'feline-nvim/feline.nvim', branch = '0.5-compat' },
--
{ {
'nvim-telescope/telescope.nvim', 'nvim-telescope/telescope.nvim',
tag = '0.1.3', tag = '0.1.3',
@ -57,7 +47,7 @@ require("lazy").setup({
{'hrsh7th/cmp-nvim-lsp'}, {'hrsh7th/cmp-nvim-lsp'},
{'hrsh7th/nvim-cmp'}, {'hrsh7th/nvim-cmp'},
{'L3MON4D3/LuaSnip'}, {'L3MON4D3/LuaSnip'},
'lewis6991/gitsigns.nvim',
{'xiyaowong/transparent.nvim'}, {'xiyaowong/transparent.nvim'},
{ 'numToStr/Comment.nvim', opts = {} }, { 'numToStr/Comment.nvim', opts = {} },
}) })