mutt: Add crypt-hook for Hallyn, and reorganize folders

Signed-off-by: Alejandro Colomar <alx@kernel.org>

31 files changed, 45 insertions, 45 deletions

diff --git a/home/.config/mutt/account/alx/account.muttrc b/home/.config/mutt/account/alx/account.muttrc
deleted file mode 100644
index e675f2d..0000000
--- a/home/.config/mutt/account/alx/account.muttrc
+++ /dev/null
@@ -1,4 +0,0 @@
-source ~/.config/mutt/account/alx/smtp.muttrc
-source ~/.config/mutt/account/alx/folder.muttrc
-source ~/.config/mutt/mailbox/migadu.muttrc
-source ~/.config/mutt/pgp/gpg.muttrc
diff --git a/home/.config/mutt/account/alx_manpages/account.muttrc b/home/.config/mutt/account/alx_manpages/account.muttrc
deleted file mode 100644
index 8a54cb5..0000000
--- a/home/.config/mutt/account/alx_manpages/account.muttrc
+++ /dev/null
@@ -1,4 +0,0 @@
-source ~/.config/mutt/account/foss/smtp.muttrc
-source ~/.config/mutt/account/alx_manpages/folder.muttrc
-source ~/.config/mutt/mailbox/gmail.muttrc
-source ~/.config/mutt/pgp/gpg.muttrc
diff --git a/home/.config/mutt/account/foss/account.muttrc b/home/.config/mutt/account/foss/account.muttrc
deleted file mode 100644
index e08b8a6..0000000
--- a/home/.config/mutt/account/foss/account.muttrc
+++ /dev/null
@@ -1,4 +0,0 @@
-source ~/.config/mutt/account/foss/smtp.muttrc
-source ~/.config/mutt/account/foss/folder.muttrc
-source ~/.config/mutt/mailbox/migadu.muttrc
-source ~/.config/mutt/pgp/gpg.muttrc
diff --git a/home/.config/mutt/account/gmail/alx/account.muttrc b/home/.config/mutt/account/gmail/alx/account.muttrc
new file mode 100644
index 0000000..368e25b
--- /dev/null
+++ b/home/.config/mutt/account/gmail/alx/account.muttrc
@@ -0,0 +1,4 @@
+source ~/.config/mutt/account/migadu/foss/smtp.muttrc
+source ~/.config/mutt/account/gmail/alx/folder.muttrc
+source ~/.config/mutt/account/maildir/gmail.muttrc
+source ~/.config/mutt/crypt/auto.muttrc
diff --git a/home/.config/mutt/account/alx_manpages/folder.muttrc b/home/.config/mutt/account/gmail/alx/folder.muttrc
index c33945b..c33945b 100644
--- a/home/.config/mutt/account/alx_manpages/folder.muttrc
+++ b/home/.config/mutt/account/gmail/alx/folder.muttrc
diff --git a/home/.config/mutt/account/gov/account.muttrc b/home/.config/mutt/account/gov/account.muttrc
deleted file mode 100644
index 183d587..0000000
--- a/home/.config/mutt/account/gov/account.muttrc
+++ /dev/null
@@ -1,4 +0,0 @@
-source ~/.config/mutt/account/gov/smtp.muttrc
-source ~/.config/mutt/account/gov/folder.muttrc
-source ~/.config/mutt/mailbox/migadu.muttrc
-source ~/.config/mutt/pgp/gpg.muttrc
diff --git a/home/.config/mutt/account/legal/account.muttrc b/home/.config/mutt/account/legal/account.muttrc
deleted file mode 100644
index b54d023..0000000
--- a/home/.config/mutt/account/legal/account.muttrc
+++ /dev/null
@@ -1,4 +0,0 @@
-source ~/.config/mutt/account/legal/smtp.muttrc
-source ~/.config/mutt/account/legal/folder.muttrc
-source ~/.config/mutt/mailbox/migadu.muttrc
-source ~/.config/mutt/pgp/gpg.muttrc
diff --git a/home/.config/mutt/mailbox/gmail.muttrc b/home/.config/mutt/account/maildir/gmail.muttrc
index 1066015..1066015 100644
--- a/home/.config/mutt/mailbox/gmail.muttrc
+++ b/home/.config/mutt/account/maildir/gmail.muttrc
diff --git a/home/.config/mutt/mailbox/migadu.muttrc b/home/.config/mutt/account/maildir/migadu.muttrc
index aa34794..aa34794 100644
--- a/home/.config/mutt/mailbox/migadu.muttrc
+++ b/home/.config/mutt/account/maildir/migadu.muttrc
diff --git a/home/.config/mutt/account/migadu/alx/account.muttrc b/home/.config/mutt/account/migadu/alx/account.muttrc
new file mode 100644
index 0000000..0ab3793
--- /dev/null
+++ b/home/.config/mutt/account/migadu/alx/account.muttrc
@@ -0,0 +1,4 @@
+source ~/.config/mutt/account/migadu/alx/smtp.muttrc
+source ~/.config/mutt/account/migadu/alx/folder.muttrc
+source ~/.config/mutt/account/maildir/migadu.muttrc
+source ~/.config/mutt/crypt/auto.muttrc
diff --git a/home/.config/mutt/account/alx/folder.muttrc b/home/.config/mutt/account/migadu/alx/folder.muttrc
index 67bfd90..67bfd90 100644
--- a/home/.config/mutt/account/alx/folder.muttrc
+++ b/home/.config/mutt/account/migadu/alx/folder.muttrc
diff --git a/home/.config/mutt/account/alx/smtp.muttrc b/home/.config/mutt/account/migadu/alx/smtp.muttrc
index fe27b26..fe27b26 100644
--- a/home/.config/mutt/account/alx/smtp.muttrc
+++ b/home/.config/mutt/account/migadu/alx/smtp.muttrc
diff --git a/home/.config/mutt/account/migadu/foss/account.muttrc b/home/.config/mutt/account/migadu/foss/account.muttrc
new file mode 100644
index 0000000..c8afcdb
--- /dev/null
+++ b/home/.config/mutt/account/migadu/foss/account.muttrc
@@ -0,0 +1,4 @@
+source ~/.config/mutt/account/migadu/foss/smtp.muttrc
+source ~/.config/mutt/account/migadu/foss/folder.muttrc
+source ~/.config/mutt/account/maildir/migadu.muttrc
+source ~/.config/mutt/crypt/auto.muttrc
diff --git a/home/.config/mutt/account/foss/folder.muttrc b/home/.config/mutt/account/migadu/foss/folder.muttrc
index d8dca61..d8dca61 100644
--- a/home/.config/mutt/account/foss/folder.muttrc
+++ b/home/.config/mutt/account/migadu/foss/folder.muttrc
diff --git a/home/.config/mutt/account/foss/smtp.muttrc b/home/.config/mutt/account/migadu/foss/smtp.muttrc
index 96cca0b..96cca0b 100644
--- a/home/.config/mutt/account/foss/smtp.muttrc
+++ b/home/.config/mutt/account/migadu/foss/smtp.muttrc
diff --git a/home/.config/mutt/account/migadu/gov/account.muttrc b/home/.config/mutt/account/migadu/gov/account.muttrc
new file mode 100644
index 0000000..d3876d5
--- /dev/null
+++ b/home/.config/mutt/account/migadu/gov/account.muttrc
@@ -0,0 +1,4 @@
+source ~/.config/mutt/account/migadu/gov/smtp.muttrc
+source ~/.config/mutt/account/migadu/gov/folder.muttrc
+source ~/.config/mutt/account/maildir/migadu.muttrc
+source ~/.config/mutt/crypt/auto.muttrc
diff --git a/home/.config/mutt/account/gov/folder.muttrc b/home/.config/mutt/account/migadu/gov/folder.muttrc
index 4391f65..4391f65 100644
--- a/home/.config/mutt/account/gov/folder.muttrc
+++ b/home/.config/mutt/account/migadu/gov/folder.muttrc
diff --git a/home/.config/mutt/account/gov/smtp.muttrc b/home/.config/mutt/account/migadu/gov/smtp.muttrc
index 0a08039..0a08039 100644
--- a/home/.config/mutt/account/gov/smtp.muttrc
+++ b/home/.config/mutt/account/migadu/gov/smtp.muttrc
diff --git a/home/.config/mutt/account/migadu/legal/account.muttrc b/home/.config/mutt/account/migadu/legal/account.muttrc
new file mode 100644
index 0000000..a2b62b4
--- /dev/null
+++ b/home/.config/mutt/account/migadu/legal/account.muttrc
@@ -0,0 +1,4 @@
+source ~/.config/mutt/account/migadu/legal/smtp.muttrc
+source ~/.config/mutt/account/migadu/legal/folder.muttrc
+source ~/.config/mutt/account/maildir/migadu.muttrc
+source ~/.config/mutt/crypt/auto.muttrc
diff --git a/home/.config/mutt/account/legal/folder.muttrc b/home/.config/mutt/account/migadu/legal/folder.muttrc
index 5dd04a2..5dd04a2 100644
--- a/home/.config/mutt/account/legal/folder.muttrc
+++ b/home/.config/mutt/account/migadu/legal/folder.muttrc
diff --git a/home/.config/mutt/account/legal/smtp.muttrc b/home/.config/mutt/account/migadu/legal/smtp.muttrc
index 1b40f0e..1b40f0e 100644
--- a/home/.config/mutt/account/legal/smtp.muttrc
+++ b/home/.config/mutt/account/migadu/legal/smtp.muttrc
diff --git a/home/.config/mutt/account/migadu/spam/account.muttrc b/home/.config/mutt/account/migadu/spam/account.muttrc
new file mode 100644
index 0000000..f50c631
--- /dev/null
+++ b/home/.config/mutt/account/migadu/spam/account.muttrc
@@ -0,0 +1,4 @@
+source ~/.config/mutt/account/migadu/spam/smtp.muttrc
+source ~/.config/mutt/account/migadu/spam/folder.muttrc
+source ~/.config/mutt/account/maildir/migadu.muttrc
+source ~/.config/mutt/crypt/noauto.muttrc
diff --git a/home/.config/mutt/account/spam/folder.muttrc b/home/.config/mutt/account/migadu/spam/folder.muttrc
index ccde2a6..ccde2a6 100644
--- a/home/.config/mutt/account/spam/folder.muttrc
+++ b/home/.config/mutt/account/migadu/spam/folder.muttrc
diff --git a/home/.config/mutt/account/spam/smtp.muttrc b/home/.config/mutt/account/migadu/spam/smtp.muttrc
index 1fece31..1fece31 100644
--- a/home/.config/mutt/account/spam/smtp.muttrc
+++ b/home/.config/mutt/account/migadu/spam/smtp.muttrc
diff --git a/home/.config/mutt/account/spam/account.muttrc b/home/.config/mutt/account/spam/account.muttrc
deleted file mode 100644
index 199fa87..0000000
--- a/home/.config/mutt/account/spam/account.muttrc
+++ /dev/null
@@ -1,4 +0,0 @@
-source ~/.config/mutt/account/spam/smtp.muttrc
-source ~/.config/mutt/account/spam/folder.muttrc
-source ~/.config/mutt/mailbox/migadu.muttrc
-source ~/.config/mutt/pgp/no-gpg.muttrc
diff --git a/home/.config/mutt/accounts.muttrc b/home/.config/mutt/accounts.muttrc
index 6c46abc..15952e4 100644
--- a/home/.config/mutt/accounts.muttrc
+++ b/home/.config/mutt/accounts.muttrc
@@ -1,15 +1,15 @@
-source ~/.config/mutt/account/alx/account.muttrc
-source ~/.config/mutt/account/foss/account.muttrc
-source ~/.config/mutt/account/gov/account.muttrc
-source ~/.config/mutt/account/legal/account.muttrc
-source ~/.config/mutt/account/spam/account.muttrc
-source ~/.config/mutt/account/alx_manpages/account.muttrc
+source ~/.config/mutt/account/migadu/alx/account.muttrc
+source ~/.config/mutt/account/migadu/foss/account.muttrc
+source ~/.config/mutt/account/migadu/gov/account.muttrc
+source ~/.config/mutt/account/migadu/legal/account.muttrc
+source ~/.config/mutt/account/migadu/spam/account.muttrc
+source ~/.config/mutt/account/gmail/alx/account.muttrc
 
