-for y in ssh termux; do
- find $y -mindepth 1 -maxdepth 1 | while read -r x; do
- l "$HOME/.$y/`basename "$x"`"
- done
-done
-x='fonts/Dina-ttf/Dina.ttf' l "$HOME/.termux/font.ttf"
+
+# ssh
+if command -v ssh >$devnull 2>&1; then
+ mkdir -pm 700 "$DEST/.ssh"
+ find ssh -mindepth 1 -maxdepth 1 | while read -r x; do
+ l ".$x"; done
+fi
+
+# termux, assume it if android
+if [ $(uname -o) = 'Android' ]; then
+ mkdir -p "$DEST/.termux"
+ find termux -mindepth 1 -maxdepth 1 | while read -r x; do l ".$x"; done
+ l '.termux/font.ttf' "gui/fonts/Dina-ttf/Dina.ttf"
+fi
+
+cd "$DEST" >$devnull
+
+# ensure xdg user dirs, and move old to new while we're at it
+source $etc/user-dirs.dirs
+function fixup_xdg_home {
+ if [ -z "$1" -o "${1#/}" = "$1" -o "$(realpath "$1")" = "$(realpath "$HOME")" ]; then
+ return;
+ fi
+ mkdir -p "$1"
+ if [ $? -eq 0 -a -n "$2" -a -d "$2" ]; then
+ mv "$2"/* $1
+ rmdir "$2"
+ fi
+}
+fixup_xdg_home $XDG_DESKTOP_DIR Desktop
+fixup_xdg_home $XDG_DOWNLOAD_DIR Downloads
+fixup_xdg_home $XDG_TEMPLATES_DIR
+fixup_xdg_home $XDG_PUBLICSHARE_DIR Public
+fixup_xdg_home $XDG_DOCUMENTS_DIR Documents
+fixup_xdg_home $XDG_MUSIC_DIR Music
+fixup_xdg_home $XDG_PICTURES_DIR Pictures
+fixup_xdg_home $XDG_VIDEOS_DIR Videos
+
+cd "$old_pwd"