up

13 files changed, 318 insertions, 75 deletions

diff --git a/.config/isyncrc b/.config/isyncrc
index 87aaa2b..cf51179 100644
--- a/.config/isyncrc
+++ b/.config/isyncrc
@@ -25,56 +25,81 @@ MaxMessages 0
 ExpireUnread no
 # End profile
 
-## IMAPStore gmail_br-remote
-## Host imap.gmail.com
-## Port 993
-## User bousset.rudy@gmail.com
-## PassCmd "pass show mutt/gmail_br"
-## AuthMechs LOGIN
-## SSLType IMAPS
-## CertificateFile /etc/ssl/cert.pem
-##
-## MaildirStore gmail_br-local
-## SubFolders Verbatim
-## Path /var/mail/jozan/gmail_br/
-## Inbox /var/mail/jozan/gmail_br/INBOX
-##
-## Channel gmail_br
-## Expunge Both
-## Far :gmail_br-remote:
-## Near :gmail_br-local:
-## Patterns *
-## Create Both
-## SyncState *
-## MaxMessages 0
-## ExpireUnread no
-## # End profile
-##
-## IMAPStore gmail_oon-remote
-## Host imap.gmail.com
-## Port 993
-## User olsen.oyvind.nor@gmail.com
-## PassCmd "pass show mutt/gmail_oon"
-## AuthMechs LOGIN
-## SSLType IMAPS
-## CertificateFile /etc/ssl/cert.pem
-##
-## MaildirStore gmail_oon-local
-## SubFolders Verbatim
-## Path /var/mail/jozan/gmail_oon/
-## Inbox /var/mail/jozan/gmail_oon/INBOX
-##
-## Channel gmail_oon
-## Expunge Both
-## Far :gmail_oon-remote:
-## Near :gmail_oon-local:
-## Patterns *
-## Create Both
-## SyncState *
-## MaxMessages 0
-## ExpireUnread no
-## # End profile
-##
+IMAPStore gmx_shop-remote
+Host imap.gmx.com
+Port 993
+User rbo_shop@gmx.us
+PassCmd "pass show mutt/gmx_shop"
+AuthMechs LOGIN
+TLSType IMAPS
+CertificateFile /etc/ssl/certs/ca-certificates.crt
+
+MaildirStore gmx_shop-local
+SubFolders Verbatim
+Path  ~/.local/share/mail/gmx_shop/
+Inbox ~/.local/share/mail/gmx_shop/INBOX
+
+Channel gmx_shop
+Expunge Both
+Far :gmx_shop-remote:
+Near :gmx_shop-local:
+Patterns *
+Create Both
+SyncState *
+MaxMessages 0
+ExpireUnread no
+# End profile
+
+IMAPStore gmail_br-remote
+Host imap.gmail.com
+Port 993
+User bousset.rudy@gmail.com
+PassCmd "pass show mutt/gmail_br"
+AuthMechs LOGIN
+TLSType IMAPS
+CertificateFile /etc/ssl/certs/ca-certificates.crt
+
+MaildirStore gmail_br-local
+SubFolders Verbatim
+Path  ~/.local/share/mail/gmail_br/
+Inbox ~/.local/share/mail/gmail_br/INBOX
+
+Channel gmail_br
+Expunge Both
+Far :gmail_br-remote:
+Near :gmail_br-local:
+Patterns *
+Create Both
+SyncState *
+MaxMessages 0
+ExpireUnread no
+# End profile
+
+IMAPStore gmail_oon-remote
+Host imap.gmail.com
+Port 993
+User olsen.oyvind.nor@gmail.com
+PassCmd "pass show mutt/gmail_oon"
+AuthMechs LOGIN
+TLSType IMAPS
+CertificateFile /etc/ssl/certs/ca-certificates.crt
+
+MaildirStore gmail_oon-local
+SubFolders Verbatim
+Path  ~/.local/share/mail/gmail_oon/
+Inbox ~/.local/share/mail/gmail_oon/INBOX
+
+Channel gmail_oon
+Expunge Both
+Far :gmail_oon-remote:
+Near :gmail_oon-local:
+Patterns *
+Create Both
+SyncState *
+MaxMessages 0
+ExpireUnread no
+# End profile
+
 ## IMAPStore gmail_tos-remote
 ## Host imap.gmail.com
 ## Port 993
