update for neomutt

5 files changed, 52 insertions, 39 deletions

diff --git a/.config/ranger/rc.conf b/.config/ranger/rc.conf
index dc9143a..2daef2f 100644
--- a/.config/ranger/rc.conf
+++ b/.config/ranger/rc.conf
@@ -290,6 +290,8 @@ set global_inode_type_filter
 # should be 'false' during start-up, but you can toggle it by pressing F.
 set freeze_files false
 
+default_linemode devicons
+
 # ===================================================================
 # == Local Options
 # ===================================================================
diff --git a/.muttrc b/.mutt/.muttrc
index 0869ecd..1d60b8e 100644
--- a/.muttrc
+++ b/.mutt/.muttrc
@@ -1,40 +1,26 @@
 # vim: filetype=neomuttrc
-set from = 'thabogre@gmail.com'
-set realname = 'farzad sadeghi'
-set imap_user = 'thabogre@gmail.com'
-source "gpg -d ~/scripts/imap.pass.gpg |"
-#set sidebar_visible = yes
+set imap_keepalive = 900
+set timeout=60
+set move = no
+
+folder-hook 'account.gmail' 'source ~/.mutt/account.gmail'
+folder-hook 'account.self' 'source ~/.mutt/account.self'
+
+# default account
+source ~/.mutt/account.gmail
+
+macro index <f2> '<sync-mailbox><refresh><enter-command>source ~/.mutt/account.self<enter><change-folder>!<enter>'
+macro index <f3> '<sync-mailbox><refresh><enter-command>source ~/.mutt/account.gmail<enter><change-folder>!<enter>'
 
 # macros
 macro index A "T~N<enter>;WNT~O<enter>;WO\CT~T<enter>” “mark all messages read"
 
-# REMOTE GMAIL FOLDERS
-set folder = 'imaps://imap.gmail.com:993'
-set spoolfile = '+Inbox'
-set postponed = '+Drafts'
-set record = '+Sent'
-set trash = '+Trash'
-
 # gives us all the mailboxes in the sidebar
 set imap_check_subscribed
 
-#LOCAL FOLDERS FOR CACHED HEADERS AND CERTIFICATES
-set header_cache = ~/.mutt/cache/headers
-#set header_cache =\home\bloodstalker\.mutt\cache\headers
-set message_cachedir = ~/.mutt/cache/bodies
-set certificate_file = ~/.mutt/certificates
-
-#SMTP SETTINGS
-set smtp_url = 'smtp://thabogre@smtp.gmail.com:587/'
-
 set editor = "vim"
 
-#SECURING
-set move = no
-set imap_keepalive = 900
-
-set timeout=30
-folder-hook gmail/important    "color status        J_black         color136        "
+# folder-hook gmail/important "color status J_black color136"
 #set imap_list_subscribed=yes
 set dsn_notify="failure,delay"
 set dsn_return="hdrs"
@@ -42,7 +28,6 @@ set dsn_return="hdrs"
 set sidebar_visible = yes
 set mail_check_stats = yes
 set sidebar_divider_char = ' |'
-set sidebar_visible = yes
 set sidebar_width = 40
 set sidebar_short_path = yes
 set sidebar_format = "%B%?F? [%F]?%* %?N?%N/?%S"
@@ -55,15 +40,6 @@ subscribe ^llvm-dev@lists.llvm.org$
 subscribe -group lua lua-l@lists.lua.org
 subscribe -group cygwin cygwin@cygwin.com
 
-# for background in 16 color terminal, valid background colors include:
-# base03, bg, black, any of the non brights
-
-# style notes:
-# when bg=235, that's a highlighted message
-# normal bg=233
-
-# basic colors ---------------------------------------------------------
-# color normal        brightyellow    default
 color error         color196        default                        # message line error text
 color tilde         color81         default                        # vi-like tildes marking blank lines
 color message       color82         default
diff --git a/.mutt/account.gmail b/.mutt/account.gmail
new file mode 100644
index 0000000..f3fc94f
--- /dev/null
+++ b/.mutt/account.gmail
@@ -0,0 +1,17 @@
+# vim: filetype=neomuttrc
+
+unmailboxes *
+set from = 'thabogre@gmail.com'
+set imap_user = 'thabogre@gmail.com'
+source "gpg -d ~/scripts/mail.gmail.pass.gpg |"
+set smtp_url = 'smtp://thabogre@smtp.gmail.com:587/'
+set realname = 'farzad sadeghi'
+set folder = 'imaps://imap.gmail.com:993'
+set spoolfile = '+Inbox'
+set postponed = '+Drafts'
+set record = '+Sent'
+set trash = '+Trash'
+set header_cache = ~/.mutt/gmail/cache/headers
+set message_cachedir = ~/.mutt/gmail/cache/bodies
+set certificate_file = ~/.mutt/gmail/certificates
+mailboxes "+Inbox" "+Drafts" "+Sent" "+Trash"
diff --git a/.mutt/account.self b/.mutt/account.self
new file mode 100644
index 0000000..a1ff604
--- /dev/null
+++ b/.mutt/account.self
@@ -0,0 +1,17 @@
+# vim: filetype=neomuttrc
+
+unmailboxes *
+set from = 'devi@terminaldweller.com'
+set imap_user = 'devi@terminaldweller.com'
+source "gpg -d ~/scripts/mail.self.pass.gpg |"
+set smtp_url = 'smtp://mail.terminaldweller.com:587/'
+set realname = 'farzad sadeghi'
+set folder = 'imaps://mail.terminaldweller.com:993'
+set spoolfile = '+INBOX'
+set postponed = '+Drafts'
+set record = '+Sent'
+set trash = '+Trash'
+set header_cache = ~/.mutt/self/cache/headers
+set message_cachedir = ~/.mutt/self/cache/bodies
+set certificate_file = ~/.mutt/self/certificates
+mailboxes "+INBOX" "+Drafts" "+Sent" "+Trash"
diff --git a/.zshrc b/.zshrc
index ce8c72b..262c3c8 100644
--- a/.zshrc
+++ b/.zshrc
@@ -45,8 +45,8 @@ alias isup="ps -aux | grep "
 alias ipfsd="ipfs daemon > /dev/null 2>&1 &; disown"
 alias i3rc="vim ~/scripts/.config/i3/config"
 alias fixi3rc="cp ~/scripts/.config/i3/config ~/.config/i3/config && i3-msg restart"
-alias muttrc="vim ~/scripts/.muttrc"
-alias fixmuttrc="cp ~/scripts/.muttrc ~/.muttrc"
+alias muttrc="vim ~/scripts/.mutt/.muttrc"
+alias fixmuttrc="cp ~/scripts/.mutt/.muttrc ~/.muttrc"
 alias dropcmake="cp ~/scripts/makefilec ./makefile"
 alias dropcppmake="cp ~/scripts/makefilecpp ./makefile"
 alias droppy="cp ~/scripts/python/main.py ./main.py"
@@ -141,6 +141,7 @@ alias fixproxychainsrc="cp ~/scripts/.proxychains/proxychains.conf ~/.proxychain
 alias zgit="proxychains git"
 alias socks5z="ssh -N -D 9998 -o ExitOnForwardFailure=yes -l pi 192.168.1.108"
 alias socks5ir="ssh -N -D 9997 -o ExitOnForwardFailure=yes -l ubuntu -p 1022 terminaldweller.com"
+alias cloud_one="ssh 130.185.121.80 -l ubuntu -p 1022"
 
 #autosuggest
 ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=#5f5fff,bg=#000000,bold"