hardcode mailbox names. don't remake shortcuts.

3 files changed, 33 insertions, 37 deletions

diff --git a/share/mutt-wizard.muttrc b/share/mutt-wizard.muttrc
index 2cb7c8e..a12a77e 100644
--- a/share/mutt-wizard.muttrc
+++ b/share/mutt-wizard.muttrc
@@ -27,11 +27,15 @@ auto_view text/html		# automatically show html (mailcap uses lynx)
 auto_view application/pgp-encrypted
 #set display_filter = "tac | sed '/\\\[-- Autoview/,+1d' | tac" # Suppress autoview messages.
 alternative_order text/plain text/enriched text/html
+
 bind index,pager i noop
 bind index,pager g noop
 bind index \Cf noop
+bind index,pager M noop
+bind index,pager C noop
 
 # General rebindings
+bind index gg first-entry
 bind index j next-entry
 bind index k previous-entry
 bind attach <return> view-mailcap
@@ -65,6 +69,25 @@ bind pager \031 previous-line		# Mouse wheel
 bind pager \005 next-line		# Mouse wheel
 bind editor <Tab> complete-query
 
+macro index,pager gi "<change-folder>=INBOX<enter>" "go to inbox"
+macro index,pager Mi ";<save-message>=INBOX<enter>" "move mail to inbox"
+macro index,pager Ci ";<copy-message>=INBOX<enter>" "copy mail to inbox"
+macro index,pager gd "<change-folder>=Drafts<enter>" "go to drafts"
+macro index,pager Md ";<save-message>=Drafts<enter>" "move mail to drafts"
+macro index,pager Cd ";<copy-message>=Drafts<enter>" "copy mail to drafts"
+macro index,pager gj "<change-folder>=Junk<enter>" "go to junk"
+macro index,pager Mj ";<save-message>=Junk<enter>" "move mail to junk"
+macro index,pager Cj ";<copy-message>=Junk<enter>" "copy mail to junk"
+macro index,pager gt "<change-folder>=Trash<enter>" "go to trash"
+macro index,pager Mt ";<save-message>=Trash<enter>" "move mail to trash"
+macro index,pager Ct ";<copy-message>=Trash<enter>" "copy mail to trash"
+macro index,pager gs "<change-folder>=Sent<enter>" "go to sent"
+macro index,pager Ms ";<save-message>=Sent<enter>" "move mail to sent"
+macro index,pager Cs ";<copy-message>=Sent<enter>" "copy mail to sent"
+macro index,pager ga "<change-folder>=Archive<enter>" "go to archive"
+macro index,pager Ma ";<save-message>=Archive<enter>" "move mail to archive"
+macro index,pager Ca ";<copy-message>=Archive<enter>" "copy mail to archive"
+
 #set crypt_autosign = yes
 #set crypt_opportunistic_encrypt = yes
 #set pgp_self_encrypt = yes
diff --git a/share/switch.muttrc b/share/switch.muttrc
new file mode 100644
index 0000000..c808c99
--- /dev/null
+++ b/share/switch.muttrc
@@ -0,0 +1,10 @@
+# vim: filetype=neomuttrc
+
+# This is an embarrassing and hacky file that unbinds a bunch of binds between
+# switching accounts. It is called each time an account is changed.
+
+unset hostname
+unmy_hdr Organization
+unmailboxes *
+unalternates *
+unset signature
diff --git a/share/unbind.muttrc b/share/unbind.muttrc
deleted file mode 100644
index 330d823..0000000
--- a/share/unbind.muttrc
+++ /dev/null
@@ -1,37 +0,0 @@
-# vim: filetype=neomuttrc
-
-# This is an embarrassing and hacky file that unbinds a bunch of binds between
-# switching accounts. It is called each time an account is changed.
-
-bind index,pager gi noop
-bind index,pager gs noop
-bind index,pager gd noop
-bind index,pager ga noop
-bind index,pager gS noop
-bind index,pager gj noop
-bind index,pager gt noop
-bind index,pager Mi noop
-bind index,pager Ms noop
-bind index,pager Md noop
-bind index,pager Ma noop
-bind index,pager MS noop
-bind index,pager Mj noop
-bind index,pager Mt noop
-bind index,pager Ci noop
-bind index,pager Cs noop
-bind index,pager Cd noop
-bind index,pager Ca noop
-bind index,pager CS noop
-bind index,pager Cj noop
-bind index,pager Ct noop
-bind index,pager gg noop
-bind index,pager g noop
-bind index,pager M noop
-bind index,pager C noop
-unset hostname
-unmy_hdr Organization
-unmailboxes *
-unalternates *
-unset signature
-
-bind index gg first-entry