From bbe82a3ac59dc44d6b642dd33b07e70220f0d55b Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 3 Oct 2018 13:35:04 -0500
Subject: [PATCH] mbsync: add option to add extra account configuration

(cherry picked from commit 5770dc58b99b8980ea33973ca1cb4d9170335069)
---
 modules/programs/mbsync-accounts.nix | 14 ++++++++++++++
 modules/programs/mbsync.nix          |  1 +
 2 files changed, 15 insertions(+)

diff --git a/modules/programs/mbsync-accounts.nix b/modules/programs/mbsync-accounts.nix
index 4a1a51c49..c586481df 100644
--- a/modules/programs/mbsync-accounts.nix
+++ b/modules/programs/mbsync-accounts.nix
@@ -89,5 +89,19 @@ in
         Remote store extra configuration.
       '';
     };
+
+    extraConfig.account = mkOption {
+      type = extraConfigType;
+      default = {};
+      example = literalExample ''
+        {
+          PipelineDepth = 10;
+          Timeout = 60;
+        };
+      '';
+      description = ''
+        Account section extra configuration.
+      '';
+    };
   };
 }
diff --git a/modules/programs/mbsync.nix b/modules/programs/mbsync.nix
index fc8503778..060bec83f 100644
--- a/modules/programs/mbsync.nix
+++ b/modules/programs/mbsync.nix
@@ -60,6 +60,7 @@ let
         }
         // genTlsConfig imap.tls
         // optionalAttrs (imap.port != null) { Port = toString imap.port; }
+        // mbsync.extraConfig.account
       )
       + "\n"
       + genSection "IMAPStore ${name}-remote" (