From 899b8d4951cfe8f486ee9bc1790519505ad6a0c9 Mon Sep 17 00:00:00 2001
From: Charles Cabergs <me@cacharle.xyz>
Date: Mon, 27 Jul 2020 08:50:59 +0200
Subject: Added mutt sidebar and encrypted password, Added git signing key

---
 .gitconfig |  7 +++++--
 .muttrc    | 36 +++++++++++++++++++++++++++++-------
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/.gitconfig b/.gitconfig
index f3d697b..bb4fef3 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,9 +1,12 @@
 [user]
-	name = Charles
-	email = sircharlesaze@gmail.com
+	name = Charles Cabergs
+	email = me@cacharle.xyz
+	signingkey = me@cacharle.xyz
 [log]
 	decorate = full
 [pull]
 	rebase = false
 [merge]
 	tool = vimdiff
+[commit]
+	gpgsign = true
diff --git a/.muttrc b/.muttrc
index dbc07bd..547180e 100644
--- a/.muttrc
+++ b/.muttrc
@@ -2,13 +2,14 @@
 # muttrc
 ###############################################################################
 
-set from      = 'me@cacharle.xyz'
-set realname  = 'Charles Cabergs'
+set from      = 'me@cacharle.xyz'  # address in new mail
+set realname  = 'Charles Cabergs'  # name in new mail
 
-set smtp_url  = 'smtp://me@mail.cacharle.xyz:587'
-set folder    = 'imaps://me@mail.cacharle.xyz:993'
+set smtp_url  = 'smtp://me@mail.cacharle.xyz:587'   # where to send
+set folder    = 'imaps://me@mail.cacharle.xyz:993'  # mails folder
 # set folder = "~/Mail/cacharle"
 
+# view html with terminal browser in .mailcap
 auto_view text/html
 alternative_order text/plain text/enriched text/html
 
@@ -20,10 +21,28 @@ set postponed = "+Drafts"
 mailboxes =INBOX =Sent =Trash =Drafts
 
 set editor = 'vim'
-set sort = 'reverse-date'
+set sort = 'reverse-date'   # newest at the top
 
 set date_format = "%d/%m %I:%M"
-set index_format = "%2C %Z %d %-15.15F %s (%-4.4c)"
+set index_format = "%2C %Z %d %-15.15F %s (%-4.4c)"  # one line format in home
+
+# from https://github.com/LukeSmithxyz/mutt-wizard/blob/master/share/mutt-wizard.muttrc
+set rfc2047_parameters = yes # decode non standard stuff
+set sleep_time = 0  # don't pause
+set markers = no    # no '+' on line wrap
+set mark_old = no   # don't mark mail as read if not seen
+set mime_forward = yes  # attachements forwarded
+set wait_key = no   # no press to continue...
+set forward_format = "Fwd: %s"  # forward subject
+set forward_quote   # include previous message in forward
+
+set sidebar_visible = yes
+set sidebar_width = 20
+set sidebar_short_path = yes
+set sidebar_next_new_wrap = yes
+set mail_check_stats
+set sidebar_format = '%B%?F? [%F]?%* %?N?%N/? %?S?%S?'
+
 
 set header_cache     = "~/.mutt/cache/headers"
 set message_cachedir = "~/.mutt/cache/bodies"
@@ -31,5 +50,8 @@ set certificate_file = "~/.mutt/certificates"
 
 set ssl_force_tls = yes
 
-# color scheme
+# solarized color scheme
 source "$DOTDIR/mutt-colors-solarized/mutt-colors-solarized-dark-16.muttrc"
+
+# password
+source "gpg -d $HOME/.config/mutt/passwd.muttrc.gpg 2> /dev/null |"
-- 
cgit