diff --git a/config/nvim/init.lua b/config/nvim/init.lua index ce1e156..fc774d9 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -49,6 +49,10 @@ require("packer").startup(function(use) -- Tabs use({ "romgrk/barbar.nvim" }) + + -- Git + use({ "lewis6991/gitsigns.nvim", requires = { "nvim-lua/plenary.nvim" } }) + use({ "tpope/vim-fugitive" }) end) require("nightfox").load() @@ -116,6 +120,10 @@ require("telescope").setup({ } }) +require("gitsigns").setup({ + current_line_blame = true, +}) + require("nvim-autopairs").setup() require("lualine").setup() diff --git a/config/nvim/lua/remaps.lua b/config/nvim/lua/remaps.lua index 3939164..ca0cfff 100644 --- a/config/nvim/lua/remaps.lua +++ b/config/nvim/lua/remaps.lua @@ -66,3 +66,9 @@ nmap("7", ":BufferGoto 7") nmap("8", ":BufferGoto 8") nmap("9", ":BufferGoto 9") nmap("e", ":BufferClose") + +-- Git +nmap("gg", ":G") +nmap("gs", ":lua require('gitsigns').stage_hunk()") +nmap("gu", ":lua require('gitsigns').undo_stage_hunk()") +nmap("gr", ":lua require('gitsigns').reset_hunk()")