diff --git a/gitconfig/gitconfig b/gitconfig/gitconfig index 1c17624..6c0bf85 100644 --- a/gitconfig/gitconfig +++ b/gitconfig/gitconfig @@ -26,6 +26,7 @@ email = github@murgi.de path = ~/dotfiles/gitconfig/sit.gitconfig [core] excludesfile = ~/dotfiles/.gitignore_global + pager = delta [submodule] recurse = true [filter "lfs"] @@ -37,3 +38,7 @@ email = github@murgi.de autoStash = true [pull] rebase = true +[interactive] + diffFilter = delta --color-only +[delta] + navigate = true diff --git a/setup_mac.sh b/setup_mac.sh index 6673025..d174865 100755 --- a/setup_mac.sh +++ b/setup_mac.sh @@ -6,7 +6,7 @@ # Distributed under terms of the MIT license. # -brew install neovim tmux coreutils cmake golang jq npm prettier virtualenvwrapper +brew install neovim tmux coreutils cmake golang jq npm prettier virtualenvwrapper fzf git-delta brew install --cask font-fira-mono-nerd-font ./install_alacritty_mac.sh BREW_PREFIX="$(brew --prefix)"