diff --git a/.config/msmtp/config b/.config/msmtp/config
index 3282f7f..e0f4fc8 100644
--- a/.config/msmtp/config
+++ b/.config/msmtp/config
@@ -13,20 +13,27 @@ account gmx_rbo
   user rbo@gmx.us
   passwordeval "pass show mutt/gmx_rbo"
 
-# account gmail_br
-#   host smtp.gmail.com
-#   port 587
-#   from Rudy Bousset
-#   user bousset.rudy@gmail.com
-#   passwordeval "pass show mutt/gmail_br"
-#
-# account gmail_oon
-#   host smtp.gmail.com
-#   port 587
-#   from Joe
-#   user olsen.oyvind.nor@gmail.com
-#   passwordeval "pass show mutt/gmail_oon"
-#
+account gmx_shop
+  host mail.gmx.com
+  port 587
+  from rbo_shop@gmx.us
+  user rbo_shop@gmx.us
+  passwordeval "pass show mutt/gmx_shop"
+
+account gmail_br
+  host smtp.gmail.com
+  port 587
+  from Rudy Bousset
+  user bousset.rudy@gmail.com
+  passwordeval "pass show mutt/gmail_br"
+
+account gmail_oon
+  host smtp.gmail.com
+  port 587
+  from joe
+  user olsen.oyvind.nor@gmail.com
+  passwordeval "pass show mutt/gmail_oon"
+
 # account gmail_tos
 #   host smtp.gmail.com
 #   port 587
diff --git a/.config/mutt/accounts/1-gmx_rbo.muttrc b/.config/mutt/accounts/1-gmx_rbo.muttrc
index 287edda..2c99094 100644
--- a/.config/mutt/accounts/1-gmx_rbo.muttrc
+++ b/.config/mutt/accounts/1-gmx_rbo.muttrc
@@ -21,12 +21,18 @@ bind pager G bottom
 macro index o "<shell-escape>killall mbsync >/dev/null 2>&1; mbsync gmx_rbo<enter>" "run mbsync to sync rbo@gmx.us"
 unmailboxes *
 
-mailboxes "=INBOX" "=Sent" "=Drafts" "=Spam" "=Trash" "=Keep"
+named-mailboxes \
+		"󰶉 inbox" =INBOX \
+		" sent"  =Sent \
+		"󱩽 draft" =Drafts \
+		"󰳤 junk"  =Spam \
+		" trash" =Trash \
+		" keep"  =Keep
 
 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"
-set spoolfile = "+INBOX"
+set spoolfile = +INBOX
 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"
@@ -34,11 +40,11 @@ set record = ""
 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"
-set postponed = "+Drafts"
+set postponed = +Drafts
 macro index,pager gS "<change-folder>=Spam<enter>" "go to spam"
 macro index,pager MS ";<save-message>=Spam<enter>" "move mail to spam"
 macro index,pager CS ";<copy-message>=Spam<enter>" "copy mail to spam"
 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"
