From 2e33ec0efb97e856a3527706bf15e4f281e58bec Mon Sep 17 00:00:00 2001
From: xeruf <27jf@pm.me>
Date: Fri, 8 Oct 2021 13:17:27 +0200
Subject: [PATCH] config/yadm: bootstrap adjustment for server compatibility

---
 .config/yadm/bootstrap       |  2 ++
 .config/yadm/bootstrap.d.bak | 25 +++++++++++++++++++++++++
 README.org                   |  6 +++++-
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100755 .config/yadm/bootstrap.d.bak

diff --git a/.config/yadm/bootstrap b/.config/yadm/bootstrap
index c4dc11b..29a92af 100755
--- a/.config/yadm/bootstrap
+++ b/.config/yadm/bootstrap
@@ -88,6 +88,8 @@ if test -f /etc/pacman.conf; then
 fi
 
 ### Applications
+test "$DISPLAY" || exit 0
+
 highlight "Block internet at night & on weekdays in the morning to force focus"
 walli 22 --save
 
diff --git a/.config/yadm/bootstrap.d.bak b/.config/yadm/bootstrap.d.bak
new file mode 100755
index 0000000..1378d3f
--- /dev/null
+++ b/.config/yadm/bootstrap.d.bak
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# Save this file as ~/.config/yadm/bootstrap and make it executable.
+# It will execute all executable files (excluding templates and editor backups)
+# in ~/.config/yadm/bootstrap.d/ when run.
+# Use in conjunction with https://yadm.io/docs/alternates
+
+set -eu
+
+# Directory to look for bootstrap executables in
+BOOTSTRAP_D="${BASH_SOURCE[0]}.d"
+
+if [[ ! -d "$BOOTSTRAP_D" ]]; then
+    echo "Error: bootstrap directory '$BOOTSTRAP_D' not found" >&2
+    exit 1
+fi
+
+find -L "$BOOTSTRAP_D" -type f | sort | while IFS= read -r bootstrap; do
+    if [[ -x "$bootstrap" && ! "$bootstrap" =~ "##" && ! "$bootstrap" =~ "~$" ]]; then
+        if ! "$bootstrap"; then
+            echo "Error: bootstrap '$bootstrap' failed" >&2
+            exit 1
+        fi
+    fi
+done
diff --git a/README.org b/README.org
index 9edd623..caddee3 100644
--- a/README.org
+++ b/README.org
@@ -22,7 +22,6 @@ and configuration for ~less~ and ~fzf~.
 - [[.config/doom][doom]] :: [[https://github.com/hlissner/doom-emacs][Doom Emacs]] configuration with personalized snippets
 - ideavim, vifm, nvim :: vi-related tools
 - git, yadm :: version control
-: yadm clone --bootstrap git.jfischer.org:xeruf/dotfiles.git
 ** .local
 - [[.local/bin/scripts][scripts]] :: lots of useful scripts,
   most have a short documentation header -
@@ -33,8 +32,12 @@ and configuration for ~less~ and ~fzf~.
 - essentials :: git zsh bat neovim man-db texinfo
 - basic tools :: fd ripgrep tree jrnl python-pynvim wget zsh-completions mlocate
 - common tools :: ffmpeg imagemagick pandoc [[https://lftp.yar.ru/][lftp]] zsh-doc glances pacman-contrib pass
+- ssh :: openssh sshfs lemonade-git
+- dotfiles :: yadm
+  : yadm clone --bootstrap git.jfischer.org:xeruf/dotfiles.git
 - aur recommendations :: tldr++ sc-im
 - personal aur utils :: diffr bat-extras-git rdictcc-git
+- experiments :: kakoune
 ** Applications
 - productivity :: activitywatch-bin
 - music :: mpd mpc ncmpc mpd-mpris vlc phonon-qt5-vlc
@@ -73,4 +76,5 @@ After running android-studio setup, accept licenses:
 : $ANDROID_SDK_ROOT/tools/bin/sdkmanager --licenses
 ** Server
 Setup systemd-resolved and systemd-networkd
+- ssh :: lemonade openssh
 - social :: pleroma-bin postgresql caddy