-source ~/.config/mutt/account/foss/account.muttrc
+source ~/.config/mutt/account/migadu/foss/account.muttrc
 
-macro index,compose,pager <f2> '<enter-command>source ~/.config/mutt/account/alx/account.muttrc<enter>'
-macro index,compose,pager <f3> '<enter-command>source ~/.config/mutt/account/foss/account.muttrc<enter>'
-macro index,compose,pager <f4> '<enter-command>source ~/.config/mutt/account/gov/account.muttrc<enter>'
-macro index,compose,pager <f5> '<enter-command>source ~/.config/mutt/account/legal/account.muttrc<enter>'
-macro index,compose,pager <f6> '<enter-command>source ~/.config/mutt/account/spam/account.muttrc<enter>'
-macro index,compose,pager <f7> '<enter-command>source ~/.config/mutt/account/alx_manpages/account.muttrc<enter>'
+macro index,compose,pager <f2> '<enter-command>source ~/.config/mutt/account/migadu/alx/account.muttrc<enter>'
+macro index,compose,pager <f3> '<enter-command>source ~/.config/mutt/account/migadu/foss/account.muttrc<enter>'
+macro index,compose,pager <f4> '<enter-command>source ~/.config/mutt/account/migadu/gov/account.muttrc<enter>'
+macro index,compose,pager <f5> '<enter-command>source ~/.config/mutt/account/migadu/legal/account.muttrc<enter>'
+macro index,compose,pager <f6> '<enter-command>source ~/.config/mutt/account/migadu/spam/account.muttrc<enter>'
+macro index,compose,pager <f7> '<enter-command>source ~/.config/mutt/account/gmail/alx/account.muttrc<enter>'
diff --git a/home/.config/mutt/pgp/gpg.muttrc b/home/.config/mutt/crypt.muttrc
index 09aee8b..eb2216c 100644
--- a/home/.config/mutt/pgp/gpg.muttrc
+++ b/home/.config/mutt/crypt.muttrc
@@ -1,6 +1,7 @@
-set crypt_autosign = yes
-set crypt_opportunistic_encrypt = yes
 set crypt_protected_headers_write = yes
 
 set pgp_self_encrypt = yes
 set pgp_default_key = A9348594CE31283A826FBDD8D57633D441E25BB5
