deleted share/colors.temp, modified share/mutt-wizard.muttrc

2 files changed, 26 insertions, 218 deletions

diff --git a/share/colors.temp b/share/colors.temp
deleted file mode 100644
index 0c69393..0000000
--- a/share/colors.temp
+++ /dev/null
@@ -1,195 +0,0 @@
-# vim: filetype=neomuttrc
-
-# make sure that you are using mutt linked against slang, not ncurses, or
-# suffer the consequences of weird color issues. use "mutt -v" to check this.
-
-# custom body highlights -----------------------------------------------
-# highlight my name and other personally relevant strings
-#color body               yellow          default         "(ethan|schoonover)"
-# custom index highlights ----------------------------------------------
-# messages which mention my name in the body
-#color index              yellow          default         "~b \"phil(_g|\!| gregory| gold)|pgregory\" !~N !~T !~F !~p !~P"
-#color index              J_cream         brightwhite     "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~N !~T !~F !~p !~P"
-#color index              yellow          cyan            "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~T !~F !~p !~P"
-#color index              yellow          J_magent        "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~F !~p !~P"
-## messages which are in reference to my mails
-#color index              J_magent        default         "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" !~N !~T !~F !~p !~P"
-#color index              J_magent        brightwhite     "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~N !~T !~F !~p !~P"
-#color index              J_magent        cyan            "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~T !~F !~p !~P"
-#color index              J_magent        red             "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~F !~p !~P"
-
-# for background in 16 color terminal, valid background colors include:
-# base03, bg, black, any of the non brights
-
-### basic colors -------------------------------------------------------
-
-color normal              default         default
-color error               red             default
-color tilde               black           default
-color message             cyan            default
-color markers             red             white
-color attachment          white           default
-color search              brightmagenta   default
-#color status              J_black         J_status
-color status              brightyellow    black
-color indicator           brightblack     white
-color tree                brightyellow    default                                     # arrow in threads
-
-### basic monocolor screen ---------------------------------------------
-
-mono  bold                bold
-mono  underline           underline
-mono  indicator           reverse
-mono  error               bold
-
-### index --------------------------------------------------------------
-
-#color index               red             default         "~D(!~p|~p)"               # deleted
-#color index               black           default         ~F                         # flagged
-#color index               brightred       default         ~=                         # duplicate messages
-#color index               brightgreen     default         "~A!~N!~T!~p!~Q!~F!~D!~P"  # the rest
-#color index               J_base          default         "~A~N!~T!~p!~Q!~F!~D"      # the rest, new
-color index_author        red             default         '.*'                        # all messages
-color index_number        blue            default         '.*'                        # all messages
-color index_subject       cyan            default         '.*'                        # all messages
-color index               red             default         "~A"                        # all messages
-color index               red             default         "~E"                        # expired messages
-color index               brightyellow    default         "~N"                        # new messages
-color index_author        brightred       default         "~N"                        # new messages
-color index_subject       brightcyan      default         "~N"                        # new messages
-color index               blue            default         "~O"                        # old messages
-color index               magenta         default         "~Q"                        # messages that have been replied to
-color index               yellow          default         "~R"                        # read messages
-color index               blue            default         "~U"                        # unread messages
-color index               blue            default         "~U~$"                      # unread, unreferenced messages
-color index               yellow          default         "~v"                        # messages part of a collapsed thread
-color index               yellow          default         "~P"                        # messages from me
-color index               cyan            default         "~p!~F"                     # messages to me
-color index               cyan            default         "~N~p!~F"                   # new messages to me
-color index               cyan            default         "~U~p!~F"                   # unread messages to me
-color index               yellow          default         "~R~p!~F"                   # messages to me
-color index               brightgreen     default         "~F"                        # flagged messages
-color index_author        brightgreen     default         "~F"                        # flagged messages
-color index_subject       brightgreen     default         "~F"                        # flagged messages
-color index               red             default         "~F~p"                      # flagged messages to me
-color index               red             default         "~N~F"                      # new flagged messages
-color index               red             default         "~N~F~p"                    # new flagged messages to me
-color index               red             default         "~U~F~p"                    # new flagged messages to me
-color index               brightblack     default         "~D"                        # deleted messages
-color index_author        brightblack     default         "~D"                        # deleted messages
-color index_subject       brightblack     default         "~D"                        # deleted messages
-color index               brightcyan      default         "~v~(!~N)"                  # collapsed thread with no unread
-color index               yellow          default         "~v~(~N)"                   # collapsed thread with some unread
-color index               green           default         "~N~v~(~N)"                 # collapsed thread with unread parent
-# statusbg used to indicated flagged when foreground color shows other status
-# for collapsed thread
-color index               red             black           "~v~(~F)!~N"                # collapsed thread with flagged, no unread
-color index               yellow          black           "~v~(~F~N)"                 # collapsed thread with some unread & flagged
-color index               green           black           "~N~v~(~F~N)"               # collapsed thread with unread parent & flagged
-color index               green           black           "~N~v~(~F)"                 # collapsed thread with unread parent, no unread inside, but some flagged
-color index               cyan            black           "~v~(~p)"                   # collapsed thread with unread parent, no unread inside, some to me directly
-color index               yellow          red             "~v~(~D)"                   # thread with deleted (doesn't differentiate between all or partial)
-#color index               yellow          default         "~(~N)"                    # messages in threads with some unread
-#color index               green           default         "~S"                       # superseded messages
-color index               brightyellow    blue            "~T"                       # tagged messages
-color index_author        brightred       blue            "~T"                       # tagged messages
-color index_subject       brightcyan      blue            "~T"                       # tagged messages
-#color index               brightred       red             "~="                       # duplicated messages
-
-### message headers ----------------------------------------------------
-
-#color header             brightgreen     default         "^"
-color hdrdefault          brightblue      default
-color header              brightmagenta   default         "^(From)"
-color header              brightcyan      default         "^(Subject)"
-color header              brightwhite     default         "^(CC|BCC)"
-
-### sidebar ------------------------------------------------------------
-
-color sidebar_highlight   red             default
-color sidebar_divider     brightblack     black
-color sidebar_flagged     red             black
-color sidebar_new         green           black
-
-### body ---------------------------------------------------------------
-
-color quoted              green           default
-color quoted1             blue            default
-color quoted2             cyan            default
-color quoted3             yellow          default
-color quoted4             red             default
-color quoted5             brightred       default
-
-color signature           brightgreen     default
-color bold                black           default
-color underline           black           default
-color normal              default         default
-
-color body                brightcyan      default         "[;:][-o][)/(|]"    # emoticons
-color body                brightcyan      default         "[;:][)(|]"         # emoticons
-color body                brightcyan      default         "[*]?((N)?ACK|CU|LOL|SCNR|BRB|BTW|CWYL|\
-                                                           |FWIW|vbg|GD&R|HTH|HTHBE|IMHO|IMNSHO|\
-                                                           |IRL|RTFM|ROTFL|ROFL|YMMV)[*]?"
-color body                brightcyan      default         "[ ][*][^*]*[*][ ]?" # more emoticon?
-color body                brightcyan      default         "[ ]?[*][^*]*[*][ ]" # more emoticon?
-
-# pgp ------------------------------------------------------------------
-
-color body                red             default         "(BAD signature)"
-color body                cyan            default         "(Good signature)"
-color body                brightblack     default         "^gpg: Good signature .*"
-color body                brightyellow    default         "^gpg: "
-color body                brightyellow    red             "^gpg: BAD signature from.*"
-mono  body                bold                            "^gpg: Good signature"
-mono  body                bold                            "^gpg: BAD signature from.*"
-
-# regex ----------------------------------------------------------------
-
-# URL
-color body                red             default         "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a-f][0-9a-f])*@)?((([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)(:[0-9]+)?)|([a-z0-9_.!~*'()$,;:@&=+-]|%[0-9a-f][0-9a-f])+)(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?(#([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?|(www|ftp)\\.(([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?(:[0-9]+)?(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?(#([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?)[^].,:;!)? \t\r\n<>\"]"
-
-# and a heavy handed email regex
-# color body               J_magent        default         "((@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]),)*@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]):)?[0-9a-z_.+%$-]+@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\])"
-
-# email addresses
-color body                brightred       default         "(mailto)?:?[ ]?[\-\.+_a-zA-Z0-9]+@[\-\.a-zA-Z0-9]+"
-
-# phone numbers
-color body                brightmagenta   default         "[\(]?(\\+[0-9]{1,2})?[\) -]?[ ]*[\(]?([0-9]{3})[\)]?[- ]?[0-9]{3,4}[- ]?[0-9]{4}"
-
-# passcode
-color body                brightgreen     default         "([^0-9]|^)[0-9]{6}([^0-9]|$)"
-
-# tracking numer
-color body                brightgreen     default         "[A-Za-z]{2}[0-9]{7}[A-Za-z]{2}$"
-color body                brightgreen     default         "[0-9]{20,22}$"
-color body                brightgreen     default         "1Z[0-9A-Za-z]{16}$"
-color body                brightgreen     default         "(TBA|[a-zA-Z])?[0-9]{12}$"
-color body                brightgreen     default         "JD[0-9]{10,39}$"
-color body                brightgreen     default         "[0-9]{12}$"
-
-# unsubscribe
-color body                brightblue      default         "unsubscribe"
-
-# extra ----------------------------------------------------------------
-
-# various smilies and the like
-color body               brightwhite     default         "<[Gg]>"                            # <g>
-color body               brightwhite     default         "<[Bb][Gg]>"                        # <bg>
-color body               yellow          default         " [;:]-*[})>{(<|]"                  # :-) etc...
-# *bold*
-color body               blue            default         "(^|[[:space:][:punct:]])\\*[^*]+\\*([[:space:][:punct:]]|$)"
-mono  body               bold                            "(^|[[:space:][:punct:]])\\*[^*]+\\*([[:space:][:punct:]]|$)"
-# _underline_
-color body               blue            default         "(^|[[:space:][:punct:]])_[^_]+_([[:space:][:punct:]]|$)"
-mono  body               underline                       "(^|[[:space:][:punct:]])_[^_]+_([[:space:][:punct:]]|$)"
-# /italic/  (Sometimes gets directory names)
-color body               blue            default         "(^|[[:space:][:punct:]])/[^/]+/([[:space:][:punct:]]|$)"
-mono body                underline                       "(^|[[:space:][:punct:]])/[^/]+/([[:space:][:punct:]]|$)"
-
-# Border lines.
-color body               blue            default         "( *[-+=#*~_]){6,}"
-
-# folder-hook .                  "color status        J_black         J_status        "
-# folder-hook gmail/inbox        "color status        J_black         yellow          "
-# folder-hook gmail/important    "color status        J_black         yellow          "
diff --git a/share/mutt-wizard.muttrc b/share/mutt-wizard.muttrc
index 3a99820..2d51a5b 100644
--- a/share/mutt-wizard.muttrc
+++ b/share/mutt-wizard.muttrc
@@ -176,11 +176,11 @@ mono  error               bold
 
 ### index --------------------------------------------------------------
 
