From 3580857057ab1797b5d0d47e3bbda64fdf647ccd Mon Sep 17 00:00:00 2001
From: Henrik Bakken <bakken.henrik@gmail.com>
Date: Sat, 11 Mar 2023 00:04:08 +0100
Subject: [PATCH] git Flog+delta

---
 HOME/.gitconfig | 13 ++++++++++++-
 nvim/init.lua   | 20 ++++----------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/HOME/.gitconfig b/HOME/.gitconfig
index 8764c41..b9c8949 100644
--- a/HOME/.gitconfig
+++ b/HOME/.gitconfig
@@ -11,7 +11,7 @@
   cpld = loadcheckpoint required = true
 [core]
   filemode = false
-  pager = diff-so-fancy | less --tabs=4 -RFX
+  pager = delta
   autorcrlf = true
   editor = nvim
 [user]
@@ -21,3 +21,14 @@
   clean = git-lfs clean -- %f
   smudge = git-lfs smudge -- %f
   process = git-lfs filter-process
+[interactive]
+    diffFilter = delta --color-only
+[delta]
+    navigate = true
+    light = false
+    line-numbers = true
+    side-by-side = true
+[merge]
+    conflictstyle = diff3
+[diff]
+    colorMoved = default
diff --git a/nvim/init.lua b/nvim/init.lua
index 4b7ca75..021b76a 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -91,7 +91,7 @@ local cmd = vim.cmd
 vim.api.nvim_command [[augroup MYAU]]
 vim.api.nvim_command [[autocmd!]]
 vim.api.nvim_command [[autocmd BufWritePost * %s/\s\+$//e]]
-vim.api.nvim_command [[autocmd BufWritePost *.py silent! execute ':Black']]
+vim.api.nvim_command [[autocmd BufWritePre *.py execute ':Black']]
 vim.api.nvim_command [[autocmd FileType *.py setlocal indentkeys-=<:>]]
 vim.api.nvim_command [[autocmd BufReadPost quickfix nmap <buffer> <cr> <cr>]]
 vim.api
@@ -209,24 +209,12 @@ require("packer").startup {
       end
     }
 
-    -- tig
     use {
-      "iberianpig/tig-explorer.vim",
-      requires = {"rbgrouleff/bclose.vim"},
+      "rbong/vim-flog",
       config = function()
-        vim.tig_explorer_keymap_edit_e = 'e'
-        vim.tig_explorer_keymap_edit = '<C-o>'
-        vim.tig_explorer_keymap_tabedit = '<C-t>'
-        vim.tig_explorer_keymap_split = '<C-s>'
-        vim.tig_explorer_keymap_vsplit = '<C-v>'
-        vim.tig_explorer_keymap_commit_edit = '<ESC>o'
-        vim.tig_explorer_keymap_commit_tabedit = '<ESC>t'
-        vim.tig_explorer_keymap_commit_split = '<ESC>s'
-        vim.tig_explorer_keymap_commit_vsplit = '<ESC>v'
-        vim.g.tig_explorer_use_builtin_term = 0
         local map = vim.api.nvim_set_keymap
-        map("", "<leader>gg", ":TigOpenProjectRootDir<cr><cr>", {})
-        map("", "<leader>gG", ":TigOpenCurrentFile<cr>", {})
+        map("", "<leader>gg", ":Flog<cr>", {})
+        map("", "<leader>gG", ":Flogsplit<cr>", {})
       end
     }