From 6a1ad74c07b98e54bed17c8a592c1cf204a6af82 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Mon, 11 Apr 2022 22:08:50 +0200 Subject: vim: switch from fugitive to neogit --- common/vim.nix | 2 +- dotfiles/vim.lua | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) 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", "", "vsnip#jumpable(-1) ? '(vsnip-jump-prev)' : ''", -- (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 -- cgit v1.2.3