-#color index               red             default         "~D(!~p|~p)"               # deleted
-#color index               black           default         ~F                         # flagged
-#color index               brightred       default         ~=                         # duplicate messages
-#color index               brightgreen     default         "~A!~N!~T!~p!~Q!~F!~D!~P"  # the rest
-#color index               yellow          default         "~A~N!~T!~p!~Q!~F!~D"      # the rest, new
+# color index               red             default         "~D(!~p|~p)"                # deleted
+# color index               black           default         ~F                          # flagged
+# color index               brightred       default         ~=                          # duplicate messages
+# color index               brightgreen     default         "~A!~N!~T!~p!~Q!~F!~D!~P"   # the rest
+# color index               yellow          default         "~A~N!~T!~p!~Q!~F!~D"       # the rest, new
 color index_author        red             default         '.*'                        # all messages
 color index_number        blue            default         '.*'                        # all messages
 color index_subject       cyan            default         '.*'                        # all messages
@@ -221,12 +221,12 @@ color index               green           black           "~N~v~(~F~N)"
 color index               green           black           "~N~v~(~F)"                 # collapsed thread with unread parent, no unread inside, but some flagged
 color index               cyan            black           "~v~(~p)"                   # collapsed thread with unread parent, no unread inside, some to me directly
 color index               yellow          red             "~v~(~D)"                   # thread with deleted (doesn't differentiate between all or partial)
