3 files changed, 7 insertions, 3 deletions

diff --git a/mutt/.gitignore b/mutt/.gitignore
index f55b38b..cb95f95 100644
--- a/mutt/.gitignore
+++ b/mutt/.gitignore
@@ -1 +1,2 @@
 alias.*
+hook.*
diff --git a/mutt/muttrc.gmail b/mutt/muttrc.gmail
index 2c73931..7f14996 100644
--- a/mutt/muttrc.gmail
+++ b/mutt/muttrc.gmail
@@ -9,7 +9,7 @@ set smtp_pass = "$imap_pass"
 # Identify meself
 set from = "typebrook@gmail.com"
 set realname = "謝晉凡 Hsieh Chin Fan"
-set signature="$SETTING_DIR/mutt/.signature"
+set signature="~/.config/mutt/.signature"
 set pgp_use_gpg_agent=yes
 set crypt_use_gpgme=yes
 set pgp_timeout=300
diff --git a/mutt/muttrc.topo b/mutt/muttrc.topo
index 810b195..4c40846 100644
--- a/mutt/muttrc.topo
+++ b/mutt/muttrc.topo
@@ -1,5 +1,4 @@
 source ~/.config/mutt/default
-source ~/.config/mutt/alias.topo
 
 # IMAP/SMTP settings
 set folder = "imaps://pham@mail.topo.tw:993/"
@@ -10,12 +9,16 @@ set smtp_pass = "$imap_pass"
 # Identify meself
 set from = "pham@topo.tw"
 set realname = "謝晉凡 Hsieh Chin Fan"
-set signature="$SETTING_DIR/mutt/.signature"
+set signature="~/.config/mutt/.signature"
 set pgp_use_gpg_agent=yes
 set crypt_use_gpgme=yes
 set pgp_timeout=300
 set pgp_sign_as=6DD8C14A # replace 6DD8C14A with your gpg key id
 
+# Tune contacts
+source ~/.config/mutt/alias.topo
+source ~/.config/mutt/hook.topo
+
 # Basic Mailbox
 set spoolfile = "+INBOX"
 set mbox= "+mbox"