emacs: mode-line-related tweaks

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

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 8d80538..21eecd6 100644 (file)
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -56,12 +56,11 @@
       esup-child-profile-require-level 0)
 
 ;; set them back to their defaults once we're done initializing
       esup-child-profile-require-level 0)
 
 ;; set them back to their defaults once we're done initializing

-(add-hook
- 'after-init-hook
- (lambda ()
-   (setq gc-cons-threshold a/gc-cons-threshold
-         gc-cons-percentage a/gc-cons-percentage
-         file-name-handler-alist a/file-name-handler-alist)))
+(defun a/post-init ()
+  (setq gc-cons-threshold a/gc-cons-threshold
+        gc-cons-percentage a/gc-cons-percentage
+        file-name-handler-alist a/file-name-handler-alist))
+(add-hook 'after-init-hook #'a/post-init)

 
 ;; increase number of lines kept in *Messages* log
 (setq message-log-max 20000)
 
 ;; increase number of lines kept in *Messages* log
 (setq message-log-max 20000)


@@ -146,9 +145,9 @@
 (defun a/reload-init ()
   "Reload init.el."
   (interactive)
 (defun a/reload-init ()
   "Reload init.el."
   (interactive)

-  (straight-transaction
-    (straight-mark-transaction-as-init)
-    (load user-init-file)))
+  (setq a/file-name-handler-alist file-name-handler-alist)
+  (load user-init-file nil 'nomessage)
+  (a/post-init))

 
 ;; use-package
 (straight-use-package 'use-package)
 
 ;; use-package
 (straight-use-package 'use-package)


@@ -165,6 +164,8 @@
 (setq use-package-always-defer t)
 (require 'bind-key)
 
 (setq use-package-always-defer t)
 (require 'bind-key)
 

+(use-package delight)
+

 ;; for browsing the Emacsmirror package database
 (comment
   (use-package epkg
 ;; for browsing the Emacsmirror package database
 (comment
   (use-package epkg


@@ -444,6 +445,18 @@ For disabling the behaviour for certain buffers and/or modes."
 ;; allow scrolling in Isearch
 (setq isearch-allow-scroll t)
 
 ;; allow scrolling in Isearch
 (setq isearch-allow-scroll t)
 

+;; open read-only file buffers in view-mode
+;; (enables niceties like `q' for quit)
+(setq view-read-only t)
+
+(use-feature vc
+  :bind ("C-x v C-=" . vc-ediff))
+
+(use-feature ediff
+  :config (add-hook 'ediff-after-quit-hook-internal 'winner-undo)
+  :custom ((ediff-window-setup-function 'ediff-setup-windows-plain)
+           (ediff-split-window-function 'split-window-horizontally)))
+

 \f
 ;;; General bindings
 
 \f
 ;;; General bindings
 


@@ -458,7 +471,7 @@ For disabling the behaviour for certain buffers and/or modes."
 
  ("C-c F m" . make-frame-command)
  ("C-c F d" . delete-frame)
 
  ("C-c F m" . make-frame-command)
  ("C-c F d" . delete-frame)

- ("C-c F D" . delete-other-frames)
+ ("C-c F D" . server-edit)

 
  ("C-c o"   . other-window)
 
 
  ("C-c o"   . other-window)
 


@@ -477,6 +490,15 @@ For disabling the behaviour for certain buffers and/or modes."
 (when (display-graphic-p)
   (unbind-key "C-z" global-map))
 
 (when (display-graphic-p)
   (unbind-key "C-z" global-map))
 

+(bind-keys
+ ;; for back and forward mouse keys
+ ("<mouse-8>"      . previous-buffer)
+ ("<drag-mouse-8>" . previous-buffer)
+ ("<mouse-9>"      . next-buffer)
+ ("<drag-mouse-9>" . next-buffer)
+ ("<drag-mouse-2>" . kill-this-buffer)
+ ("<drag-mouse-3>" . ivy-switch-buffer))
+

 (bind-keys
  :prefix-map a/straight-prefix-map
  :prefix "C-c p s"
 (bind-keys
  :prefix-map a/straight-prefix-map
  :prefix "C-c p s"


@@ -539,6 +561,7 @@ For disabling the behaviour for certain buffers and/or modes."
   (("C-c a o a" . org-agenda)
    :map org-mode-map
    ("M-L" . org-insert-last-stored-link)
   (("C-c a o a" . org-agenda)
    :map org-mode-map
    ("M-L" . org-insert-last-stored-link)

+   ("M-O" . org-toggle-link-display)

    ("s-T" . org-todo))
   :hook ((org-mode . org-indent-mode)
          (org-mode . auto-fill-mode)
    ("s-T" . org-todo))
   :hook ((org-mode . org-indent-mode)
          (org-mode . auto-fill-mode)


@@ -627,6 +650,7 @@ For disabling the behaviour for certain buffers and/or modes."
   (nconc magit-section-initial-visibility-alist
          '(([unpulled status] . show)
            ([unpushed status] . show)))
   (nconc magit-section-initial-visibility-alist
          '(([unpulled status] . show)
            ([unpushed status] . show)))

+  :custom (magit-display-buffer-function #'magit-display-buffer-fullframe-status-v1)

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


@@ -634,13 +658,14 @@ For disabling the behaviour for certain buffers and/or modes."
   :defer 0.2
   :config
   (add-to-list 'recentf-exclude "^/\\(?:ssh\\|su\\|sudo\\)?:")
   :defer 0.2
   :config
   (add-to-list 'recentf-exclude "^/\\(?:ssh\\|su\\|sudo\\)?:")

-  (setq recentf-max-saved-items 40))
+  (setq recentf-max-saved-items 2000))

 
 ;; smart M-x enhancement (needed by counsel for history)
 (use-package smex)
 
 (use-package ivy
   :defer 0.3
 
 ;; smart M-x enhancement (needed by counsel for history)
 (use-package smex)
 
 (use-package ivy
   :defer 0.3

+  :delight ;; " 🙒"

   :bind
   (:map ivy-minibuffer-map
    ([escape] . keyboard-escape-quit)
   :bind
   (:map ivy-minibuffer-map
    ([escape] . keyboard-escape-quit)


@@ -668,6 +693,7 @@ For disabling the behaviour for certain buffers and/or modes."
 
 (use-package counsel
   :after ivy
 
 (use-package counsel
   :after ivy

+  :delight

   :bind (([remap execute-extended-command] . counsel-M-x)
          ([remap find-file]                . counsel-find-file)
          ("C-c x"                          . counsel-M-x)
   :bind (([remap execute-extended-command] . counsel-M-x)
          ([remap find-file]                . counsel-find-file)
          ("C-c x"                          . counsel-M-x)


@@ -782,6 +808,7 @@ For disabling the behaviour for certain buffers and/or modes."
         (mode . scheme-mode)
         (mode . haskell-mode)
         (mode . lean-mode)
         (mode . scheme-mode)
         (mode . haskell-mode)
         (mode . lean-mode)

+        (mode . go-mode)

         (mode . alloy-mode)))
       ("tex"
        (or
         (mode . alloy-mode)))
       ("tex"
        (or


@@ -807,6 +834,7 @@ For disabling the behaviour for certain buffers and/or modes."
 
 (use-feature outline
   :hook (prog-mode . outline-minor-mode)
 
 (use-feature outline
   :hook (prog-mode . outline-minor-mode)

+  :delight (outline-minor-mode " outl")

   :bind
   (:map
    outline-minor-mode-map
   :bind
   (:map
    outline-minor-mode-map


@@ -853,6 +881,17 @@ For disabling the behaviour for certain buffers and/or modes."
                         (setq ediff-after-quit-hook-internal nil)
                         (set-window-configuration wnd))))
         (error "no more than 2 files should be marked"))))
                         (setq ediff-after-quit-hook-internal nil)
                         (set-window-configuration wnd))))
         (error "no more than 2 files should be marked"))))

+
+  (require 'dired-x)
+  (setq dired-guess-shell-alist-user
+        '(("\\.pdf\\'"  "evince" "zathura" "okular")
+          ("\\.doc\\'"  "libreoffice")
+          ("\\.docx\\'" "libreoffice")
+          ("\\.ppt\\'"  "libreoffice")
+          ("\\.pptx\\'" "libreoffice")
+          ("\\.xls\\'"  "libreoffice")
+          ("\\.xlsx\\'" "libreoffice")
+          ("\\.flac\\'" "mpv")))

   :bind (:map dired-mode-map
               ("b"  . dired-up-directory)
               ("e"  . dired-ediff-files)
   :bind (:map dired-mode-map
               ("b"  . dired-up-directory)
               ("e"  . dired-ediff-files)


@@ -896,6 +935,7 @@ For disabling the behaviour for certain buffers and/or modes."
 ;; display Lisp objects at point in the echo area
 (use-feature eldoc
   :when (version< "25" emacs-version)
 ;; display Lisp objects at point in the echo area
 (use-feature eldoc
   :when (version< "25" emacs-version)

+  :delight " eldoc"

   :config (global-eldoc-mode))
 
 ;; highlight matching parens
   :config (global-eldoc-mode))
 
 ;; highlight matching parens


@@ -903,7 +943,12 @@ For disabling the behaviour for certain buffers and/or modes."
   :demand
   :config (show-paren-mode))
 
   :demand
   :config (show-paren-mode))
 

+(use-feature elec-pair
+  :demand
+  :config (electric-pair-mode))
+

 (use-feature simple
 (use-feature simple

+  :delight (auto-fill-function " fill")

   :config (column-number-mode))
 
 ;; save minibuffer history
   :config (column-number-mode))
 
 ;; save minibuffer history


@@ -922,11 +967,17 @@ For disabling the behaviour for certain buffers and/or modes."
   (add-hook 'prog-mode-hook #'indicate-buffer-boundaries-left))
 
 (use-feature text-mode
   (add-hook 'prog-mode-hook #'indicate-buffer-boundaries-left))
 
 (use-feature text-mode

-  :hook ((text-mode . indicate-buffer-boundaries-left)
-         (text-mode . abbrev-mode)))
+  :hook (text-mode . indicate-buffer-boundaries-left))
+
+(use-feature conf-mode
+  :mode "\\.*rc$")
+
+(use-feature sh-mode
+  :mode "\\.bashrc$")

 
 (use-package company
   :defer 0.6
 
 (use-package company
   :defer 0.6

+  :delight " comp"

   :bind
   (:map company-active-map
         ([tab]    . company-complete-common-or-cycle)
   :bind
   (:map company-active-map
         ([tab]    . company-complete-common-or-cycle)


@@ -952,7 +1003,11 @@ For disabling the behaviour for certain buffers and/or modes."
   (setq flycheck-emacs-lisp-load-path 'inherit)
 
   ;; Only flycheck when I actually save the buffer
   (setq flycheck-emacs-lisp-load-path 'inherit)
 
   ;; Only flycheck when I actually save the buffer

-  (setq flycheck-check-syntax-automatically '(mode-enabled save)))
+  (setq flycheck-check-syntax-automatically '(mode-enabled save))
+  :custom (flycheck-mode-line-prefix "flyc"))
+
+(use-feature flyspell
+  :delight " flysp")

 
 ;; http://endlessparentheses.com/ispell-and-apostrophes.html
 (use-package ispell
 
 ;; http://endlessparentheses.com/ispell-and-apostrophes.html
 (use-package ispell


@@ -980,17 +1035,26 @@ For disabling the behaviour for certain buffers and/or modes."
   (advice-add #'ispell-parse-output :filter-args
               #'endless/replace-quote))
 
   (advice-add #'ispell-parse-output :filter-args
               #'endless/replace-quote))
 

+(use-feature abbrev
+  :delight " abbr"
+  :hook (text-mode . abbrev-mode))
+

 \f
 ;;; Programming modes
 
 (use-feature lisp-mode
   :config
 \f
 ;;; Programming modes
 
 (use-feature lisp-mode
   :config

-  (add-hook 'emacs-lisp-mode-hook 'outline-minor-mode)
-  (add-hook 'emacs-lisp-mode-hook 'reveal-mode)

   (defun indent-spaces-mode ()
     (setq indent-tabs-mode nil))
   (add-hook 'lisp-interaction-mode-hook #'indent-spaces-mode))
 
   (defun indent-spaces-mode ()
     (setq indent-tabs-mode nil))
   (add-hook 'lisp-interaction-mode-hook #'indent-spaces-mode))
 

+(use-feature reveal
+  :delight (reveal-mode " reveal")
+  :hook (emacs-lisp-mode . reveal-mode))
+
+(use-feature elisp-mode
+  :delight (emacs-lisp-mode "Elisp" :major))
+

 (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\\'"


@@ -1146,6 +1210,8 @@ For disabling the behaviour for certain buffers and/or modes."
     :custom
     (font-latex-fontify-sectioning 'color)))
 
     :custom
     (font-latex-fontify-sectioning 'color)))
 

+(use-package go-mode)
+

 \f
 ;;; Theme
 
 \f
 ;;; Theme
 


@@ -1156,7 +1222,8 @@ For disabling the behaviour for certain buffers and/or modes."
   :commands (sml/apply-theme)
   :demand
   :config
   :commands (sml/apply-theme)
   :demand
   :config

-  (sml/setup))
+  (sml/setup)
+  (smart-mode-line-enable))

 
 (use-package doom-themes)
 
 
 (use-package doom-themes)
 


@@ -1196,6 +1263,7 @@ For disabling the behaviour for certain buffers and/or modes."
 
 (use-package which-key
   :defer 0.4
 
 (use-package which-key
   :defer 0.4

+  :delight

   :config
   (which-key-add-key-based-replacements
     ;; prefixes for global prefixes and minor modes
   :config
   (which-key-add-key-based-replacements
     ;; prefixes for global prefixes and minor modes


@@ -1269,10 +1337,22 @@ For disabling the behaviour for certain buffers and/or modes."
          ("<end>"  . mwim-end-of-line-or-code)))
 
 (use-package projectile
          ("<end>"  . mwim-end-of-line-or-code)))
 
 (use-package projectile

+  :defer 0.5

   :bind-keymap ("C-c P" . projectile-command-map)
   :config
   (projectile-mode)
 
   :bind-keymap ("C-c P" . projectile-command-map)
   :config
   (projectile-mode)
 

+  (defun a/projectile-mode-line-fun ()
+  "Report project name and type in the modeline."
+  (let ((project-name (projectile-project-name))
+        (project-type (projectile-project-type)))
+    (format "%s%s"
+            projectile-mode-line-prefix
+            (if project-type
+                (format ":%s" project-type)
+              ""))))
+  (setq projectile-mode-line-function 'a/projectile-mode-line-fun)
+

   (defun my-projectile-invalidate-cache (&rest _args)
     ;; ignore the args to `magit-checkout'
     (projectile-invalidate-cache nil))
   (defun my-projectile-invalidate-cache (&rest _args)
     ;; ignore the args to `magit-checkout'
     (projectile-invalidate-cache nil))


@@ -1283,7 +1363,9 @@ For disabling the behaviour for certain buffers and/or modes."
                    :after #'my-projectile-invalidate-cache)
        (advice-add 'magit-branch-and-checkout
                    :after #'my-projectile-invalidate-cache)))
                    :after #'my-projectile-invalidate-cache)
        (advice-add 'magit-branch-and-checkout
                    :after #'my-projectile-invalidate-cache)))

-  :custom (projectile-completion-system 'ivy))
+  :custom
+  (projectile-completion-system 'ivy)
+  (projectile-mode-line-prefix " proj"))

 
 (use-package helpful
   :defer 0.6
 
 (use-package helpful
   :defer 0.6


@@ -1339,9 +1421,10 @@ For disabling the behaviour for certain buffers and/or modes."
 ;; easily type pretty quotes & other typography, like ‘’“”-–—«»‹›
 (use-package typo
   :defer 0.5
 ;; easily type pretty quotes & other typography, like ‘’“”-–—«»‹›
 (use-package typo
   :defer 0.5

+  :delight " typo"

   :config
   (typo-global-mode 1)
   :config
   (typo-global-mode 1)

-  :hook (text-mode . typo-mode))
+  :hook ((text-mode erc-mode) . typo-mode))

 
 ;; highlight TODOs in buffers
 (use-package hl-todo
 
 ;; highlight TODOs in buffers
 (use-package hl-todo


@@ -1376,9 +1459,7 @@ For disabling the behaviour for certain buffers and/or modes."
          ("C-c a s m p" . multi-term-prev)
          ("C-c a s m n" . multi-term-next)
          :map term-mode-map
          ("C-c a s m p" . multi-term-prev)
          ("C-c a s m n" . multi-term-next)
          :map term-mode-map

-         ("C-c C-j" . term-char-mode)
-         :map term-raw-map
-         ("C-c C-j" . term-line-mode))
+         ("C-c C-j" . term-char-mode))

   :config
   (setq multi-term-program "screen"
         multi-term-program-switches (concat "-c"
   :config
   (setq multi-term-program "screen"
         multi-term-program-switches (concat "-c"


@@ -1392,6 +1473,7 @@ For disabling the behaviour for certain buffers and/or modes."
         term-bind-key-alist
         '(("C-c C-c" . term-interrupt-subjob)
           ("C-c C-e" . term-send-esc)
         term-bind-key-alist
         '(("C-c C-c" . term-interrupt-subjob)
           ("C-c C-e" . term-send-esc)

+          ("C-c C-j" . term-line-mode)

           ("C-k" . kill-line)
           ;; ("C-y" . term-paste)
           ("C-y" . term-send-raw)
           ("C-k" . kill-line)
           ;; ("C-y" . term-paste)
           ("C-y" . term-send-raw)


@@ -1424,6 +1506,9 @@ For disabling the behaviour for certain buffers and/or modes."
 
 (use-package page-break-lines
   :defer 0.5
 
 (use-package page-break-lines
   :defer 0.5

+  :delight " pgln"
+  :custom
+  (page-break-lines-max-width fill-column)

   :config
   (global-page-break-lines-mode))
 
   :config
   (global-page-break-lines-mode))
 


@@ -1449,11 +1534,10 @@ For disabling the behaviour for certain buffers and/or modes."
   :config
   (defconst yas-verbosity-cur yas-verbosity)
   (setq yas-verbosity 2)
   :config
   (defconst yas-verbosity-cur yas-verbosity)
   (setq yas-verbosity 2)

-  (add-to-list 'yas-snippet-dirs "~/src/git/guix/etc/snippets")
+  (add-to-list 'yas-snippet-dirs "~/src/git/guix/etc/snippets" t)

   (yas-reload-all)
   (setq yas-verbosity yas-verbosity-cur)
   (yas-reload-all)
   (setq yas-verbosity yas-verbosity-cur)

-  :hook
-  (text-mode . yas-minor-mode))
+  (yas-global-mode))

 
 (use-package debbugs
   :straight (debbugs
 
 (use-package debbugs
   :straight (debbugs


@@ -1517,8 +1601,12 @@ For disabling the behaviour for certain buffers and/or modes."
 
 (use-package alert
   :commands (alert)
 
 (use-package alert
   :commands (alert)

-  :init
-  (setq alert-default-style 'notifier))
+  :init (setq alert-default-style 'notifications))
+
+;; (use-package fill-column-indicator)
+
+(use-package emojify
+  :hook (erc-mode . emojify-mode))

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


@@ -1545,12 +1633,68 @@ For disabling the behaviour for certain buffers and/or modes."
             (nnimap-server-port 143)
             (nnimap-authenticator plain)
             (nnimap-user "amin@bndl.local"))
             (nnimap-server-port 143)
             (nnimap-authenticator plain)
             (nnimap-user "amin@bndl.local"))

+     (nnimap "gnu"
+            (nnimap-stream plain)
+            (nnimap-address "127.0.0.1")
+            (nnimap-server-port 143)
+            (nnimap-authenticator plain)
+            (nnimap-user "bandali@gnu.local")
+            (nnimap-inbox "INBOX")
+            (nnimap-split-methods 'nnimap-split-fancy)
+            (nnimap-split-fancy (|
+                                 ;; (: gnus-registry-split-fancy-with-parent)
+                                 ;; (: gnus-group-split-fancy "INBOX" t "INBOX")
+                                 ;; gnu
+                                 (list ".*emacs-devel.gnu.org" "l.gnu.emacs.devel")
+                                 (list ".*help-gnu-emacs.gnu.org" "l.gnu.emacs.help")
+                                 (list ".*info-gnu-emacs.gnu.org" "l.gnu.emacs.info")
+                                 (list ".*emacs-orgmode.gnu.org" "l.gnu.emacs.orgmode")
+                                 (list ".*emacs-tangents.gnu.org" "l.gnu.emacs.tangents")
+                                 (list ".*emacsconf-discuss.gnu.org" "l.gnu.emacsconf.discuss")
+                                 (list ".*fencepost-users.gnu.org" "l.gnu.fencepost.users")
+                                 (list ".*gnunet-developers.gnu.org" "l.gnu.gnunet.developers")
+                                 (list ".*help-gnunet.gnu.org" "l.gnu.gnunet.help")
+                                 (list ".*bug-gnuzilla.gnu.org" "l.gnu.gnuzilla.bug")
+                                 (list ".*gnuzilla-dev.gnu.org" "l.gnu.gnuzilla.dev")
+                                 (list ".*guile-devel.gnu.org" "l.gnu.guile.devel")
+                                 (list ".*guile-user.gnu.org" "l.gnu.guile.user")
+                                 (list ".*guix-devel.gnu.org" "l.gnu.guix.devel")
+                                 (list ".*info-guix.gnu.org" "l.gnu.guix.info")
+                                 (list ".*savannah-hackers-public.gnu.org" "l.gnu.savannah.hackers.public")
+                                 (list ".*savannah-users.gnu.org" "l.gnu.savannah.users")
+                                 (list ".*www-commits.gnu.org" "l.gnu.www.commits")
+                                 (list ".*www-discuss.gnu.org" "l.gnu.www.discuss")
+                                 ;; webmasters
+                                 (from "webmasters\\(-comment\\)?@gnu\\.org" "webmasters")
+                                 ;; haskell
+                                 (list ".*haskell-art.we.lurk.org" "l.haskell.art")
+                                 (list ".*haskell-cafe.haskell.org" "l.haskell.cafe")
+                                 ;; other
+                                 (list ".*deepspec.lists.cs.princeton.edu" "l.deepspec")
+                                 (list ".*notmuch.notmuchmail.org" "l.notmuch")
+                                 (list ".*dev.lists.parabola.nu" "l.parabola.dev")
+                                 ;; *@lists.sr.ht
+                                 (list ".*~bandali/public-inbox@lists.sr.ht" "l.~bandali.public-inbox")
+                                 (list ".*~sircmpwn/sr.ht-admins@lists.sr.ht" "l.~sircmpwn.srht.admins")
+                                 (list ".*~sircmpwn/sr.ht-announce@lists.sr.ht" "l.~sircmpwn.srht.announce")
+                                 (list ".*~sircmpwn/sr.ht-dev@lists.sr.ht" "l.~sircmpwn.srht.dev")
+                                 (list ".*~sircmpwn/sr.ht-discuss@lists.sr.ht" "l.~sircmpwn.srht.discuss")
+                                 "INBOX")))

      (nnimap "uw"
              (nnimap-stream plain)
              (nnimap-address "127.0.0.1")
              (nnimap-server-port 143)
              (nnimap-authenticator plain)
      (nnimap "uw"
              (nnimap-stream plain)
              (nnimap-address "127.0.0.1")
              (nnimap-server-port 143)
              (nnimap-authenticator plain)

-             (nnimap-user "abandali@uw.local"))
+             (nnimap-user "abandali@uw.local")
+             (nnimap-inbox "INBOX")
+             (nnimap-split-methods 'nnimap-split-fancy)
+             (nnimap-split-fancy (|
+                                  ;; (: gnus-registry-split-fancy-with-parent)
+                                  ;; se463-s19
+                                  ("subject" "\\(SE\\s-?463\\|Deliverable\\)" "course.se463-s19")
+                                  (from "\\(SE\\s-?463\\|Gema\\|Hemant\\|Davood\\|Camilo\\|Reza\\|Michael\\|Sandy\\)" "course.se463-s19")
+                                  ;; catch-all
+                                  "INBOX")))

      (nnimap "csc"
              (nnimap-stream plain)
              (nnimap-address "127.0.0.1")
      (nnimap "csc"
              (nnimap-stream plain)
              (nnimap-address "127.0.0.1")


@@ -1559,79 +1703,112 @@ For disabling the behaviour for certain buffers and/or modes."
              (nnimap-user "abandali@csc.uw.local")))
    gnus-message-archive-group "nnimap+amin:Sent"
    gnus-parameters
              (nnimap-user "abandali@csc.uw.local")))
    gnus-message-archive-group "nnimap+amin:Sent"
    gnus-parameters

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

       (to-address . "deepspec@lists.cs.princeton.edu")
       (to-address . "deepspec@lists.cs.princeton.edu")

-      (to-list    . "deepspec@lists.cs.princeton.edu"))
-     ("gnu\\.emacs-devel"
+      (to-list    . "deepspec@lists.cs.princeton.edu")
+      (list-identifier . "\\[deepspec\\]"))
+     ("l\\.gnu\\.emacs\\.devel"

       (to-address . "emacs-devel@gnu.org")
       (to-list    . "emacs-devel@gnu.org"))
       (to-address . "emacs-devel@gnu.org")
       (to-list    . "emacs-devel@gnu.org"))

-     ("gnu\\.emacs-orgmode"
+     ("l\\.gnu\\.emacs\\.help"
+      (to-address . "help-gnu-emacs@gnu.org")
+      (to-list    . "help-gnu-emacs@gnu.org"))
+     ("l\\.gnu\\.emacs\\.info"
+      (to-address . "info-gnu-emacs@gnu.org")
+      (to-list    . "info-gnu-emacs@gnu.org"))
+     ("l\\.gnu\\.emacs\\.orgmode"

       (to-address . "emacs-orgmode@gnu.org")
       (to-address . "emacs-orgmode@gnu.org")

-      (to-list    . "emacs-orgmode@gnu.org"))
-     ("gnu\\.emacsconf-discuss"
+      (to-list    . "emacs-orgmode@gnu.org")
+      (list-identifier . "\\[O\\]"))
+     ("l\\.gnu\\.emacs\\.tangents"
+      (to-address . "emacs-tangents@gnu.org")
+      (to-list    . "emacs-tangents@gnu.org"))
+     ("l\\.gnu\\.emacsconf\\.discuss"

       (to-address . "emacsconf-discuss@gnu.org")
       (to-list    . "emacsconf-discuss@gnu.org"))
       (to-address . "emacsconf-discuss@gnu.org")
       (to-list    . "emacsconf-discuss@gnu.org"))

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

       (to-address . "fencepost-users@gnu.org")
       (to-address . "fencepost-users@gnu.org")

-      (to-list    . "fencepost-users@gnu.org"))
-     ("gnu\\.gnunet-developers"
+      (to-list    . "fencepost-users@gnu.org")
+      (list-identifier . "\\[Fencepost-users\\]"))
+     ("l\\.gnu\\.gnunet\\.developers"

       (to-address . "gnunet-developers@gnu.org")
       (to-address . "gnunet-developers@gnu.org")

-      (to-list    . "gnunet-developers@gnu.org"))
-     ("gnu\\.guile-devel"
+      (to-list    . "gnunet-developers@gnu.org")
+      (list-identifier . "\\[GNUnet-developers\\]"))
+     ("l\\.gnu\\.gnunet\\.help"
+      (to-address . "help-gnunet@gnu.org")
+      (to-list    . "help-gnunet@gnu.org")
+      (list-identifier . "\\[Help-gnunet\\]"))
+     ("l\\.gnu\\.gnuzilla\\.bug"
+      (to-address . "bug-gnuzilla@gnu.org")
+      (to-list    . "bug-gnuzilla@gnu.org")
+      (list-identifier . "\\[Bug-gnuzilla\\]"))
+     ("l\\.gnu\\.gnuzilla\\.dev"
+      (to-address . "gnuzilla-dev@gnu.org")
+      (to-list    . "gnuzilla-dev@gnu.org")
+      (list-identifier . "\\[Gnuzilla-dev\\]"))
+     ("l\\.gnu\\.guile\\.devel"

       (to-address . "guile-devel@gnu.org")
       (to-list    . "guile-devel@gnu.org"))
       (to-address . "guile-devel@gnu.org")
       (to-list    . "guile-devel@gnu.org"))

-     ("gnu\\.guix-devel"
+     ("l\\.gnu\\.guile\\.user"
+      (to-address . "guile-user@gnu.org")
+      (to-list    . "guile-user@gnu.org"))
+     ("l\\.gnu\\.guix\\.devel"

       (to-address . "guix-devel@gnu.org")
       (to-list    . "guix-devel@gnu.org"))
       (to-address . "guix-devel@gnu.org")
       (to-list    . "guix-devel@gnu.org"))

-     ("gnu\\.haskell-art"
-      (to-address . "haskell-art@we.lurk.org")
-      (to-list    . "haskell-art@we.lurk.org"))
-     ("gnu\\.haskell-cafe"
-      (to-address . "haskell-cafe@haskell.org")
-      (to-list    . "haskell-cafe@haskell.org"))
-     ("gnu\\.help-gnu-emacs"
-      (to-address . "help-gnu-emacs@gnu.org")
-      (to-list    . "help-gnu-emacs@gnu.org"))
-     ("gnu\\.info-gnu-emacs"
-      (to-address . "info-gnu-emacs@gnu.org")
-      (to-list    . "info-gnu-emacs@gnu.org"))
-     ("gnu\\.info-guix"
+     ("l\\.gnu\\.guix\\.info"

       (to-address . "info-guix@gnu.org")
       (to-list    . "info-guix@gnu.org"))
       (to-address . "info-guix@gnu.org")
       (to-list    . "info-guix@gnu.org"))

-     ("gnu\\.notmuch"
-      (to-address . "notmuch@notmuchmail.org")
-      (to-list    . "notmuch@notmuchmail.org"))
-     ("gnu\\.parabola-dev"
-      (to-address . "dev@lists.parabola.nu")
-      (to-list    . "dev@lists.parabola.nu"))
-     ("gnu\\.webmasters"
-      (to-address . "webmasters@gnu.org")
-      (to-list    . "webmasters@gnu.org"))
-     ("gnu\\.www-commits"
+     ("l\\.gnu\\.savannah\\.hackers\\.public"
+      (to-address . "savannah-hackers-public@gnu.org")
+      (to-list    . "savannah-hackers-public@gnu.org"))
+     ("l\\.gnu\\.savannah\\.users"
+      (to-address . "savannah-users@gnu.org")
+      (to-list    . "savannah-users@gnu.org"))
+     ("l\\.gnu\\.www\\.commits"

       (to-address . "www-commits@gnu.org")
       (to-list    . "www-commits@gnu.org"))
       (to-address . "www-commits@gnu.org")
       (to-list    . "www-commits@gnu.org"))

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

       (to-address . "www-discuss@gnu.org")
       (to-list    . "www-discuss@gnu.org"))
       (to-address . "www-discuss@gnu.org")
       (to-list    . "www-discuss@gnu.org"))

-     ("gnu\\.~bandali\\.public-inbox"
+     ("l\\.haskell\\.art"
+      (to-address . "haskell-art@we.lurk.org")
+      (to-list    . "haskell-art@we.lurk.org")
+      (list-identifier . "\\[haskell-art\\]"))
+     ("l\\.haskell\\.cafe"
+      (to-address . "haskell-cafe@haskell.org")
+      (to-list    . "haskell-cafe@haskell.org")
+      (list-identifier . "\\[Haskell-cafe\\]"))
+     ("l\\.notmuch"
+      (to-address . "notmuch@notmuchmail.org")
+      (to-list    . "notmuch@notmuchmail.org"))
+     ("l\\.parabola\\.dev"
+      (to-address . "dev@lists.parabola.nu")
+      (to-list    . "dev@lists.parabola.nu")
+      (list-identifier . "\\[Dev\\]"))
+     ("l\\.~bandali\\.public-inbox"

       (to-address . "~bandali/public-inbox@lists.sr.ht")
       (to-list    . "~bandali/public-inbox@lists.sr.ht"))
       (to-address . "~bandali/public-inbox@lists.sr.ht")
       (to-list    . "~bandali/public-inbox@lists.sr.ht"))

-     ("gnu\\.~sircmpwn\\.srht-admins"
+     ("l\\.~sircmpwn\\.srht\\.admins"

       (to-address . "~sircmpwn/sr.ht-admins@lists.sr.ht")
       (to-list    . "~sircmpwn/sr.ht-admins@lists.sr.ht"))
       (to-address . "~sircmpwn/sr.ht-admins@lists.sr.ht")
       (to-list    . "~sircmpwn/sr.ht-admins@lists.sr.ht"))

-     ("gnu\\.~sircmpwn\\.srht-announce"
+     ("l\\.~sircmpwn\\.srht\\.announce"

       (to-address . "~sircmpwn/sr.ht-announce@lists.sr.ht")
       (to-list    . "~sircmpwn/sr.ht-announce@lists.sr.ht"))
       (to-address . "~sircmpwn/sr.ht-announce@lists.sr.ht")
       (to-list    . "~sircmpwn/sr.ht-announce@lists.sr.ht"))

-     ("gnu\\.~sircmpwn\\.srht-dev"
+     ("l\\.~sircmpwn\\.srht\\.dev"

       (to-address . "~sircmpwn/sr.ht-dev@lists.sr.ht")
       (to-list    . "~sircmpwn/sr.ht-dev@lists.sr.ht"))
       (to-address . "~sircmpwn/sr.ht-dev@lists.sr.ht")
       (to-list    . "~sircmpwn/sr.ht-dev@lists.sr.ht"))

-     ("gnu\\.~sircmpwn\\.srht-discuss"
+     ("l\\.~sircmpwn\\.srht\\.discuss"

       (to-address . "~sircmpwn/sr.ht-discuss@lists.sr.ht")
       (to-list    . "~sircmpwn/sr.ht-discuss@lists.sr.ht"))
       (to-address . "~sircmpwn/sr.ht-discuss@lists.sr.ht")
       (to-list    . "~sircmpwn/sr.ht-discuss@lists.sr.ht"))

+     ("webmasters"
+      (to-address . "webmasters@gnu.org")
+      (to-list    . "webmasters@gnu.org"))

      ("gnu.*"
       (gcc-self . t))
      ("gnu\\."
      ("gnu.*"
       (gcc-self . t))
      ("gnu\\."

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

    gnus-large-newsgroup  50
    gnus-home-directory   (no-littering-expand-var-file-name "gnus/")
    gnus-directory        (concat gnus-home-directory "news/")
    gnus-large-newsgroup  50
    gnus-home-directory   (no-littering-expand-var-file-name "gnus/")
    gnus-directory        (concat gnus-home-directory "news/")


@@ -1646,6 +1823,8 @@ For disabling the behaviour for certain buffers and/or modes."
   (require 'ebdb-mua)
   (require 'ebdb-gnus)
 
   (require 'ebdb-mua)
   (require 'ebdb-gnus)
 

+  ;; (gnus-registry-initialize)
+

   (with-eval-after-load 'recentf
     (add-to-list 'recentf-exclude gnus-home-directory)))
 
   (with-eval-after-load 'recentf
     (add-to-list 'recentf-exclude gnus-home-directory)))
 


@@ -1691,23 +1870,36 @@ For disabling the behaviour for certain buffers and/or modes."
 
 (use-feature gnus-msg
   :config
 
 (use-feature gnus-msg
   :config

+  (defvar a/gnu-signature "Amin Bandali | GNU Webmaster
+https://bandali.eu.org | https://gnu.org
+GPG Key: BE62 7373 8E61 6D6D 1B3A  08E8 A21A 0202 4881 6103")
+  (defvar a/uw-signature "Amin Bandali, MMath Student
+Cheriton School of Computer Science
+University of Waterloo
+https://bandali.eu.org")
+  (defvar a/csc-signature "Amin Bandali | Termcom, CSC
+https://csclub.uwaterloo.ca/~abandali/")

   (setq gnus-posting-styles
         '((".*"
            (address "amin@bndl.org")
            (body "\nBest,\n")
            (eval (setq a/message-cite-say-hi t)))
   (setq gnus-posting-styles
         '((".*"
            (address "amin@bndl.org")
            (body "\nBest,\n")
            (eval (setq a/message-cite-say-hi t)))

-          ("gnu.*"
+          ("nnimap\\+gnu:.*"

            (address "bandali@gnu.org")
            (address "bandali@gnu.org")

+           (signature a/gnu-signature)

            (eval (set (make-local-variable 'message-user-fqdn) "fencepost.gnu.org")))
           ((header "subject" "ThankCRM")
            (to "webmasters-comment@gnu.org")
            (eval (set (make-local-variable 'message-user-fqdn) "fencepost.gnu.org")))
           ((header "subject" "ThankCRM")
            (to "webmasters-comment@gnu.org")

-           (body "Added  to 2019supporters.html.\n\nMoving to campaigns.\n\n-amin\n")
+           (body "Added  to 2019supporters.html.\n\nMoving to campaigns.\n")

            (eval (setq a/message-cite-say-hi nil)))
           ("nnimap\\+uw:.*"
            (address "abandali@uwaterloo.ca")
            (eval (setq a/message-cite-say-hi nil)))
           ("nnimap\\+uw:.*"
            (address "abandali@uwaterloo.ca")

+           (signature a/uw-signature))
+          ("nnimap\\+uw:INBOX"

            (gcc "\"nnimap+uw:Sent Items\""))
           ("nnimap\\+csc:.*"
            (address "abandali@csclub.uwaterloo.ca")
            (gcc "\"nnimap+uw:Sent Items\""))
           ("nnimap\\+csc:.*"
            (address "abandali@csclub.uwaterloo.ca")

+           (signature a/csc-signature)

            (gcc "nnimap+csc:Sent")))))
 
 (use-feature gnus-topic
            (gcc "nnimap+csc:Sent")))))
 
 (use-feature gnus-topic


@@ -1723,9 +1915,11 @@ For disabling the behaviour for certain buffers and/or modes."
   :config
   (setq gnus-permanently-visible-groups "\\(:INBOX$\\|:gnu$\\)"))
 
   :config
   (setq gnus-permanently-visible-groups "\\(:INBOX$\\|:gnu$\\)"))
 

-(use-feature gnus-win
-  :config
-  (setq gnus-use-full-window nil))
+(comment
+  ;; problematic with ebdb's popup, *EBDB-Gnus*
+  (use-feature gnus-win
+    :config
+    (setq gnus-use-full-window nil)))

 
 (use-feature gnus-dired
   :commands gnus-dired-mode
 
 (use-feature gnus-dired
   :commands gnus-dired-mode


@@ -1790,9 +1984,13 @@ For disabling the behaviour for certain buffers and/or modes."
   ;; (message-header-cc      ((t (:foreground "#333" :weight normal))))
   )
 
   ;; (message-header-cc      ((t (:foreground "#333" :weight normal))))
   )
 

-(with-eval-after-load 'mml-sec
-  (setq mml-secure-openpgp-encrypt-to-self t
-        mml-secure-openpgp-sign-with-sender t))
+(use-feature mml
+  :delight " mml")
+
+(use-feature mml-sec
+  :custom
+  (mml-secure-openpgp-encrypt-to-self t)
+  (mml-secure-openpgp-sign-with-sender t))

 
 (use-feature footnote
   :after message
 
 (use-feature footnote
   :after message


@@ -1880,7 +2078,62 @@ For disabling the behaviour for certain buffers and/or modes."
       (gnus-harvest-install))))
 
 \f
       (gnus-harvest-install))))
 
 \f

-;;; IRC
+;;; IRC (with ERC and ZNC)
+
+(use-feature erc
+  :bind (("C-c a e b" . erc-switch-to-buffer)
+         :map erc-mode-map
+         ("M-a" . erc-track-switch-buffer))
+  :custom
+  (erc-join-buffer 'bury)
+  (erc-lurker-hide-list '("JOIN" "PART" "QUIT"))
+  (erc-nick "bandali")
+  (erc-rename-buffers t)
+  (erc-server-reconnect-attempts 5)
+  (erc-server-reconnect-timeout 3)
+  :config
+  (with-eval-after-load 'ivy
+    ;; ignore channel buffer names
+    (add-to-list 'ivy-ignore-buffers "^#"))
+  (defun erc-cmd-OPME ()
+    "Request chanserv to op me."
+    (erc-message "PRIVMSG"
+                 (format "chanserv op %s %s"
+                         (erc-default-target)
+                         (erc-current-nick)) nil))
+  (defun erc-cmd-DEOPME ()
+    "Deop myself from current channel."
+    (erc-cmd-DEOP (format "%s" (erc-current-nick))))
+  (add-to-list 'erc-modules 'keep-place)
+  (add-to-list 'erc-modules 'notifications)
+  (add-to-list 'erc-modules 'spelling)
+  (add-to-list 'erc-modules 'scrolltoplace)
+  (erc-update-modules))
+
+(use-feature erc-fill
+  :after erc
+  :custom
+  (erc-fill-function 'erc-fill-static)
+  (erc-fill-static-center 18))
+
+(use-feature erc-pcomplete
+  :after erc
+  :custom
+  (erc-pcomplete-nick-postfix ","))
+
+(use-feature erc-track
+  :after erc
+  :custom
+  (erc-track-exclude-types '("JOIN" "MODE" "NICK" "PART" "QUIT"
+                             "324" "329" "332" "333" "353" "477"))
+  (erc-track-priority-faces-only 'all)
+  (erc-track-shorten-function nil))
+
+(use-package erc-hl-nicks
+  :after erc)
+
+(use-package erc-scrolltoplace
+  :after erc)

 
 (use-package znc
   :straight (:host nil :repo "https://git.bndl.org/amin/znc.el")
 
 (use-package znc
   :straight (:host nil :repo "https://git.bndl.org/amin/znc.el")


@@ -1895,7 +2148,9 @@ For disabling the behaviour for certain buffers and/or modes."
           `(("znc.bndl.org" 1337 t
              ((freenode "amin/freenode" ,pwd)))
             ("znc.bndl.org" 1337 t
           `(("znc.bndl.org" 1337 t
              ((freenode "amin/freenode" ,pwd)))
             ("znc.bndl.org" 1337 t

-             ((moznet "amin/moznet" ,pwd)))))))
+             ((moznet "amin/moznet" ,pwd)))
+            ("znc.bndl.org" 1337 t
+             ((oftc "amin/oftc" ,pwd)))))))

 
 \f
 ;;; Post initialization
 
 \f
 ;;; Post initialization