diff --git a/bin/auj b/bin/auj
new file mode 100755
index 0000000..d0eeb42
--- /dev/null
+++ b/bin/auj
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# if ! groups | grep -q systemd-journal; then
+#     echo >&2 "Need to be in systemd-journal group; aborting!"
+#     exit 1
+# fi
+
+jcfuu 'auto-*' -n 1000 | \
+    lnavf \
+        -f $0.filters \
+        "$@"
diff --git a/bin/auj.filters b/bin/auj.filters
new file mode 100644
index 0000000..3bf1533
--- /dev/null
+++ b/bin/auj.filters
@@ -0,0 +1,29 @@
+# These are (at least mostly) not needed now we have git-annex-clean-sync
+
+# :filter-out auto-sync-org\[\d+\]: remote: error: refusing to update checked out branch: refs/heads/master
+# :filter-out auto-sync-org\[\d+\]: To ssh://aegean-wifi/home/adam/org
+# :filter-out auto-sync-org\[\d+\]:  ! \[remote rejected\] master -> master \(branch is currently checked out\)
+# :filter-out auto-sync-org\[\d+\]: error: failed to push some refs to 'ssh://adam@aegean-wifi/home/adam/org'
+
+# These are the kinds of errors seen from auto-sync-org when there are
+# merge conflicts:
+#
+# push aegean
+# To ssh://aegean-wifi/home/adam/org
+#  ! [rejected]        master -> synced/master (non-fast-forward)
+# error: failed to push some refs to 'ssh://adam@aegean-wifi/home/adam/org'
+# hint: Updates were rejected because a pushed branch tip is behind its remote
+# hint: counterpart. Check out this branch and integrate the remote changes
+# hint: (e.g. 'git pull ...') before pushing again.
+# hint: See the 'Note about fast-forwards' in 'git push --help' for details.
+# To ssh://aegean-wifi/home/adam/org
+#  ! [rejected]        master -> master (non-fast-forward)
+# error: failed to push some refs to 'ssh://adam@aegean-wifi/home/adam/org'
+# hint: Updates were rejected because the tip of your current branch is behind
+# hint: its remote counterpart. Integrate the remote changes (e.g.
+# hint: 'git pull ...') before pushing again.
+# hint: See the 'Note about fast-forwards' in 'git push --help' for details.
+#   Pushing to aegean failed.
+#   (non-fast-forward problems can be solved by setting receive.denyNonFastforwards to false in the remote's git config)
+# failed
+# push adamspiers.org
diff --git a/bin/auls b/bin/auls
new file mode 100755
index 0000000..82072be
--- /dev/null
+++ b/bin/auls
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+if [ -z "$1" ]; then
+    if name=$( mrname 2>/dev/null ); then
+        set -- "$name"
+    else
+        set -- org
+    fi
+fi
+
+for repo in "$@"; do
+    systemctl list-unit-files --user |
+        awk '/^auto-(sync|commit)-'"$repo"'\.service/ {print $1}'
+done
diff --git a/bin/aus b/bin/aus
new file mode 100755
index 0000000..2c860f2
--- /dev/null
+++ b/bin/aus
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+austa
+
+cd ~/org
+echo
+export GIT_PAGER_MODE=none
+ggl1 -n5
diff --git a/bin/ausp b/bin/ausp
new file mode 100755
index 0000000..6606f51
--- /dev/null
+++ b/bin/ausp
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+ausys stop
+
diff --git a/bin/ausre b/bin/ausre
new file mode 100755
index 0000000..97339cc
--- /dev/null
+++ b/bin/ausre
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+ausys restart
+
diff --git a/bin/aust b/bin/aust
new file mode 100755
index 0000000..e37cba8
--- /dev/null
+++ b/bin/aust
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+ausys start
diff --git a/bin/austa b/bin/austa
new file mode 100755
index 0000000..71a34ed
--- /dev/null
+++ b/bin/austa
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+ausys status
diff --git a/bin/ausys b/bin/ausys
new file mode 100755
index 0000000..f9add4e
--- /dev/null
+++ b/bin/ausys
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+systemctl list-unit-files --user |
+    awk '/^auto-(sync|commit)-[^ ]+\.service/ {print $1}' |
+    xargs systemctl --user --no-pager "$@"
diff --git a/bin/auto-commit-daemon b/bin/auto-commit-daemon
new file mode 100755
index 0000000..2d93dfb
--- /dev/null
+++ b/bin/auto-commit-daemon
@@ -0,0 +1,32 @@
+#!/usr/bin/env zsh
+
+debug=
+if [[ "$1" == '-d' ]]; then
+    debug=-d
+    shift
+fi
+
+if [ $# != 3 ]; then
+    cat <<EOF >&2
+Usage: $(basename $0) [-d] REPO-DIR SLEEP MIN-AGE
+EOF
+    exit 1
+fi
+
+repo_dir="$1"
+sleep="$2"
+min_age="$3"
+
+cd "$repo_dir"
+
+for var in name email; do
+    if ! git config user.$var >/dev/null; then
+        echo >&2 "Error: user.$var not set in git config; aborting"
+        exit 1
+    fi
+done
+
+while true; do
+    git auto-commit $debug -m "$min_age"
+    sleep "$sleep"
+done
diff --git a/bin/auto-sync-daemon b/bin/auto-sync-daemon
new file mode 100755
index 0000000..8bee997
--- /dev/null
+++ b/bin/auto-sync-daemon
@@ -0,0 +1,80 @@
+#!/usr/bin/env zsh
+
+BRANCH=master  # FIXME: parameterise at some point
+
+process_inotify_batch () {
+    while read dir action file; do
+        try_sync
+
+        # This should not be unnecessary since we are relying on inotifywait
+        # to only return a single event; the filtering is done by that
+        # process, not this loop.
+        break
+    done
+}
+
+try_sync () {
+    if detect_ssh_agent; then
+        # Do a sync regardless of whether auto-commit did anything,
+        # because another remote may have pushed changes to our
+        # synced/master branch.  First give other remotes a chance
+        # to completely finish their push, just in case of any races.
+        sleep 5
+        git-annex-clean-sync
+    else
+        echo >&2 "WARNING: can't connect to ssh-agent; skipping annex sync"
+    fi
+}
+
+main () {
+    if ! inotifywait --help | grep -q -- '--include'; then
+        echo >&2 "inotifywait doesn't support --include; aborting!"
+        exit 1
+    fi
+
+    if [ $# != 1 ]; then
+        cat <<EOF >&2
+Usage: $(basename $me) REPO-DIR
+EOF
+        exit 1
+    fi
+
+    repo_dir="$1"
+    cd "$repo_dir"
+
+    if [[ -e HEAD ]] && [[ -e info ]] && [[ -e objects ]] && [[ -e refs ]] &&
+           [[ -e branches ]]
+    then
+        mode=bare
+        git_dir=.
+    elif [[ -d .git ]]; then
+        mode=worktree
+        git_dir=.git
+    else
+        echo >&2 "`pwd` isn't a git repo; aborting!"
+        exit 1
+    fi
+
+    # Do this at startup to allow easy checking at startup time that
+    # the agent was detected correct.
+    detect_ssh_agent
+
+    # This was a massive PITA to get right.  It seems that if you
+    # specify specific files then it will look up the inodes on
+    # start-up and only monitor those.  There's some similar weirdness
+    # with moves too.  Suffice to say that it's necessary to use
+    # --include and watch the whole directory.  -r is needed to catch
+    # the synced/ subdirectory too.  For more clues see
+    # https://unix.stackexchange.com/questions/164794/why-doesnt-inotifywatch-detect-changes-on-added-files
+    while true; do
+        inotifywait \
+                -q -r \
+                --include "/($BRANCH|synced/($BRANCH|git-annex))\$" \
+                -e create -e modify -e move -e delete \
+                "$git_dir/refs/heads" |
+            process_inotify_batch
+    done
+}
+
+me="$0"
+main "$@"
diff --git a/bin/git-auto-commit b/bin/git-auto-commit
new file mode 100755
index 0000000..d622f69
--- /dev/null
+++ b/bin/git-auto-commit
@@ -0,0 +1,279 @@
+#!/usr/bin/env python3
+
+import argparse
+import datetime
+import logging
+import os.path
+import pygit2       # type: ignore
+import subprocess
+import sys
+from textwrap import dedent, wrap
+
+
+DEFAULT_MIN_AGE = datetime.timedelta(minutes=5).total_seconds()
+
+STATUS_FLAGS = {
+    pygit2.GIT_STATUS_CURRENT: "CURRENT",
+    pygit2.GIT_STATUS_INDEX_NEW: "INDEX_NEW",
+    pygit2.GIT_STATUS_INDEX_MODIFIED: "INDEX_MODIFIED",
+    pygit2.GIT_STATUS_INDEX_DELETED: "INDEX_DELETED",
+    pygit2.GIT_STATUS_WT_NEW: "WT_NEW",
+    pygit2.GIT_STATUS_WT_MODIFIED: "WT_MODIFIED",
+    pygit2.GIT_STATUS_WT_DELETED: "WT_DELETED",
+    pygit2.GIT_STATUS_IGNORED: "IGNORED",
+    pygit2.GIT_STATUS_CONFLICTED: "CONFLICTED",
+}
+
+FORMAT = '%(levelname)-7s | %(message)s'
+logging.basicConfig(format=FORMAT)
+
+
+def get_status_output(flags):
+    if flags & pygit2.GIT_STATUS_IGNORED:
+        return "!!"
+    elif flags & pygit2.GIT_STATUS_WT_NEW:
+        return "??"
+    elif flags & pygit2.GIT_STATUS_WT_MODIFIED:
+        return " M"
+    elif flags & pygit2.GIT_STATUS_WT_DELETED:
+        return " D"
+    elif flags & pygit2.GIT_STATUS_INDEX_NEW:
+        return "A "
+    elif flags & pygit2.GIT_STATUS_INDEX_MODIFIED:
+        return "M "
+    elif flags & pygit2.GIT_STATUS_INDEX_DELETED:
+        return "D "
+    elif flags & pygit2.GIT_STATUS_CONFLICTED:
+        return "UU"
+    elif flags & pygit2.GIT_STATUS_CURRENT:
+        return ".."
+    else:
+        return "  "
+
+
+def get_status_flags(flags):
+    return [
+        descr
+        for flag, descr in STATUS_FLAGS.items()
+        if flags & flag
+    ]
+
+
+def file_is_staged(flags):
+    return flags & (pygit2.GIT_STATUS_INDEX_NEW
+                    | pygit2.GIT_STATUS_INDEX_MODIFIED
+                    | pygit2.GIT_STATUS_INDEX_DELETED)
+
+
+def file_is_conflicted(flags):
+    return flags & pygit2.GIT_STATUS_CONFLICTED
+
+
+def get_hostname():
+    nick_file = os.path.expanduser("~/.localhost-nickname")
+    if os.path.isfile(nick_file):
+        with open(nick_file) as f:
+            return f.readline().rstrip("\n")
+    else:
+        return os.getenv("HOST") or os.getenv("HOSTNAME")
+
+
+def quit(msg):
+    logging.debug(msg)
+    sys.exit(1)
+
+
+def abort(msg):
+    logging.error(msg)
+    sys.exit(1)
+
+
+class GitAutoCommitter:
+    def __init__(self, repo_path, min_age):
+        self.repo_path = repo_path
+        self.min_age = datetime.timedelta(seconds=min_age)
+        logging.debug("GitAutoCommitter with min age %ds on repo %s"
+                      % (int(self.min_age.total_seconds()), self.repo_path))
+        self.repo = pygit2.Repository(repo_path)
+        self.check_config()
+
+    def check_config(self):
+        if self.config_get("user.name") is None:
+            abort("user.name is not set in git config; aborting!")
+        if self.config_get("user.email") is None:
+            abort("user.name is not set in git config; aborting!")
+
+    def manual_attention_required(self):
+        found_issues = False
+        for filepath, flags in self.process_files():
+            if not filepath.endswith(".org"):
+                # logging.debug(f"# {filepath} not an .org file")
+                continue
+
+            if self.ignored(filepath):
+                # logging.debug(f"# {filepath} ignored by git")
+                continue
+
+            st = get_status_output(flags)
+            if file_is_staged(flags):
+                logging.debug(f"{st} {filepath}\t\t<-- staged")
+                found_issues = True
+            elif file_is_conflicted(flags):
+                logging.debug(f"{st} {filepath}\t\t<-- conflicted")
+                found_issues = True
+            else:
+                logging.debug(f"{st} {filepath}")
+
+        return found_issues
+
+    def auto_commit_changes(self):
+        staged = self.stage_changes()
+        if staged > 0:
+            self.commit_changes()
+        else:
+            quit("Nothing to commit")
+
+    def stage_changes(self):
+        staged = 0
+
+        for filepath, flags in self.process_files():
+            if not filepath.endswith(".org"):
+                # logging.debug(f"# {filepath} not an .org file")
+                continue
+
+            if self.ignored(filepath):
+                logging.debug(f"# {filepath} ignored by git")
+                continue
+
+            # Flags can be found here:
+            # https://github.com/libgit2/pygit2/blob/320ee5e733039d4a3cc952b287498dbc5737c353/src/pygit2.c#L312-L320
+            if flags & pygit2.GIT_STATUS_WT_NEW:
+                self.stage_file(filepath, "new")
+                staged += 1
+            elif flags & pygit2.GIT_STATUS_WT_MODIFIED:
+                commit_age = self.time_since_last_commit(filepath)
+                file_age = self.time_since_mtime(filepath)
+                if commit_age < self.min_age:
+                    logging.debug(f"Not staging {filepath}, "
+                                  f"last committed {commit_age} ago")
+                elif file_age < self.min_age:
+                    logging.debug(f"Not staging {filepath}, "
+                                  f"last modified {file_age} ago")
+                else:
+                    self.stage_file(filepath, "changed")
+                    staged += 1
+
+            # else:
+            #     fl = " ".join(get_status_flags(flags))
+            #     logging.debug(f"Not staging {filepath} with flags {fl}")
+
+        if staged > 0:
+            self.repo.index.write()
+        return staged
+
+    def config_get(self, name):
+        try:
+            return self.repo.config[name]
+        except KeyError:
+            return None
+
+    def commit_changes(self):
+        author = pygit2.Signature(
+            self.repo.config["user.name"],
+            self.repo.config["user.email"]
+        )
+        committer = pygit2.Signature(
+            self.config_get("auto-commit.name")
+            or self.config_get("user.name"),
+            self.config_get("auto-commit.email")
+            or self.config_get("user.email")
+        )
+        tree = self.repo.index.write_tree()
+        head_oid = self.repo.head.resolve().target
+        host = get_hostname()
+        message = f"auto-commit on {host} by {__file__}"
+        oid = self.repo.create_commit( # noqa
+            "refs/heads/master", author, committer, message, tree,
+            [head_oid]  # parent commit(s)
+        )
+        # commit = self.repo.get(oid)
+        # logging.debug(f"\n{commit.short_id} {message}")
+        logging.debug("")
+        subprocess.call(["git", "show", "--format=fuller", "--name-status"])
+
+    def process_files(self):
+        for filepath, flags in self.repo.status().items():
+            yield filepath, flags
+
+    def ignored(self, filepath):
+        dirname, filename = os.path.split(filepath)
+        if filename.startswith(".#"):
+            # emacs lock file
+            return True
+
+        return False
+
+    def time_since_mtime(self, filepath):
+        now = datetime.datetime.now()
+        last_change = datetime.datetime.fromtimestamp(
+            os.stat(filepath).st_mtime)
+        return now - last_change
+
+    def time_since_last_commit(self, filepath):
+        descr = subprocess.check_output(
+            ["git", "describe", "--always", f"HEAD:{filepath}"],
+            encoding='utf-8')
+        ref, _path = descr.split(":", 1)
+        rev = self.repo.revparse_single(ref)
+        now = datetime.datetime.now()
+        last_change = datetime.datetime.fromtimestamp(rev.commit_time)
+        return now - last_change
+
+    def stage_file(self, filepath, reason):
+        logging.debug(f"%-20s {filepath}" % f"Staged {reason} file:")
+        self.repo.index.add(filepath)
+
+
+def parse_args():
+    descr = "\n".join(wrap(dedent("""\
+        Automatically commit .org files last modified or committed
+        before a certain age.  Doesn't do anything if any change
+        is already staged in git's index.
+    """), width=int(os.getenv("COLUMNS", "70"))))
+
+    parser = argparse.ArgumentParser(
+        description=descr,
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+    )
+    parser.add_argument(
+        "-d", "--debug", action="store_true",
+        help="Enable debug output"
+    )
+    parser.add_argument(
+        "-m", "--min-age", metavar="SECS", type=int, default=DEFAULT_MIN_AGE,
+        help="Minimum number of seconds since a file needs to have been "
+        "last updated in order for it to get committed."
+    )
+    parser.add_argument(
+        "repo_path", metavar="REPO-PATH", nargs="?",
+        default=".", help="Path to repository to auto-commit"
+    )
+
+    return parser.parse_known_args()
+
+
+def main():
+    options, args = parse_args()
+    if options.debug:
+        logging.getLogger().setLevel(logging.DEBUG)
+
+    gac = GitAutoCommitter(options.repo_path, options.min_age)
+
+    if gac.manual_attention_required():
+        abort("Manual attention required; aborting.")
+
+    logging.debug("")
+    gac.auto_commit_changes()
+
+
+main()