From d3ff26f682dafc92dc2b89a3c2b5d4b205ac2344 Mon Sep 17 00:00:00 2001 From: sgoudham Date: Mon, 13 Feb 2023 03:23:56 +0000 Subject: [PATCH] feat(nvim): add neogit --- dot_config/nvim/lua/plugins/catppuccin.lua | 7 ++++++- dot_config/nvim/lua/plugins/gitsigns.lua | 10 ++++++---- dot_config/nvim/lua/plugins/neogit.lua | 7 +++++++ 3 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 dot_config/nvim/lua/plugins/neogit.lua diff --git a/dot_config/nvim/lua/plugins/catppuccin.lua b/dot_config/nvim/lua/plugins/catppuccin.lua index f568787..9580534 100644 --- a/dot_config/nvim/lua/plugins/catppuccin.lua +++ b/dot_config/nvim/lua/plugins/catppuccin.lua @@ -13,6 +13,7 @@ return { term_colors = true, no_italic = true, integrations = { + neogit = true, mason = true, native_lsp = { enabled = true }, navic = { @@ -52,7 +53,11 @@ return { TelescopeTitle = { fg = cp.subtext0 }, QuickScopePrimary = { fg = cp.red }, QuickScopeSecondary = { fg = cp.peach }, - -- MiniIndentscopeSymbol = { fg = cp.blue }, + + DapStoppedLinehl = { bg = "#324430" }, + DapBreakpointLinehl = { bg = "#492a32" }, + + NeogitDiffContextHighlight = { bg = "NONE" } }, }) vim.cmd.colorscheme("catppuccin") diff --git a/dot_config/nvim/lua/plugins/gitsigns.lua b/dot_config/nvim/lua/plugins/gitsigns.lua index e627208..141ba66 100644 --- a/dot_config/nvim/lua/plugins/gitsigns.lua +++ b/dot_config/nvim/lua/plugins/gitsigns.lua @@ -1,6 +1,7 @@ return { { "lewis6991/gitsigns.nvim", + priority = 500, config = function() require("gitsigns").setup({ on_attach = function(bufnr) @@ -35,6 +36,7 @@ return { end, { expr = true }, "Previous Hunk") -- Actions + map({ "n", "v" }, "gg", ":Neogit", {}, "Open Git") map({ "n", "v" }, "gs", ":Gitsigns stage_hunk", {}, "Stage Hunk") map({ "n", "v" }, "gr", ":Gitsigns reset_hunk", {}, "Reset Hunk") map("n", "gS", gs.stage_buffer, {}, "Stage Buffer") @@ -45,10 +47,10 @@ return { gs.blame_line({ full = true }) end, {}, "Show Blame") map("n", "gb", gs.toggle_current_line_blame, {}, "Current Line Blame") - map("n", "gd", gs.diffthis, {}, "Diff This") - map("n", "gD", function() - gs.diffthis("~") - end, {}, "") + -- map("n", "gd", gs.diffthis, {}, "Diff This") + -- map("n", "gD", function() + -- gs.diffthis("~") + -- end, {}, "") map("n", "gd", gs.toggle_deleted, {}, "Show Deleted") -- Text object diff --git a/dot_config/nvim/lua/plugins/neogit.lua b/dot_config/nvim/lua/plugins/neogit.lua new file mode 100644 index 0000000..a32b25f --- /dev/null +++ b/dot_config/nvim/lua/plugins/neogit.lua @@ -0,0 +1,7 @@ +return { + { + "TimUntersberger/neogit", + config = true, + dependencies = { "nvim-lua/plenary.nvim" }, + }, +}