From ecc301166eebc9d752b7fc28b5b99b52d8ced1b4 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Wed, 6 Jan 2021 16:03:32 +0100
Subject: [PATCH] Move some directories around

---
 configurations/mail.nix      | 17 ++++++++---------
 configurations/syncthing.nix |  2 +-
 configurations/xdg-dirs.nix  |  6 +++---
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/configurations/mail.nix b/configurations/mail.nix
index a0fe8557..b4e63de3 100644
--- a/configurations/mail.nix
+++ b/configurations/mail.nix
@@ -35,9 +35,7 @@ let
         expunge = "both";
         flatten = ".";
         remove = "both";
-        extraConfig.account = {
-          AuthMechs = "PLAIN";
-        };
+        extraConfig.account.AuthMechs = "PLAIN";
       };
       msmtp.enable = true;
       neomutt = {
@@ -81,10 +79,9 @@ in
 {
   chvp.zfs.homeLinks = [
     { path = "mail"; type = "data"; }
-    { path = ".local/share/offlineimap"; type = "data"; }
-    { path = ".local/share/contacts"; type = "data"; }
-    { path = ".local/share/calendars"; type = "data"; }
-    { path = ".local/share/vdirsyncer"; type = "data"; }
+    { path = ".local/share/contacts"; type = "cache"; }
+    { path = ".local/share/calendars"; type = "cache"; }
+    { path = ".local/share/vdirsyncer"; type = "cache"; }
   ];
   home-manager.users.charlotte = { ... }: {
     accounts.email = {
@@ -111,10 +108,11 @@ in
           passFile = "work/UGentNet";
           useStartTls = true;
           extraConfig = {
+            folders = { drafts = "Drafts"; inbox = "INBOX"; sent = "Sent Items"; trash = "Deleted Items"; };
+            mbsync.extraConfig.account.PipelineDepth = "1";
             neomutt.extraConfig = ''
               alternates dodona@ugent.be
             '';
-            folders = { drafts = "Drafts"; inbox = "INBOX"; sent = "Sent Items"; trash = "Deleted Items"; };
           };
         };
         #work-aap-we-fr = makeAccount {
@@ -125,8 +123,9 @@ in
         #  passFile = "work/UGentNet";
         #  useStartTls = true;
         #  extraConfig = {
-        #    userName = "UGENT\\ecvpeteg/aap-we-fr";
         #    folders = { drafts = "Concepten"; inbox = "INBOX"; sent = "Verzonden items"; trash = "Verwijderde items"; };
+        #    mbsync.extraConfig.account.PipelineDepth = "1";
+        #    userName = "UGENT\\ecvpeteg/aap-we-fr";
         #  };
         #};
         posteo = makeAccount {
diff --git a/configurations/syncthing.nix b/configurations/syncthing.nix
index 5ee2d125..c9d450bd 100644
--- a/configurations/syncthing.nix
+++ b/configurations/syncthing.nix
@@ -3,7 +3,7 @@
 {
   chvp.zfs.homeLinks = [
     { path = ".config/syncthing"; type = "data"; }
-    { path = "sync"; type = "data"; }
+    { path = "sync"; type = "cache"; }
   ];
   home-manager.users.charlotte = { pkgs, ... }: {
     services.syncthing.enable = true;
diff --git a/configurations/xdg-dirs.nix b/configurations/xdg-dirs.nix
index 08e17da6..94c56a5e 100644
--- a/configurations/xdg-dirs.nix
+++ b/configurations/xdg-dirs.nix
@@ -4,10 +4,10 @@
   chvp.zfs.homeLinks = [
     { path = "desktop"; type = "data"; }
     { path = "documents"; type = "data"; }
-    { path = "downloads"; type = "data"; }
+    { path = "downloads"; type = "cache"; }
     { path = "music"; type = "data"; }
-    { path = "pictures"; type = "data"; }
-    { path = "repos"; type = "data"; }
+    { path = "pictures"; type = "cache"; }
+    { path = "repos"; type = "cache"; }
     { path = "templates"; type = "data"; }
     { path = "videos"; type = "data"; }
   ];