+
+crypt-hook serge@hallyn.com 0xF1D08DB778185BF784002DFFE9FEEA06A85E3F9D
+send-hook ~t serge@hallyn.com 'set crypt_confirmhook=no'
diff --git a/home/.config/mutt/crypt/auto.muttrc b/home/.config/mutt/crypt/auto.muttrc
new file mode 100644
index 0000000..8f4b7cc
--- /dev/null
+++ b/home/.config/mutt/crypt/auto.muttrc
@@ -0,0 +1,2 @@
+set crypt_autosign = yes
+set crypt_opportunistic_encrypt = yes
diff --git a/home/.config/mutt/crypt/noauto.muttrc b/home/.config/mutt/crypt/noauto.muttrc
new file mode 100644
index 0000000..22f1181
--- /dev/null
+++ b/home/.config/mutt/crypt/noauto.muttrc
@@ -0,0 +1,2 @@
+set crypt_autosign = no
+set crypt_opportunistic_encrypt = no
diff --git a/home/.config/mutt/muttrc b/home/.config/mutt/muttrc
index 96bdcb7..79e2346 100644
--- a/home/.config/mutt/muttrc
+++ b/home/.config/mutt/muttrc
@@ -1,5 +1,6 @@
 source ~/.config/mutt/pass.muttrc
 source ~/.config/mutt/accounts.muttrc
+source ~/.config/mutt/crypt.muttrc
 source ~/.config/mutt/thread.muttrc
 source ~/.config/mutt/pager.muttrc
 source ~/.config/mutt/char.muttrc
diff --git a/home/.config/mutt/pgp/no-gpg.muttrc b/home/.config/mutt/pgp/no-gpg.muttrc
deleted file mode 100644
index 9f7d342..0000000
--- a/home/.config/mutt/pgp/no-gpg.muttrc
+++ /dev/null
@@ -1,6 +0,0 @@
-set crypt_autosign = no
-set crypt_opportunistic_encrypt = no
-set crypt_protected_headers_write = yes
-
-set pgp_self_encrypt = yes
-set pgp_default_key = A9348594CE31283A826FBDD8D57633D441E25BB5