Mercurial hasn't been a thing for a while here

.config/nvim/lua/plugins/plantuml.lua

@@ -0,0 +1,13 @@
+return {
+  "goropikari/plantuml.nvim",
+  dependencies = {
+    "goropikari/LibDeflate.nvim",
+  },
+  opts = {
+    -- default opts
+    base_url = "https://www.plantuml.com/plantuml",
+    reload_events = { "BufWritePre" },
+    viewer = "xdg-open", -- Image viewer for non-ASCII exports
+    docker_image = "plantuml/plantuml-server:tomcat",
+  },
+}

.config/nvim/lua/plugins/plantuml_highlighting.lua

@@ -0,0 +1,4 @@
+return {
+  "aklt/plantuml-syntax",
+  ft = { "plantuml" },
+}

.hgauthors.txt

@@ -1,5 +0,0 @@
-mbscholt = Michiel Scholten <michiel@aquariusoft.org>
-m.scholten = Michiel Scholten <michiel@aquariusoft.org>
-Michiel Scholten = Michiel Scholten <michiel@aquariusoft.org>
-convert-repo = svnconvert <michiel@aquariusoft.org>
-michiel.scholten@sanomamedia.nl = Michiel Scholten <michiel@aquariusoft.org>

.hgignore

@@ -1,9 +0,0 @@
-syntax: glob
-*.orig
-*.rej
-*~
-*.o
-tests/*.err
-
-syntax: regexp
-.*\#.*\#$

.hgrc

@@ -1,33 +0,0 @@
-[ui]
-#username = Michiel Scholten <michiel@aquariusoft.org>
-username = m.scholten
-
-[extensions]
-# If you get an error about missing keyring, install python-keyring
-hgext.mercurial_keyring = ~/workspace/application_addons/mercurial/mercurial_keyring/mercurial_keyring.py
-convert =
-hgext.bookmarks =
-graphlog =
-hgext.purge=
-hgk=
-hgflow = ~/workspace/application_addons/mercurial/hgflow/src/hgflow.py
-#hggit = ~/workspace/application_addons/mercurial/hg-git/hggit
-prompt = /home/mbscholt/workspace/application_addons/mercurial/hg-prompt/prompt.py
-shelve=
-
-[git]
-authors = /home/mbscholt/.hgauthors.txt
-
-[tortoisehg]
-editor = geany
-tabwidth = 8
-shell = gnome-terminal
-
-[auth]
-sanoma.schemes = https
-sanoma.prefix = hg.sanomaservices.nl
-sanoma.username = m.scholten
-
-aqs.schemes = ssh
-aqs.prefix = aquariusoft.org
-aqs.username = Michiel Scholten <michiel@aquariusoft.org>

README.md

@@ -5,7 +5,7 @@ After having my homedirs in subversion for years, moved this collection to Git [
 
 To install:
 
-```
+```bash
 mkdir ~/.dot
 cd ~/.dot
 clone <url>
@@ -44,6 +44,8 @@ ln -s ../.dot/dotfiles/.config/starship.toml
 
 To have the full experience, install all of these:
 
+Debian/Ubuntu etc.:
+
 ```bash
 sudo apt install git curl vim-nox fzf ripgrep exuberant-ctags fish grc tmux htop direnv
 # needed for building vim plugins:
@@ -52,6 +54,16 @@ sudo apt install cmake build-essential
 sudo apt install mc
 ```
 
+CachyOS/Arch:
+
+```bash
+sudo pacman -Syu curl vim-nox fzf ripgrep ctags fish grc tmux htop direnv
+# needed for building vim plugins:
+sudo pacman -Syu cmake make
+# also, this classic:
+sudo pacman -Syu mc
+```
+
 and maybe install a nice colour theme for your terminal from https://gogh-co.github.io/Gogh/ - I use argonaut with a black background myself.
 
 
@@ -71,7 +83,7 @@ In tmux, do `infocmp > screen-256color`. Add the line `kf16=\E[17;2~,` and compi
 
 The `update_repos` script takes the `~/.git_repos` config file and lets you update and clone your projects automatically (or at least in a batch). In the example the first four repos are located in ~/workspace/projects/github, and the other two in workspace/projects/others and workspace/projects/private respectively; then the workspace and group are empty, so mydocs is cloned into the homedir. At the moment, only paths relative to the user's homedir are supported.
 
-```
+```ini
 workspace=workspace/projects
 group=github
 git@github.com:aquatix/ns-api.git

bin/ssh_config_gen

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# SSH config merge
+if [ -e ~/.ssh/config.d ]; then
+    #if find ~/.ssh/config.d -mindepth 1 -print -quit | grep -q .; then
+    # Do we have config files in that directory?
+    if find ~/.ssh/config.d -print -quit | grep -q .; then
+        newestconfig=$(find ~/.ssh/config.d/* -printf '%TY-%Tm-%Td %.8TT %p\n' | sort -r | head -n1 | awk '{print $3}')
+        if [ "$newestconfig" -nt ~/.ssh/config ]; then
+            # We found a config that's newer than the generated config file, re-generate
+            [ -e ~/.ssh/config ] && mv ~/.ssh/config ~/.ssh/config.bak.$(date -Is)
+            # Lets preserve order, so you can have  00_generic 10_homestuff 20_work1 21_work2  and such
+            find ~/.ssh/config.d/* -type f -print0 | sort -z | xargs -0 -n1 cat > ~/.ssh/config
+            chmod 600 ~/.ssh/config
+        fi
+    fi
+fi

install.sh

@@ -1,8 +1,7 @@
 #!/bin/bash
 # inspired by rrix' dotfiles
 
-install_fish()
+install_fish() {
-{
     touch ~/.dot/.dot_has_fish
     mkdir -p "${HOME}/.config/fish/completions"
     curl -sL get.fisherman.sh | fish
@@ -12,50 +11,59 @@ install_fish()
     ln -s "${HOME}/workspace/application_addons/cli/tmuxinator/completion/mux.fish" "${HOME}/.config/fish/completions"
     ln -s "${HOME}/workspace/application_addons/cli/tmuxinator/completion/tmuxinator.fish" "${HOME}/.config/fish/completions"
     echo
-    echo "You might want to install Fisher:"
+    echo "Do you wish to install the Fisher plugin manager? This will do:"
     echo "curl -sL https://git.io/fisher | source && fisher install jorgebucaran/fisher"
     echo "fisher update"
     echo
+    select yn in "Yes" "No"; do
+        case $yn in
+        Yes)
+            curl -sL https://git.io/fisher | source && fisher install jorgebucaran/fisher
+            fisher update
+            break
+            ;;
+        No) break ;;
+        esac
+    done
 }
 
-make_link()
+make_link() {
-{
+    DIR="$1"
-  DIR="$1"
+    TARGET="$2"
-  TARGET="$2"
+    cd || exit
-  cd || exit
+    echo $TARGET
-  echo $TARGET
+    if [ "$(readlink $TARGET)" = "$DIR/$TARGET" ]; then
-  if [ "$(readlink $TARGET)" = "$DIR/$TARGET" ]; then
+        echo "  symlink exists and is fine, skipping"
-      echo "  symlink exists and is fine, skipping"
+        return
-      return
+    elif [ -e $TARGET ] || [ -L $TARGET ] && [ "$(readlink $TARGET)" != "$DIR/$TARGET" ]; then
-  elif [ -e $TARGET ] || [ -L $TARGET ] && [ "$(readlink $TARGET)" != "$DIR/$TARGET" ]; then
+        echo "  exists, moving out of the way"
-      echo "  exists, moving out of the way"
+        if [ ! -d "workspace/backup/dotfiles_$DATETIME" ]; then
-      if [ ! -d "workspace/backup/dotfiles_$DATETIME" ]; then
+            mkdir -p "workspace/backup/dotfiles_$DATETIME"
-          mkdir -p "workspace/backup/dotfiles_$DATETIME"
+        fi
-      fi
+        DIRNAME=$(dirname ${TARGET})
-      DIRNAME=$(dirname ${TARGET})
+        if [ "$DIRNAME" != "." ]; then
-      if [ "$DIRNAME" != "." ]; then
+            mkdir "workspace/backup/dotfiles_$DATETIME/$DIRNAME"
-          mkdir "workspace/backup/dotfiles_$DATETIME/$DIRNAME"
+            mv $TARGET "workspace/backup/dotfiles_$DATETIME/$DIRNAME"
-          mv $TARGET "workspace/backup/dotfiles_$DATETIME/$DIRNAME"
+            #echo "workspace/backup/privdotfiles_$DATETIME/$DIRNAME"
-          #echo "workspace/backup/privdotfiles_$DATETIME/$DIRNAME"
+        else
-      else
+            mv $TARGET "workspace/backup/dotfiles_$DATETIME/"
-          mv $TARGET "workspace/backup/dotfiles_$DATETIME/"
+            #echo "workspace/backup/privdotfiles_$DATETIME/${TARGET}"
-          #echo "workspace/backup/privdotfiles_$DATETIME/${TARGET}"
+        fi
-      fi
+    fi
-  fi
 
-  # If link is in a subdir, go there
+    # If link is in a subdir, go there
-  DIRNAME=$(dirname ${TARGET})
+    DIRNAME=$(dirname ${TARGET})
-  if [ "$DIRNAME" != "." ]; then
+    if [ "$DIRNAME" != "." ]; then
-      cd "$DIRNAME" || exit
+        cd "$DIRNAME" || exit
-  fi
+    fi
-  # Create the symlink
+    # Create the symlink
-  ln -s "$DIR/$TARGET"
+    ln -s "$DIR/$TARGET"
-  #echo "ln -s $DIR/$TARGET"
+    #echo "ln -s $DIR/$TARGET"
 
 }
 
 # Get the directory the dotfiles have been cloned into
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 echo "Installing from $DIR"
 DATETIME=$(date +%Y%m%d_%H%M)
 
@@ -66,8 +74,7 @@ cd || exit
 mkdir -p .config/direnv
 
 # Symlink all the things
-for TARGET in .bash_aliases .bashrc bin .gitconfig .gitignore_global .gitmodules .hgauthors.txt .hgignore .hgrc .ideavimrc .ignore .screenrc .terminfo .tmux.conf .vim .vimrc install.sh .config/direnv/direnvrc .config/nvim
+for TARGET in .bash_aliases .bashrc bin .gitconfig .gitignore_global .gitmodules .ideavimrc .ignore .screenrc .terminfo .tmux.conf .vim .vimrc install.sh .config/direnv/direnvrc .config/nvim; do
-do
     make_link $DIR $TARGET
 done
 
@@ -89,8 +96,14 @@ elif [ ! -e ~/.dot/.dot_no_fish ]; then
     echo "Do you wish to install fish shell configuration?"
     select yn in "Yes" "No"; do
         case $yn in
-            Yes ) install_fish; break;;
+        Yes)
-            No ) touch ~/.dot/.dot_no_fish; break;;
+            install_fish
+            break
+            ;;
+        No)
+            touch ~/.dot/.dot_no_fish
+            break
+            ;;
         esac
     done
 fi
@@ -99,8 +112,12 @@ echo
 echo "Do you wish to install the starship prompt?"
 select yn in "Yes" "No"; do
     case $yn in
-        Yes ) make_link $DIR ".config/starship.toml"; curl -sS https://starship.rs/install.sh | sh; break;;
+    Yes)
-        No ) break;;
+        make_link $DIR ".config/starship.toml"
+        curl -sS https://starship.rs/install.sh | sh
+        break
+        ;;
+    No) break ;;
     esac
 done
 
@@ -109,8 +126,14 @@ if [ ! -e ~/.dot_is_server ] && [ ! -e ~/.dot_no_server ]; then
     echo "Is this machine a server?"
     select yn in "Yes" "No"; do
         case $yn in
-            Yes ) touch ~/.dot_is_server; break;;
+        Yes)
-            No ) touch ~/.dot_no_server; break;;
+            touch ~/.dot_is_server
+            break
+            ;;
+        No)
+            touch ~/.dot_no_server
+            break
+            ;;
         esac
     done
 fi