emacs: update packages

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

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 847f282..6b8dd8e 100644 (file)
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -184,6 +184,9 @@
 \f
 ;;; Initial setup
 
 \f
 ;;; Initial setup
 

+(defvar b/exwm-p (string= (system-name) "jirud")
+  "Whether or not we will be using `exwm'.")
+

 ;; keep ~/.emacs.d clean
 (use-package no-littering
   :demand
 ;; keep ~/.emacs.d clean
 (use-package no-littering
   :demand


@@ -394,6 +397,7 @@ For disabling the behaviour for certain buffers and/or modes."
 
 ;; time and battery in mode-line
 (use-feature time
 
 ;; time and battery in mode-line
 (use-feature time

+  :if b/exwm-p

   :demand
   :config
   (display-time-mode)
   :demand
   :config
   (display-time-mode)


@@ -402,6 +406,7 @@ For disabling the behaviour for certain buffers and/or modes."
   (display-time-format "%a %b %-e, %-l:%M%P"))
 
 (use-feature battery
   (display-time-format "%a %b %-e, %-l:%M%P"))
 
 (use-feature battery

+  :if b/exwm-p

   :demand
   :config
   (display-battery-mode)
   :demand
   :config
   (display-battery-mode)


@@ -488,6 +493,11 @@ For disabling the behaviour for certain buffers and/or modes."
   :custom
   ((epg-gpg-program (executable-find "gpg"))))
 
   :custom
   ((epg-gpg-program (executable-find "gpg"))))
 

+(use-feature auth-source
+  :custom
+  (auth-sources '("~/.authinfo.gpg"))
+  (authinfo-hidden (regexp-opt '("password" "client-secret" "token"))))
+

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


@@ -561,6 +571,7 @@ For disabling the behaviour for certain buffers and/or modes."
 ;;; Essential packages
 
 (use-package exwm
 ;;; Essential packages
 
 (use-package exwm

+  :if b/exwm-p

   :demand
   :config
   ;; make class name the buffer name, truncating beyond 60 characters
   :demand
   :config
   ;; make class name the buffer name, truncating beyond 60 characters


@@ -602,14 +613,16 @@ around if needed."
   ;; shorten 'C-c C-q' to 'C-q'
   (define-key exwm-mode-map [?\C-q] #'exwm-input-send-next-key)
 
   ;; shorten 'C-c C-q' to 'C-q'
   (define-key exwm-mode-map [?\C-q] #'exwm-input-send-next-key)
 

-  (setq exwm-input-global-keys
+  (setq exwm-workspace-number 4
+        exwm-input-global-keys

         `(([?\s-R] . exwm-reset)
           ([?\s-\\] . exwm-workspace-switch)
         `(([?\s-R] . exwm-reset)
           ([?\s-\\] . exwm-workspace-switch)

-          ([?\s-\s] . (lambda (command)
-                        (interactive
-                         (list (read-shell-command "➜ ")))
-                        (start-process-shell-command
-                         command nil command)))
+          ([?\s-\s] . dmenu)
+          ([?\S-\s-\s] . (lambda (command)
+                              (interactive
+                               (list (read-shell-command "➜ ")))
+                              (start-process-shell-command
+                               command nil command)))

           ([s-return] . (lambda ()
                           (interactive)
                           (start-process "" nil "urxvt")))
           ([s-return] . (lambda ()
                           (interactive)
                           (start-process "" nil "urxvt")))


@@ -618,6 +631,18 @@ around if needed."
                            (interactive)
                            (start-process-shell-command
                             "rofi-pass" nil "rofi-pass")))
                            (interactive)
                            (start-process-shell-command
                             "rofi-pass" nil "rofi-pass")))

+          ([?\s-h] . windmove-left)
+          ([?\s-j] . windmove-down)
+          ([?\s-k] . windmove-up)
+          ([?\s-l] . windmove-right)
+          ([?\s-H] . windmove-swap-states-left)
+          ([?\s-J] . windmove-swap-states-down)
+          ([?\s-K] . windmove-swap-states-up)
+          ([?\s-L] . windmove-swap-states-right)
+          ([?\M-\s-h] . shrink-window-horizontally)
+          ([?\M-\s-l] . enlarge-window-horizontally)
+          ([?\M-\s-k] . shrink-window)
+          ([?\M-\s-j] . enlarge-window)

           ([?\s-\[] . (lambda ()
                         (interactive)
                         (exwm-workspace-switch-create
           ([?\s-\[] . (lambda ()
                         (interactive)
                         (exwm-workspace-switch-create


@@ -642,10 +667,10 @@ around if needed."
                     (number-sequence 0 (1- exwm-workspace-number)))
           ([?\s-t] . exwm-floating-toggle-floating)
           ([?\s-f] . exwm-layout-toggle-fullscreen)
                     (number-sequence 0 (1- exwm-workspace-number)))
           ([?\s-t] . exwm-floating-toggle-floating)
           ([?\s-f] . exwm-layout-toggle-fullscreen)

-          ([?\s-w] . (lambda ()
+          ([?\s-W] . (lambda ()

                        (interactive)
                        (kill-buffer (current-buffer))))
                        (interactive)
                        (kill-buffer (current-buffer))))

-          ([?\s-q] . (lambda ()
+          ([?\s-Q] . (lambda ()

                        (interactive)
                        (exwm-manage--kill-client)))
           ([?\s-\'] . (lambda ()
                        (interactive)
                        (exwm-manage--kill-client)))
           ([?\s-\'] . (lambda ()


@@ -681,7 +706,9 @@ around if needed."
           ([XF86ScreenSaver] .
            (lambda ()
                     (interactive)
           ([XF86ScreenSaver] .
            (lambda ()
                     (interactive)

-                    (start-process "" nil "dm-tool" "lock")))))
+                    (start-process "" nil "dm-tool" "lock")))
+          ([\s-XF86Back] . previous-buffer)
+          ([\s-XF86Forward] . next-buffer)))

 
   ;; Line-editing shortcuts
   (setq exwm-input-simulation-keys
 
   ;; Line-editing shortcuts
   (setq exwm-input-simulation-keys


@@ -706,16 +733,41 @@ around if needed."
       ([?\C-y] . [?\C-v])
       ([?\M-d] . [C-S-right ?\C-x])
       ([?\M-\d] . [C-S-left ?\C-x])
       ([?\C-y] . [?\C-v])
       ([?\M-d] . [C-S-right ?\C-x])
       ([?\M-\d] . [C-S-left ?\C-x])

-      ;; search
+      ;; window
+      ([?\s-w] . [?\C-w])
+      ([?\s-q] . [?\C-q])
+      ;; misc

       ([?\C-s] . [?\C-f])
       ([?\C-s] . [?\C-f])

-      ;; escape
+      ([?\s-s] . [?\C-s])

       ([?\C-g] . [escape]))))
 
       ([?\C-g] . [escape]))))
 

+(use-feature exwm-manage
+  :demand
+  :after exwm
+  :hook
+  (exwm-manage-finish . (lambda ()
+                          (when exwm-class-name
+                            (cond
+                             ((string= exwm-class-name "Abrowser")
+                              (exwm-input-set-local-simulation-keys
+                               `(,@exwm-input-simulation-keys
+                                 ([?\C-\S-d] . [?\C-d]))))
+                             ((string= exwm-class-name "URxvt")
+                              (exwm-input-set-local-simulation-keys
+                               '(([?\C-c ?\C-c] . [?\C-c])
+                                 ([?\C-c ?\C-u] . [?\C-u]))))
+                             ((string= exwm-class-name "Zathura")
+                              (exwm-input-set-local-simulation-keys
+                               '(([?\C-p] . [C-up])
+                                 ([?\C-n] . [C-down])))))))))
+

 (use-feature exwm-randr
   :demand
   :after exwm
   :config
 (use-feature exwm-randr
   :demand
   :after exwm
   :config

-  (exwm-randr-enable))
+  (exwm-randr-enable)
+  :custom
+  (exwm-randr-workspace-monitor-plist '(1 "VGA-1")))

 
 (use-feature exwm-systemtray
   :demand
 
 (use-feature exwm-systemtray
   :demand


@@ -723,11 +775,11 @@ around if needed."
   :config
   (exwm-systemtray-enable))
 
   :config
   (exwm-systemtray-enable))
 

-(use-feature exwm-workspace
+(use-feature exwm-workspace)
+
+(use-package exwm-edit

   :demand
   :demand

-  :after exwm
-  :custom
-  (exwm-workspace-number 4))
+  :after exwm)

 
 ;; use the org-plus-contrib package to get the whole deal
 (use-package org-plus-contrib)
 
 ;; use the org-plus-contrib package to get the whole deal
 (use-package org-plus-contrib)


@@ -1068,7 +1120,8 @@ This function is intended for use with `ivy-ignore-buffers'."
 
 (use-feature dired
   :config
 
 (use-feature dired
   :config

-  (setq dired-listing-switches "-alh"
+  (setq dired-dwim-target t
+        dired-listing-switches "-alh"

         ls-lisp-use-insert-directory-program nil)
 
   ;; easily diff 2 marked files
         ls-lisp-use-insert-directory-program nil)
 
   ;; easily diff 2 marked files


@@ -1196,7 +1249,6 @@ This function is intended for use with `ivy-ignore-buffers'."
   :mode "\\.bashrc$")
 
 (use-package company
   :mode "\\.bashrc$")
 
 (use-package company

-  :defer 0.6

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


@@ -1274,12 +1326,11 @@ 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)
+  :hook (alloy-mode . (lambda () (setq-local indent-tabs-mode nil))))

 
 (eval-when-compile (defvar lean-mode-map))
 (use-package lean-mode
 
 (eval-when-compile (defvar lean-mode-map))
 (use-package lean-mode

-  :straight (:host github :repo "leanprover/lean-mode"
-                   :fork (:repo "notbandali/lean-mode" :branch "remove-cl"))

   :defer 0.4
   :bind (:map lean-mode-map
               ("S-SPC" . company-complete))
   :defer 0.4
   :bind (:map lean-mode-map
               ("S-SPC" . company-complete))


@@ -1444,6 +1495,10 @@ This function is intended for use with `ivy-ignore-buffers'."
   :hook ((tex-mode . auto-fill-mode)
          (tex-mode . flyspell-mode)))
 
   :hook ((tex-mode . auto-fill-mode)
          (tex-mode . flyspell-mode)))
 

+(use-package george-mode
+  :straight (:host nil :repo "https://git.shemshak.org/amin/george-mode")
+  :mode "\\.grg\\'")
+

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


@@ -1456,6 +1511,7 @@ This function is intended for use with `ivy-ignore-buffers'."
   :commands (sml/apply-theme)
   :demand
   :config
   :commands (sml/apply-theme)
   :demand
   :config

+  (setq sml/theme 'tangomod)

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


@@ -1468,29 +1524,59 @@ This function is intended for use with `ivy-ignore-buffers'."
 
 (use-package doom-themes)
 
 
 (use-package doom-themes)
 

+(use-package solarized-theme
+  :disabled
+  :config
+  (load-theme 'solarized-light t))
+
+(use-package moody
+  :disabled
+  :demand
+  :config
+  (setq x-underline-at-descent-line t)
+  (let ((line (face-attribute 'mode-line :underline)))
+    (set-face-attribute 'mode-line          nil :overline   line)
+    (set-face-attribute 'mode-line-inactive nil :overline   line)
+    (set-face-attribute 'mode-line-inactive nil :underline  line)
+    (set-face-attribute 'mode-line          nil :box        nil)
+    (set-face-attribute 'mode-line-inactive nil :box        nil)
+    (set-face-attribute 'mode-line-inactive nil :background "#e1e1e1")) ; d3d7cf
+  (moody-replace-mode-line-buffer-identification)
+  (moody-replace-vc-mode))
+
+(use-package mini-modeline
+  :disabled
+  :demand
+  :config (mini-modeline-mode))
+

 (defvar b/org-mode-font-lock-keywords
   '(("[ \t]*\\(#\\+\\(BEGIN\\|END\\|begin\\|end\\)_\\(\\S-+\\)\\)[ \t]*\\([^\n:]*\\)"
       (1 '(:foreground "#5a5b5a" :background "#292b2b") t) ; directive
       (3 '(:foreground "#81a2be" :background "#292b2b") t) ; kind
 (defvar b/org-mode-font-lock-keywords
   '(("[ \t]*\\(#\\+\\(BEGIN\\|END\\|begin\\|end\\)_\\(\\S-+\\)\\)[ \t]*\\([^\n:]*\\)"
       (1 '(:foreground "#5a5b5a" :background "#292b2b") t) ; directive
       (3 '(:foreground "#81a2be" :background "#292b2b") t) ; kind

-      (4 '(:foreground "#c5c8c6") t))))                    ; title
+      (4 '(:foreground "#c5c8c6") t)))                     ; title
+  "For use with the `doom-tomorrow-night' theme.")

 
 (defun b/lights-on ()
   "Enable my favourite light theme."
   (interactive)
   (mapc #'disable-theme custom-enabled-themes)
   (load-theme 'tangomod t)
 
 (defun b/lights-on ()
   "Enable my favourite light theme."
   (interactive)
   (mapc #'disable-theme custom-enabled-themes)
   (load-theme 'tangomod t)

-  (sml/apply-theme 'automatic)
+  (sml/apply-theme 'tangomod)

   (font-lock-remove-keywords
   (font-lock-remove-keywords

-   'org-mode b/org-mode-font-lock-keywords))
+   'org-mode b/org-mode-font-lock-keywords)
+  (when (featurep 'exwm-systemtray)
+    (exwm-systemtray--refresh)))

 
 (defun b/lights-off ()
   "Go dark."
   (interactive)
   (mapc #'disable-theme custom-enabled-themes)
 
 (defun b/lights-off ()
   "Go dark."
   (interactive)
   (mapc #'disable-theme custom-enabled-themes)

-  (load-theme 'doom-tomorrow-night t)
+  (load-theme 'doom-one t)

   (sml/apply-theme 'automatic)
   (font-lock-add-keywords
   (sml/apply-theme 'automatic)
   (font-lock-add-keywords

-   'org-mode b/org-mode-font-lock-keywords t))
+   'org-mode b/org-mode-font-lock-keywords t)
+  (when (featurep 'exwm-systemtray)
+    (exwm-systemtray--refresh)))

 
 (bind-keys
  ("C-c t d" . b/lights-off)
 
 (bind-keys
  ("C-c t d" . b/lights-off)


@@ -1513,11 +1599,18 @@ This function is intended for use with `ivy-ignore-buffers'."
     "C-c 8 -" "typo/dashes"
     "C-c 8 <" "typo/left-brackets"
     "C-c 8 >" "typo/right-brackets"
     "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 8"   "unicode"

+    "C-x @"   "event modifiers"

     "C-x a"   "abbrev/expand"
     "C-x r"   "rectangle/register/bookmark"
     "C-x a"   "abbrev/expand"
     "C-x r"   "rectangle/register/bookmark"

+    "C-x t"   "tabs"

     "C-x v"   "version control"
     "C-x v"   "version control"

+    "C-x X"   "edebug"
+    "C-x C-a" "edebug"
+    "C-x C-k" "kmacro"

     ;; prefixes for my personal bindings
     ;; prefixes for my personal bindings

+    "C-c &"   "yasnippet"

     "C-c a"   "applications"
     "C-c a e" "erc"
     "C-c a o" "org"
     "C-c a"   "applications"
     "C-c a e" "erc"
     "C-c a o" "org"


@@ -1534,6 +1627,10 @@ This function is intended for use with `ivy-ignore-buffers'."
     "C-c P s" "projectile/search"
     "C-c P x" "projectile/execute"
     "C-c P 4" "projectile/other-window"
     "C-c P s" "projectile/search"
     "C-c P x" "projectile/execute"
     "C-c P 4" "projectile/other-window"

+    "C-c p"   "package management"
+    "C-c ps"  "straight"
+    "C-c psa" "all"
+    "C-c psp" "package"

     "C-c q"   "boxquote"
     "C-c t"   "themes"
     ;; "s-O"     "outline"
     "C-c q"   "boxquote"
     "C-c t"   "themes"
     ;; "s-O"     "outline"


@@ -1659,8 +1756,8 @@ This function is intended for use with `ivy-ignore-buffers'."
   :defer 0.5
   :config
   (typo-global-mode 1)
   :defer 0.5
   :config
   (typo-global-mode 1)

-  :hook (((text-mode erc-mode) . typo-mode)
-         (tex-mode             . (lambda ()(typo-mode -1)))))
+  :hook (((text-mode erc-mode web-mode) . typo-mode)
+         (tex-mode                      . (lambda ()(typo-mode -1)))))

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


@@ -1672,16 +1769,17 @@ This function is intended for use with `ivy-ignore-buffers'."
   :defer 0.5
   :after eshell
   :config
   :defer 0.5
   :after eshell
   :config

-  (defvar user-@-host (concat (user-login-name) "@" (system-name) " "))
+  (defvar user-@-host (concat (user-login-name) "@" (system-name) ":"))

   (defun +eshell/prompt ()
   (defun +eshell/prompt ()

-    (let ((base/dir (shrink-path-prompt default-directory)))
-      (concat (propertize user-@-host 'face 'default)
-              (propertize (car base/dir)
-                          'face 'font-lock-comment-face)
-              (propertize (cdr base/dir)
-                          'face 'font-lock-constant-face)
-              (propertize "> " 'face 'default))))
-  (setq eshell-prompt-regexp (concat user-@-host ".*> ")
+    (concat (propertize user-@-host 'face 'default)
+            (propertize (abbreviate-file-name default-directory)
+                        'face 'font-lock-comment-face)
+            (propertize "\n" 'face 'default)
+            (if (= (user-uid) 0)
+                (propertize "#" 'face 'red)
+              (propertize "$" 'face 'default))
+            (propertize " " 'face 'default)))
+  (setq eshell-prompt-regexp "\\(.*\n\\)*[$#] "

         eshell-prompt-function #'+eshell/prompt))
 
 (use-package eshell-up
         eshell-prompt-function #'+eshell/prompt))
 
 (use-package eshell-up


@@ -1761,11 +1859,9 @@ This function is intended for use with `ivy-ignore-buffers'."
                ("p" . mc/mark-previous-like-this)
                ("a" . mc/mark-all-like-this))))
 
                ("p" . mc/mark-previous-like-this)
                ("a" . mc/mark-all-like-this))))
 

-(comment
-  ;; TODO
-  (use-package forge
-    :after magit
-    :demand))
+(use-package forge
+  :demand
+  :after magit)

 
 (use-package yasnippet
   :defer 0.6
 
 (use-package yasnippet
   :defer 0.6


@@ -1809,15 +1905,23 @@ This function is intended for use with `ivy-ignore-buffers'."
 ;; (use-package fill-column-indicator)
 
 (use-package emojify
 ;; (use-package fill-column-indicator)
 
 (use-package emojify

+  :disabled

   :hook (erc-mode . emojify-mode))
 
 (use-feature window
   :bind
   :hook (erc-mode . emojify-mode))
 
 (use-feature window
   :bind

-  (("C-c w <right>" . split-window-right)
-   ("C-c w <down>"  . split-window-below)
-   ("C-c w s l"     . split-window-right)
-   ("C-c w s j"     . split-window-below)
-   ("C-c w q"       . quit-window))
+  (("C-c w s l" . b/split-window-right)
+   ("C-c w s j" . b/split-window-below)
+   ("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))
 


@@ -1847,10 +1951,20 @@ This function is intended for use with `ivy-ignore-buffers'."
               ("<C-XF86Forward>" . pdf-history-forward)
               ("<mouse-9>"       . pdf-history-forward)
               ("<drag-mouse-9>"  . pdf-history-forward)
               ("<C-XF86Forward>" . pdf-history-forward)
               ("<mouse-9>"       . pdf-history-forward)
               ("<drag-mouse-9>"  . pdf-history-forward)

-              ("M-RET"           . image-previous-line))
+              ("M-RET"           . image-previous-line)
+              ("C-s"             . isearch-forward)
+              ("s s"             . isearch-forward))

   :config (pdf-tools-install nil t)
   :custom (pdf-view-resize-factor 1.05))
 
   :config (pdf-tools-install nil t)
   :custom (pdf-view-resize-factor 1.05))
 

+(use-package org-pdftools
+  :straight (:host github :repo "fuxialexander/org-pdftools")
+  :demand
+  :after org
+  :config
+  (with-eval-after-load 'org
+    (require 'org-pdftools)))
+

 (use-package biblio)
 
 (use-feature reftex
 (use-package biblio)
 
 (use-feature reftex


@@ -1874,6 +1988,47 @@ This function is intended for use with `ivy-ignore-buffers'."
   :demand
   :config (minions-mode))
 
   :demand
   :config (minions-mode))
 

+(use-package dmenu
+  :custom
+  (dmenu-prompt-string "run: ")
+  (dmenu-save-file (b/var "dmenu-items")))
+
+(use-package eosd
+  ;; TODO: fix build by properly building the eosd-pixbuf.c module
+  ;; e.g. see https://github.com/raxod502/straight.el/issues/386
+  :disabled
+  :straight (:host github :repo "clarete/eosd")
+  :demand
+  :after exwm
+  :config
+  (eosd-start))
+
+(use-package nnreddit
+  :disabled
+  :demand
+  :after gnus
+  :custom
+  (nnreddit-python-command "python3"))
+
+(use-package hyperbole
+  :disabled
+  :straight (hyperbole
+             :host github :repo "rswgnu/hyperbole"
+             :files ("*.el" ("kotl" "kotl/*.el")
+                     "DEMO" "man/*.info" "man/*.texi")))
+
+(use-package oddmuse-curl
+  :straight (:host github :repo "kensanata/oddmuse-curl")
+  :config
+  (setq
+   oddmuse-wikis
+   (append
+    '(("EmacsConf" "https://emacsconf.org" utf-8 "question" nil)
+      ("EmacsConf 2019" "https://emacsconf.org/2019" utf-8 "question" nil))
+    oddmuse-wikis))
+  :custom
+  (oddmuse-username "bandali"))
+

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


@@ -1896,41 +2051,41 @@ This function is intended for use with `ivy-ignore-buffers'."
    gnus-select-method '(nnnil "")
    gnus-secondary-select-methods
    '((nnimap "shemshak"
    gnus-select-method '(nnnil "")
    gnus-secondary-select-methods
    '((nnimap "shemshak"

-            (nnimap-stream plain)
-            (nnimap-address "127.0.0.1")
-            (nnimap-server-port 143)
-            (nnimap-authenticator plain)
-            (nnimap-user "amin@shemshak.local"))
+             (nnimap-stream plain)
+             (nnimap-address "127.0.0.1")
+             (nnimap-server-port 143)
+             (nnimap-authenticator plain)
+             (nnimap-user "amin@shemshak.local"))

      (nnimap "gnu"
      (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 ".*<\\(.*\\)\\.\\(non\\)?gnu\\.org>.*" "l.\\1")
-                                 ;; *@lists.sr.ht, omitting one dot if present
-                                 ;;    add more \\.?\\([^.@]*\\) if needed
-                                 (list ".*<~\\(.*\\)/\\([^.@]*\\)\\.?\\([^.@]*\\)@lists.sr.ht>.*" "l.~\\1.\\2\\3")
-                                 ;; webmasters
-                                 (from "webmasters\\(-comment\\)?@gnu\\.org" "webmasters")
-                                 ;; other
-                                 (list ".*atreus.freelists.org" "l.atreus")
-                                 (list ".*deepspec.lists.cs.princeton.edu" "l.deepspec")
-                                 ;; (list ".*haskell-art.we.lurk.org" "l.haskell.art") ;d
-                                 (list ".*haskell-cafe.haskell.org" "l.haskell-cafe")
-                                 ;; (list ".*notmuch.notmuchmail.org" "l.notmuch") ;u
-                                 ;; (list ".*dev.lists.parabola.nu" "l.parabola-dev") ;u
-                                 ;; ----------------------------------
-                                 ;; legend: (u)nsubscribed | (d)ead
-                                 ;; ----------------------------------
-                                 ;; otherwise, leave mail in INBOX
-                                 "INBOX")))
+             (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 ".*<\\(.*\\)\\.\\(non\\)?gnu\\.org>.*" "l.\\1")
+                                  ;; *.lists.sr.ht, omitting one dot if present
+                                  ;;    add more \\.?\\([^.]*\\) if needed
+                                  (list ".*<~\\(.*\\)/\\([^.]*\\)\\.?\\([^.]*\\)\\.lists.sr.ht>.*" "l.~\\1.\\2\\3")
+                                  ;; webmasters
+                                  (from "webmasters\\(-comment\\)?@gnu\\.org" "webmasters")
+                                  ;; other
+                                  (list ".*atreus.freelists.org" "l.atreus")
+                                  (list ".*deepspec.lists.cs.princeton.edu" "l.deepspec")
+                                  ;; (list ".*haskell-art.we.lurk.org" "l.haskell.art") ;d
+                                  (list ".*haskell-cafe.haskell.org" "l.haskell-cafe")
+                                  ;; (list ".*notmuch.notmuchmail.org" "l.notmuch") ;u
+                                  ;; (list ".*dev.lists.parabola.nu" "l.parabola-dev") ;u
+                                  ;; ----------------------------------
+                                  ;; legend: (u)nsubscribed | (d)ead
+                                  ;; ----------------------------------
+                                  ;; otherwise, leave mail in INBOX
+                                  "INBOX")))

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


@@ -1952,7 +2107,7 @@ This function is intended for use with `ivy-ignore-buffers'."
              (nnimap-server-port 143)
              (nnimap-authenticator plain)
              (nnimap-user "abandali@csc.uw.local")))
              (nnimap-server-port 143)
              (nnimap-authenticator plain)
              (nnimap-user "abandali@csc.uw.local")))

-   gnus-message-archive-group "nnimap+shemshak:Sent"
+   gnus-message-archive-group "nnimap+gnu:INBOX"

    gnus-parameters
    '(("l\\.atreus"
       (to-address . "atreus@freelists.org")
    gnus-parameters
    '(("l\\.atreus"
       (to-address . "atreus@freelists.org")


@@ -1977,6 +2132,9 @@ This function is intended for use with `ivy-ignore-buffers'."
      ("l\\.emacs-tangents"
       (to-address . "emacs-tangents@gnu.org")
       (to-list    . "emacs-tangents@gnu.org"))
      ("l\\.emacs-tangents"
       (to-address . "emacs-tangents@gnu.org")
       (to-list    . "emacs-tangents@gnu.org"))

+     ("l\\.emacsconf-committee"
+      (to-address . "emacsconf-committee@gnu.org")
+      (to-list    . "emacsconf-committee@gnu.org"))

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


@@ -2155,14 +2313,12 @@ This function is intended for use with `ivy-ignore-buffers'."
 
 (use-feature gnus-msg
   :config
 
 (use-feature gnus-msg
   :config

-  (defvar b/signature "Amin Bandali
-Free Software Activist | GNU Webmaster & Volunteer
-GPG: BE62 7373 8E61 6D6D 1B3A  08E8 A21A 0202 4881 6103
-https://shemshak.org/~amin")

   (defvar b/gnu-signature "Amin Bandali
   (defvar b/gnu-signature "Amin Bandali

-Free Software Activist | GNU Webmaster & Volunteer
+Free Software Activist | GNU Maintainer & Webmaster

 GPG: BE62 7373 8E61 6D6D 1B3A  08E8 A21A 0202 4881 6103
 https://bandali.eu.org")
 GPG: BE62 7373 8E61 6D6D 1B3A  08E8 A21A 0202 4881 6103
 https://bandali.eu.org")

+  (defvar b/shemshak-signature "Amin Bandali
+https://shemshak.org/~amin")

   (defvar b/uw-signature "Amin Bandali, MMath Student
 Cheriton School of Computer Science
 University of Waterloo
   (defvar b/uw-signature "Amin Bandali, MMath Student
 Cheriton School of Computer Science
 University of Waterloo


@@ -2171,29 +2327,36 @@ https://bandali.eu.org")
 Systems Committee
 Computer Science Club, University of Waterloo
 https://csclub.uwaterloo.ca/~abandali")
 Systems Committee
 Computer Science Club, University of Waterloo
 https://csclub.uwaterloo.ca/~abandali")

-  (setq gnus-posting-styles
+  (setq gnus-message-replysign t
+        gnus-posting-styles

         '((".*"
         '((".*"

-           (address "amin@shemshak.org")
-           (body "\nBest,\n")
-           (signature b/signature)
-           (eval (setq b/message-cite-say-hi t)))
-          ("nnimap\\+gnu:.*"

            (address "bandali@gnu.org")
            (signature b/gnu-signature)
            (eval (set (make-local-variable 'message-user-fqdn) "fencepost.gnu.org")))
            (address "bandali@gnu.org")
            (signature b/gnu-signature)
            (eval (set (make-local-variable 'message-user-fqdn) "fencepost.gnu.org")))

+          ("nnimap\\+gnu:l\\..*"
+           (signature nil))

           ((header "subject" "ThankCRM")
            (to "webmasters-comment@gnu.org")
            (body "")
            (eval (setq b/message-cite-say-hi nil)))
           ((header "subject" "ThankCRM")
            (to "webmasters-comment@gnu.org")
            (body "")
            (eval (setq b/message-cite-say-hi nil)))

+          ("nnimap\\+shemshak:.*"
+           (address "amin@shemshak.org")
+           (body "\nBest,\n")
+           (signature b/shemshak-signature)
+           (gcc "nnimap+shemshak:Sent")
+           (eval (setq b/message-cite-say-hi t)))

           ("nnimap\\+uw:.*"
           ("nnimap\\+uw:.*"

-           (address "abandali@uwaterloo.ca")
+           (address "bandali@uwaterloo.ca")
+           (body "\nBest,\n")

            (signature b/uw-signature))
           ("nnimap\\+uw:INBOX"
            (gcc "\"nnimap+uw:Sent Items\""))
           ("nnimap\\+csc:.*"
            (signature b/uw-signature))
           ("nnimap\\+uw:INBOX"
            (gcc "\"nnimap+uw:Sent Items\""))
           ("nnimap\\+csc:.*"

-           (address "abandali@csclub.uwaterloo.ca")
+           (address "bandali@csclub.uwaterloo.ca")

            (signature b/csc-signature)
            (signature b/csc-signature)

-           (gcc "nnimap+csc:Sent")))))
+           (gcc "nnimap+csc:Sent"))))
+  ;; :hook (gnus-message-setup . 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)


@@ -2269,7 +2432,7 @@ https://csclub.uwaterloo.ca/~abandali")
         message-subscribed-address-functions
         '(gnus-find-subscribed-addresses)
         message-dont-reply-to-names
         message-subscribed-address-functions
         '(gnus-find-subscribed-addresses)
         message-dont-reply-to-names

-        "\\(\\(\\(amin\\|mab\\)@shemshak\\.org\\)\\|\\(amin@bndl\\.org\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(bandali\\|mab\\|aminb?\\)@gnu\\.org\\)\\|\\(a\\(min\\.\\)?bandali@uwaterloo\\.ca\\)\\|\\(abandali@csclub\\.uwaterloo\\.ca\\)\\)")
+        "\\(\\(\\(amin\\|mab\\)@shemshak\\.org\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(bandali\\|mab\\|aminb?\\)@gnu\\.org\\)\\|\\(a?bandali@\\(csclub\\.\\)?uwaterloo\\.ca\\)\\)")

   (require 'company-ebdb)
   :hook (;; (message-setup . mml-secure-message-sign-pgpmime)
          (message-mode . flyspell-mode)
   (require 'company-ebdb)
   :hook (;; (message-setup . mml-secure-message-sign-pgpmime)
          (message-mode . flyspell-mode)


@@ -2332,7 +2495,6 @@ https://csclub.uwaterloo.ca/~abandali")
   (defun company-ebdb--post-complete (_) nil))
 
 (use-feature ebdb-gnus
   (defun company-ebdb--post-complete (_) nil))
 
 (use-feature ebdb-gnus

-  :demand

   :after ebdb
   :custom
   (ebdb-gnus-window-size 0.3))
   :after ebdb
   :custom
   (ebdb-gnus-window-size 0.3))


@@ -2340,7 +2502,7 @@ https://csclub.uwaterloo.ca/~abandali")
 (use-feature ebdb-mua
   :demand
   :after ebdb
 (use-feature ebdb-mua
   :demand
   :after ebdb

-  :custom (ebdb-mua-pop-up nil))
+  :custom (ebdb-mua-pop-up t))

 
 ;; (use-package ebdb-message
 ;;   :after ebdb)
 
 ;; (use-package ebdb-message
 ;;   :after ebdb)


@@ -2410,80 +2572,7 @@ https://csclub.uwaterloo.ca/~abandali")
   (add-to-list 'erc-modules 'notifications)
   (add-to-list 'erc-modules 'spelling)
   (add-to-list 'erc-modules 'scrolltoplace)
   (add-to-list 'erc-modules 'notifications)
   (add-to-list 'erc-modules 'spelling)
   (add-to-list 'erc-modules 'scrolltoplace)

-  (erc-update-modules)
-
-  (when (and (version<= "24.4" emacs-version)
-             (version<         emacs-version "27"))
-    ;; fix erc-lurker bug
-    ;; patch submitted: https://bugs.gnu.org/36843#10
-    ;; TODO: remove when patch is merged and emacs 27 is released
-    (defvar erc-message-parsed)
-    (defun erc-display-message (parsed type buffer msg &rest args)
-      "Display MSG in BUFFER.
-
-ARGS, PARSED, and TYPE are used to format MSG sensibly.
-
-See also `erc-format-message' and `erc-display-line'."
-      (let ((string (if (symbolp msg)
-                        (apply #'erc-format-message msg args)
-                      msg))
-            (erc-message-parsed parsed))
-        (setq string
-              (cond
-               ((null type)
-                string)
-               ((listp type)
-                (mapc (lambda (type)
-                        (setq string
-                              (erc-display-message-highlight type string)))
-                      type)
-                string)
-               ((symbolp type)
-                (erc-display-message-highlight type string))))
-
-        (if (not (erc-response-p parsed))
-            (erc-display-line string buffer)
-          (unless (erc-hide-current-message-p parsed)
-            (erc-put-text-property 0 (length string) 'erc-parsed parsed string)
-            (erc-put-text-property 0 (length string) 'rear-sticky t string)
-            (when (erc-response.tags parsed)
-              (erc-put-text-property 0 (length string) 'tags (erc-response.tags parsed)
-                                     string))
-            (erc-display-line string buffer)))))
-
-    (defun erc-lurker-update-status (_message)
-      "Update `erc-lurker-state' if necessary.
-
-This function is called from `erc-insert-pre-hook'.  If the
-current message is a PRIVMSG, update `erc-lurker-state' to
-reflect the fact that its sender has issued a PRIVMSG at the
-current time.  Otherwise, take no action.
-
-This function depends on the fact that `erc-display-message'
-lexically binds `erc-message-parsed', which is used to check if
-the current message is a PRIVMSG and to determine its sender.
-See also `erc-lurker-trim-nicks' and `erc-lurker-ignore-chars'.
-
-In order to limit memory consumption, this function also calls
-`erc-lurker-cleanup' once every `erc-lurker-cleanup-interval'
-updates of `erc-lurker-state'."
-      (when (and (boundp 'erc-message-parsed)
-                 (erc-response-p erc-message-parsed))
-        (let* ((command (erc-response.command erc-message-parsed))
-               (sender
-                (erc-lurker-maybe-trim
-                 (car (erc-parse-user (erc-response.sender erc-message-parsed)))))
-               (server
-                (erc-canonicalize-server-name erc-server-announced-name)))
-          (when (equal command "PRIVMSG")
-            (when (>= (cl-incf erc-lurker-cleanup-count)
-                      erc-lurker-cleanup-interval)
-              (setq erc-lurker-cleanup-count 0)
-              (erc-lurker-cleanup))
-            (unless (gethash server erc-lurker-state)
-              (puthash server (make-hash-table :test 'equal) erc-lurker-state))
-            (puthash sender (current-time)
-                     (gethash server erc-lurker-state))))))))
+  (erc-update-modules))

 
 (use-feature erc-fill
   :after erc
 
 (use-feature erc-fill
   :after erc


@@ -2505,6 +2594,7 @@ updates of `erc-lurker-state'."
   (erc-track-enable-keybindings nil)
   (erc-track-exclude-types '("JOIN" "MODE" "NICK" "PART" "QUIT"
                              "324" "329" "332" "333" "353" "477"))
   (erc-track-enable-keybindings nil)
   (erc-track-exclude-types '("JOIN" "MODE" "NICK" "PART" "QUIT"
                              "324" "329" "332" "333" "353" "477"))

+  (erc-track-position-in-mode-line t)

   (erc-track-priority-faces-only 'all)
   (erc-track-shorten-function nil))
 
   (erc-track-priority-faces-only 'all)
   (erc-track-shorten-function nil))