From ddde145313e017c0c77f2e07dc27e8224a5c4534 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Sat, 3 Feb 2024 06:32:57 +0000
Subject: [PATCH] Update README with new instructions for protonmail-bridge

Remove davmail from installed packages, just run with nix if/when
needed manually
---
 README.org              | 52 ++++++++++++++++++++---------------------
 home/accounts/email.nix |  1 -
 2 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/README.org b/README.org
index 18b5dda5..ea9371e3 100644
--- a/README.org
+++ b/README.org
@@ -1,45 +1,45 @@
 #+title: README
 #+author: Evie Litherland-Smith
 #+email: evie@xenia.me.uk
-
 * Password store setup
 ** Transfer GPG key(s)
 #+begin_src bash
-# Export key on existing machine
-gpg --export-secret-keys > key.gpg
-# Import key on new machine
-gpg --import key.gpg
-# Edit (for each key) to set trust
-gpg --edit-key ...
+  # Export key on existing machine
+  gpg --export-secret-keys > key.gpg
+  # Import key on new machine
+  gpg --import key.gpg
+  # Edit (for each key) to set trust
+  gpg --edit-key ...
 #+end_src
 ** Clone password-store repository
 #+begin_src bash
-git clone https://git.xenia.me.uk/xenia/pass $PASSWORD_STORE_DIR
+  git clone https://git.xenia.me.uk/xenia/pass $PASSWORD_STORE_DIR
 #+end_src
 * Email setup
 ** Proton
 *** Bridge
-Docker source: [[https://hub.docker.com/r/shenxn/protonmail-bridge][Docker]] / [[https://github.com/shenxn/protonmail-bridge-docker][GitHub - shenxn/protonmail-bridge-docker: ProtonMail IMAP/SMTP Bridge Docker ...]]
-
-To initialise:
+Run bridge in CLI mode to login, wait for initial sync and get app password
 #+begin_src bash
-podman kill protonmail-bridge && podman run --rm -it -v protonmail:/root shenxn/protonmail-bridge init
-# Restart so that service picks up available ports
-podman kill protonmail-bridge
+  nix run nixpkgs#protonmail-bridge -- -c
+  # Follow prompts to login and get password
+#+end_src
+
+Restart ~systemd~ service:
+#+begin_src bash
+  systemctl --user restart protonmail-bridge.service
 #+end_src
-and follow normal login system for cli.
-systemd unit handles running container on boot after this.
 **** uidvalidity issue
-Remove uid lines from .mbsyncrc (in each mail directory) and delete .uidvalidity, re-run mbsync to fix
++Remove uid lines from .mbsyncrc (in each mail directory) and delete .uidvalidity, re-run mbsync to fix+
+Above might be duplicating mail, faster to just delete local maildirs and let them re-sync.
 *** Password
-Get password from protonmail-bridge, save to password-store:
+Get password from ~protonmail-bridge~, save to ~password-store~:
 #+begin_src bash
   pass insert mbsync/$(hostname)/proton
   # Insert pass at prompt
 #+end_src
 ** iCloud
 *** Password
-If not already done, save password to password-store:
+If not already done, save password to ~password-store~:
 #+begin_src bash
   pass insert mbsync/$(hostname)/icloud
   # Insert pass at prompt
@@ -47,7 +47,7 @@ If not already done, save password to password-store:
 This will be synced across devices so only needs doing once
 ** Outlook
 *** Password
-If not already done, save password to password-store:
+If not already done, save password to ~password-store~:
 #+begin_src bash
   pass insert mbsync/$(hostname)/outlook
   # Insert pass at prompt
@@ -56,10 +56,10 @@ This will be synced across devices so only needs doing once
 *** Configuration
 On first run (or if token expires), stop systemd service and run manually to complete manual auth. Token will stay valid for a little while (no idea how long specifically).
 #+begin_src bash
-# Restart service to ensure ~/.davmail.properties exists
-systemctl --user restart davmail.service
-# Run to use manual authentication
-systemctl --user stop davmail.service && davmail -notray ~/.davmail.properties
-# Restart again so that service picks up available ports
-systemctl --user restart davmail.service
+  # Restart service to ensure ~/.davmail.properties exists
+  systemctl --user restart davmail.service
+  # Run to use manual authentication
+  systemctl --user stop davmail.service && davmail -notray ~/.davmail.properties
+  # Restart again so that service picks up available ports
+  systemctl --user restart davmail.service
 #+end_src
diff --git a/home/accounts/email.nix b/home/accounts/email.nix
index 750206cd..05fdc042 100644
--- a/home/accounts/email.nix
+++ b/home/accounts/email.nix
@@ -5,7 +5,6 @@
   hostName,
   ...
 }: {
-  home.packages = with pkgs; [davmail];
   accounts.email = {
     maildirBasePath = "Mail";
     accounts = let