neomutt/bindings

@@ -4,20 +4,9 @@
 
 # Pager bindings
 
-#bind pager <down> next-line
+bind pager <down> next-line
-#bind pager <up>   previous-line
+bind pager <up>   previous-line
-bind pager j      next-line
-bind pager k      previous-line
 bind pager /      search
 bind pager 0      top
 bind pager G      bottom
 bind pager g      group-reply
-
-#
-# Sidebar Navigation ---------------------------------
-bind index <down>   sidebar-next
-bind index <up>     sidebar-prev
-bind index <right>  sidebar-open
-
-# Replicate Gmail in Gmail
-macro index,pager A "<save-message>=[Gmail]/All Mail<enter>" "Archive"

neomutt/colors-gruvbox-shuber

@@ -1,122 +0,0 @@
-# gruvbox dark (contrast dark):
-
-# bg0    = 234
-# bg1    = 237
-# bg2    = 239
-# bg3    = 241
-# bg4    = 243
-# 
-# gray   = 245
-# 
-# fg0    = 229
-# fg1    = 223
-# fg2    = 250
-# fg3    = 248
-# fg4    = 246
-# 
-# red    = 167
-# green  = 142
-# yellow = 214
-# blue   = 109
-# purple = 175
-# aqua   = 108
-# orange = 208
-
-
-# See http://www.mutt.org/doc/manual/#color
-
-color attachment  color109 color234
-color bold        color229 color234
-color error       color167 color234
-color hdrdefault  color246 color234
-color indicator   color223 color237
-color markers     color243 color234
-color normal      color223 color234
-color quoted      color250 color234
-color quoted1     color108 color234
-color quoted2     color250 color234
-color quoted3     color108 color234
-color quoted4     color250 color234
-color quoted5     color108 color234
-color search      color234 color208
-color signature   color108 color234
-color status      color234 color250
-color tilde       color243 color234
-color tree        color142 color234
-color underline   color223 color239
-
-color sidebar_divider    color250 color234
-color sidebar_new        color142 color234
-
-color index color142 color234 ~N
-color index color108 color234 ~O
-color index color109 color234 ~P
-color index color214 color234 ~F
-color index color175 color234 ~Q
-color index color167 color234 ~=
-color index color234 color223 ~T
-color index color234 color167 ~D
-
-color header color214 color234 "^(To:|From:)"
-color header color142 color234 "^Subject:"
-color header color108 color234 "^X-Spam-Status:"
-color header color108 color234 "^Received:"
-
-# Regex magic for URLs and hostnames
-#
-# Attention: BSD's regex has RE_DUP_MAX set to 255.
-#
-# Examples:
-#   http://some-service.example.com
-#   example.com
-#   a.example.com
-#   some-service.example.com
-#   example.com/
-#   example.com/datenschutz
-#   file:///tmp/foo
-#
-# Non-examples:
-#   1.1.1900
-#   14.02.2022/24:00
-#   23.59
-#   w.l.o.g
-#   team.its
-color body color142 color234 "[a-z]{3,255}://[[:graph:]]*"
-color body color142 color234 "([-[:alnum:]]+\\.)+([0-9]{1,3}|[-[:alpha:]]+)/[[:graph:]]*"
-color body color142 color234 "([-[:alnum:]]+\\.){2,255}[-[:alpha:]]{2,10}"
-
-# IPv4 and IPv6 stolen from https://stackoverflow.com/questions/53497/regular-expression-that-matches-valid-ipv6-addresses
-color body color142 color234 "((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])"
-color body color142 color234 "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))"
-
-# Mail addresses and mailto URLs
-color body color208 color234 "[-a-z_0-9.%$]+@[-a-z_0-9.]+\\.[-a-z][-a-z]+"
-color body color208 color234 "mailto:[-a-z_0-9.]+@[-a-z_0-9.]+"
-
-# some simleys and stuff
-color body color234 color214 "[;:]-*[)>(<lt;|]"
-color body color229 color234 "\\*[- A-Za-z]+\\*"
-
-color body color214 color234 "^-.*PGP.*-*"
-color body color142 color234 "^gpg: Good signature from"
-color body color167 color234 "^gpg: Can't.*$"
-color body color214 color234 "^gpg: WARNING:.*$"
-color body color167 color234 "^gpg: BAD signature from"
-color body color167 color234 "^gpg: Note: This key has expired!"
-color body color214 color234 "^gpg: There is no indication that the signature belongs to the owner."
-color body color214 color234 "^gpg: can't handle these multiple signatures"
-color body color214 color234 "^gpg: signature verification suppressed"
-color body color214 color234 "^gpg: invalid node with packet of type"
-
-color body color142 color234 "^Good signature from:"
-color body color167 color234 "^.?BAD.? signature from:"
-color body color142 color234 "^Verification successful"
-color body color167 color234 "^Verification [^s][^[:space:]]*$"
-
-color compose header            color223 color234
-color compose security_encrypt  color175 color234
-color compose security_sign     color109 color234
-color compose security_both     color142 color234
-color compose security_none     color208 color234
-
-

neomutt/colors-gruvbox-shuber-extended

@@ -1,2 +0,0 @@
-color sidebar_unread     color108 color234
-

neomutt/colours

@@ -7,7 +7,7 @@
 color hdrdefault cyan         black
 color quoted     red          black
 color signature  blue         brightblack
-color indicator  default      color237
+color indicator  brightwhite  black
 color attachment green        black
 color error      red          black
 color message    yellow       black
@@ -32,9 +32,7 @@ mono  header bold               "^(From|Subject|X-Junked-Because|X-Virus-hagbard
 
 # Colours for items in the index
 color index white       black ~N
