Update

2 files changed, 24 insertions, 12 deletions

diff --git a/mutt/default b/mutt/default
index c6c0160..e8cc2fc 100644
--- a/mutt/default
+++ b/mutt/default
@@ -32,9 +32,10 @@ auto_view text/html
 macro pager h "v/html<return>xq<return>" "Open html file"
 
 # Vim-style key binding, \c means Ctrl
-# ref: https://fancyseeker.github.io/2015/08/19/mutt/#vim风格键位绑定
 bind index o sort-reverse
 bind index O sort-mailbox
+bind index E edit-type
+bind index,pager N search-opposite
 bind index <Return> sync-mailbox
 bind index y edit-label
 bind index x tag-entry
@@ -52,8 +53,6 @@ bind index,pager,browser \cd half-down
 bind index,pager,browser \cu half-up
 bind index } bottom-page
 bind pager G bottom
-bind pager gg noop
-bind pager gg top
 bind pager j next-line
 bind pager k previous-line
 bind pager \cn next-entry
@@ -75,6 +74,27 @@ macro pager U "\
 :set pipe_decode=\$my_tmp_pipe_decode\n\
 :unset my_tmp_pipe_decode\n"
 #macro pager U "<pipe-message>less<enter>" "CHECK"
+# Quick jump to other mailboxes
+bind index,pager            g       noop
+bind generic                gg      first-entry
+bind generic,index          G       last-entry
+bind pager                  gg      top
+bind pager                  G       bottom
+macro   index,pager         gi      "<change-folder>+INBOX<Return>" "Switch to INBOX folder"
+macro index,pager           gm      "<change-folder>+mbox<Return>" "Switch to INBOX folder"
+macro index,pager           gs      "<change-folder>+Sent<Return>" "Switch to Sent folder"
+macro index,pager           gd      "<change-folder>+DeltaChat<Return>" "Switch to Drafts folder"
+macro index,pager           gD      "<change-folder>+Drafts<Return>" "Switch to Drafts folder"
+macro index,pager           gt      "<change-folder>+Trash<Return>" "Switch to Trash folder"
+bind index,pager            gv      sidebar-toggle-visible
+bind generic                zt      current-top
+bind generic                zz      current-middle
+bind generic                zb      current-bottom
+bind index                  za      collapse-thread
+bind index                  zA      collapse-all
+bind generic,pager          \Cy     previous-line
+bind generic,index,pager    \Ce     next-line
+
 
 # Sidebar
 set mail_check = 120
@@ -96,14 +116,6 @@ color sidebar_divider color8 black
 color sidebar_flagged red black
 color sidebar_new green black
 
-bind index,pager g noop
-macro index,pager gi "<change-folder>+INBOX<Return>" "Switch to INBOX folder"
-macro index,pager gm "<change-folder>+mbox<Return>" "Switch to INBOX folder"
-macro index,pager gs "<change-folder>+Sent<Return>" "Switch to Sent folder"
-macro index,pager gd "<change-folder>+Drafts<Return>" "Switch to Drafts folder"
-macro index,pager gt "<change-folder>+Trash<Return>" "Switch to Trash folder"
-bind index,pager gv sidebar-toggle-visible
-
 # basic colors
 color normal        white           black
 color error         red             black
diff --git a/mutt/muttrc.topo b/mutt/muttrc.topo
index 4c40846..d5f0b08 100644
--- a/mutt/muttrc.topo
+++ b/mutt/muttrc.topo
@@ -29,7 +29,7 @@ set postponed = "+Drafts"
 
 # Sidebar
 unmailboxes *
-mailboxes =INBOX =mbox "+------ Watch ------" =hometeach =pay =osm =keep "+---- Processed ----" =Sent =Trash =Drafts =test =spam
+mailboxes =INBOX =mbox =DeltaChat "+------ Watch ------" =hometeach =pay =osm =keep "+---- Processed ----" =Sent =Trash =Drafts =test =spam
 
 # Keybinding
 macro index,pager <f4> '<sync-mailbox><enter-command>source ~/.config/mutt/muttrc.topo<enter><change-folder>!<enter>'