accounts.email: add option to disable an account

Allow a user to disable an email account by setting
`accounts.email.accounts.<name>.enable = false`.  This is useful if
someone wants to configure email accounts globally but only use them in
certain circumstances.

Everywhere email account configuration is used, check if the account is
enabled before checking any attributes of the account.

modules/programs/aerc/default.nix

@@ -47,7 +47,9 @@ let
       ;
   };
 
-  aerc-accounts = attrsets.filterAttrs (_: v: v.aerc.enable) config.accounts.email.accounts;
+  aerc-accounts = attrsets.filterAttrs (
+    _: v: v.enable && v.aerc.enable
+  ) config.accounts.email.accounts;
 
   configDir =
     if (pkgs.stdenv.isDarwin && !config.xdg.enable) then

modules/programs/alot/default.nix

@@ -17,7 +17,9 @@ let
 
   cfg = config.programs.alot;
 
-  enabledAccounts = lib.filter (a: a.notmuch.enable) (lib.attrValues config.accounts.email.accounts);
+  enabledAccounts = lib.filter (a: a.enable && a.notmuch.enable) (
+    lib.attrValues config.accounts.email.accounts
+  );
 
   # sorted: primary first
   alotAccounts = lib.sort (a: b: !(a.primary -> b.primary)) enabledAccounts;

modules/programs/astroid/default.nix

@@ -11,7 +11,9 @@ let
 
   jsonFormat = pkgs.formats.json { };
 
-  astroidAccounts = lib.filterAttrs (n: v: v.astroid.enable) config.accounts.email.accounts;
+  astroidAccounts = lib.filterAttrs (
+    n: v: v.enable && v.astroid.enable
+  ) config.accounts.email.accounts;
 
   boolOpt = b: if b then "true" else "false";
 

modules/programs/getmail/default.nix

@@ -5,7 +5,9 @@
   ...
 }:
 let
-  accounts = lib.filter (a: a.getmail.enable) (lib.attrValues config.accounts.email.accounts);
+  accounts = lib.filter (a: a.enable && a.getmail.enable) (
+    lib.attrValues config.accounts.email.accounts
+  );
 
   renderAccountConfig =
     account:

modules/programs/git.nix

