Merge commit '6cc4fd6ede4909226cb81d3475834251ed1b7210'

1 files changed, 28 insertions, 31 deletions

diff --git a/home-manager/modules/programs/getmail.nix b/home-manager/modules/programs/getmail.nix
index 04a958d6cda..2c3919dcf2f 100644
--- a/home-manager/modules/programs/getmail.nix
+++ b/home-manager/modules/programs/getmail.nix
@@ -4,34 +4,33 @@ with lib;
 
 let
 
-  accounts = filter (a: a.getmail.enable)
-    (attrValues config.accounts.email.accounts);
+  accounts =
+    filter (a: a.getmail.enable) (attrValues config.accounts.email.accounts);
 
-  renderAccountConfig = account: with account;
+  renderAccountConfig = account:
+    with account;
     let
       passCmd = concatMapStringsSep ", " (x: "'${x}'") passwordCommand;
-      renderedMailboxes = concatMapStringsSep ", " (x: "'${x}'") getmail.mailboxes;
-      retrieverType = if imap.tls.enable
-        then "SimpleIMAPSSLRetriever"
-        else "SimpleIMAPRetriever";
-      destination = if getmail.destinationCommand != null
-        then
-        {
-          destinationType = "MDA_external";
-          destinationPath = getmail.destinationCommand;
-        }
-        else
-        {
-          destinationType = "Maildir";
-          destinationPath = "${maildir.absPath}/";
-        };
+      renderedMailboxes =
+        concatMapStringsSep ", " (x: "'${x}'") getmail.mailboxes;
+      retrieverType = if imap.tls.enable then
+        "SimpleIMAPSSLRetriever"
+      else
+        "SimpleIMAPRetriever";
+      destination = if getmail.destinationCommand != null then {
+        destinationType = "MDA_external";
+        destinationPath = getmail.destinationCommand;
+      } else {
+        destinationType = "Maildir";
+        destinationPath = "${maildir.absPath}/";
+      };
       renderGetmailBoolean = v: if v then "true" else "false";
     in ''
       # Generated by Home-Manager.
       [retriever]
       type = ${retrieverType}
       server = ${imap.host}
-      ${optionalString (imap.port != null) "port = ${imap.port}"}
+      ${optionalString (imap.port != null) "port = ${toString imap.port}"}
       username = ${userName}
       password_command = (${passCmd})
       mailboxes = ( ${renderedMailboxes} )
@@ -46,15 +45,13 @@ let
     '';
   getmailEnabled = length (filter (a: a.getmail.enable) accounts) > 0;
   # Watch out! This is used by the getmail.service too!
-  renderConfigFilepath = a: ".getmail/getmail${if a.primary then "rc" else a.name}";
-in
-
-  {
-    config = mkIf getmailEnabled {
-      home.file = map (a:
-        { target = renderConfigFilepath a;
-          text = renderAccountConfig a;
-        }) accounts;
-
-    };
-  }
+  renderConfigFilepath = a:
+    ".getmail/getmail${if a.primary then "rc" else a.name}";
+
+in {
+  config = mkIf getmailEnabled {
+    home.file = foldl' (a: b: a // b) { }
+      (map (a: { "${renderConfigFilepath a}".text = renderAccountConfig a; })
+        accounts);
+  };
+}