2 files changed, 22 insertions, 1 deletions

diff --git a/common/vim.nix b/common/vim.nix
index 5ee48c7..09dd9f5 100644
--- a/common/vim.nix
+++ b/common/vim.nix
@@ -105,7 +105,7 @@ let
 
           # Other
           tmux-complete-vim
-          vim-fugitive
+          neogit
           vim-rhubarb
           vim-repeat
           vim-unimpaired
diff --git a/dotfiles/vim.lua b/dotfiles/vim.lua
index d3604e3..9317453 100644
--- a/dotfiles/vim.lua
+++ b/dotfiles/vim.lua
@@ -246,6 +246,27 @@ map("s", "<S-Tab>", "vsnip#jumpable(-1) ? '<Plug>(vsnip-jump-prev)' : '<Tab>'",
 -- (e.g. goes through SSH)
 vim.cmd "autocmd TextYankPost * if v:event.regname is 't' | OSCYankReg t | endif"
 
+-- Diffview
+
+require("diffview").setup {
+        use_icons = false,
+        enhanced_diff_hl = true,
+}
+
+-- Neogit
+
+require("neogit").setup {
+        signs = {
+                section = { "", "" },
+                item = { "", "" },
+        },
+        integrations = {
+                diffview = true,
+        },
+}
+
+-- Local config
+
 function isModuleAvailable(name)
   if package.loaded[name] then
     return true