-#color index               yellow          default         "~(~N)"                    # messages in threads with some unread
-#color index               green           default         "~S"                       # superseded messages
-color index               brightyellow    blue            "~T"                       # tagged messages
-color index_author        brightred       blue            "~T"                       # tagged messages
-color index_subject       brightcyan      blue            "~T"                       # tagged messages
-#color index               brightred       red             "~="                       # duplicated messages
+# color index               yellow          default         "~(~N)"                     # messages in threads with some unread
+# color index               green           default         "~S"                        # superseded messages
+color index               brightyellow    blue            "~T"                        # tagged messages
+color index_author        brightred       blue            "~T"                        # tagged messages
+color index_subject       brightcyan      blue            "~T"                        # tagged messages
+# color index               brightred       red             "~="                        # duplicated messages
 
 ### message headers ----------------------------------------------------
 
@@ -238,10 +238,13 @@ color header              brightwhite     default         "^(CC|BCC)"
 
 ### sidebar ------------------------------------------------------------
 
-color sidebar_highlight   red             default
+color sidebar_highlight   green           default
 color sidebar_divider     brightblack     black
 color sidebar_flagged     red             black
+color sidebar_indicator   white           brightblack
 color sidebar_new         green           black
+color sidebar_spool_file  brightblue      black
+color sidebar_unread      yellow          default
 
 ### body ---------------------------------------------------------------
 
