From 82b26e9139332b78ea923c65a864f525922f031d Mon Sep 17 00:00:00 2001 From: George Rawlinson Date: Tue, 23 Mar 2021 23:29:38 +0000 Subject: [PATCH] fix(mail): remove old account --- mail/.config/neomutt/accounts/nullpointer | 26 ------- mail/.config/neomutt/accounts/rawlinson | 2 +- mail/.config/neomutt/hooks | 2 +- mail/.config/neomutt/mailboxes | 4 +- mail/.mbsyncrc | 90 ++++------------------- mail/.notmuch-config | 2 +- 6 files changed, 19 insertions(+), 107 deletions(-) delete mode 100644 mail/.config/neomutt/accounts/nullpointer diff --git a/mail/.config/neomutt/accounts/nullpointer b/mail/.config/neomutt/accounts/nullpointer deleted file mode 100644 index 279b2fc..0000000 --- a/mail/.config/neomutt/accounts/nullpointer +++ /dev/null @@ -1,26 +0,0 @@ -# clear previously defined mailboxes -#unmailboxes * - -# clear previously defined headers -unmy_hdr * - -set mbox = "+nullpointer/Archive" -set postponed = "+nullpointer/Drafts" -set trash = "+nullpointer/Trash" -set record = "+nullpointer/Sent" - -set realname = "George Rawlinson" -set from = "george@nullpointer.io" - -# smtp settings -set smtp_pass = `pass mail/george@nullpointer.io` -set smtp_url = smtp://$from@smtp.nullpointer.io:587 - -# nullpointer specific macros -macro index A "+nullpointer/Archive" "move message to the archive" -macro index S "+nullpointer/Junk" "mark message as spam" -macro index D "+nullpointer/Trash" "move message to the trash" -# tag macros -macro index \Ca "+nullpointer/Archive" "move tagged messages to archive" -macro index \Cs "+nullpointer/Junk" "move tagged messages to spam" -macro index \Cd "+nullpointer/Trash" "move tagged messages to trash" diff --git a/mail/.config/neomutt/accounts/rawlinson b/mail/.config/neomutt/accounts/rawlinson index 91ab04c..c2206f0 100644 --- a/mail/.config/neomutt/accounts/rawlinson +++ b/mail/.config/neomutt/accounts/rawlinson @@ -14,7 +14,7 @@ set from = "george@rawlinson.net.nz" # smtp settings set smtp_pass = `pass mail/george@rawlinson.net.nz` -set smtp_url = smtp://$from@smtp.nullpointer.io:587 +set smtp_url = smtps://$from@smtp.little.kiwi # rawlinson specific macros macro index A "+rawlinson/Archive" "move message to the archive" diff --git a/mail/.config/neomutt/hooks b/mail/.config/neomutt/hooks index 701db83..5eb409a 100644 --- a/mail/.config/neomutt/hooks +++ b/mail/.config/neomutt/hooks @@ -1,5 +1,5 @@ # folder hooks for different accounts folder-hook rawlinson/* source ~/.config/neomutt/accounts/rawlinson -folder-hook nullpointer/* source ~/.config/neomutt/accounts/nullpointer +#folder-hook accountname/* source ~/.config/neomutt/accounts/accountname source ~/.config/neomutt/accounts/rawlinson # default account diff --git a/mail/.config/neomutt/mailboxes b/mail/.config/neomutt/mailboxes index f08cdb2..87d6374 100644 --- a/mail/.config/neomutt/mailboxes +++ b/mail/.config/neomutt/mailboxes @@ -1,6 +1,4 @@ -named-mailboxes ":: rawlinson" ~/.config/neomutt/div_rw mailboxes `find ~/.mail/rawlinson -type d -name cur | sort | sed -e 's:/cur/*$::' -e 's/ /\\ /g' | tr '\n' ' '` -named-mailboxes ":: nullpointer" ~/.config/neomutt/div_np -mailboxes `find ~/.mail/nullpointer -type d -name cur | sort | sed -e 's:/cur/*$::' -e 's/ /\\ /g' | tr '\n' ' '` +#mailboxes `find ~/.mail/accountname -type d -name cur | sort | sed -e 's:/cur/*$::' -e 's/ /\\ /g' | tr '\n' ' '` # vim: syntax=muttrc diff --git a/mail/.mbsyncrc b/mail/.mbsyncrc index 5f0d7b8..e45f01a 100644 --- a/mail/.mbsyncrc +++ b/mail/.mbsyncrc @@ -5,7 +5,7 @@ SyncState * # rawlinson IMAPAccount rawlinson - Host imap.nullpointer.io + Host imap.little.kiwi User george@rawlinson.net.nz PassCmd "pass mail/george@rawlinson.net.nz" # get password from pass AuthMechs LOGIN @@ -22,33 +22,33 @@ MaildirStore rawlinson-local # folders Channel rawlinson-inbox - Master :rawlinson-remote:INBOX - Slave :rawlinson-local:INBOX + Far :rawlinson-remote:INBOX + Near :rawlinson-local:INBOX Channel rawlinson-archive - Master :rawlinson-remote:Archive - Slave :rawlinson-local:Archive + Far :rawlinson-remote:Archive + Near :rawlinson-local:Archive Channel rawlinson-drafts - Master :rawlinson-remote:Drafts - Slave :rawlinson-local:Drafts + Far :rawlinson-remote:Drafts + Near :rawlinson-local:Drafts Channel rawlinson-junk - Master :rawlinson-remote:Junk - Slave :rawlinson-local:Junk + Far :rawlinson-remote:Junk + Near :rawlinson-local:Junk Channel rawlinson-sent - Master :rawlinson-remote:Sent - Slave :rawlinson-local:Sent + Far :rawlinson-remote:Sent + Near :rawlinson-local:Sent Channel rawlinson-trash - Master :rawlinson-remote:Trash - Slave :rawlinson-local:Trash + Far :rawlinson-remote:Trash + Near :rawlinson-local:Trash # all folders except above Channel rawlinson-folders - Master :rawlinson-remote: - Slave :rawlinson-local: + Far :rawlinson-remote: + Near :rawlinson-local: Patterns * !INBOX !Archive !Drafts !Junk !Sent !Trash # group all channels, so they can be sync'd with one command `mbsync rawlinson` @@ -60,63 +60,3 @@ Group rawlinson Channel rawlinson-junk Channel rawlinson-sent Channel rawlinson-folders - - -# nullpointer -IMAPAccount nullpointer - Host imap.nullpointer.io - User george@nullpointer.io - PassCmd "pass mail/george@nullpointer.io" # get password from pass - AuthMechs LOGIN - SSLType IMAPS - -# remote storage -IMAPStore nullpointer-remote - Account nullpointer - -# local storage -MaildirStore nullpointer-local - Path ~/.mail/nullpointer/ # must append slash to specify directory - Inbox ~/.mail/nullpointer/INBOX # place inbox inside mail dir - -# folders -Channel nullpointer-inbox - Master :nullpointer-remote:INBOX - Slave :nullpointer-local:INBOX - -Channel nullpointer-archive - Master :nullpointer-remote:Archive - Slave :nullpointer-local:Archive - -Channel nullpointer-drafts - Master :nullpointer-remote:Drafts - Slave :nullpointer-local:Drafts - -Channel nullpointer-junk - Master :nullpointer-remote:Junk - Slave :nullpointer-local:Junk - -Channel nullpointer-sent - Master :nullpointer-remote:Sent - Slave :nullpointer-local:Sent - -Channel nullpointer-trash - Master :nullpointer-remote:Trash - Slave :nullpointer-local:Trash - -# all folders except above -Channel nullpointer-folders - Master :nullpointer-remote: - Slave :nullpointer-local: - Patterns * !INBOX !Archive !Drafts !Junk !Sent !Trash - -# group all channels, so they can be sync'd with one command `mbsync nullpointer` -Group nullpointer - Channel nullpointer-trash - Channel nullpointer-inbox - Channel nullpointer-archive - Channel nullpointer-drafts - Channel nullpointer-junk - Channel nullpointer-sent - Channel nullpointer-folders - diff --git a/mail/.notmuch-config b/mail/.notmuch-config index 08b194c..a586583 100644 --- a/mail/.notmuch-config +++ b/mail/.notmuch-config @@ -11,7 +11,7 @@ # configured here named ".notmuch". # [database] -path=/home/george/.mail +path=.mail # User configuration #