-set trash = "+Trash"
+set trash = +Trash
diff --git a/.config/mutt/accounts/2-gmx_shop.muttrc b/.config/mutt/accounts/2-gmx_shop.muttrc
new file mode 100644
index 0000000..abb951b
--- /dev/null
+++ b/.config/mutt/accounts/2-gmx_shop.muttrc
@@ -0,0 +1,49 @@
+# vim: filetype=neomuttrc
+# muttrc file for account bousset.rudy@gmail.com
+set realname = "joe"
+set from = "rbo_shop@gmx.us"
+set sendmail = "msmtp -a gmx_shop"
+alias me joe <rbo_shop@gmx.us>
+set folder = "$MAIL/gmx_shop"
+set header_cache = $XDG_RUNTIME_DIR/mutt/gmx_shop/headers
+set message_cachedir = $XDG_RUNTIME_DIR/mutt/gmx_shop/bodies
+set mbox_type = Maildir
+set crypt_autosign = yes
+set signature = $XDG_CONFIG_HOME/mutt/sig/2-gmx_shop
+
+bind index,pager gg noop
+bind index,pager g noop
+bind index,pager M noop
+bind index,pager C noop
+bind index gg first-entry
+bind pager gg top
+bind pager G bottom
+macro index o "<shell-escape>killall mbsync >/dev/null 2>&1; mbsync gmx_shop<enter>" "run mbsync to sync rbo@gmx.us"
+unmailboxes *
+
+named-mailboxes \
+		"󰶉 inbox" =INBOX \
+		" sent"  =Sent \
+		"󱩽 draft" =Drafts \
+		"󰳤 junk"  =Spam \
+		" trash" =Trash
+
+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"
+set spoolfile = +INBOX
+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"
+set record = ""
+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"
+set postponed = +Drafts
+macro index,pager gS "<change-folder>=Spam<enter>" "go to spam"
+macro index,pager MS ";<save-message>=Spam<enter>" "move mail to spam"
+macro index,pager CS ";<copy-message>=Spam<enter>" "copy mail to spam"
+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"
+set trash = +Trash
diff --git a/.config/mutt/accounts/3-gmail_br.muttrc b/.config/mutt/accounts/3-gmail_br.muttrc
new file mode 100644
index 0000000..18d1da4
--- /dev/null
+++ b/.config/mutt/accounts/3-gmail_br.muttrc
@@ -0,0 +1,50 @@
+# vim: filetype=neomuttrc
+# muttrc file for account bousset.rudy@gmail.com
+set realname = "Rudy Bousset"
+set from = "bousset.rudy@gmail.com"
+set sendmail = "msmtp -a gmail_br"
+alias me Rudy Bousset <bousset.rudy@gmail.com>
+set folder = "$MAIL/gmail_br"
+set header_cache = $XDG_RUNTIME_DIR/mutt/gmail_br/headers
+set message_cachedir = $XDG_RUNTIME_DIR/mutt/gmail_br/bodies
+set mbox_type = Maildir
+set crypt_autosign = yes
+set signature = $XDG_CONFIG_HOME/mutt/sig/3-gmail_br
+
+bind index,pager gg noop
+bind index,pager g noop
+bind index,pager M noop
+bind index,pager C noop
+bind index gg first-entry
+bind pager gg top
+bind pager G bottom
+macro index o "<shell-escape>killall mbsync >/dev/null 2>&1; mbsync -c $XDG_CONFIG_HOME/mbsync/mbsyncrc gmail_br<enter>" "run mbsync to sync bousset.rudy@gmail.com"
+unmailboxes *
+
+named-mailboxes \
+		"󰶉 inbox"  =INBOX \
+		" sent"  "=[Gmail]/Sent Mail" \
+		"󱩽 draft"  =[Gmail]/Drafts \
+		"󰳤 junk"   =[Gmail]/Spam \
+		" trash"  =[Gmail]/Trash \
+		" keep"   =Keep
+
+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"
+set spoolfile = "+INBOX"
+macro index,pager gs "<change-folder>=[Gmail]/Sent Mail<enter>" "go to sent"
+macro index,pager Ms ";<save-message>=[Gmail]/Sent Mail<enter>" "move mail to sent"
+macro index,pager Cs ";<copy-message>=[Gmail]/Sent Mail<enter>" "copy mail to sent"
+set record = ""
+macro index,pager gd "<change-folder>=[Gmail]/Drafts<enter>" "go to drafts"
+macro index,pager Md ";<save-message>=[Gmail]/Drafts<enter>" "move mail to drafts"
+macro index,pager Cd ";<copy-message>=[Gmail]/Drafts<enter>" "copy mail to drafts"
+set postponed = +[Gmail]/Drafts
+macro index,pager gS "<change-folder>=[Gmail]/Spam<enter>" "go to spam"
+macro index,pager MS ";<save-message>=[Gmail]/Spam<enter>" "move mail to spam"
+macro index,pager CS ";<copy-message>=[Gmail]/Spam<enter>" "copy mail to spam"
+macro index,pager gt "<change-folder>=[Gmail]/Trash<enter>" "go to trash"
+macro index,pager Mt ";<save-message>=[Gmail]/Trash<enter>" "move mail to trash"
+macro index,pager Ct ";<copy-message>=[Gmail]/Trash<enter>" "copy mail to trash"
+set trash = +[Gmail]/Trash
diff --git a/.config/mutt/accounts/4-gmail_oon.muttrc b/.config/mutt/accounts/4-gmail_oon.muttrc
new file mode 100644
index 0000000..4f398a5
--- /dev/null
+++ b/.config/mutt/accounts/4-gmail_oon.muttrc
@@ -0,0 +1,50 @@
+# vim: filetype=neomuttrc
+# muttrc file for account olsen.oyvind.nor@gmail.com
+set realname = "joe"
+set from = "olsen.oyvind.nor@gmail.com"
+set sendmail = "msmtp -a gmail_oon"
+alias me joe <olsen.oyvind.nor@gmail.com>
+set folder = "$MAIL/gmail_oon"
+set header_cache = $XDG_RUNTIME_DIR/mutt/gmail_oon/headers
+set message_cachedir = $XDG_RUNTIME_DIR/mutt/gmail_oon/bodies
+set mbox_type = Maildir
+set crypt_autosign = yes
+set signature = $XDG_CONFIG_HOME/mutt/sig/4-gmail_oon
+
+bind index,pager gg noop
+bind index,pager g noop
+bind index,pager M noop
+bind index,pager C noop
+bind index gg first-entry
+bind pager gg top
+bind pager G bottom
+macro index o "<shell-escape>killall mbsync >/dev/null 2>&1; mbsync -c $XDG_CONFIG_HOME/mbsync/mbsyncrc gmail_oon<enter>" "run mbsync to sync olsen.oyvind.nor@gmail.com"
+unmailboxes *
+
+named-mailboxes \
+		"󰶉 inbox"  =INBOX \
+		" sent"  "=[Gmail]/Sent Mail" \
+		"󱩽 draft"  =[Gmail]/Drafts \
+		"󰳤 junk"   =[Gmail]/Spam \
+		" trash"  =[Gmail]/Trash \
+		" keep"   =Keep
+
+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"
+set spoolfile = +INBOX
+macro index,pager gs "<change-folder>=[Gmail]/Sent Mail<enter>" "go to sent"
+macro index,pager Ms ";<save-message>=[Gmail]/Sent Mail<enter>" "move mail to sent"
+macro index,pager Cs ";<copy-message>=[Gmail]/Sent Mail<enter>" "copy mail to sent"
+set record = ""
+macro index,pager gd "<change-folder>=[Gmail]/Drafts<enter>" "go to drafts"
+macro index,pager Md ";<save-message>=[Gmail]/Drafts<enter>" "move mail to drafts"
+macro index,pager Cd ";<copy-message>=[Gmail]/Drafts<enter>" "copy mail to drafts"
+set postponed = +[Gmail]/Drafts
+macro index,pager gS "<change-folder>=[Gmail]/Spam<enter>" "go to spam"
+macro index,pager MS ";<save-message>=[Gmail]/Spam<enter>" "move mail to spam"
+macro index,pager CS ";<copy-message>=[Gmail]/Spam<enter>" "copy mail to spam"
+macro index,pager gt "<change-folder>=[Gmail]/Trash<enter>" "go to trash"
+macro index,pager Mt ";<save-message>=[Gmail]/Trash<enter>" "move mail to trash"
+macro index,pager Ct ";<copy-message>=[Gmail]/Trash<enter>" "copy mail to trash"
+set trash = +[Gmail]/Trash
diff --git a/.config/mutt/accounts/off/6-gmail_tos.muttrc b/.config/mutt/accounts/off/6-gmail_tos.muttrc
new file mode 100644
index 0000000..55bb1a1
--- /dev/null
+++ b/.config/mutt/accounts/off/6-gmail_tos.muttrc
@@ -0,0 +1,44 @@
+# vim: filetype=neomuttrc
+# muttrc file for account towerofsilence777@gmail.com
+set realname = "Tower Of Silence - Joe"
+set from = "towerofsilence777@gmail.com"
+set sendmail = "msmtp -a gmail_tos"
+alias me Tower Of Silence - Joe <towerofsilence777@gmail.com>
+set folder = "$MAIL/gmail_tos"
+set header_cache = $XDG_RUNTIME_DIR/mutt/gmail_tos/headers
+set message_cachedir = $XDG_RUNTIME_DIR/mutt/gmail_tos/bodies
+set mbox_type = Maildir
+set crypt_autosign = yes
+set signature = $XDG_CONFIG_HOME/mutt/sig/4-gmail_tos
+
+bind index,pager gg noop
+bind index,pager g noop
+bind index,pager M noop
+bind index,pager C noop
+bind index gg first-entry
+bind pager gg top
+bind pager G bottom
+macro index o "<shell-escape>killall mbsync >/dev/null 2>&1; mbsync -c $XDG_CONFIG_HOME/mbsync/mbsyncrc gmail_tos<enter>" "run mbsync to sync towerofsilence777@gmail.com"
+unmailboxes *
+
+mailboxes "=INBOX" "=[Gmail]/Sent Mail" "=[Gmail]/Drafts" "=[Gmail]/Spam" "=[Gmail]/Trash" "=Keep"
+
+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"
+set spoolfile = "+INBOX"
+macro index,pager gs "<change-folder>=[Gmail]/Sent Mail<enter>" "go to sent"
+macro index,pager Ms ";<save-message>=[Gmail]/Sent Mail<enter>" "move mail to sent"
+macro index,pager Cs ";<copy-message>=[Gmail]/Sent Mail<enter>" "copy mail to sent"
+set record = ""
+macro index,pager gd "<change-folder>=[Gmail]/Drafts<enter>" "go to drafts"
+macro index,pager Md ";<save-message>=[Gmail]/Drafts<enter>" "move mail to drafts"
+macro index,pager Cd ";<copy-message>=[Gmail]/Drafts<enter>" "copy mail to drafts"
+set postponed = "+[Gmail]/Drafts"
+macro index,pager gS "<change-folder>=[Gmail]/Spam<enter>" "go to spam"
+macro index,pager MS ";<save-message>=[Gmail]/Spam<enter>" "move mail to spam"
+macro index,pager CS ";<copy-message>=[Gmail]/Spam<enter>" "copy mail to spam"
+macro index,pager gt "<change-folder>=[Gmail]/Trash<enter>" "go to trash"
+macro index,pager Mt ";<save-message>=[Gmail]/Trash<enter>" "move mail to trash"
+macro index,pager Ct ";<copy-message>=[Gmail]/Trash<enter>" "copy mail to trash"
+set trash = "+[Gmail]/Trash"
diff --git a/.config/mutt/defaults.muttrc b/.config/mutt/defaults.muttrc
index 0a714bd..3787f44 100644
--- a/.config/mutt/defaults.muttrc
+++ b/.config/mutt/defaults.muttrc
@@ -97,6 +97,7 @@ bind pager,browser G bottom-page
 bind index,pager,browser d half-down
 bind index,pager,browser u half-up
 bind index,pager S sync-mailbox
