src/priv -> lib/priv

1 files changed, 33 insertions, 21 deletions

diff --git a/.mrconfig.in b/.mrconfig.in
index 5b0ef5ad..fd1a4b91 100644
--- a/.mrconfig.in
+++ b/.mrconfig.in
@@ -90,9 +90,6 @@ lib =
     # tucson() {
     #     on artemis shortgeese athena hephaestus iris
     # }
-    gcrypt() {
-        which git-remote-gcrypt >/dev/null 2>/dev/null
-    }
     install_git_hooks() {
         cp -L $HOME/src/dotfiles/lib/hooks/git/$1/* "$MR_REPO/.git/hooks"
     }
@@ -239,29 +236,44 @@ pre_update_append = always_adopt .config/mimeapps.list
 
 # --- private dotfiles repositories
 
-[src/priv]
-checkout = git clone athenag:priv.git priv
+[lib/priv]
+checkout = git clone athenag:libpriv.git priv
+update = git annex sync --content cloud origin
+push = git annex sync --content cloud origin
 stowable = true
+skip = ! workstation
+
+post_checkout =
+    cd priv
+    git annex init
+    git annex enableremote cloud
+    git annex group . backup
 
-# this repository can't be checked out until we install
-# git-remote-gcrypt
-skip = (! gcrypt) || (! workstation)
+    # `git annex init` adds an additional line to .git/info/attributes
+    # which disables the smudge filter for dotfiles, but this repo
+    # needs the smudge filter for dotfiles, so override it
+    echo "* filter=annex" >.git/info/attributes
 
 fixups =
-        chmod 600 .passwddb.pet \
-              .gnupg/*.kbx \
-              .gnupg/private-keys-v1.d/*.key
-	# if we don't run this status command after chmodding, git
-	# diff-files falsely reports that there is a difference
-	# between the working tree and the index
-        git status --porcelain >/dev/null
-
-        git config remote.origin.gcrypt-publish-participants true
-        git config remote.origin.gcrypt-participants 0x0F56D0553B6D411B
-        # git config gcrypt.publish-participants true
-        # git config gcrypt.participants 0x0F56D0553B6D411B
+    chmod 600 .passwddb.pet \
+          .gnupg/*.kbx \
+          .gnupg/private-keys-v1.d/*.key
+
+    git config push.default nothing
+    git config remote.origin.gcrypt-publish-participants true
+    git config remote.origin.gcrypt-participants 0x0F56D0553B6D411B
+    git config annex.startupscan false
+    git config annex.autocommit true # needed for `git annex sync`
+    git config remote.origin.annex-ignore true
+    git config unpushed-tags.ignore true
+
+    git config annex.gitaddtoannex false # see README
+    git config annex.addunlocked true    # see README
+
+    git config mrrepo.review-unused false
+
 autoci =
-        git add .passwddb.pet .labbook.gpg .gnupg/pubring.kbx
+        git annex add .passwddb.pet .labbook.gpg .gnupg/pubring.kbx
         git commit -a -m \
             "auto passwddb, pubring and labbook commit on $(hostname -s)" || true
 pre_update = mr autoci