Update configuration files for improved clarity and consistency

config/jj/config.toml

@@ -6,4 +6,5 @@ email = "zlorfi@gmail.com"
 
 [ui]
 # pager = "delta"
-diff-editor = "nvim"
+# diff-editor = "nvim"
+diff-formatter = ["difft", "--color=always", "$left", "$right"]

gitconfig

@@ -14,19 +14,9 @@
 [color]
   ui = auto
 [diff]
-  tool = difftastic
-[difftool]
-  prompt = false
-[difftool "difftastic"]
-  cmd = difft "$LOCAL" "$REMOTE"f
+  external = difft
 [gpg]
 	program = /opt/homebrew/bin/gpg
-[difftool "sourcetree"]
-	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
-	path = 
-[mergetool "sourcetree"]
-	cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
-	trustExitCode = true
 [commit]
 	template = /Users/michi/dotfiles/gitmessage
 [filter "lfs"]

make_my_dotfiles.sh

@@ -5,7 +5,7 @@ _shell="/opt/homebrew/bin/zsh"
 # _shell="/opt/homebrew/bin/fish"
 _homebrew=`which brew`
 _to_install="btop gh imagemagick rbenv ruby-build tmux iperf3 zsh oh-my-posh gs tectonic tree-sitter\
-             git git-flow nvim azure-cli openssl kubectl typst thonny k9s uv stern nvm lazygit"
+             git git-flow nvim azure-cli openssl kubectl typst thonny k9s uv stern nvm lazygit difftastic"
 
 # Generate symlinks for files
 for i in gitconfig gitmessage gitignore tmux.conf prettierrc zsh_secrets