From ef8a092b801adabcae91dfb13bd7e1ee150bac1e Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Thu, 8 Nov 2018 13:03:58 -0500
Subject: [PATCH] [emacs] gnus-posting-styles is good enough, no need for
 gnus-alias

---
 .gitmodules    |  3 --
 init.org       | 93 ++++++++++++++++++++++++++++----------------------
 lib/gnus-alias |  1 -
 3 files changed, 52 insertions(+), 45 deletions(-)
 delete mode 160000 lib/gnus-alias

diff --git a/.gitmodules b/.gitmodules
index 2469ae7..db55daa 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -107,9 +107,6 @@
 [submodule "git-modes"]
 	path = lib/git-modes
 	url = git@github.com:magit/git-modes.git
-[submodule "gnus-alias"]
-	path = lib/gnus-alias
-	url = git@github.com:hexmode/gnus-alias.git
 [submodule "graphql"]
 	path = lib/graphql
 	url = git@github.com:vermiculus/graphql.el.git
diff --git a/init.org b/init.org
index d8ea5c1..f9986e0 100644
--- a/init.org
+++ b/init.org
@@ -1843,6 +1843,17 @@ Hopefully temporary.
   (setq nnmail-extra-headers (append nnmail-extra-headers
                                      '(List-Id X-RT-Originator))))
 
+(use-package gnus-msg
+  :config
+  (setq gnus-posting-styles
+        '((".*"
+           (address "amin@aminb.org"))
+          ("gnu.*"
+           (address "bandali@gnu.org"))
+          ("nnimap\\+uwaterloo:.*"
+           (address "abandali@uwaterloo.ca")
+           (gcc "\"nnimap+uwaterloo:Sent Items\"")))))
+
 (use-package gnus-group
   :hook (gnus-group-mode . gnus-topic-mode))
 
@@ -1851,47 +1862,6 @@ Hopefully temporary.
   (setq mm-discouraged-alternatives '("text/html" "text/richtext")))
 #+end_src
 
-** gnus-alias
-
-#+begin_src emacs-lisp
-(use-package gnus-alias
-  :commands (gnus-alias-determine-identity
-             gnus-alias-select-identity)
-  :bind (:map  message-mode-map
-               ("s-i" . gnus-alias-select-identity))
-  :config
-  (setq
-   gnus-alias-default-identity "amin"
-   gnus-alias-identity-alist
-   '(("amin"
-      nil   ;; Does not refer to any other identity
-      "Amin Bandali <amin@aminb.org>"
-      nil   ;; Organization
-      nil   ;; extra headers
-      nil   ;; extra body text
-      nil)  ;; signature file
-     ("gnu"
-      nil
-      "Amin Bandali <bandali@gnu.org>"
-      nil
-      nil
-      nil
-      nil)
-     ("uw"
-      nil
-      "Amin Bandali <abandali@uwaterloo.ca>"
-      nil
-      (("Gcc" . "\"nnimap+uwaterloo:Sent Items\""))
-      nil
-      nil))
-   gnus-alias-identity-rules
-   '(("amin" ("Delivered-To" "<amin\\@aminb\\.org" both) "amin")
-     ("gnu" ("Delivered-To" "<gnu\\@aminb\\.org" both) "gnu")
-     ("uw" ("any" "<\\(.+\\)\\@uwaterloo\\.ca" both) "uw"))
-   gnus-alias-override-user-mail-address t)
-  :hook (message-setup . gnus-alias-determine-identity))
-#+end_src
-
 ** sendmail
 
 #+begin_src emacs-lisp
@@ -1981,6 +1951,47 @@ variables.  This is useful for a regi `begin' frame-entry."
 nil))
 #+end_src
 
+** COMMENT gnus-alias                                              :ARCHIVE:
+
+#+begin_src emacs-lisp
+(use-package gnus-alias
+  :commands (gnus-alias-determine-identity
+             gnus-alias-select-identity)
+  :bind (:map  message-mode-map
+               ("s-i" . gnus-alias-select-identity))
+  :config
+  (setq
+   gnus-alias-default-identity "amin"
+   gnus-alias-identity-alist
+   '(("amin"
+      nil   ;; Does not refer to any other identity
+      "Amin Bandali <amin@aminb.org>"
+      nil   ;; Organization
+      nil   ;; extra headers
+      nil   ;; extra body text
+      nil)  ;; signature file
+     ("gnu"
+      nil
+      "Amin Bandali <bandali@gnu.org>"
+      nil
+      nil
+      nil
+      nil)
+     ("uw"
+      nil
+      "Amin Bandali <abandali@uwaterloo.ca>"
+      nil
+      (("Gcc" . "\"nnimap+uwaterloo:Sent Items\""))
+      nil
+      nil))
+   gnus-alias-identity-rules
+   '(("amin" ("Delivered-To" "<amin\\@aminb\\.org" both) "amin")
+     ("gnu" ("Delivered-To" "<gnu\\@aminb\\.org" both) "gnu")
+     ("uw" ("any" "<\\(.+\\)\\@uwaterloo\\.ca" both) "uw"))
+   gnus-alias-override-user-mail-address t)
+  :hook (message-setup . gnus-alias-determine-identity))
+#+end_src
+
 ** COMMENT [[https://notmuchmail.org][notmuch]]                                                 :ARCHIVE:
 
 See [[notmuch:id:87muuqsvci.fsf@fencepost.gnu.org][bug follow-up]].
diff --git a/lib/gnus-alias b/lib/gnus-alias
deleted file mode 160000
index 9447d3c..0000000
--- a/lib/gnus-alias
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9447d3ccb4c0e75d0468899cccff7aa249657bac
-- 
2.20.1