From 263189adba2a461af1b1fba9334c743d542ede79 Mon Sep 17 00:00:00 2001
From: Michel <m@dh>
Date: Wed, 30 Oct 2024 15:43:46 +0100
Subject: [PATCH] docs: README

---
 .README.md | 77 +++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 56 insertions(+), 21 deletions(-)

diff --git a/.README.md b/.README.md
index f599145..13ebcd0 100644
--- a/.README.md
+++ b/.README.md
@@ -51,23 +51,40 @@ git apply --stat --apply 2604.patch
 
 ## Debian Packages {#debian}
 
+### Installation
+
 ```sh
 apt install --no-install-recommends \
-  aptitude \
-  curl fd-find fzf git grc ripgrep \
-  vim-nox vim-tiny- wget xdg-utils xsel \
-  libarchive-tools trash-cli \
-  kitty-terminfo
+  7zip aptitude bat \
+  curl fd-find fzf git grc \
+  kitty-terminfo libarchive-tools lsd \
+  meld ncdu \
+  ripgrep trash-cli \
+  vim-nox vim-tiny- wget xdg-utils xsel
 
-dpkg-divert --rename --divert /usr/bin/fd /usr/bin/fdfind
-dpkg-divert --rename --divert /usr/share/man/man1/fd.1.gz \
-                              /usr/share/man/man1/fdfind.1.gz
-dpkg-divert --rename --divert /usr/share/zsh/vendor-completions/_rg \
-                              /usr/share/zsh/vendor-completions/rg.zsh
+ # Diversion: <new-name> <old-name>
+dpkg-divert --rename --divert /usr/bin/fd{,find}
+dpkg-divert --rename --divert /usr/share/man/man1/fd{,find}.1.gz
+dpkg-divert --rename --divert /usr/share/zsh/vendor-completions/{_rg,rg.zsh}
 
- # Installed by kicksecure
-dpkg-divert --rename --divert /usr/share/zsh-autosuggestions/disabled \
-                              /usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh
+[[ -x /usr/bin/batcat ]] && \
+sudo dpkg-divert --rename --divert /usr/bin/bat{,cat} && \
+sudo dpkg-divert --rename --divert /usr/share/zsh/vendor-completions/_bat{,cat}
+
+ # Installed by kicksecure, but unwanted
+dpkg-divert --rename --divert /usr/share/zsh-autosuggestions/{disabled,zsh-autosuggestions.zsh}
+```
+
+### Updates
+
+```sh
+ # Show manually installed & diverted packages
+aptitude search '!~M~i !-dev' --display-format '%p'
+aptitude search '!~M~i  -dev' --display-format '%p'
+dpkg-divert --list | grep ^local | sort
+
+ # Search Backports updates
+aptitude -t $(lsb_release -cs)-backports search "~U" --display-format '%20v %20V  %M %p'
 ```
 
 ## dotfiles — Bare Git Repository {#dotfiles}
@@ -115,7 +132,7 @@ for file in ${BKDIR%/}/*(D); {
 
 ### Updates
 
-To _upgrade_ to SSH (not compatible with Qubes proxy):
+To _upgrade_ to SSH (not compatible with Qubes Proxy / TemplateVM):
 
 ```sh
 dotfiles remote set-url origin ssh://gitea@forge.chapril.org:222/michel_ouba/points.git
@@ -247,6 +264,14 @@ for Plugin in $(asdf plugin list); { echo $Plugin; asdf list $Plugin }
 
 TODO: [Where are all the installed flatpak apps .desktop files located](https://github.com/flatpak/flatpak/issues/1286)
 
+#### Overrides
+
+```sh
+sudo flatpak override --reset $APP
+sudo flatpak override $APP --filesystem=host-os:ro
+flatpak override --show $APP
+```
+
 #### Updates
 
 ```sh
@@ -464,19 +489,29 @@ commit=, build date=, build source=unknown, version=unversioned, os=linux, arch=
 ### Binary Nightly Release
 
 ```sh
+ # --- ~/Downloads
+cd ~/Downloads
+wget-proxy <URL from versions_check>
+chmod ugo+rx nvim.appimage
+
+NVIM="nvim_$(./nvim.appimage --version | grep -Pio 'v\d\.\d+\.\d+').appimage"
+mv nvim.appimage ${NVIM}
+
+ # --- ~/.local
 mkdir -p $HOME/.local/bin
 cd $HOME/.local/bin
- # ---
+ # --- /opt
+sudo chown root:root nvim.appimage
 sudo mkdir -p /opt/neovim/bin
 cd /opt/neovim/bin
+SUDO=sudo
 
-sudo =curl-proxy -LO https://github.com/neovim/neovim/releases/download/nightly/nvim.appimage
-sudo mv ~/Downloads/nvim.appimage /opt/neovim/bin
-sudo chown root:root nvim.appimage
-sudo chmod ugo+rx nvim.appimage
-sudo ln -sf nvim.appimage nvim
-sudo ln -sf nvim.appimage vi
+ # --- Target Folder
+${SUDO} mv ~/Downloads/${NVIM} .
+${SUDO} ln -sf ${NVIM} nvim
+${SUDO} ln -sf ${NVIM} vi
 
+ # --- Tests
 cd $HOME
 nvim --version
 vi --version