aerc: add more bindigs

users/modules/mail/default.nix

@@ -1,8 +1,20 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 let
   exec = cmd: ":${cmd}<Enter>";
   fill = cmd: ":${cmd}<space>";
+
+  globalBinds = {
+    "gt" = exec "next-tab";
+    "gT" = exec "prev-tab";
+  };
+
+  commonMessageBinds = {
+    "U" = exec "unsubscribe";
+    "D" = exec "delete";
+    "A" = exec "archive flat";
+    "mS" = exec "move Junk";
+  };
 in
 {
   accounts.email.maildirBasePath = "${config.xdg.dataHome}/mail";
@@ -27,7 +39,7 @@ in
         border-char-vertical = "│";
         border-char-horizontal = "─";
         fuzzy-complete = true;
-        new-message-bell = false;
+        new-message-bell = true;
       };
 
       statusline = {
@@ -40,12 +52,12 @@ in
       };
     };
     extraBinds = {
-      messages = {
+      messages = lib.mkMerge [
+        globalBinds
+        commonMessageBinds
+        {
           "q" = exec "quit";
 
-        "gt" = exec "next-tab";
-        "gT" = exec "prev-tab";
-
           "j" = exec "next";
           "<Down>" = exec "next";
           "<C-d>" = exec "next 50%";
@@ -68,17 +80,17 @@ in
           "\\" = fill "filter";
           "n" = exec "next-result";
           "N" = exec "prev-result";
-
-        "U" = exec "unsubscribe";
-        "D" = exec "delete";
-        "A" = exec "archive flat";
           #"D" = exec "modify-labels +deleted -inbox";
           #"A" = exec "modify-labels -inbox";
           #"ms" = exec "modify-labels +spam -inbox";
           #"mS" = exec "modify-labels -spam +inbox";
-      };
+        }
+      ];
 
-      view = {
+      view = lib.mkMerge [
+        globalBinds
+        commonMessageBinds
+        {
           "q" = exec "close";
           "O" = exec "open";
           "S" = fill "save";
@@ -94,20 +106,18 @@ in
           "<C-j>" = exec "next-part";
           "J" = exec "next";
           "K" = exec "prev";
+        }
+      ];
 
-        "U" = exec "unsubscribe";
-        "D" = exec "delete";
-        "A" = exec "archive flat";
-        # "ms" = exec "modify-labels +spam -inbox";
-        # "mS" = exec "modify-labels -spam +inbox";
-      };
-
-      compose = {
+      compose = lib.mkMerge [
+        globalBinds
+        {
           "$ex" = "<C-x>";
           "<C-k>" = exec "prev-field";
           "<C-j>" = exec "next-field";
           "<tab>" = exec "next-field";
-      };
+        }
+      ];
 
       "compose::editor" = {
         "$noinherit" = "true";