isync: fix permissions of new mail

1 files changed, 20 insertions, 17 deletions

diff --git a/modules/workstation/mail/isync/default.nix b/modules/workstation/mail/isync/default.nix
index 1ec41d8e13c2..326a3bc31ec8 100644
--- a/modules/workstation/mail/isync/default.nix
+++ b/modules/workstation/mail/isync/default.nix
@@ -4,27 +4,30 @@
 {
   environment.systemPackages = with pkgs; [ isync ];
 
-  systemd.services.isync = 
+  systemd.services.isync =
     let
-      mbsyncrc = pkgs.writeText "mbsyncrc" (import ./mbsyncrc.nix {
-        maildir = "${config.users.users.qyliss.home}/mail";
-      });
-    in {
-      serviceConfig = {
-        Type = "oneshot";
-        User = "qyliss-mail";
-        ExecStart = ''
-          ${pkgs.isync}/bin/mbsync -a -c ${mbsyncrc}
-        '';
-      };
+      maildir = "${config.users.users.qyliss.home}/mail";
+      mbsyncrc = pkgs.writeText "mbsyncrc"
+                                (import ./mbsyncrc.nix { inherit maildir; });
+    in with pkgs; {
+      serviceConfig.Type = "oneshot";
+      script = ''
+        ${sudo}/bin/sudo -u qyliss-mail \
+        ${isync}/bin/mbsync -a -c ${mbsyncrc}
+      '';
+      postStart = ''
+        ${findutils}/bin/find \
+            "${maildir}" \
+            -not -name .mbsyncstate \
+            -exec ${coreutils}/bin/chown qyliss:qyliss '{}' \;
+      '';
     };
 
   systemd.timers.isync = {
-    timerConfig = {
-      Unit = "isync.service";
-      OnCalendar = "*:0/5";
-      Persistent = "true";
-    };
+    timerConfig.Unit = "isync.service";
+    timerConfig.OnCalendar = "*:0/5";
+    timerConfig.Persistent = "true";
+    after = [ "networking.target" ];
     wantedBy = [ "multi-user.target" ];
   };
 }