mutt: refactoring

4 files changed, 26 insertions, 25 deletions

diff --git a/by_os/Linux/mutt/.mutt/personal.rc b/by_os/Linux/mutt/.mutt/personal.rc
deleted file mode 100644
index c56b39d..0000000
--- a/by_os/Linux/mutt/.mutt/personal.rc
+++ /dev/null
@@ -1,13 +0,0 @@
-color status            blue color231
-color sidebar_divider   blue color231
-color sidebar_highlight color201 color231
-color indicator         color231 blue
-
-set from      = "p@simianer.de"
-set sendmail  = "/usr/bin/msmtp -a personal"
-set record    = "+personal/all"
-set postponed = "+personal/drafts"
-set spoolfile = "+personal/inbox"
-
-macro index,pager S "<save-message>+personal/all<enter><enter><sync-mailbox>"
-
diff --git a/by_os/Linux/mutt/.mutt/primary.rc b/by_os/Linux/mutt/.mutt/primary.rc
new file mode 100644
index 0000000..8e9387b
--- /dev/null
+++ b/by_os/Linux/mutt/.mutt/primary.rc
@@ -0,0 +1,13 @@
+color status            blue color231
+color sidebar_divider   blue color231
+color sidebar_highlight color201 color231
+color indicator         color231 blue
+
+set from      = "p@simianer.de"
+set sendmail  = "/usr/bin/msmtp -a primary"
+set record    = "+primary/all"
+set postponed = "+primary/drafts"
+set spoolfile = "+primary/inbox"
+
+macro index,pager S "<save-message>+primary/all<enter><enter><sync-mailbox>"
+
diff --git a/by_os/Linux/mutt/.mutt/work.rc b/by_os/Linux/mutt/.mutt/secondary.rc
index 3501727..3501727 100644
--- a/by_os/Linux/mutt/.mutt/work.rc
+++ b/by_os/Linux/mutt/.mutt/secondary.rc
diff --git a/mutt/.mutt/muttrc b/mutt/.mutt/muttrc
index 8470cb2..0de9b6d 100644
--- a/mutt/.mutt/muttrc
+++ b/mutt/.mutt/muttrc
@@ -22,8 +22,8 @@ bind index F "flag-message"
 
 # macros
 set wait_key = no
-macro index,pager G "<shell-escape>imapfilter -c ~/.imapfilter/personal.lua &>/dev/null && mbsync personal && notmuch new 2>/dev/null<enter>"
-macro index,pager H "<shell-escape>imapfilter -c ~/.imapfilter/work.lua &>/dev/null     && mbsync work     && notmuch new 2>/dev/null<enter>"
+macro index,pager G "<shell-escape>imapfilter -c ~/.imapfilter/primary.lua &>/dev/null && mbsync primary && notmuch new 2>/dev/null<enter>"
+macro index,pager H "<shell-escape>imapfilter -c ~/.imapfilter/secondary.lua &>/dev/null     && mbsync secondary     && notmuch new 2>/dev/null<enter>"
 macro index,pager J "<shell-escape>mbsync -a && notmuch new 2>/dev/null<enter>"
 macro index <esc>m "T~N<enter>;WNT~O<enter>;WO\CT~T<enter>" "mark all messages read"
 macro index c "<change-folder>?<toggle-mailboxes>" "open a different folder"
@@ -39,17 +39,18 @@ ignore *
 unignore from date subject to cc
 hdr_order from to cc date subject
 
-# mailboxes
-mailboxes =personal/inbox =personal/drafts =personal/all
-mailboxes =work/inbox =work/drafts =work/all
+# primary mailboxes
+mailboxes =primary/inbox =primary/drafts =primary/all
+# secondary mailboxes
+mailboxes
 
 # folder hooks
-folder-hook personal/* source ~/.mutt/personal.rc
-folder-hook work/* source ~/.mutt/work.rc
+folder-hook primary/* source ~/.mutt/primary.rc
+folder-hook secondary/* source ~/.mutt/secondary.rc
 folder-hook . 'set read_inc=1'
-folder-hook personal/all 'set read_inc=1000'
-folder-hook work/all 'set read_inc=1000'
-folder-hook work/lists 'set read_inc=1000'
+folder-hook primary/all 'set read_inc=1000'
+folder-hook secondary/all 'set read_inc=1000'
+folder-hook secondary/lists 'set read_inc=1000'
 
 # notmuch
 set my_notmuchfs_folder="~/.notmuchfs"
@@ -94,6 +95,6 @@ unset help
 # ui
 source ~/.mutt/ui.rc
 
-# default personal
-source ~/.mutt/personal.rc
+# default primary
+source ~/.mutt/primary.rc