coja
a700e23e0a
Mirrors the private dots tree at 900bdda: one shared base plus per-host overlays, replacing the old flat .config/ layout (last synced 2026-06-28). - packages: common/ gui/ wm/ lw/ fl/ + install.sh and bin/ tooling (dotsync, reconcile-hyde.sh) - new README (layout, deploy order, HyDE dependency), plus ToDo.md and HYDE-UPDATE.md - current HyDE waybar rig (layouts/, cava), pi agent extensions, claude/ config, tmux, presenterm, aichat roles - drops stale duplicates and generated cruft that should never have been tracked: the second top-level .pi/ copy, btop.log, zellij config.kdl.bak, fish_variables, nvim codecompanion.lua - .pi/agent/auth.json is gitignored now; auth.json.example ships instead - fl/ and wm/ hypr themes/ stay untracked (HyDE-generated per machine, per the root .gitignore)
67 lines
2.9 KiB
Bash
Executable File
67 lines
2.9 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# dotsync — sync dotfiles with the least churn.
|
|
#
|
|
# Deployed configs are symlinks into this repo, so `git pull` makes edits LIVE instantly
|
|
# with no re-stow — meaning no symlink churn and no app reloads (kitty etc. keep their
|
|
# runtime state). Re-stowing (install.sh) is only needed when files are ADDED / REMOVED,
|
|
# to create or prune symlinks. dotsync does the minimum: pull, and re-link ONLY if the
|
|
# pull added/removed/renamed files.
|
|
#
|
|
# dotsync pull, then relink only if the file set changed
|
|
# dotsync -n preview incoming changes (fetch only; no pull, no relink)
|
|
set -uo pipefail
|
|
DOTS="$(cd "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")/.." && pwd)"
|
|
cd "$DOTS" || exit 1
|
|
|
|
if [ "${1:-}" = "-n" ] || [ "${1:-}" = "--dry-run" ]; then
|
|
git fetch -q 2>/dev/null || { echo "fetch failed (offline?)"; exit 1; }
|
|
up="$(git rev-parse --abbrev-ref '@{u}' 2>/dev/null)" || { echo "no upstream set"; exit 1; }
|
|
# rev-list, not diff: a plain diff also fires when the LOCAL side is ahead, mislabelling
|
|
# your own unpushed commits as incoming. Count commits that exist only on the upstream.
|
|
n="$(git rev-list --count "HEAD..$up")"
|
|
if [ "$n" -eq 0 ]; then echo "already up to date with $up."; else
|
|
echo "incoming from $up ($n commit(s)):"; git --no-pager diff --stat "HEAD...$up"
|
|
fi
|
|
exit 0
|
|
fi
|
|
|
|
before="$(git rev-parse HEAD)"
|
|
if ! git pull --ff-only; then
|
|
echo "pull not fast-forward (local commits or conflicts) — commit/stash, then retry." >&2
|
|
exit 1
|
|
fi
|
|
after="$(git rev-parse HEAD)"
|
|
|
|
if [ "$before" = "$after" ]; then
|
|
echo "already up to date — nothing to sync."
|
|
exit 0
|
|
fi
|
|
|
|
# Services that read config ONCE at startup don't pick up pulled edits — nudge loudly.
|
|
# (Symlinked edits are live for everything else; these are the exceptions that bit us.)
|
|
if git diff --name-only "$before" "$after" | grep -q '\.config/llamacpp/' \
|
|
&& systemctl cat llama.service &>/dev/null; then
|
|
echo ""
|
|
echo "⚠⚠ llamacpp presets changed — the router reads them only at startup. Apply with:"
|
|
echo " sudo systemctl restart llama.service"
|
|
echo ""
|
|
fi
|
|
|
|
# A unit file is read from /etc, not through the stow symlink — needs daemon-reload as well.
|
|
if git diff --name-only "$before" "$after" | grep -q '\.config/whisper/' \
|
|
&& systemctl cat whisper.service &>/dev/null; then
|
|
echo ""
|
|
echo "⚠⚠ whisper unit changed — apply with:"
|
|
echo " sudo systemctl daemon-reload && sudo systemctl restart whisper.service"
|
|
echo ""
|
|
fi
|
|
|
|
# Modified files (M) are already live through the symlinks. Only Added/Deleted/Renamed
|
|
# need (un)linking, which is the only case that justifies the churny re-stow.
|
|
if git diff --name-status "$before" "$after" | grep -qE '^(A|D|R)'; then
|
|
echo "files added/removed/renamed — re-linking via install.sh (this may reload some apps)…"
|
|
exec "$DOTS/install.sh"
|
|
else
|
|
echo "edits only — already live through the symlinks; no re-stow, no reload needed."
|
|
fi
|