@@ -257,13 +260,13 @@ color bold                black           default
 color underline           black           default
 color normal              default         default
 
-color body                brightcyan      default         "[;:][-o][)/(|]"    # emoticons
-color body                brightcyan      default         "[;:][)(|]"         # emoticons
+color body                brightcyan      default         "[;:][-o][)/(|]"            # emoticons
+color body                brightcyan      default         "[;:][)(|]"                 # emoticons
 color body                brightcyan      default         "[*]?((N)?ACK|CU|LOL|SCNR|BRB|BTW|CWYL|\
                                                            |FWIW|vbg|GD&R|HTH|HTHBE|IMHO|IMNSHO|\
                                                            |IRL|RTFM|ROTFL|ROFL|YMMV)[*]?"
-color body                brightcyan      default         "[ ][*][^*]*[*][ ]?" # more emoticon?
-color body                brightcyan      default         "[ ]?[*][^*]*[*][ ]" # more emoticon?
+color body                brightcyan      default         "[ ][*][^*]*[*][ ]?"        # more emoticon?
+color body                brightcyan      default         "[ ]?[*][^*]*[*][ ]"        # more emoticon?
 
 # pgp ------------------------------------------------------------------
 
@@ -301,14 +304,14 @@ color body                brightgreen     default         "JD[0-9]{10,39}$"
 color body                brightgreen     default         "[0-9]{12}$"
 
 # unsubscribe
-color body                brightblue      default         "unsubscribe"
+color body                brightred       default         "unsubscribe"
 
 # extra ----------------------------------------------------------------
 
 # various smilies and the like
-color body               brightwhite     default         "<[Gg]>"                            # <g>
-color body               brightwhite     default         "<[Bb][Gg]>"                        # <bg>
-color body               yellow          default         " [;:]-*[})>{(<|]"                  # :-) etc...
+color body               brightwhite     default         "<[Gg]>"                    # <g>
+color body               brightwhite     default         "<[Bb][Gg]>"                # <bg>
+color body               yellow          default         " [;:]-*[})>{(<|]"          # :-) etc...
 # *bold*
 color body               blue            default         "(^|[[:space:][:punct:]])\\*[^*]+\\*([[:space:][:punct:]]|$)"
 mono  body               bold                            "(^|[[:space:][:punct:]])\\*[^*]+\\*([[:space:][:punct:]]|$)"
@@ -322,6 +325,6 @@ mono body                underline                       "(^|[[:space:][:punct:]
 # Border lines.
 color body               blue            default         "( *[-+=#*~_]){6,}"
 
-# folder-hook .                  "color status        black         yellow          "
-# folder-hook gmail/inbox        "color status        black         yellow          "
-# folder-hook gmail/important    "color status        black         yellow          "
+# folder-hook .                  "color status        black         yellow"
+# folder-hook gmail/inbox        "color status        black         yellow"
+# folder-hook gmail/important    "color status        black         yellow"