From 22c6aff64698eec5231a9c43b4fb3642d2b97f97 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 23 Jan 2018 23:41:16 +0100
Subject: l mail: use attrSets

---
 lass/2configs/mail.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'lass/2configs/mail.nix')

diff --git a/lass/2configs/mail.nix b/lass/2configs/mail.nix
index a26f3fcb..7c58e8c5 100644
--- a/lass/2configs/mail.nix
+++ b/lass/2configs/mail.nix
@@ -20,13 +20,13 @@ let
     text/html; ${pkgs.elinks}/bin/elinks -dump ; copiousoutput;
   '';
 
-  inboxes = [
-    { l = "wireguard"; q = [ "wireguard@lists.zx2c4" ]; }
-    { l = "c-base"; q = [ "c-base.org" ]; }
-    { l = "security"; q = [ "seclists.org" "security" "bugtraq" ]; }
-    { l = "nix-devel"; q = [ "nix-devel@googlegroups.com" ]; }
-    { l = "shack"; q = [ "shackspace.de" ]; }
-  ];
+  mailboxes = {
+    wireguard = [ "wireguard@lists.zx2c4" ];
+    c-base = [ "c-base.org" ];
+    security = [ "seclists.org" "security" "bugtraq" ];
+    nix-devel = [ "nix-devel@googlegroups.com" ];
+    shack = [ "shackspace.de" ];
+  };
 
   muttrc = pkgs.writeText "muttrc" ''
     # gpg
@@ -82,9 +82,9 @@ let
 
     virtual-mailboxes \
       "Unread" "notmuch://?query=tag:unread"\
-      "INBOX" "notmuch://?query=tag:inbox ${concatMapStringsSep " " (f: "and NOT to:${f}") (concatMap (l: l.q) inboxes)}"\
-    ${concatMapStringsSep "\n" (i: ''${"  "}"${i.l}" "notmuch://?query=${concatMapStringsSep " or " (f: "to:${f}") i.q}"\'') inboxes}
-      "BOX" "notmuch://?query=${concatMapStringsSep " and " (f: "NOT to:${f}") (concatMap (l: l.q) inboxes)}"\
+      "INBOX" "notmuch://?query=tag:inbox ${concatMapStringsSep " " (f: "and NOT to:${f}") (flatten (attrValues mailboxes))}"\
+    ${concatMapStringsSep "\n" (i: ''${"  "}"${i.name}" "notmuch://?query=${concatMapStringsSep " or " (f: "to:${f}") i.value}"\'') (mapAttrsToList nameValuePair mailboxes)}
+      "BOX" "notmuch://?query=${concatMapStringsSep " and " (f: "NOT to:${f}") (flatten (attrValues mailboxes))}"\
       "TODO" "notmuch://?query=tag:TODO"\
       "Starred" "notmuch://?query=tag:*"\
       "Archive" "notmuch://?query=tag:archive"\
-- 
cgit v1.2.3