+bind index,pager s sync-mailbox
 bind index,pager R group-reply
 bind index \031 previous-undeleted	# Mouse wheel
 bind index \005 next-undeleted		# Mouse wheel
@@ -179,9 +180,9 @@ color index_author brightred default "~N"
 # color index_subject brightred default "~N"
 
 # Tagged mail is highlighted:
-color index default color088 "~T"
-color index_author default color088 "~T"
-color index_subject default default "~T"
+color index default red "~T"
+color index_author default red "~T"
+color index_subject default red "~T"
 
 # Shaded for deleted
 color index brightblack default '~D'
diff --git a/.config/mutt/muttrc b/.config/mutt/muttrc
index f902400..81f903a 100644
--- a/.config/mutt/muttrc
+++ b/.config/mutt/muttrc
@@ -3,6 +3,8 @@ source $XDG_CONFIG_HOME/mutt/defaults.muttrc
 source $XDG_CONFIG_HOME/mutt/accounts/1-gmx_rbo.muttrc
 macro index,pager <f1> '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/1-gmx_rbo.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to rbo@gmx.us"
 macro index,pager 1    '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/1-gmx_rbo.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to rbo@gmx.us"
+macro index,pager <f2> '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/2-gmx_shop.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to rbo_shop@gmx.us"
+macro index,pager 2    '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/2-gmx_shop.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to rbo_shop@gmx.us"
 # macro index,pager <f4> '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/4-gmail_br.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to bousset.rudy@gmail.com"
 # macro index,pager 4    '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/4-gmail_br.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to bousset.rudy@gmail.com"
 # macro index,pager <f5> '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/5-gmail_oon.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to olsen.oyvind.nor@gmail.com"
