emacs: alloy-mode: rebind TAB to indent-for-tab-command

[~bandali/configs] / .emacs.d / init.el

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index b7be16a..57a8f74 100644 (file)
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -266,9 +266,21 @@
   (previous-line)
   (insert "\n\f\n;;; "))
 
   (previous-line)
   (insert "\n\f\n;;; "))
 

+;; (defvar b/fill-column 47
+;;   "My custom `fill-column'.")
+
+(defconst b/asterism "* * *")
+

 (defun b/insert-asterism ()
 (defun b/insert-asterism ()

+  "Insert a centred asterism."

   (interactive)
   (interactive)

-  (insert "\n\n                                 * * *\n\n"))
+  (insert
+   (concat
+    "\n\n"
+    (make-string (floor (/ (- fill-column (length b/asterism)) 2))
+                 ?\s)
+    b/asterism
+    "\n\n")))

 
 (defun b/no-mouse-autoselect-window ()
   "Conveniently disable `focus-follows-mouse'.
 
 (defun b/no-mouse-autoselect-window ()
   "Conveniently disable `focus-follows-mouse'.


@@ -472,6 +484,11 @@ For disabling the behaviour for certain buffers and/or modes."
 (use-feature vc
   :bind ("C-x v C-=" . vc-ediff))
 
 (use-feature vc
   :bind ("C-x v C-=" . vc-ediff))
 

+(use-feature vc-git
+  :after vc
+  :custom
+  (vc-git-print-log-follow t))
+

 (use-feature ediff
   :config (add-hook 'ediff-after-quit-hook-internal 'winner-undo)
   :custom ((ediff-window-setup-function 'ediff-setup-windows-plain)
 (use-feature ediff
   :config (add-hook 'ediff-after-quit-hook-internal 'winner-undo)
   :custom ((ediff-window-setup-function 'ediff-setup-windows-plain)


@@ -538,12 +555,13 @@ For disabling the behaviour for certain buffers and/or modes."
  ;; for back and forward mouse keys
  ("<XF86Back>"     . previous-buffer)
  ("<mouse-8>"      . previous-buffer)
  ;; for back and forward mouse keys
  ("<XF86Back>"     . previous-buffer)
  ("<mouse-8>"      . previous-buffer)

- ("<drag-mouse-8>" . previous-buffer)
+ ;; ("<drag-mouse-8>" . previous-buffer)

  ("<XF86Forward>"  . next-buffer)
  ("<mouse-9>"      . next-buffer)
  ("<XF86Forward>"  . next-buffer)
  ("<mouse-9>"      . next-buffer)

- ("<drag-mouse-9>" . next-buffer)
- ("<drag-mouse-2>" . kill-this-buffer)
- ("<drag-mouse-3>" . ivy-switch-buffer))
+ ;; ("<drag-mouse-9>" . next-buffer)
+ ;; ("<drag-mouse-2>" . kill-this-buffer)
+ ;; ("<drag-mouse-3>" . switch-to-buffer)
+ )

 
 (bind-keys
  :prefix-map b/straight-prefix-map
 
 (bind-keys
  :prefix-map b/straight-prefix-map


@@ -909,6 +927,7 @@ around if needed."
   :custom
   (magit-diff-refine-hunk t)
   (magit-display-buffer-function #'magit-display-buffer-fullframe-status-v1)
   :custom
   (magit-diff-refine-hunk t)
   (magit-display-buffer-function #'magit-display-buffer-fullframe-status-v1)

+  ;; (magit-completing-read-function 'magit-ido-completing-read)

   :custom-face (magit-diff-file-heading ((t (:weight normal)))))
 
 ;; recently opened files
   :custom-face (magit-diff-file-heading ((t (:weight normal)))))
 
 ;; recently opened files


@@ -916,11 +935,73 @@ around if needed."
   :defer 0.2
   ;; :config
   ;; (add-to-list 'recentf-exclude "^/\\(?:ssh\\|su\\|sudo\\)?:")
   :defer 0.2
   ;; :config
   ;; (add-to-list 'recentf-exclude "^/\\(?:ssh\\|su\\|sudo\\)?:")

+  :config
+  (recentf-mode)

   :custom
   (recentf-max-saved-items 2000))
 
 ;; smart M-x enhancement (needed by counsel for history)
   :custom
   (recentf-max-saved-items 2000))
 
 ;; smart M-x enhancement (needed by counsel for history)

-(use-package smex)
+;; (use-package smex)
+
+(bind-keys
+ ("C-c f ." . find-file)
+ ("C-c f l" . find-library)
+ ("C-c f r" . recentf-open-files)
+ ("C-c x"   . execute-extended-command))
+
+(comment
+  (use-feature ido
+    :demand
+    :bind
+    (:map ido-common-completion-map
+          ([escape] . minibuffer-keyboard-quit)
+          ("DEL"    . b/ido-backspace))
+    :config
+    (require 'delsel)
+    (defun b/ido-backspace ()
+      "Forward to `backward-delete-char'.  On error (read-only), quit."
+      (interactive)
+      (condition-case nil
+          (backward-delete-char 1)
+        (error
+         (minibuffer-keyboard-quit))))
+    (ido-mode 1)
+    (ido-everywhere 1)
+    :custom
+    (ido-enable-flex-matching t)
+    ;; (ido-enable-regexp t)
+    ;; (ido-enable-prefix t)
+    (ido-max-window-height 10)
+    (ido-use-virtual-buffers t))
+
+  (use-package ido-vertical-mode
+    :defer 0.3
+    :config
+    (ido-vertical-mode 1)
+    :custom
+    (ido-vertical-define-keys 'C-n-C-p-up-and-down)
+    (ido-vertical-show-count t))
+
+  (use-package ido-completing-read+
+    :defer 0.3
+    :after ido
+    :config
+    (ido-ubiquitous-mode 1))
+
+  (use-package crm-custom
+    :defer 0.3
+    :config
+    (crm-custom-mode 1))
+
+  (use-feature icomplete
+    :defer 0.3
+    :config
+    (icomplete-mode 1)))
+
+(use-package amx
+  :defer 0.3
+  :config
+  (amx-mode))

 
 (use-package ivy
   :defer 0.3
 
 (use-package ivy
   :defer 0.3


@@ -932,7 +1013,7 @@ around if needed."
    ("DEL"    . ivy-backward-delete-char))
   :config
   (setq ivy-wrap t
    ("DEL"    . ivy-backward-delete-char))
   :config
   (setq ivy-wrap t

-        ivy-height 14
+        ;; ivy-height 14

         ivy-use-virtual-buffers t
         ivy-virtual-abbreviate 'abbreviate
         ivy-count-format "%d/%d ")
         ivy-use-virtual-buffers t
         ivy-virtual-abbreviate 'abbreviate
         ivy-count-format "%d/%d ")


@@ -950,26 +1031,25 @@ This function is intended for use with `ivy-ignore-buffers'."
   (add-to-list 'ivy-ignore-buffers 'b/ivy-ignore-buffer-p)
 
   (ivy-mode 1)
   (add-to-list 'ivy-ignore-buffers 'b/ivy-ignore-buffer-p)
 
   (ivy-mode 1)

-  ;; :custom-face
-  ;; (ivy-minibuffer-match-face-2 ((t (:background "#e99ce8" :weight semi-bold))))
-  ;; (ivy-minibuffer-match-face-3 ((t (:background "#bbbbff" :weight semi-bold))))
-  ;; (ivy-minibuffer-match-face-4 ((t (:background "#ffbbff" :weight semi-bold))))
-)
+  :custom-face
+  (ivy-minibuffer-match-face-1 ((t (:background "#eeeeee"))))
+  (ivy-minibuffer-match-face-2 ((t (:background "#e7e7e7" :weight bold))))
+  (ivy-minibuffer-match-face-3 ((t (:background "light goldenrod" :weight semi-bold))))
+  (ivy-minibuffer-match-face-4 ((t (:background "misty rose" :weight semi-bold))))
+  (ivy-current-match ((((class color) (background light))
+                       :background "#d7d7d7" :foreground "black")
+                      (((class color) (background dark))
+                       :background "#65a7e2" :foreground "black"))))

 
 (use-package swiper
 
 (use-package swiper

+  :demand

   :after ivy
   :after ivy

-  :bind (("C-s"   . swiper-isearch)
-         ("C-r"   . swiper)
-         ("C-S-s" . isearch-forward)))
+  :bind (("C-S-s" . swiper-isearch)))

 
 (use-package counsel
 
 (use-package counsel

+  :demand

   :after ivy
   :after ivy

-  :bind (([remap execute-extended-command] . counsel-M-x)
-         ([remap find-file]                . counsel-find-file)
-         ("C-c f ."                        . counsel-find-file)
-         ("C-c f l"                        . counsel-find-library)
-         ("C-c f r"                        . counsel-recentf)
-         ("C-c x"                          . counsel-M-x)
+  :bind (("C-c f r" . counsel-recentf)

          :map minibuffer-local-map
          ("C-r" . counsel-minibuffer-history))
   :config
          :map minibuffer-local-map
          ("C-r" . counsel-minibuffer-history))
   :config


@@ -1018,7 +1098,9 @@ This function is intended for use with `ivy-ignore-buffers'."
                ("C-d"   . b/eshell-quit-or-delete-char)
                ("C-S-l" . b/eshell-clear)
                ("M-r"   . counsel-esh-history)
                ("C-d"   . b/eshell-quit-or-delete-char)
                ("C-S-l" . b/eshell-clear)
                ("M-r"   . counsel-esh-history)

-               ([tab]   . company-complete)))
+               ;; ([tab]   . company-complete)
+               :map eshell-hist-mode-map
+               ("M-r" . counsel-esh-history)))

 
   :hook (eshell-mode . b/eshell-setup)
   :custom
 
   :hook (eshell-mode . b/eshell-setup)
   :custom


@@ -1244,7 +1326,8 @@ This function is intended for use with `ivy-ignore-buffers'."
 
 (use-feature text-mode
   :bind (:map text-mode-map ("C-*" . b/insert-asterism))
 
 (use-feature text-mode
   :bind (:map text-mode-map ("C-*" . b/insert-asterism))

-  :hook (text-mode . indicate-buffer-boundaries-left))
+  :hook ((text-mode . indicate-buffer-boundaries-left)
+         (text-mode . flyspell-mode)))

 
 (use-feature conf-mode
   :mode "\\.*rc$")
 
 (use-feature conf-mode
   :mode "\\.*rc$")


@@ -1256,15 +1339,18 @@ This function is intended for use with `ivy-ignore-buffers'."
   :bind
   (:map company-active-map
         ([tab]    . company-complete-common-or-cycle)
   :bind
   (:map company-active-map
         ([tab]    . company-complete-common-or-cycle)

-        ([escape] . company-abort))
+        ([escape] . company-abort)
+        ("C-p"    . company-select-previous-or-abort)
+        ("C-n"    . company-select-next-or-abort))

   :custom
   (company-minimum-prefix-length 1)
   (company-selection-wrap-around t)
   (company-dabbrev-char-regexp "\\sw\\|\\s_\\|[-_]")
   (company-dabbrev-downcase nil)
   (company-dabbrev-ignore-case nil)
   :custom
   (company-minimum-prefix-length 1)
   (company-selection-wrap-around t)
   (company-dabbrev-char-regexp "\\sw\\|\\s_\\|[-_]")
   (company-dabbrev-downcase nil)
   (company-dabbrev-ignore-case nil)

-  :config
-  (global-company-mode t))
+  ;; :config
+  ;; (global-company-mode t)
+  )

 
 (use-package flycheck
   :defer 0.6
 
 (use-package flycheck
   :defer 0.6


@@ -1330,7 +1416,21 @@ This function is intended for use with `ivy-ignore-buffers'."
 (use-package alloy-mode
   :straight (:host github :repo "dwwmmn/alloy-mode")
   :mode "\\.als\\'"
 (use-package alloy-mode
   :straight (:host github :repo "dwwmmn/alloy-mode")
   :mode "\\.als\\'"

-  :config (setq alloy-basic-offset 2)
+  :config
+  (setq alloy-basic-offset 2)
+  ;; (defun b/alloy-simple-indent (start end)
+  ;;   (interactive "r")
+  ;;   ;; (if (region-active-p)
+  ;;   ;;     (indent-rigidly start end alloy-basic-offset)
+  ;;   ;;   (if (bolp)
+  ;;   ;;       (indent-rigidly (line-beginning-position)
+  ;;   ;;                       (line-end-position)
+  ;;   ;;                       alloy-basic-offset)))
+  ;;   (indent-to (+ (current-column) alloy-basic-offset)))
+  :bind (:map alloy-mode-map
+              ("RET" . electric-newline-and-maybe-indent)
+              ;; ("TAB" . b/alloy-simple-indent)
+              ("TAB" . indent-for-tab-command))

   :hook (alloy-mode . (lambda () (setq-local indent-tabs-mode nil))))
 
 (eval-when-compile (defvar lean-mode-map))
   :hook (alloy-mode . (lambda () (setq-local indent-tabs-mode nil))))
 
 (eval-when-compile (defvar lean-mode-map))


@@ -1389,7 +1489,9 @@ This function is intended for use with `ivy-ignore-buffers'."
   (b/setq-every 2
     web-mode-code-indent-offset
     web-mode-css-indent-offset
   (b/setq-every 2
     web-mode-code-indent-offset
     web-mode-css-indent-offset

-    web-mode-markup-indent-offset))
+    web-mode-markup-indent-offset)
+  :custom
+  (web-mode-enable-auto-indentation nil))

 
 (use-package emmet-mode
   :after (:any web-mode css-mode sgml-mode)
 
 (use-package emmet-mode
   :after (:any web-mode css-mode sgml-mode)


@@ -1603,10 +1705,10 @@ This function is intended for use with `ivy-ignore-buffers'."
     ;; prefixes for global prefixes and minor modes
     "C-c @"   "outline"
     "C-c !"   "flycheck"
     ;; prefixes for global prefixes and minor modes
     "C-c @"   "outline"
     "C-c !"   "flycheck"

-    "C-c 8"   "typo"
-    "C-c 8 -" "typo/dashes"
-    "C-c 8 <" "typo/left-brackets"
-    "C-c 8 >" "typo/right-brackets"
+    ;; "C-c 8"   "typo"
+    ;; "C-c 8 -" "typo/dashes"
+    ;; "C-c 8 <" "typo/left-brackets"
+    ;; "C-c 8 >" "typo/right-brackets"

     "C-x RET" "coding system"
     "C-x 8"   "unicode"
     "C-x @"   "event modifiers"
     "C-x RET" "coding system"
     "C-x 8"   "unicode"
     "C-x @"   "event modifiers"


@@ -1664,7 +1766,7 @@ This function is intended for use with `ivy-ignore-buffers'."
 (use-package crux            ; results in Waiting for git... [2 times]
   :defer 0.4
   :bind (("C-c d"   . crux-duplicate-current-line-or-region)
 (use-package crux            ; results in Waiting for git... [2 times]
   :defer 0.4
   :bind (("C-c d"   . crux-duplicate-current-line-or-region)

-         ("C-c D"   . crux-duplicate-and-comment-current-line-or-region)
+         ("C-c M-d" . crux-duplicate-and-comment-current-line-or-region)

          ("C-c f C" . crux-copy-file-preserve-attributes)
          ("C-c f D" . crux-delete-file-and-buffer)
          ("C-c f R" . crux-rename-file-and-buffer)
          ("C-c f C" . crux-copy-file-preserve-attributes)
          ("C-c f D" . crux-delete-file-and-buffer)
          ("C-c f R" . crux-rename-file-and-buffer)


@@ -1761,12 +1863,19 @@ This function is intended for use with `ivy-ignore-buffers'."
 
 ;; easily type pretty quotes & other typography, like ‘’“”-–—«»‹›
 (use-package typo
 
 ;; easily type pretty quotes & other typography, like ‘’“”-–—«»‹›
 (use-package typo

+  :disabled

   :defer 0.5
   :config
   (typo-global-mode 1)
   :hook (((text-mode erc-mode web-mode) . typo-mode)
          (tex-mode                      . (lambda ()(typo-mode -1)))))
 
   :defer 0.5
   :config
   (typo-global-mode 1)
   :hook (((text-mode erc-mode web-mode) . typo-mode)
          (tex-mode                      . (lambda ()(typo-mode -1)))))
 

+(use-feature electric
+  :disabled
+  :demand
+  :config
+  (electric-quote-mode))
+

 ;; highlight TODOs in buffers
 (use-package hl-todo
   :defer 0.5
 ;; highlight TODOs in buffers
 (use-package hl-todo
   :defer 0.5


@@ -1895,7 +2004,24 @@ This function is intended for use with `ivy-ignore-buffers'."
   :straight (debbugs
              :host github
              :repo "emacs-straight/debbugs"
   :straight (debbugs
              :host github
              :repo "emacs-straight/debbugs"

-             :files (:defaults "Debbugs.wsdl")))
+             :files (:defaults "Debbugs.wsdl"))
+  :bind
+  (("C-c D d" . debbugs-gnu)
+   ("C-c D e" .
+    (lambda ()
+      (interactive)
+      (setq debbugs-gnu-current-suppress t)
+      (debbugs-gnu debbugs-gnu-default-severities '("emacs"))))
+   ("C-c D g" .
+    (lambda ()
+      (interactive)
+      (setq debbugs-gnu-current-suppress t)
+      (debbugs-gnu debbugs-gnu-default-severities '("gnuzilla"))))
+   ("C-c D G" .
+    (lambda ()
+      (interactive)
+      (setq debbugs-gnu-current-suppress t)
+      (debbugs-gnu debbugs-gnu-default-severities '("guix"))))))

 
 (use-package org-ref
   :init
 
 (use-package org-ref
   :init


@@ -1918,18 +2044,20 @@ This function is intended for use with `ivy-ignore-buffers'."
 
 (use-feature window
   :bind
 
 (use-feature window
   :bind

-  (("C-c w s l" . b/split-window-right)
-   ("C-c w s j" . b/split-window-below)
+  (("C-c w e"   . (lambda ()
+                    (interactive)
+                    (split-window-right)
+                    (other-window 1)
+                    (erc-switch-to-buffer)))
+   ("C-c w s l" . (lambda ()
+                    (interactive)
+                    (split-window-right)
+                    (other-window 1)))
+   ("C-c w s j" . (lambda ()
+                    (interactive)
+                    (split-window-below)
+                    (other-window 1)))

    ("C-c w q"   . quit-window))
    ("C-c w q"   . quit-window))

-  :init
-  (defun b/split-window-right ()
-    (interactive)
-    (split-window-right)
-    (other-window 1))
-  (defun b/split-window-below ()
-    (interactive)
-    (split-window-below)
-    (other-window 1))

   :custom
   (split-width-threshold 150))
 
   :custom
   (split-width-threshold 150))
 


@@ -2041,6 +2169,12 @@ This function is intended for use with `ivy-ignore-buffers'."
   :custom
   (debpaste-paste-is-hidden t))
 
   :custom
   (debpaste-paste-is-hidden t))
 

+(use-package scpaste
+  :disabled
+  :config
+  (setq scpaste-http-destination "https://p.bndl.org"
+        scpaste-scp-destination "nix:/var/www/p.bndl.org"))
+

 \f
 ;;; Email (with Gnus)
 
 \f
 ;;; Email (with Gnus)
 


@@ -2081,6 +2215,8 @@ This function is intended for use with `ivy-ignore-buffers'."
                                   ;; (: gnus-group-split-fancy "INBOX" t "INBOX")
                                   ;; gnu
                                   (list ".*<\\(.*\\)\\.\\(non\\)?gnu\\.org>.*" "l.\\1")
                                   ;; (: gnus-group-split-fancy "INBOX" t "INBOX")
                                   ;; gnu
                                   (list ".*<\\(.*\\)\\.\\(non\\)?gnu\\.org>.*" "l.\\1")

+                                  ;; gnus
+                                  (list ".*<\\(.*\\)\\.gnus\\.org>.*" "l.\\1")

                                   ;; *.lists.sr.ht, omitting one dot if present
                                   ;;    add more \\.?\\([^.]*\\) if needed
                                   (list ".*<~\\(.*\\)/\\([^.]*\\)\\.?\\([^.]*\\)\\.lists.sr.ht>.*" "l.~\\1.\\2\\3")
                                   ;; *.lists.sr.ht, omitting one dot if present
                                   ;;    add more \\.?\\([^.]*\\) if needed
                                   (list ".*<~\\(.*\\)/\\([^.]*\\)\\.?\\([^.]*\\)\\.lists.sr.ht>.*" "l.~\\1.\\2\\3")


@@ -2253,7 +2389,7 @@ This function is intended for use with `ivy-ignore-buffers'."
       (to-list    . "webmasters@gnu.org"))
      ("gnu.*"
       (gcc-self . t))
       (to-list    . "webmasters@gnu.org"))
      ("gnu.*"
       (gcc-self . t))

-     ("gnu\\."
+     ("l\\."

       (subscribed . t))
      ("nnimap\\+uw:.*"
       (gcc-self . t)))
       (subscribed . t))
      ("nnimap\\+uw:.*"
       (gcc-self . t)))


@@ -2304,7 +2440,7 @@ This function is intended for use with `ivy-ignore-buffers'."
                              "^User-Agent:"
                              "^X-detected-operating-system:"
                              "^Message-ID:"
                              "^User-Agent:"
                              "^X-detected-operating-system:"
                              "^Message-ID:"

-                             "^References:"
+                             ;; "^References:"

                              "^List-Id:"
                              "^Gnus-Warning:")
    gnus-visible-headers (mapconcat 'identity
                              "^List-Id:"
                              "^Gnus-Warning:")
    gnus-visible-headers (mapconcat 'identity


@@ -2387,8 +2523,9 @@ https://csclub.uwaterloo.ca/~abandali")
            (address "bandali@csclub.uwaterloo.ca")
            (signature b/csc-signature)
            (gcc "nnimap+csc:Sent"))))
            (address "bandali@csclub.uwaterloo.ca")
            (signature b/csc-signature)
            (gcc "nnimap+csc:Sent"))))

-  ;; :hook (gnus-message-setup . mml-secure-message-sign)
-  )
+  :hook (gnus-message-setup . (lambda ()
+                                (unless (mml-secure-is-encrypted-p)
+                                  (mml-secure-message-sign)))))

 
 (use-feature gnus-topic
   :hook (gnus-group-mode . gnus-topic-mode)
 
 (use-feature gnus-topic
   :hook (gnus-group-mode . gnus-topic-mode)


@@ -2414,6 +2551,11 @@ https://csclub.uwaterloo.ca/~abandali")
   :init
   (add-hook 'dired-mode-hook 'gnus-dired-mode))
 
   :init
   (add-hook 'dired-mode-hook 'gnus-dired-mode))
 

+(comment
+  (use-feature gnus-utils
+    :custom
+    (gnus-completing-read-function 'gnus-ido-completing-read)))
+

 (use-feature mm-decode
   :config
   (setq mm-discouraged-alternatives '("text/html" "text/richtext")
 (use-feature mm-decode
   :config
   (setq mm-discouraged-alternatives '("text/html" "text/richtext")


@@ -2466,12 +2608,12 @@ https://csclub.uwaterloo.ca/~abandali")
         '(gnus-find-subscribed-addresses)
         message-dont-reply-to-names
         "\\(\\(\\(amin\\|mab\\)@shemshak\\.org\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(bandali\\|mab\\|aminb?\\)@gnu\\.org\\)\\|\\(a?bandali@\\(csclub\\.\\)?uwaterloo\\.ca\\)\\)")
         '(gnus-find-subscribed-addresses)
         message-dont-reply-to-names
         "\\(\\(\\(amin\\|mab\\)@shemshak\\.org\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(bandali\\|mab\\|aminb?\\)@gnu\\.org\\)\\|\\(a?bandali@\\(csclub\\.\\)?uwaterloo\\.ca\\)\\)")

-  (require 'company-ebdb)
+  ;; (require 'company-ebdb)

   :hook (;; (message-setup . mml-secure-message-sign-pgpmime)
          (message-mode . flyspell-mode)
          (message-mode . (lambda ()
   :hook (;; (message-setup . mml-secure-message-sign-pgpmime)
          (message-mode . flyspell-mode)
          (message-mode . (lambda ()

-                           ;; (setq fill-column 65
-                           ;;       message-fill-column 65)
+                           ;; (setq-local fill-column b/fill-column
+                           ;;             message-fill-column b/fill-column)

                            (make-local-variable 'company-idle-delay)
                            (setq company-idle-delay 0.2))))
   ;; :custom-face
                            (make-local-variable 'company-idle-delay)
                            (setq company-idle-delay 0.2))))
   ;; :custom-face


@@ -2506,6 +2648,17 @@ https://csclub.uwaterloo.ca/~abandali")
         ("r" . footnote-renumber-footnotes)
         ("s" . footnote-set-style)))
 
         ("r" . footnote-renumber-footnotes)
         ("s" . footnote-set-style)))
 

+(use-package bbdb
+  :disabled
+  :demand
+  :after gnus
+  :bind (:map gnus-group-mode-map ("e" . bbdb))
+  :config
+  (bbdb-initialize 'gnus 'message)
+  :custom
+  (bbdb-complete-mail-allow-cycling t)
+  (bbdb-user-mail-address-re message-dont-reply-to-names))
+

 (use-package ebdb
   :demand
   :after gnus
 (use-package ebdb
   :demand
   :after gnus


@@ -2518,14 +2671,19 @@ https://csclub.uwaterloo.ca/~abandali")
 (use-feature ebdb-com
   :after ebdb)
 
 (use-feature ebdb-com
   :after ebdb)
 

-;; (use-package ebdb-complete
-;;   :after ebdb
-;;   :config
-;;   (ebdb-complete-enable))
-
-(use-package company-ebdb
+(use-feature ebdb-complete
+  :after ebdb

   :config
   :config

-  (defun company-ebdb--post-complete (_) nil))
+  ;; (setq ebdb-complete-mail 'capf)
+  (ebdb-complete-enable))
+
+(use-feature ebdb-message
+  :demand
+  :after ebdb)
+
+;; (use-package company-ebdb
+;;   :config
+;;   (defun company-ebdb--post-complete (_) nil))

 
 (use-feature ebdb-gnus
   :after ebdb
 
 (use-feature ebdb-gnus
   :after ebdb


@@ -2617,7 +2775,7 @@ https://csclub.uwaterloo.ca/~abandali")
 (use-feature erc-pcomplete
   :after erc
   :custom
 (use-feature erc-pcomplete
   :after erc
   :custom

-  (erc-pcomplete-nick-postfix ","))
+  (erc-pcomplete-nick-postfix ", "))

 
 (use-feature erc-track
   :after erc
 
 (use-feature erc-track
   :after erc