@@ -566,7 +566,7 @@ in
       {
         programs.git.iniContent =
           let
-            hasSmtp = name: account: account.smtp != null;
+            hasSmtp = name: account: account.enable && account.smtp != null;
 
             genIdentity =
               name: account:

modules/programs/himalaya.nix

@@ -34,7 +34,7 @@ let
   mkAccountConfig =
     _: account:
     let
-      notmuchEnabled = account.notmuch.enable;
+      notmuchEnabled = account.enable && account.notmuch.enable;
       imapEnabled = !isNull account.imap && !notmuchEnabled;
       maildirEnabled = !isNull account.maildir && !imapEnabled && !notmuchEnabled;
 
@@ -165,7 +165,7 @@ in
       configFile."himalaya/config.toml".source =
         let
           enabledAccounts = lib.filterAttrs (
-            _: account: account.himalaya.enable
+            _: account: account.enable && account.himalaya.enable
           ) config.accounts.email.accounts;
           accountsConfig = lib.mapAttrs mkAccountConfig enabledAccounts;
           globalConfig = compactAttrs himalaya.settings;

modules/programs/lieer.nix

@@ -15,7 +15,9 @@ let
 
   cfg = config.programs.lieer;
 
-  lieerAccounts = lib.filter (a: a.lieer.enable) (lib.attrValues config.accounts.email.accounts);
+  lieerAccounts = lib.filter (a: a.enable && a.lieer.enable) (
+    lib.attrValues config.accounts.email.accounts
+  );
 
   nonGmailAccounts = map (a: a.name) (lib.filter (a: a.flavor != "gmail.com") lieerAccounts);
 

modules/programs/mbsync/default.nix

@@ -20,7 +20,9 @@ let
   cfg = config.programs.mbsync;
 
   # Accounts for which mbsync is enabled.
-  mbsyncAccounts = lib.filter (a: a.mbsync.enable) (lib.attrValues config.accounts.email.accounts);
+  mbsyncAccounts = lib.filter (a: a.enable && a.mbsync.enable) (
+    lib.attrValues config.accounts.email.accounts
+  );
 
   # Given a SINGLE group's channels attribute set, return true if ANY of the channel's
   # patterns use the invalidOption attribute set value name.

modules/programs/meli.nix

@@ -18,7 +18,7 @@ let
   tomlFormat = pkgs.formats.toml { };
 
   enabledAccounts = lib.attrsets.filterAttrs (
-    name: value: value.meli.enable or false
+    name: value: value.enable && (value.meli.enable or false)
   ) config.accounts.email.accounts;
 
   meliAccounts = (lib.attrsets.mapAttrs (name: value: (mkMeliAccounts name value)) enabledAccounts);

modules/programs/msmtp/default.nix

@@ -9,7 +9,9 @@ let
 
   cfg = config.programs.msmtp;
 
-  msmtpAccounts = lib.filter (a: a.msmtp.enable) (lib.attrValues config.accounts.email.accounts);
+  msmtpAccounts = lib.filter (a: a.enable && a.msmtp.enable) (
+    lib.attrValues config.accounts.email.accounts
+  );
 
   onOff = p: if p then "on" else "off";
 

modules/programs/mu.nix

@@ -14,7 +14,9 @@ let
   sortedAddresses =
     let
       # Set of email account sets where mu.enable = true.
-      muAccounts = lib.filter (a: a.mu.enable) (lib.attrValues config.accounts.email.accounts);
+      muAccounts = lib.filter (a: a.enable && a.mu.enable) (
+        lib.attrValues config.accounts.email.accounts
+      );
       addrs = map (a: a.address) muAccounts;
       # Construct list of lists containing email aliases, and flatten
       aliases = map (alias: alias.address or alias) (lib.flatten (map (a: a.aliases) muAccounts));

modules/programs/mujmap.nix

@@ -9,7 +9,9 @@ let
 
   cfg = config.programs.mujmap;
 
-  mujmapAccounts = lib.filter (a: a.mujmap.enable) (lib.attrValues config.accounts.email.accounts);
+  mujmapAccounts = lib.filter (a: a.enable && a.mujmap.enable) (
+    lib.attrValues config.accounts.email.accounts
+  );
 
   missingNotmuchAccounts = map (a: a.name) (
     lib.filter (a: !a.notmuch.enable && a.mujmap.notmuchSetupWarning) mujmapAccounts

modules/programs/neomutt/default.nix

@@ -20,7 +20,9 @@ let
 
   cfg = config.programs.neomutt;
 
-  neomuttAccountsCfg = filterAttrs (n: a: a.neomutt.enable) config.accounts.email.accounts;
+  neomuttAccountsCfg = filterAttrs (
+    n: a: a.enable && a.neomutt.enable
+  ) config.accounts.email.accounts;
   neomuttAccounts = attrValues neomuttAccountsCfg;
 
   accountCommandNeeded = lib.any (

modules/programs/notmuch/default.nix

@@ -47,7 +47,7 @@ let
 
     user =
       let
-        accounts = filter (a: a.notmuch.enable) (lib.attrValues config.accounts.email.accounts);
+        accounts = filter (a: a.enable && a.notmuch.enable) (lib.attrValues config.accounts.email.accounts);
         primary = filter (a: a.primary) accounts;
         secondaries = filter (a: !a.primary) accounts;
       in

modules/programs/offlineimap/default.nix

@@ -9,7 +9,9 @@ let
 
   cfg = config.programs.offlineimap;
 
-  accounts = lib.filter (a: a.offlineimap.enable) (lib.attrValues config.accounts.email.accounts);
+  accounts = lib.filter (a: a.enable && a.offlineimap.enable) (
+    lib.attrValues config.accounts.email.accounts
+  );
 
   toIni = lib.generators.toINI {
     mkKeyValue =

modules/programs/thunderbird.nix

@@ -32,16 +32,21 @@ let
 
   moduleName = "programs.thunderbird";
 
-  filterEnabled = accounts: attrValues (lib.filterAttrs (_: a: a.thunderbird.enable) accounts);
   addId = map (a: a // { id = builtins.hashString "sha256" a.name; });
 
-  enabledEmailAccounts = filterEnabled config.accounts.email.accounts;
+  enabledEmailAccounts = filter (a: a.enable && a.thunderbird.enable) (
+    attrValues config.accounts.email.accounts
+  );
   enabledEmailAccountsWithId = addId enabledEmailAccounts;
 
-  enabledCalendarAccounts = filterEnabled config.accounts.calendar.accounts;
+  enabledCalendarAccounts = filter (a: a.thunderbird.enable) (
+    attrValues config.accounts.calendar.accounts
+  );
   enabledCalendarAccountsWithId = addId enabledCalendarAccounts;
 
-  enabledContactAccounts = filterEnabled config.accounts.contact.accounts;
+  enabledContactAccounts = filter (a: a.thunderbird.enable) (
+    attrValues config.accounts.contact.accounts
+  );
   enabledContactAccountsWithId = addId enabledContactAccounts;
 
   thunderbirdConfigPath = if isDarwin then "Library/Thunderbird" else ".thunderbird";