Add modular neomutt configurations (settings/colors/bindings/etc)

2 files changed, 12 insertions, 10 deletions

diff --git a/.neomuttrc b/.neomuttrc
index d5993fa..b0c1967 100644
--- a/.neomuttrc
+++ b/.neomuttrc
@@ -12,6 +12,8 @@ set realname = "Ahmed AbdelHalim"
 # IMAP Settings
 set imap_user = "a14m.me"
 set imap_pass = "`pass personal/mutt`"
+set imap_keepalive = 900
+set imap_check_subscribed
 # set imap_pipeline_depth = 0
 
 # SMTP Settings
@@ -26,15 +28,10 @@ set spoolfile = "+INBOX"
 set postponed = "+Drafts"
 set record = "+Sent Messages"
 
-# Solarized Theme
-source ~/.config/neomutt/mutt-colors-solarized-dark-256.muttrc
-
-# PGP Settings
-set crypt_use_gpgme = yes
-set crypt_autosign = no
-set crypt_verify_sig = yes
-set pgp_use_gpg_agent = yes
-set pgp_good_sign="^gpgv?: Good signature from "
+# Settings files
+source ~/.config/neomutt/settings
+source ~/.config/neomutt/colors
+source ~/.config/neomutt/mappings
 
 # NeoMutt Config
 # setenv PINENTRY_USER_DATA curses
diff --git a/README.md b/README.md
index 44aa72a..f26da24 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,6 @@ ln -sf ~/.rc/.bash_profile ~/.bash_profile
 ln -sf ~/.rc/.editorconfig ~/.editorconfig
 ln -sf ~/.rc/.inputrc ~/.inputrc
 ln -sf ~/.rc/.screenrc ~/.screenrc
-ln -sf ~/.rc/.neomuttrc ~/.neomuttrc
 ln -sf ~/.rc/.tmux.conf ~/.tmux.conf
 ln -sf ~/.rc/.tmux-osx.conf ~/.tmux-osx.conf
 
@@ -64,6 +63,12 @@ ln -sf ~/.rc/.config/tmuxinator/personal.yml ~/.config/tmuxinator/personal.yml
 ln -sf ~/.rc/.config/tmuxinator/spc.yml ~/.config/tmuxinator/spc.yml
 ln -sf ~/.rc/.config/tmuxinator/infra.yml ~/.config/tmuxinator/infra.yml
 
+mkdir -p ~/.config/neomutt
+ln -sf ~/.rc/.neomuttrc ~/.neomuttrc
+ln -sf ~/.rc/.config/neomutt/settings ~/.config/neomutt/settings
+ln -sf ~/.rc/.config/neomutt/colors ~/.config/neomutt/colors
+ln -sf ~/.rc/.config/neomutt/mappings ~/.config/neomutt/mappings
+
 cd ~/.rc
 git remote remove origin
 git remote add origin [email protected]:~a14m/.rc