clang to latest, use broot, difft as an option for semantic diff

Author: shurane

.bashrc

@@ -53,15 +53,16 @@ alias tree="tree -C"
 PS1='\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
 #PS1='\u@\h:\w\$ '
 
-# https://the.exa.website/
+# https://github.com/eza-community/eza
 alias ls="ls --human-readable --group-directories-first --sort=extension --color=auto"
-test -x "$(command -v exa)" && alias ls="exa --group-directories-first --sort=extension"
+test -x "$(command -v eza)" && alias ls="eza --group-directories-first --sort=extension"
 
 test -x "$(command -v bat)" && alias cat=bat
 test -x "$(command -v rg)" && alias grep="rg --ignore-case"
 test -x "$(command -v vivid)" && export LS_COLORS="$(vivid generate snazzy)"
 test -x "$(command -v zoxide)" && eval "$(zoxide init bash)"
 test -x "$(command -v nvim)" && alias vim=nvim
+test -x "$(command -v broot)" && source $HOME/.config/broot/launcher/bash/br
 
 # https://github.com/BurntSushi/ripgrep/issues/86#issuecomment-331718946
 rgl() { rg -i -p -M 500 "$@" | less -XFR; }
@@ -77,3 +78,4 @@ batdiff() { git diff --name-only --diff-filter=d | xargs bat --diff; }
 #export FZF_DEFAULT_COMMAND='rg --files --hidden -g "!.git"'
 export FZF_DEFAULT_COMMAND='fd --hidden --exclude .git'
 
+

.gitconfig

@@ -5,16 +5,19 @@
 [push]
 	default = simple
 
+[pull]
+	rebase = true
+
 [credential]
 	helper = cache
 
 [alias]
-    hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
     # http://stackoverflow.com/a/9074343/198348
     lg1 = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
-    lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all
-    lg3 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset) %C(bold cyan)(committed: %cD)%C(reset) %C(bold yellow)%d%C(reset)%n''          %C(white)%s%C(reset)%n''          %C(dim white)- %an <%ae> %C(reset) %C(dim white)(committer: %cn <%ce>)%C(reset) --all'
-    # there's also git log --oneline
+
+    # https://difftastic.wilfred.me.uk/git.html
+    dshow = -c diff.external=difft show --ext-diff
+    ddiff = -c diff.external=difft diff
 
 # https://dandavison.github.io/delta/get-started.html
 [core]
@@ -28,7 +31,7 @@
     navigate = true
 
 [merge]
-    conflictstyle = diff3
+    conflictstyle = zdiff3
 
 [diff]
     colorMoved = default

setup.sh

@@ -10,6 +10,7 @@
 - sharkdp/diskus https://github.com/sharkdp/diskus (du -sh alternative that's parallelized)
 - dandavision/delta https://github.com/dandavison/delta
 - zoxide (successor to fasd, autojump) https://github.com/ajeetdsouza/zoxide
+- broot https://github.com/Canop/broot - file manager
 - bkt https://github.com/dimo414/bkt (for caching command output)
 - plt/racket
 - rustup
@@ -33,18 +34,18 @@ sudo pip3 install ipython bpython requests flask pylint black pep8 rope pyright
 # clang, gcc
 wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
 sudo tee /etc/apt/sources.list.d/llvm.list << END
-# 16, https://apt.llvm.org/
-deb http://apt.llvm.org/focal/ llvm-toolchain-focal-16 main
-deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-16 main
+# https://apt.llvm.org/
+deb http://apt.llvm.org/noble/ llvm-toolchain-noble main
+deb-src http://apt.llvm.org/noble/ llvm-toolchain-noble main
 END
 # https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test
 sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
 # related to having a c compiler
 # https://github.com/microsoft/WSL/issues/5663 - "/sbin/ldconfig.real: /usr/lib/wsl/lib/libcuda.so.1 is not a symbolic link"
 
-sudo apt update && sudo apt install clang-16 clangd-16 gcc-13 g++-13
+sudo apt update && sudo apt install clang clangd clang-format gcc-13 g++-13
 # https://gist.github.com/mpusz/886a2a68742f1f63820d6b1425866791
-sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-16 160 --slave /usr/bin/clang++ clang++ /usr/bin/clang++-16 --slave /usr/bin/clangd clangd /usr/bin/clangd-16
+#sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-18 180 --slave /usr/bin/clang++ clang++ /usr/bin/clang++-18 --slave /usr/bin/clangd clangd /usr/bin/clangd-18
 sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 130 --slave /usr/bin/g++ g++ /usr/bin/g++-13
 
 # https://github.com/nodesource/distributions/blob/master/README.md