From 42cb7eac04d6470a3dd05c1644470dbf3d03925e Mon Sep 17 00:00:00 2001
From: eeva <eeva@era>
Date: Sat, 11 Mar 2017 16:47:37 +0100
Subject: [PATCH] Send emails on a regular basis (don't stack forever)

---
 configuration.nix |  1 -
 mail.nix          | 22 ++++++++++++++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index eda1d88..c06aba8 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -39,7 +39,6 @@
       pavucontrol
       dell-530cdn
       arandr
-      inotify-tools
     ];
   };
 
diff --git a/mail.nix b/mail.nix
index d7e8a93..c1c728f 100644
--- a/mail.nix
+++ b/mail.nix
@@ -8,13 +8,15 @@
 # and various automation provided by systemd
 { config, pkgs, ... }:
 
+let mu-light = (pkgs.mu.override { withMug = false; }); # no webkit dependency
+in
 {
   environment.systemPackages = with pkgs; [
     msmtp
     neomutt
     ripmime
+    mu-light
     w3m
-    (mu.override { withMug = false; }) # no webkit dependency
   ];
 
   services.offlineimap = {
@@ -25,15 +27,27 @@
   systemd.user.services = {
     mu = {
       description = "Updating mail database";
-      script = "/run/current-system/sw/bin/mu index --quiet -m ~/mail";
+      path = [ mu-light ];
+      script = "mu index --quiet -m ~/mail";
       startAt = "daily";
       wantedBy = [ "timers.target" ];
     };
 
     offlineimap-fast = {
       description = "Quick mail synchronization";
-      script = "/run/current-system/sw/bin/offlineimap -u quiet -q";
+      path = [ pkgs.offlineimap ];
+      script = "offlineimap -u quiet -q";
+    };
+
+    msmtp-runqueue = {
+      description = "Flushing mail queue";
+      script = builtins.readFile "/home/eeva/prefix/bin/msmtp-runqueue";
+      preStart = "mkdir -p /home/eeva/.msmtpqueue";
+      startAt = "*:0/10";
+      serviceConfig = {
+        Restart = "on-failure";
+      };
+      path = [ pkgs.msmtp ];
     };
   };
-
 }