X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=buster%2Fsetup_scripts%2Fsetup_home_eeepc.sh;h=1b54a5682a9dd1fe39d113732db5911ddb8c5daa;hb=9cf85bce08b00c254652cfa929ed55ccafa6f8e5;hp=74049de970f9c5332422753c1f28e19d3c785591;hpb=e28d643cdc94ab26ed36f5fdac63543f617f0256;p=config
diff --git a/buster/setup_scripts/setup_home_eeepc.sh b/buster/setup_scripts/setup_home_eeepc.sh
index 74049de..1b54a56 100755
--- a/buster/setup_scripts/setup_home_eeepc.sh
+++ b/buster/setup_scripts/setup_home_eeepc.sh
@@ -9,7 +9,10 @@ setup_scripts_dir="${config_tree_buster}/setup_scripts"
repos_list_file="${public_repos_dir}/repos"
dir_secrets="${HOME}/tmp_secrets"
borgkeys_dir=~/.config/borg/keys
+borgrepos_file=~/.borgrepos
ssh_dir=~/.ssh
+authinfo_file=.authinfo
+maildir=~/mail/maildir
ensure_repo() {
repo_name="${1}"
@@ -37,22 +40,28 @@ cp id_rsa ~/.ssh
stty -echo
ssh-keygen -y -f ~/.ssh/id_rsa > ~/.ssh/id_rsa.pub
stty echo
+gpg --import secret_keys.asc
tar xf borg_keyfiles.tar
mkdir -p "${borgkeys_dir}"
mv borg_keyfiles/* "${borgkeys_dir}"
+# .authinfo may not be present on every secrets drive yet
+if [ -f "${authinfo_file}" ]; then
+ cp "${authinfo_file}" ~
+fi
cd
rm -rf "${dir_secrets}"
# Sync org dir via borgbackup. For this we need the borgbackup servers
# in our .ssh/known_hosts file.
-cat "${borgconfig_file}" | while read line; do
+cat "${borgrepos_file}" | while read line; do
first_char=$(echo "${line}" | cut -c1)
if [ "${first_char}" = "#" ]; then
continue
fi
- ssh-keyscan "${line}" >> "${ssh_dir}"/known_hosts
+ server=$(echo "${line}" | sed 's/.*@//')
+ ssh-keyscan "${server}" >> "${ssh_dir}"/known_hosts
done
-"${path_borgscript}" orgpull
+BORG_PASSPHRASE="${SECRETS_PASS}" "${path_borgscript}" orgpull
# Fill ~/public_repos.
cat "${repos_list_file}" | while read line; do
@@ -63,5 +72,14 @@ cat "${repos_list_file}" | while read line; do
ensure_repo "${line}"
done
+# Set up e-mail system. Note that we only do mbsync if the imap pass file
+# is found. It may not be present on every secrets drive yet, so we have to
+# deal with the possibility of it being absent at this point.
+mkdir -p "${maildir}" # expected by mbsync/isync
+if [ -f "${HOME}/${authinfo_file}" ]; then
+ mbsync -a
+ notmuch new
+fi
+
# Final note on how to integrate tridactyl.
echo "TODO: As tridactyl user, don't forget to do :source on the first Firefox run and then re-start."