From 666cc8b6611302ffa4cb768a0be26f13124eb950 Mon Sep 17 00:00:00 2001
From: Michael Grote <michael.grote@dataport.de>
Date: Mon, 18 Mar 2024 09:32:12 +0100
Subject: [PATCH] git: difftool

Signed-off-by: Michael Grote <michael.grote@dataport.de>
---
 .bash_extra | 2 +-
 .gitconfig  | 3 +++
 .vimrc      | 7 +++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.bash_extra b/.bash_extra
index 3350163..5708b02 100644
--- a/.bash_extra
+++ b/.bash_extra
@@ -275,7 +275,7 @@ alias gs="git status"
 alias gf="git fetch"
 alias gdel="git reset --hard ; git clean -f"
 alias glast="git log -1 HEAD --stat"
-alias gd="git diff"
+alias gd="git difftool"
 alias gsp="git stage -p"
 # docker
 alias dcu="docker-compose up"
diff --git a/.gitconfig b/.gitconfig
index 67b063e..87a6052 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -36,3 +36,6 @@ addEmptyPathspec   = false
 	verbose = true
 [rerere]
 	enabled = true
+[diff]
+        tool = vimdiff
+
diff --git a/.vimrc b/.vimrc
index 939ea79..5183730 100644
--- a/.vimrc
+++ b/.vimrc
@@ -34,6 +34,8 @@ Plugin 'ConradIrwin/vim-bracketed-paste'
 Plugin 'mbbill/undotree'
 " highlight yanked text
 Plugin 'machakann/vim-highlightedyank'
+" nord theme für vimdiff
+Plugin 'nordtheme/vim'
 call vundle#end()
 
 let mapleader = ","
@@ -244,3 +246,8 @@ autocmd FileType yml setlocal ai ts=2 sw=2 et
 
 " timeouts
 set timeoutlen=100
+
+" set colorscheme for vimdiff
+if &diff
+    colorscheme nord
+endif