From 459695e9a0ab22fbea035ba4b695209b5cd8c82c Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Tue, 10 Oct 2023 08:29:31 +0100
Subject: [PATCH] Add davmail as package for easier setup

---
 README.org              | 5 ++++-
 home/accounts/email.nix | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.org b/README.org
index 1da3d408..77df02c3 100644
--- a/README.org
+++ b/README.org
@@ -54,7 +54,10 @@ secret-tool store --label="UKAEA mail mbsync" email evie.litherland-smith@ukaea.
 *** 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
-systemctl --user disable --now davmail.service && nix run nixpkgs#davmail -- -notray ~/.davmail.properties
+# Restart service to ensure ~/.davmail.properties exists
+systemctl --user restart davmail.service
+# Disable service and run to use manual authentication
+systemctl --user disable --now davmail.service && davmail -notray ~/.davmail.properties
 #+end_src
 
 Recreate and enable services after modifying:
diff --git a/home/accounts/email.nix b/home/accounts/email.nix
index 4d41e850..5b664a01 100644
--- a/home/accounts/email.nix
+++ b/home/accounts/email.nix
@@ -1,6 +1,7 @@
 { config, lib, pkgs, hostName, ... }:
 
 {
+  home.packages = with pkgs; [ davmail ];
   programs = {
     mbsync = {
       enable = true;