alot: apply nixfmt

format

@@ -33,7 +33,6 @@ find . -name '*.nix' \
   ! -path ./modules/misc/xdg.nix \
   ! -path ./modules/modules.nix \
   ! -path ./modules/programs/afew.nix \
-  ! -path ./modules/programs/alot.nix \
   ! -path ./modules/programs/bash.nix \
   ! -path ./modules/programs/emacs.nix \
   ! -path ./modules/programs/firefox.nix \

modules/programs/alot.nix

@@ -7,18 +7,14 @@ let
 
   cfg = config.programs.alot;
 
-  alotAccounts = filter (a: a.notmuch.enable)
+  alotAccounts =
-    (attrValues config.accounts.email.accounts);
+    filter (a: a.notmuch.enable) (attrValues config.accounts.email.accounts);
 
   boolStr = v: if v then "True" else "False";
 
   mkKeyValue = key: value:
-    let
+    let value' = if isBool value then boolStr value else toString value;
-      value' =
+    in "${key} = ${value'}";
-        if isBool value then boolStr value
-        else toString value;
-    in
-      "${key} = ${value'}";
 
   mk2ndLevelSectionName = name: "[" + name + "]";
 
@@ -61,59 +57,43 @@ let
     };
   };
 
-  accountStr = account: with account;
+  accountStr = account:
-    concatStringsSep "\n" (
+    with account;
-      [ "[[${name}]]" ]
+    concatStringsSep "\n" ([ "[[${name}]]" ]
-      ++ mapAttrsToList (n: v: n + "=" + v) (
+      ++ mapAttrsToList (n: v: n + "=" + v) ({
-        {
         address = address;
         realname = realName;
         sendmail_command =
           optionalString (alot.sendMailCommand != null) alot.sendMailCommand;
         sent_box = "maildir" + "://" + maildir.absPath + "/" + folders.sent;
         draft_box = "maildir" + "://" + maildir.absPath + "/" + folders.drafts;
-        }
+      } // optionalAttrs (aliases != [ ]) {
-        // optionalAttrs (aliases != []) {
         aliases = concatStringsSep "," aliases;
-        }
+      } // optionalAttrs (gpg != null) {
-        // optionalAttrs (gpg != null) {
         gpg_key = gpg.key;
         encrypt_by_default = if gpg.encryptByDefault then "all" else "none";
         sign_by_default = boolStr gpg.signByDefault;
-        }
+      } // optionalAttrs (signature.showSignature != "none") {
-        // optionalAttrs (signature.showSignature != "none") {
         signature = pkgs.writeText "signature.txt" signature.text;
-          signature_as_attachment =
+        signature_as_attachment = boolStr (signature.showSignature == "attach");
-            boolStr (signature.showSignature == "attach");
+      }) ++ [ alot.extraConfig ] ++ [ "[[[abook]]]" ]
-        }
+      ++ mapAttrsToList (n: v: n + "=" + v) alot.contactCompletion);
-      )
-      ++ [ alot.extraConfig ]
-      ++ [ "[[[abook]]]" ]
-      ++ mapAttrsToList (n: v: n + "=" + v) alot.contactCompletion
-      );
 
-  configFile =
+  configFile = let
-    let
     bindingsToStr = attrSet:
       concatStringsSep "\n" (mapAttrsToList (n: v: "${n} = ${v}") attrSet);
-    in
+  in ''
-      ''
     # Generated by Home Manager.
     # See http://alot.readthedocs.io/en/latest/configuration/config_options.html
 
     ${generators.toKeyValue { inherit mkKeyValue; } cfg.settings}
     ${cfg.extraConfig}
     [tags]
-      ''
+  '' + (let
-      + (
-        let
     submoduleToAttrs = m:
       filterAttrs (name: v: name != "_module" && v != null) m;
-        in
+  in generators.toINI { mkSectionName = mk2ndLevelSectionName; }
-            generators.toINI { mkSectionName = mk2ndLevelSectionName; }
+  (mapAttrs (name: x: submoduleToAttrs x) cfg.tags)) + ''
-                            (mapAttrs (name: x: submoduleToAttrs x) cfg.tags)
-      )
-      + ''
     [bindings]
     ${bindingsToStr cfg.bindings.global}
 
@@ -133,9 +113,7 @@ let
     ${concatStringsSep "\n\n" (map accountStr alotAccounts)}
   '';
 
-in
+in {
-
-{
   options.programs.alot = {
     enable = mkOption {
       type = types.bool;
@@ -210,10 +188,8 @@ in
 
     settings = mkOption {
       type = with types;
-        let
+        let primitive = either (either (either str int) bool) float;
-          primitive = either (either (either str int) bool) float;
+        in attrsOf primitive;
-        in
-          attrsOf primitive;
       default = {
         initial_command = "search tag:inbox AND NOT tag:killed";
         auto_remove_unread = true;
@@ -249,8 +225,7 @@ in
     xdg.configFile."alot/hooks.py" = mkIf (cfg.hooks != "") {
       text = ''
         # Generated by Home Manager.
-      ''
+      '' + cfg.hooks;
-      + cfg.hooks;
     };
   };
 }