1 files changed, 22 insertions, 8 deletions

diff --git a/.config/nvim/lua/plugins/git.lua b/.config/nvim/lua/plugins/git.lua
index 0e4d7f5..5f1c1e3 100644
--- a/.config/nvim/lua/plugins/git.lua
+++ b/.config/nvim/lua/plugins/git.lua
@@ -1,15 +1,27 @@
 return {
     {
+        "purarue/gitsigns-yadm.nvim",
+        lazy = true,
+    },
+    {
         "lewis6991/gitsigns.nvim",
+        event = { "BufReadPost", "VeryLazy" },
         opts = {
             signs                        = {
                 add          = { text = '│' },
-                change       = { text = '│' },
+                change       = { text = '~' },
                 delete       = { text = '_' },
                 topdelete    = { text = '‾' },
                 changedelete = { text = '~' },
                 untracked    = { text = '┆' },
             },
+            _on_attach_pre               = function(_, callback)
+                if vim.fn.executable("yadm") == 1 then
+                    require("gitsigns-yadm").yadm_signs(callback)
+                else
+                    callback()
+                end
+            end,
             signcolumn                   = true,  -- Toggle with `:Gitsigns toggle_signs`
             numhl                        = false, -- Toggle with `:Gitsigns toggle_numhl`
             linehl                       = false, -- Toggle with `:Gitsigns toggle_linehl`
@@ -38,10 +50,6 @@ return {
                 row = 0,
                 col = 1
             },
-            yadm                         = {
-                enable = true
-            },
-
             on_attach                    = function(bufnr)
                 local gs = package.loaded.gitsigns
 
@@ -89,7 +97,13 @@ return {
         },
     },
     {
-        "tpope/vim-fugitive",
-        cmd = { 'Git', 'Gstatus', 'Gblame', 'Gpush', 'Gpull' },
-    },
+        "NeogitOrg/neogit",
+        dependencies = {
+            "nvim-lua/plenary.nvim",         -- required
+            "sindrets/diffview.nvim",        -- optional - Diff integration
+            "nvim-telescope/telescope.nvim", -- optional
+        },
+        cmd = "Neogit",
+        config = true
+    }
 }