From 2de55b87793fa4acdb10130a6d9f12bf7cd0306e Mon Sep 17 00:00:00 2001
From: Luke Smith <luke@lukesmith.xyz>
Date: Mon, 22 Apr 2019 12:14:17 -0400
Subject: [PATCH] mw configs moved out of muttrc

---
 README.md                    | 1 -
 muttrc => mutt-wizard.muttrc | 7 ++++---
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename muttrc => mutt-wizard.muttrc (96%)

diff --git a/README.md b/README.md
index 4b0443e..4156baf 100644
--- a/README.md
+++ b/README.md
@@ -101,6 +101,5 @@ mutt-wizard is free/libre software, licensed under the GPLv3.
 
 ## Details for Tinkerers
 
-- The `muttrc` file is for universal settings.
 - `personal.muttrc`, called by the `muttrc`, is the place where user-specific settings are set, and the wizard automatically adds the macros for switching between accounts here. If you want to contribute to mutt-wizard, you should put your universal personal settings here and have git ignore it. For example, I put my gpg settings here and personal aliases here.
 - Accounts are generated in `accounts/`. If I create an account named `luke`, for example, `accounts/luke.muttrc` will hold that account's unique settings and `accounts/luke/` will hold headers and cache files.
diff --git a/muttrc b/mutt-wizard.muttrc
similarity index 96%
rename from muttrc
rename to mutt-wizard.muttrc
index 658bbba..b90aac8 100644
--- a/muttrc
+++ b/mutt-wizard.muttrc
@@ -1,5 +1,8 @@
 # vim: filetype=neomuttrc
-# This is the general mutt config which has the settings that all accounts use.
+# This file contains all of mutt-wizard's default settings.
+# mutt-wizard will have this file sourced from your muttrc.
+# In the interest of seamless updating, do not edit this file.
+# If you want to override any settings, set those in your muttrc.
 set mailcap_path = ~/.config/mutt/mailcap
 set date_format="%y/%m/%d %I:%M%p"
 set index_format="%2C %zs %?X?A& ? %D %-15.15F %s (%-4.4c)"
@@ -140,5 +143,3 @@ color body brightyellow red "^gpg: BAD signature from.*"
 mono body bold "^gpg: Good signature"
 mono body bold "^gpg: BAD signature from.*"
 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<>\"]"
-
-source personal.muttrc