From be69988c4f3c0860273709ce778eb1ae77d4fa1e Mon Sep 17 00:00:00 2001
From: Hsieh Chin Fan <typebrook@gmail.com>
Date: Sun, 3 Jul 2022 11:29:43 +0800
Subject: Update muttrc

---
 mutt/gmail.login      | 15 ---------------
 mutt/muttrc           |  3 +--
 mutt/muttrc.b97602041 | 11 +++++++++++
 mutt/muttrc.gmail     | 17 ++++++++++++++++-
 mutt/muttrc.topo      | 27 +++++++++++++++++++++++++++
 mutt/topo.tw.login    | 25 -------------------------
 6 files changed, 55 insertions(+), 43 deletions(-)
 delete mode 100644 mutt/gmail.login
 mode change 100644 => 120000 mutt/muttrc
 create mode 100644 mutt/muttrc.b97602041
 create mode 100644 mutt/muttrc.topo
 delete mode 100644 mutt/topo.tw.login

(limited to 'mutt')

diff --git a/mutt/gmail.login b/mutt/gmail.login
deleted file mode 100644
index ec3c6f7..0000000
--- a/mutt/gmail.login
+++ /dev/null
@@ -1,15 +0,0 @@
-# IMAP/SMTP settings
-set imap_user = "typebrook@gmail.com"
-set imap_pass = `pass google/imap_for_typebrook`
-set smtp_url = "typebrook@gmail.com"
-set smtp_pass = "$imap_pass"
-
-set ssl_starttls = yes 
-set ssl_force_tls = yes
-
-# Set mailboxes
-set folder = "imaps://imap.gmail.com/"
-set spoolfile = "+INBOX"
-set postponed = "+[Gmail]/Drafts"
-set record = "+[Gmail]/Sent Mail"
-set trash = "+[Gmail]/Trash"
diff --git a/mutt/muttrc b/mutt/muttrc
deleted file mode 100644
index cdb7813..0000000
--- a/mutt/muttrc
+++ /dev/null
@@ -1,2 +0,0 @@
-source ~/.config/mutt/default
-source ~/.config/mutt/topo.tw.login
diff --git a/mutt/muttrc b/mutt/muttrc
new file mode 120000
index 0000000..9bd13d3
--- /dev/null
+++ b/mutt/muttrc
@@ -0,0 +1 @@
+muttrc.topo
\ No newline at end of file
diff --git a/mutt/muttrc.b97602041 b/mutt/muttrc.b97602041
new file mode 100644
index 0000000..70c6583
--- /dev/null
+++ b/mutt/muttrc.b97602041
@@ -0,0 +1,11 @@
+source ./default
+
+set pop_host = "pops://ms97.ntu.edu.tw"
+set pop_user = b97602041
+set pop_pass = `pass misc/ntu | head -1`
+#set smtp_url="smtp://localhost:25"
+
+set ssl_starttls = yes 
+set ssl_force_tls = yes
+
+set folder = pops://b97602041:`pass misc/ntu | head -1`@ms97.ntu.edu.tw:995/
diff --git a/mutt/muttrc.gmail b/mutt/muttrc.gmail
index b7522b5..b4e56c3 100644
--- a/mutt/muttrc.gmail
+++ b/mutt/muttrc.gmail
@@ -1,2 +1,17 @@
 source ./default
-source ./gmail.login
+
+# IMAP/SMTP settings
+set imap_user = "typebrook"
+set imap_pass = `pass google/imap_for_typebrook`
+set smtp_url = "smtps://$imap_user@smtp.gmail.com"
+set smtp_pass = "$imap_pass"
+
+set ssl_starttls = yes 
+set ssl_force_tls = yes
+
+# Set mailboxes
+set folder = "imaps://imap.gmail.com/"
+set spoolfile = "+INBOX"
+set record = "+[Gmail]/Sent"
+set postponed = "+[Gmail]/Drafts"
+set trash = "+[Gmail]/Trash"
diff --git a/mutt/muttrc.topo b/mutt/muttrc.topo
new file mode 100644
index 0000000..f4af7b7
--- /dev/null
+++ b/mutt/muttrc.topo
@@ -0,0 +1,27 @@
+source ~/.config/mutt/default
+
+# IMAP/SMTP settings
+set folder = "imaps://pham@mail.topo.tw:993/"
+set imap_pass = `pass pham@topo.tw`
+set smtp_url = "smtp://pham@mail.topo.tw:587"
+set smtp_pass = "$imap_pass"
+
+# Identify meself
+set from = "pham@topo.tw"
+set realname = "謝晉凡 Hsieh Chin Fan"
+set signature="$SETTING_DIR/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
+
+# Basic Mailbox
+set spoolfile = "+INBOX"
+set mbox= "+mbox"
+set move = yes
+set record = "+Sent"
+set trash = "+Trash"
+set postponed = "+Drafts"
+
+# Sidebar
+mailboxes =INBOX =mbox "+------ Watch ------" =pay =osm =keep "+---- Processed ----" =Sent =Trash =Drafts
diff --git a/mutt/topo.tw.login b/mutt/topo.tw.login
deleted file mode 100644
index 5de7718..0000000
--- a/mutt/topo.tw.login
+++ /dev/null
@@ -1,25 +0,0 @@
-# IMAP/SMTP settings
-set folder = "imaps://pham@mail.topo.tw:993/"
-set imap_pass = `pass pham@topo.tw`
-set smtp_url = "smtp://pham@mail.topo.tw:587"
-set smtp_pass = "$imap_pass"
-
-# Identify meself
-set from = "pham@topo.tw"
-set realname = "謝晉凡 Hsieh Chin Fan"
-set signature="$SETTING_DIR/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
-
-# Basic Mailbox
-set spoolfile = "+INBOX"
-set mbox= "+mbox"
-set move = yes
-set record = "+Sent"
-set trash = "+Trash"
-set postponed = "+Drafts"
-
-# Sidebar
-mailboxes =INBOX =mbox "+------ Watch ------" =pay =osm =keep "+---- Processed ----" =Sent =Trash =Drafts
-- 
cgit v1.2.3-70-g09d2