-#color index brightblue  black "~N (~e \"(gpsec|guidepointsecurity)\.com\" | ~h \"^In-[Rr]eply-[Tt]o: .*(gpsec|guidepointsecurity)\.com\")"
+color index brightblue  black "~N (~e guidepointsecurity\.com | ~h \"^In-[Rr]eply-[Tt]o: .*guidepointsecurity\.com\")"
-#color index brightblue  black "~R (~e guidepointsecurity\.com | ~h \"^In-[Rr]eply-[Tt]o: .*guidepointsecurity\.com\")"
-color index brightblue  black "~f guidepointsecurity\.com"
 color index red         black ~F
 color index green       black ~T
 color index blue        black ~D

neomutt/macros

@@ -15,7 +15,7 @@ macro index "\ef"    "<pipe-message>view-x-face<enter>"                   # View
 macro index "\ev"    "<pipe-message>less<enter>"                          # View the message in less.
 macro index "\Cs\Co" "<limit>~h \"X-SpamProbe: GOOD\"<enter><last-entry>" # View good emails.
 macro index "\Cs\Cs" "<limit>~h \"X-SpamProbe: SPAM\"<enter><last-entry>" # View bad emails.
-macro index \Cr       ":source ~/.config/neomutt/neomuttrc<enter>"        "Re-source the neomuttrc"
+macro index \Cr       ":source ~/.muttrc<enter>"                          "Re-source the muttrc"
 
 # Macros for use in the pager.
 macro pager "w"      "<enter-command>set invsmart_wrap invmarkers<enter>" # Toggle wrap stuff

neomutt/mailboxes

@@ -14,8 +14,7 @@ set mbox="+[Gmail]/All Mail"
 set postponed="+[Gmail]/Drafts"
 
 # ... and it gets saved in =outbox.
-# Gmail does this automatically, let's not duplicate...
+set record="+[Gmail]/Sent Mail"
-#set record="+[Gmail]/Sent Mail"
 
 # Look me up
 set spoolfile="+INBOX"

neomutt/neomuttrc

@@ -9,7 +9,7 @@ set hidden_host                                     # Hide host details
 set alias_file=~/.config/neomutt/aliases            # Personal mail aliases
 #set query_command="~/bin/mutt-ldap '%s'"           # How to query the company contacts
 set postpone=ask-no                                 # Ask about postponing
-unset move                                          # Keep read mail in inbox, also Gmail moves it automatically
+set move                                            # Keep read mail in inbox
 set print=ask-no                                    # Ask before printing
 set delete=yes                                      # Just delete it
 set include                                         # Include messages in replies
@@ -23,7 +23,7 @@ set edit_headers                                    # I want to edit the message
 #set editor="emacs -geometry 90x73+298+0 --load post-mode"
 set editor="vim -c ':0' -c '/^$/' -c ':nohlsearch'"
 #set query_command="lbdbq '%s'"                      # Use the little brother database for doing queries.
-set mark_old                                        # Don't mark unread new msgs as old.
+#set nomark_old                                      # Don't mark unread new msgs as old.
 set mail_check=90
 set timeout=15
 set mbox_type=maildir                               # mailbox type
@@ -40,14 +40,13 @@ set nostrict_threads                                # Lets have some fuzzy threa
 set sendmail_wait=-1                                # Don't wait around for sendmail.
 set wait_key=no                                     # Don't wait after subshell exit
 set fcc_clear                                       # Keep fcc's clear of signatues and encryption.
-unset pipe_decode                                   # Don't decode messages when piping.
+set nopipe_decode                                   # Don't decode messages when piping.
-set thorough_search                                 # Strip headers and eval mimes before searching
 					            # Print via a2ps
 set print_command="a2ps -1gEmail --borders=no --strip=3"
 set tilde                                           # Fill out messages with '~'.
 set read_inc=100                                    # Read counter ticks every 100 msgs.
 set write_inc=100                                   # Write counter ticks every 100 msgs.
-unset confirmappend                                 # Just append, don't hassle me.
+set noconfirmappend                                 # Just append, don't hassle me.
 set pager_stop                                      # Don't skip msgs on next page.
                                                     # Where to find the mailcap.
 set mailcap_path=~/.config/neomutt/mailcap:/usr/local/etc/mailcap:/etc/mailcap
@@ -63,9 +62,7 @@ source ~/.config/neomutt/accounts                             # Account details
 source ~/.config/neomutt/aliases                              # Load in my aliases.
 source ~/.config/neomutt/auto_views                           # Define auto_views.
 source ~/.config/neomutt/bindings                             # Define key bindings.
-#source ~/.config/neomutt/colours                              # Define colours.
+source ~/.config/neomutt/colours                              # Define colours.
-source ~/.config/neomutt/colors-gruvbox-shuber
-source ~/.config/neomutt/colors-gruvbox-shuber-extended
 source ~/.config/neomutt/fcc-hooks                            # Define fcc-hooks.
 source ~/.config/neomutt/folder-hooks                         # Define folder-hooks.
 source ~/.config/neomutt/headers                              # Configure header display.
@@ -76,12 +73,6 @@ source ~/.config/neomutt/non-standard                         # Support for mutt
 source ~/.config/neomutt/save-hooks                           # Define save-hooks.
 source ~/.config/neomutt/subscriptions                        # Define the list of subscribed mailing lists.
 
-# Play with the sidebar?
-#set sidebar_divider_char = '|'
-set sidebar_visible = yes
-set sidebar_width   = 24
-#color sidebar_new color221 color233
-
 # HTML is the last option.
 alternative_order text/enriched text/plain text/html
 

neomutt/save-hooks

@@ -4,4 +4,3 @@
 #
 
 #save-hook .* =Archive/`date "+%Y"`/`date "+%m"`
-save-hook .* "=[Gmail]/All Mail"