diff --git a/.config/mutt/sig/1-main b/.config/mutt/sig/1-gmx_rbo
index ebd66b8..ebd66b8 100644
--- a/.config/mutt/sig/1-main
+++ b/.config/mutt/sig/1-gmx_rbo
diff --git a/.config/mutt/sig/2-gmx_shop b/.config/mutt/sig/2-gmx_shop
new file mode 100644
index 0000000..ebd66b8
--- /dev/null
+++ b/.config/mutt/sig/2-gmx_shop
@@ -0,0 +1,3 @@
+joe
+jozan.org
++337 86 27 02 09
diff --git a/.config/nvim/lua/config/hooks.lua b/.config/nvim/lua/config/hooks.lua
index da0df5d..dfe4715 100644
--- a/.config/nvim/lua/config/hooks.lua
+++ b/.config/nvim/lua/config/hooks.lua
@@ -1,6 +1,10 @@
 vim.api.nvim_create_autocmd({"BufWritePre"}, {
 	pattern = "*",
 	callback = function(ev)
+		local excluded = { 'mail', 'markdown' }
+		if vim.tbl_contains(excluded, vim.bo.filetype) then
+			return
+		end
         save_cursor = vim.fn.getpos(".")
         vim.cmd([[%s/\s\+$//e]])
         vim.fn.setpos(".", save_cursor)
diff --git a/.local/bin/fetch_mail.sh b/.local/bin/fetch_mail.sh
index 0b085f5..9f6a1f8 100755
--- a/.local/bin/fetch_mail.sh
+++ b/.local/bin/fetch_mail.sh
@@ -12,10 +12,11 @@ if [ -f $mc_file ]; then
 	pre_count=$(cat $mc_file)
 else
 	pre_count="$(ls "${MAIL:-/var/mail/jozan}"/gmx_rbo/INBOX/new | wc -l 2>/dev/null)"
+	mb1="$(ls "${MAIL:-/var/mail/jozan}"/gmx_shop/INBOX/new | wc -l 2>/dev/null)"
 	#pre_count="$(ls "${MAIL:-/var/mail/jozan}"/gmail_br/INBOX/new | wc -l 2>/dev/null)"
 	#mb1="$(ls "${MAIL:-/var/mail/jozan}"/gmail_oon/INBOX/new | wc -l 2>/dev/null)"
 	#mb2="$(ls "${MAIL:-/var/mail/jozan}"/gmail_tos/INBOX/new | wc -l 2>/dev/null)"
-	pre_count="$((pre_count + mb1 + mb2))"
+	pre_count="$((pre_count + mb1))"
 fi
 
 if ! echo test | gpg2 --sign --batch --no-tty --pinentry-mode error -o /dev/null >/dev/null 2>&1; then
@@ -23,7 +24,7 @@ if ! echo test | gpg2 --sign --batch --no-tty --pinentry-mode error -o /dev/null
 	exit 1
 fi
 killall mbsync >/dev/null 2>&1
-notify-send -u low -t 3000 'mbsync' '  fetching mail...' >/dev/null 2>&1
+notify-send -u low -t 3000 'mbsync' '  fetching mail' >/dev/null 2>&1
 # {
 mbsync -a  ||
 	notify-send -u low -t 6000 'mbsync' '  failed to fetch mail' >/dev/null 2>&1
@@ -31,11 +32,12 @@ mbsync -a  ||
 # gsleep 0.2
 # kill -74 $(pidof dwmblocks) >/dev/null 2>&1
 # fg
-pre_count="$(ls "${MAIL:-/var/mail/jozan}"/gmx_rbo/INBOX/new | wc -l 2>/dev/null)"
+post_count="$(ls "${MAIL:-/var/mail/jozan}"/gmx_rbo/INBOX/new | wc -l 2>/dev/null)"
+mb1="$(ls "${MAIL:-/var/mail/jozan}"/gmx_shop/INBOX/new | wc -l 2>/dev/null)"
 # pre_count="$(ls "${MAIL:-/var/mail/jozan}"/gmail_br/INBOX/new | wc -l 2>/dev/null)"
 # mb1="$(ls "${MAIL:-/var/mail/jozan}"/gmail_oon/INBOX/new | wc -l 2>/dev/null)"
 # mb2="$(ls "${MAIL:-/var/mail/jozan}"/gmail_tos/INBOX/new | wc -l 2>/dev/null)"
-post_count="$((post_count + mb1 + mb2))"
+post_count="$((post_count + mb1))"
 if [ $post_count -gt $pre_count ]; then
 	notify-send -u normal 'NeoMutt' '  '$post_count' new mail(s)'
 fi