X-Git-Url: https://git.shemshak.org/~bandali/configs/blobdiff_plain/4bdfe6ab1909672db4346714de828482f7671901..5b4b57a9b114fb1d57cde09bc9ad7a02d3fb10e1:/.emacs.d/init.el

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 9b16583..04133fe 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -17,9 +17,10 @@
 
 ;;; Commentary:
 
-;; Emacs configuration of Amin Bandali, computer scientist, functional
-;; programmer, and free software activist.  Uses straight.el for
-;; purely functional and fully reproducible package management.
+;; GNU Emacs configuration of Amin Bandali, computer scientist,
+;; Free Software activist, and GNU maintainer & webmaster.  Packages
+;; are installed through GNU Guix for a fully reproducible setup.
+;; Before switching to Guix, I used straight.el, and before that Borg.
 
 ;; Over the years, I've taken inspiration from configurations of many
 ;; great people.  Some that I can remember off the top of my head are:
@@ -53,7 +54,7 @@
 (defvar b/gc-cons-threshold gc-cons-threshold)
 (defvar b/gc-cons-percentage gc-cons-percentage)
 (defvar b/file-name-handler-alist file-name-handler-alist)
-(setq gc-cons-threshold (* 400 1024 1024)  ; 400 MiB
+(setq gc-cons-threshold (* 30 1024 1024)  ; 30 MiB
       gc-cons-percentage 0.6
       file-name-handler-alist nil
       ;; sidesteps a bug when profiling with esup
@@ -65,7 +66,16 @@
   (setq b/emacs-initialized     t
         gc-cons-threshold       b/gc-cons-threshold
         gc-cons-percentage      b/gc-cons-percentage
-        file-name-handler-alist b/file-name-handler-alist))
+        file-name-handler-alist b/file-name-handler-alist)
+  (with-eval-after-load 'exwm-workspace
+    (setq-default
+     mode-line-format
+     (append
+      mode-line-format
+      '((:eval
+         (format
+          "[%s]" (number-to-string
+                  exwm-workspace-current-index))))))))
 (add-hook 'after-init-hook #'b/post-init)
 
 ;; increase number of lines kept in *Messages* log
@@ -94,80 +104,16 @@
 
 ;;; Package management
 
-;; No package.el  (for emacs 26 and before, uncomment the following)
-;; Not necessary when using straight.el
-;;   (C-h v straight-package-neutering-mode RET)
-
-(when (and
-       (not (featurep 'straight))
-       (version< emacs-version "27"))
+;; No package.el  (for emacs 26 and before)
+(when (version< emacs-version "27")
   (setq package-enable-at-startup nil)
   ;; (package-initialize)
   )
-
 ;; for emacs 27 and later, we use early-init.el.  see
 ;; https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=24acb31c04b4048b85311d794e600ecd7ce60d3b
 
-;; straight.el
-
-;; Main engine start...
-
-(setq straight-repository-branch "develop"
-      straight-check-for-modifications '(check-on-save find-when-checking))
-
-(defun b/bootstrap-straight ()
-  (defvar bootstrap-version)
-  (let ((bootstrap-file
-         (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory))
-        (bootstrap-version 5))
-    (unless (file-exists-p bootstrap-file)
-      (with-current-buffer
-          (url-retrieve-synchronously
-           "https://raw.githubusercontent.com/raxod502/straight.el/develop/install.el"
-           'silent 'inhibit-cookies)
-        (goto-char (point-max))
-        (eval-print-last-sexp)))
-    (load bootstrap-file nil 'nomessage)))
-
-;; Solid rocket booster ignition...
-
-(b/bootstrap-straight)
-
-;; We have lift off!
-
-(setq straight-use-package-by-default t)
-
-(defmacro use-feature (name &rest args)
-  "Like `use-package', but with `straight-use-package-by-default' disabled."
-  (declare (indent 1))
-  `(use-package ,name
-     :straight nil
-     ,@args))
-
-(with-eval-after-load 'use-package-core
-  (let ((upflk (car use-package-font-lock-keywords)))
-    (font-lock-add-keywords
-     'emacs-lisp-mode
-     `((,(replace-regexp-in-string
-          "use-package" "use-feature"
-          (car upflk))
-        ,@(cdr upflk))))))
-
-(with-eval-after-load 'recentf
-  (add-to-list 'recentf-exclude
-               (expand-file-name "~/.emacs.d/straight/build/")))
-
-(defun b/reload-init ()
-  "Reload `user-init-file'."
-  (interactive)
-  (setq b/before-user-init-time   (current-time)
-        b/file-name-handler-alist file-name-handler-alist)
-  (load user-init-file nil 'nomessage)
-  (b/post-init))
 
 ;; use-package
-(straight-use-package 'use-package)
-
 (if nil                             ; set to t when need to debug init
     (progn
       (setq use-package-verbose t
@@ -184,7 +130,7 @@
 
 ;;; Initial setup
 
-(defvar b/exwm-p (string= (system-name) "jirud")
+(defvar b/exwm-p (string= (system-name) "chaman")
   "Whether or not we will be using `exwm'.")
 
 ;; keep ~/.emacs.d clean
@@ -195,7 +141,7 @@
   (defalias 'b/var 'no-littering-expand-var-file-name))
 
 ;; separate custom file (don't want it mixing with init.el)
-(use-feature custom
+(use-package custom
   :no-require
   :config
   (setq custom-file (b/etc "custom.el"))
@@ -214,21 +160,9 @@
   (with-demoted-errors
       (load (b/etc "secrets"))))
 
-;; better $PATH (and other environment variable) handling
-(use-package exec-path-from-shell
-  :defer 0.4
-  :init
-  (setq exec-path-from-shell-arguments           nil
-        exec-path-from-shell-check-startup-files nil)
-  :config
-  (exec-path-from-shell-initialize)
-  ;; while we're at it, let's fix access to our running ssh-agent
-  (exec-path-from-shell-copy-env "SSH_AGENT_PID")
-  (exec-path-from-shell-copy-env "SSH_AUTH_SOCK"))
-
 ;; start up emacs server.  see
 ;; https://www.gnu.org/software/emacs/manual/html_node/emacs/Emacs-Server.html#Emacs-Server
-(use-feature server
+(use-package server
   :defer 0.4
   :config (or (server-running-p) (server-mode)))
 
@@ -266,9 +200,21 @@
   (previous-line)
   (insert "\n\n;;; "))
 
+;; (defvar b/fill-column 47
+;;   "My custom `fill-column'.")
+
+(defconst b/asterism "* * *")
+
 (defun b/insert-asterism ()
+  "Insert a centred asterism."
   (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'.
@@ -276,6 +222,12 @@ For disabling the behaviour for certain buffers and/or modes."
   (make-local-variable 'mouse-autoselect-window)
   (setq mouse-autoselect-window nil))
 
+(defun b/kill-current-buffer ()
+  "Kill the current buffer."
+  ;; also see https://redd.it/64xb3q
+  (interactive)
+  (kill-buffer (current-buffer)))
+
 
 ;;; Defaults
 
@@ -345,7 +297,7 @@ For disabling the behaviour for certain buffers and/or modes."
 
 ;;;; Elisp-level customizations
 
-(use-feature startup
+(use-package startup
   :no-require
   :demand
   :config
@@ -364,7 +316,7 @@ For disabling the behaviour for certain buffers and/or modes."
   (inhibit-startup-screen t)
   (inhibit-startup-echo-area-message user-login-name))
 
-(use-feature files
+(use-package files
   :no-require
   :demand
   :custom
@@ -391,7 +343,7 @@ For disabling the behaviour for certain buffers and/or modes."
 (defalias 'yes-or-no-p #'y-or-n-p)
 
 ;; enable automatic reloading of changed buffers and files
-(use-feature autorevert
+(use-package autorevert
   :demand
   :config
   (global-auto-revert-mode 1)
@@ -400,37 +352,37 @@ For disabling the behaviour for certain buffers and/or modes."
   (global-auto-revert-non-file-buffers nil))
 
 ;; time and battery in mode-line
-(use-feature time
-  :if b/exwm-p
+(use-package time
   :demand
   :config
   (display-time-mode)
   :custom
   (display-time-default-load-average nil)
-  (display-time-format "%a %b %-e, %-l:%M%P"))
+  (display-time-format "%a %b %-e %-l:%M%P")
+  (display-time-mail-icon '(image :type xpm :file "gnus/gnus-pointer.xpm" :ascent center))
+  (display-time-use-mail-icon t))
 
-(use-feature battery
-  :if b/exwm-p
+(use-package battery
   :demand
   :config
   (display-battery-mode)
   :custom
   (battery-mode-line-format " %p%% %t"))
 
-(use-feature fringe
+(use-package fringe
   :demand
   :config
   ;; smaller fringe
   ;; (fringe-mode '(3 . 1))
   (fringe-mode nil))
 
-(use-feature winner
+(use-package winner
   :demand
   :config
   ;; enable winner-mode (C-h f winner-mode RET)
   (winner-mode 1))
 
-(use-feature compile
+(use-package compile
   :config
   ;; don't display *compilation* buffer on success.  based on
   ;; https://stackoverflow.com/a/17788551, with changes to use `cl-letf'
@@ -453,7 +405,7 @@ For disabling the behaviour for certain buffers and/or modes."
       ad-do-it))
   (ad-activate 'compilation-start))
 
-(use-feature isearch
+(use-package isearch
   :custom
   ;; allow scrolling in Isearch
   (isearch-allow-scroll t)
@@ -465,44 +417,61 @@ For disabling the behaviour for certain buffers and/or modes."
 
 ;; uncomment to extend the above behaviour to query-replace
 (comment
-  (use-feature replace
+  (use-package replace
     :custom
     (replace-char-fold t)))
 
-(use-feature vc
+(use-package vc
   :bind ("C-x v C-=" . vc-ediff))
 
-(use-feature vc-git
+(use-package vc-git
   :after vc
   :custom
   (vc-git-print-log-follow t))
 
-(use-feature ediff
+(use-package 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)))
 
-(use-feature face-remap
+(use-package face-remap
   :custom
   ;; gentler font resizing
   (text-scale-mode-step 1.05))
 
-(use-feature mwheel
+(use-package mwheel
   :defer 0.4
   :config
   (setq mouse-wheel-scroll-amount '(1 ((shift) . 1)) ; one line at a time
         mouse-wheel-progressive-speed nil            ; don't accelerate scrolling
         mouse-wheel-follow-mouse t))                 ; scroll window under mouse
 
-(use-feature pixel-scroll
+(use-package pixel-scroll
   :defer 0.4
   :config (pixel-scroll-mode 1))
 
-(use-feature epg-config
+(use-package epg-config
+  :config
+  ;; ask for GPG passphrase in minibuffer
+  ;; this will fail if gpg>=2.1 is not available
+  (if (version< "27" emacs-version)
+      (setq epg-pinentry-mode 'loopback)
+    (setq epa-pinentry-mode 'loopback))
   :custom
-  ((epg-gpg-program (executable-find "gpg"))))
+  (epg-gpg-program (executable-find "gpg")))
 
-(use-feature auth-source
+(use-package epg
+  :after epg-config)
+
+(use-package pinentry
+  :demand
+  :after (epa epg server)
+  :config
+  ;; workaround for systemd-based distros:
+  ;; (setq pinentry--socket-dir server-socket-dir)
+  (pinentry-start))
+
+(use-package auth-source
   :custom
   (auth-sources '("~/.authinfo.gpg"))
   (authinfo-hidden (regexp-opt '("password" "client-secret" "token"))))
@@ -528,7 +497,7 @@ For disabling the behaviour for certain buffers and/or modes."
  ("C-S-h C" . describe-char)
  ("C-S-h F" . describe-face)
 
- ("C-x k"   . kill-this-buffer)
+ ("C-x k"   . b/kill-current-buffer)
  ("C-x K"   . kill-buffer)
  ("C-x s"   . save-buffer)
  ("C-x S"   . save-some-buffers)
@@ -551,32 +520,6 @@ For disabling the behaviour for certain buffers and/or modes."
  ;; ("<drag-mouse-3>" . switch-to-buffer)
  )
 
-(bind-keys
- :prefix-map b/straight-prefix-map
- :prefix "C-c p s"
- ("u" . straight-use-package)
- ("f" . straight-freeze-versions)
- ("t" . straight-thaw-versions)
- ("P" . straight-prune-build)
- ("g" . straight-get-recipe)
- ("r" . b/reload-init)
- ;; M-x ^straight-.*-all$
- ("a c" . straight-check-all)
- ("a f" . straight-fetch-all)
- ("a m" . straight-merge-all)
- ("a n" . straight-normalize-all)
- ("a F" . straight-pull-all)
- ("a P" . straight-push-all)
- ("a r" . straight-rebuild-all)
- ;; M-x ^straight-.*-package$
- ("p c" . straight-check-package)
- ("p f" . straight-fetch-package)
- ("p m" . straight-merge-package)
- ("p n" . straight-normalize-package)
- ("p F" . straight-pull-package)
- ("p P" . straight-push-package)
- ("p r" . straight-rebuild-package))
-
 
 ;;; Essential packages
 
@@ -596,12 +539,12 @@ For disabling the behaviour for certain buffers and/or modes."
   :hook ((exwm-update-class . b/exwm-rename-buffer)
          (exwm-update-title . b/exwm-rename-buffer)))
 
-(use-feature exwm-config
+(use-package exwm-config
   :demand
   :after exwm
   :hook (exwm-init . exwm-config--fix/ido-buffer-window-other-frame))
 
-(use-feature exwm-input
+(use-package exwm-input
   :demand
   :after exwm
   :config
@@ -690,17 +633,17 @@ around if needed."
           ([XF86AudioMute] .
            (lambda ()
              (interactive)
-             (start-process "" nil "pamixer" "--toggle-mute")))
+             (start-process "" nil "amixer" "set" "'Master',0" "toggle")))
           ([XF86AudioLowerVolume] .
            (lambda ()
              (interactive)
              (start-process
-              "" nil "pamixer" "--allow-boost" "--decrease" "5")))
+              "" nil "amixer" "set" "'Master',0" "5%-")))
           ([XF86AudioRaiseVolume] .
            (lambda ()
              (interactive)
              (start-process
-              "" nil "pamixer" "--allow-boost" "--increase" "5")))
+              "" nil "amixer" "set" "'Master',0" "5%+")))
           ([XF86AudioPlay] .
            (lambda ()
              (interactive)
@@ -751,14 +694,14 @@ around if needed."
       ([?\s-s] . [?\C-s])
       ([?\C-g] . [escape]))))
 
-(use-feature exwm-manage
+(use-package exwm-manage
   :demand
   :after exwm
   :hook
   (exwm-manage-finish . (lambda ()
                           (when exwm-class-name
                             (cond
-                             ((string= exwm-class-name "Abrowser")
+                             ((string= exwm-class-name "IceCat")
                               (exwm-input-set-local-simulation-keys
                                `(,@exwm-input-simulation-keys
                                  ([?\C-\S-d] . [?\C-d]))))
@@ -771,7 +714,7 @@ around if needed."
                                '(([?\C-p] . [C-up])
                                  ([?\C-n] . [C-down])))))))))
 
-(use-feature exwm-randr
+(use-package exwm-randr
   :demand
   :after exwm
   :config
@@ -779,13 +722,13 @@ around if needed."
   :custom
   (exwm-randr-workspace-monitor-plist '(1 "VGA-1")))
 
-(use-feature exwm-systemtray
+(use-package exwm-systemtray
   :demand
   :after exwm
   :config
   (exwm-systemtray-enable))
 
-(use-feature exwm-workspace)
+(use-package exwm-workspace)
 
 (use-package exwm-edit
   :demand
@@ -794,7 +737,7 @@ around if needed."
 ;; use the org-plus-contrib package to get the whole deal
 (use-package org-plus-contrib)
 
-(use-feature org
+(use-package org
   :defer 0.5
   :config
   (setq org-src-tab-acts-natively t
@@ -833,7 +776,7 @@ around if needed."
   '(org-block ((t (:background "#1d1f21"))))
   '(org-latex-and-related ((t (:foreground "#b294bb")))))
 
-(use-feature ox-latex
+(use-package ox-latex
   :after ox
   :config
   (setq org-latex-listings 'listings
@@ -849,7 +792,7 @@ around if needed."
                t)
   (require 'ox-beamer))
 
-(use-feature ox-extra
+(use-package ox-extra
   :config
   (ox-extras-activate '(latex-header-blocks ignore-headlines)))
 
@@ -908,7 +851,7 @@ around if needed."
   ;;                         'magit-insert-untracked-files
   ;;                         'append)
   (setq magit-repository-directories '(("~/" . 0)
-                                       ("~/src/git/" . 1)))
+                                       ("~/src/git/" . 2)))
   (nconc magit-section-initial-visibility-alist
          '(([unpulled status] . show)
            ([unpushed status] . show)))
@@ -919,7 +862,7 @@ around if needed."
   :custom-face (magit-diff-file-heading ((t (:weight normal)))))
 
 ;; recently opened files
-(use-feature recentf
+(use-package recentf
   :defer 0.2
   ;; :config
   ;; (add-to-list 'recentf-exclude "^/\\(?:ssh\\|su\\|sudo\\)?:")
@@ -933,12 +876,13 @@ around if needed."
 
 (bind-keys
  ("C-c f ." . find-file)
+ ("C-c f d" . find-name-dired)
  ("C-c f l" . find-library)
- ("C-c f r" . recentf-open-files)
+ ;; ("C-c f r" . recentf-open-files)
  ("C-c x"   . execute-extended-command))
 
 (comment
-  (use-feature ido
+  (use-package ido
     :demand
     :bind
     (:map ido-common-completion-map
@@ -981,7 +925,7 @@ around if needed."
     :config
     (crm-custom-mode 1))
 
-  (use-feature icomplete
+  (use-package icomplete
     :defer 0.3
     :config
     (icomplete-mode 1)))
@@ -1044,23 +988,7 @@ This function is intended for use with `ivy-ignore-buffers'."
   (counsel-mode 1)
   (defalias 'locate #'counsel-locate))
 
-(comment
-  (use-package helm
-    :commands (helm-M-x helm-mini helm-resume)
-    :bind (("M-x"     . helm-M-x)
-           ("M-y"     . helm-show-kill-ring)
-           ("C-x b"   . helm-mini)
-           ("C-x C-b" . helm-buffers-list)
-           ("C-x C-f" . helm-find-files)
-           ("C-h r"   . helm-info-emacs)
-           ("C-s-r"   . helm-resume)
-           :map helm-map
-           ("<tab>" . helm-execute-persistent-action)
-           ("C-i"   . helm-execute-persistent-action) ; Make TAB work in terminals
-           ("C-z"   . helm-select-action))            ; List actions
-    :config (helm-mode 1)))
-
-(use-feature eshell
+(use-package eshell
   :defer 0.5
   :commands eshell
   :bind ("C-c a s e" . eshell)
@@ -1087,14 +1015,34 @@ This function is intended for use with `ivy-ignore-buffers'."
                ("C-S-l" . b/eshell-clear)
                ("M-r"   . counsel-esh-history)
                ;; ([tab]   . company-complete)
-               ))
+               )
+    (if (version< "27" emacs-version)
+        (bind-keys :map eshell-hist-mode-map
+                   ("M-r" . counsel-esh-history))
+      (bind-keys :map eshell-mode-map
+                 ("M-r" . counsel-esh-history))))
+
+  (setq
+   eshell-prompt-regexp "\\(.*\n\\)*[$#] "
+   eshell-prompt-function
+   (lambda ()
+     (concat
+      (propertize (format "%s@%s:" (user-login-name) (system-name))
+                  '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))))
 
   :hook (eshell-mode . b/eshell-setup)
   :custom
   (eshell-hist-ignoredups t)
   (eshell-input-filter 'eshell-input-filter-initial-space))
 
-(use-feature ibuffer
+(use-package ibuffer
   :bind
   (("C-x C-b" . ibuffer)
    :map ibuffer-mode-map
@@ -1125,7 +1073,8 @@ This function is intended for use with `ivy-ignore-buffers'."
         (mode . message-mode)))
       ("web"
        (or
-        (mode . web-mode)
+        ;; (mode . web-mode)
+        (mode . mhtml-mode)
         (mode . css-mode)
         (mode . scss-mode)
         (mode . js2-mode)))
@@ -1144,7 +1093,7 @@ This function is intended for use with `ivy-ignore-buffers'."
         (mode . scheme-mode)
         (mode . haskell-mode)
         (mode . lean-mode)
-        (mode . go-mode)
+        ;; (mode . go-mode)
         (mode . alloy-mode)))
       ("tex"
        (or
@@ -1169,7 +1118,7 @@ This function is intended for use with `ivy-ignore-buffers'."
            " " filename)))
   :hook (ibuffer . (lambda () (ibuffer-switch-to-saved-filter-groups "default"))))
 
-(use-feature outline
+(use-package outline
   :disabled
   :hook (prog-mode . outline-minor-mode)
   :bind
@@ -1187,10 +1136,10 @@ This function is intended for use with `ivy-ignore-buffers'."
    ("h"   . outline-hide-subtree)
    ("s"   . outline-show-subtree)))
 
-(use-feature ls-lisp
+(use-package ls-lisp
   :custom (ls-lisp-dirs-first t))
 
-(use-feature dired
+(use-package dired
   :config
   (setq dired-dwim-target t
         dired-listing-switches "-alh"
@@ -1232,30 +1181,27 @@ This function is intended for use with `ivy-ignore-buffers'."
           ("\\.flac\\'" "mpv")))
   :bind (:map dired-mode-map
               ("b"  . dired-up-directory)
-              ("e"  . dired-ediff-files)
-              ("E"  . dired-toggle-read-only)
+              ("E"  . dired-ediff-files)
+              ("e"  . dired-toggle-read-only)
               ("\\" . dired-hide-details-mode)
               ("z"  . (lambda ()
                         (interactive)
                         (b/dired-start-process "zathura"))))
   :hook (dired-mode . dired-hide-details-mode))
 
-(use-feature help
+(use-package help
   :config
   (temp-buffer-resize-mode)
   (setq help-window-select t))
 
-(use-feature tramp
+(use-package tramp
   :config
   (add-to-list 'tramp-default-proxies-alist '(nil "\\`root\\'" "/ssh:%h:"))
   (add-to-list 'tramp-default-proxies-alist '("localhost" nil nil))
   (add-to-list 'tramp-default-proxies-alist
                (list (regexp-quote (system-name)) nil nil)))
 
-(use-package dash
-  :config (dash-enable-font-lock))
-
-(use-feature doc-view
+(use-package doc-view
   :bind (:map doc-view-mode-map
               ("M-RET" . image-previous-line)))
 
@@ -1271,20 +1217,20 @@ This function is intended for use with `ivy-ignore-buffers'."
   :hook (magit-post-refresh . diff-hl-magit-post-refresh))
 
 ;; display Lisp objects at point in the echo area
-(use-feature eldoc
+(use-package eldoc
   :when (version< "25" emacs-version)
   :config (global-eldoc-mode))
 
 ;; highlight matching parens
-(use-feature paren
+(use-package paren
   :demand
   :config (show-paren-mode))
 
-(use-feature elec-pair
+(use-package elec-pair
   :demand
   :config (electric-pair-mode))
 
-(use-feature simple
+(use-package simple
   :config (column-number-mode)
   :custom
   ;; Save what I copy into clipboard from other applications into Emacs'
@@ -1294,34 +1240,36 @@ This function is intended for use with `ivy-ignore-buffers'."
   (save-interprogram-paste-before-kill t))
 
 ;; save minibuffer history
-(use-feature savehist
+(use-package savehist
   :demand
   :config
   (savehist-mode)
   (add-to-list 'savehist-additional-variables 'kill-ring))
 
 ;; automatically save place in files
-(use-feature saveplace
+(use-package saveplace
   :when (version< "25" emacs-version)
   :config (save-place-mode))
 
-(use-feature prog-mode
+(use-package prog-mode
   :config (global-prettify-symbols-mode)
   (defun indicate-buffer-boundaries-left ()
     (setq indicate-buffer-boundaries 'left))
   (add-hook 'prog-mode-hook #'indicate-buffer-boundaries-left))
 
-(use-feature text-mode
+(use-package 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
+(use-package conf-mode
   :mode "\\.*rc$")
 
-(use-feature sh-mode
+(use-package sh-mode
   :mode "\\.bashrc$")
 
 (use-package company
+  :disabled
   :bind
   (:map company-active-map
         ([tab]    . company-complete-common-or-cycle)
@@ -1353,10 +1301,10 @@ This function is intended for use with `ivy-ignore-buffers'."
   (setq flycheck-check-syntax-automatically '(mode-enabled save))
   :custom (flycheck-mode-line-prefix "flyc"))
 
-(use-feature flyspell)
+(use-package flyspell)
 
 ;; http://endlessparentheses.com/ispell-and-apostrophes.html
-(use-feature ispell
+(use-package ispell
   :defer 0.6
   :config
   ;; ’ can be part of a word
@@ -1382,28 +1330,42 @@ This function is intended for use with `ivy-ignore-buffers'."
   (advice-add #'ispell-parse-output :filter-args
               #'endless/replace-quote))
 
-(use-feature abbrev
+(use-package abbrev
   :hook (text-mode . abbrev-mode))
 
 
 ;;; Programming modes
 
-(use-feature lisp-mode
+(use-package lisp-mode
   :config
   (defun indent-spaces-mode ()
     (setq indent-tabs-mode nil))
   (add-hook 'lisp-interaction-mode-hook #'indent-spaces-mode))
 
-(use-feature reveal
+(use-package reveal
   :hook (emacs-lisp-mode . reveal-mode))
 
-(use-feature elisp-mode)
-
-(use-package alloy-mode
-  :straight (:host github :repo "dwwmmn/alloy-mode")
-  :mode "\\.als\\'"
-  :config (setq alloy-basic-offset 2)
-  :hook (alloy-mode . (lambda () (setq-local indent-tabs-mode nil))))
+(use-package elisp-mode)
+
+;; (use-package alloy-mode
+;;   :straight (:host github :repo "dwwmmn/alloy-mode")
+;;   :mode "\\.\\(als\\|dsh\\)\\'"
+;;   :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))
 (use-package lean-mode
@@ -1419,134 +1381,28 @@ This function is intended for use with `ivy-ignore-buffers'."
         lean-input-user-translations '(("/" "/")))
   (lean-input-setup))
 
-(comment
-  (use-package proof-site                 ; for Coq
-    :straight proof-general)
+(use-package mhtml-mode)
 
-  (use-package haskell-mode
-    :config
-    (setq haskell-indentation-layout-offset 4
-          haskell-indentation-left-offset 4
-          flycheck-checker 'haskell-hlint
-          flycheck-disabled-checkers '(haskell-stack-ghc haskell-ghc)))
-
-  (use-package dante
-    :after haskell-mode
-    :commands dante-mode
-    :hook (haskell-mode . dante-mode))
-
-  (use-package hlint-refactor
-    :after haskell-mode
-    :bind (:map hlint-refactor-mode-map
-                ("C-c l b" . hlint-refactor-refactor-buffer)
-                ("C-c l r" . hlint-refactor-refactor-at-point))
-    :hook (haskell-mode . hlint-refactor-mode))
-
-  (use-package flycheck-haskell
-    :after haskell-mode)
-  ;; alternative: hs-lint https://github.com/ndmitchell/hlint/blob/20e116a043f2073c57b17b24ae6364b5e433ba7e/data/hs-lint.el
-  )
-
-(use-feature sgml-mode
+(use-package sgml-mode
   :config
-  (setq sgml-basic-offset 2))
+  (setq sgml-basic-offset 0))
 
-(use-feature css-mode
+(use-package css-mode
   :config
   (setq css-indent-offset 2))
 
-(use-package web-mode
-  :mode "\\.html\\'"
-  :config
-  (b/setq-every 2
-    web-mode-code-indent-offset
-    web-mode-css-indent-offset
-    web-mode-markup-indent-offset))
-
 (use-package emmet-mode
-  :after (:any web-mode css-mode sgml-mode)
+  :after (:any mhtml-mode css-mode sgml-mode)
   :bind* (("C-)" . emmet-next-edit-point)
           ("C-(" . emmet-prev-edit-point))
   :config
   (unbind-key "C-j" emmet-mode-keymap)
   (setq emmet-move-cursor-between-quotes t)
-  :hook (web-mode css-mode html-mode sgml-mode))
-
-(comment
-  (use-package meghanada
-    :bind
-    (:map meghanada-mode-map
-          (("C-M-o" . meghanada-optimize-import)
-           ("C-M-t" . meghanada-import-all)))
-    :hook (java-mode . meghanada-mode)))
-
-(comment
-  (use-package treemacs
-    :config (setq treemacs-never-persist t))
-
-  (use-package yasnippet
-    :config
-    ;; (yas-global-mode)
-    )
-
-  (use-package lsp-mode
-    :init (setq lsp-eldoc-render-all nil
-                lsp-highlight-symbol-at-point nil)
-    )
-
-  (use-package hydra)
-
-  (use-package company-lsp
-    :after company
-    :config
-    (setq company-lsp-cache-candidates t
-          company-lsp-async t))
-
-  (use-package lsp-ui
-    :config
-    (setq lsp-ui-sideline-update-mode 'point))
-
-  (use-package lsp-java
-    :config
-    (add-hook 'java-mode-hook
-              (lambda ()
-                (setq-local company-backends (list 'company-lsp))))
-
-    (add-hook 'java-mode-hook 'lsp-java-enable)
-    (add-hook 'java-mode-hook 'flycheck-mode)
-    (add-hook 'java-mode-hook 'company-mode)
-    (add-hook 'java-mode-hook 'lsp-ui-mode))
-
-  (use-package dap-mode
-    :after lsp-mode
-    :config
-    (dap-mode t)
-    (dap-ui-mode t))
-
-  (use-package dap-java
-    :after (lsp-java))
-
-  (use-package lsp-java-treemacs
-    :after (treemacs)))
-
-(comment
-  (use-package eclim
-    :bind (:map eclim-mode-map ("S-SPC" . company-complete))
-    :hook ((java-mode . eclim-mode)
-           (eclim-mode . (lambda ()
-                           (make-local-variable 'company-idle-delay)
-                           (defvar company-idle-delay)
-                           ;; (setq company-idle-delay 0.7)
-                           (setq company-idle-delay nil))))
-    :custom
-    (eclim-auto-save nil)
-    ;; (eclimd-default-workspace "~/src/eclipse-workspace-exp")
-    (eclim-executable "~/.p2/pool/plugins/org.eclim_2.8.0/bin/eclim")
-    (eclim-eclipse-dirs '("~/usr/eclipse/dsl-2018-09/eclipse"))))
+  :hook (css-mode html-mode sgml-mode))
 
 (use-package geiser)
 
-(use-feature geiser-guile
+(use-package geiser-guile
   :config
   (setq geiser-guile-load-path "~/src/git/guix"))
 
@@ -1557,13 +1413,14 @@ This function is intended for use with `ivy-ignore-buffers'."
     :custom
     (font-latex-fontify-sectioning 'color)))
 
-(use-package go-mode)
+(use-package go-mode
+  :disabled)
 
 (use-package po-mode
   :hook
   (po-mode . (lambda () (run-with-timer 0.1 nil 'View-exit))))
 
-(use-feature tex-mode
+(use-package tex-mode
   :config
   (cl-delete-if
    (lambda (p) (string-match "^---?" (car p)))
@@ -1571,9 +1428,9 @@ This function is intended for use with `ivy-ignore-buffers'."
   :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\\'")
+;; (use-package george-mode
+;;   :straight (:host nil :repo "https://git.shemshak.org/amin/george-mode")
+;;   :mode "\\.grg\\'")
 
 
 ;;; Theme
@@ -1587,6 +1444,8 @@ This function is intended for use with `ivy-ignore-buffers'."
   :commands (sml/apply-theme)
   :demand
   :config
+  ;; thanks, but no thnaks; don't make fixed-width fills.
+  (defun sml/fill-for-buffer-identification () "")
   (setq sml/theme 'tangomod)
   (sml/setup)
   (smart-mode-line-enable))
@@ -1600,11 +1459,6 @@ This function is intended for use with `ivy-ignore-buffers'."
 
 (use-package doom-themes)
 
-(use-package solarized-theme
-  :disabled
-  :config
-  (load-theme 'solarized-light t))
-
 (use-package moody
   :disabled
   :demand
@@ -1637,7 +1491,8 @@ This function is intended for use with `ivy-ignore-buffers'."
   (interactive)
   (mapc #'disable-theme custom-enabled-themes)
   (load-theme 'tangomod t)
-  (sml/apply-theme 'tangomod)
+  (when (featurep 'smart-mode-line)
+    (sml/apply-theme 'tangomod))
   (font-lock-remove-keywords
    'org-mode b/org-mode-font-lock-keywords)
   (when (featurep 'erc-hl-nicks)
@@ -1650,7 +1505,8 @@ This function is intended for use with `ivy-ignore-buffers'."
   (interactive)
   (mapc #'disable-theme custom-enabled-themes)
   (load-theme 'doom-one t)
-  (sml/apply-theme 'automatic)
+  (when (featurep 'smart-mode-line)
+    (sml/apply-theme 'automatic))
   (font-lock-add-keywords
    'org-mode b/org-mode-font-lock-keywords t)
   (when (featurep 'erc-hl-nicks)
@@ -1675,10 +1531,6 @@ This function is intended for use with `ivy-ignore-buffers'."
     ;; 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-x RET" "coding system"
     "C-x 8"   "unicode"
     "C-x @"   "event modifiers"
@@ -1703,14 +1555,10 @@ This function is intended for use with `ivy-ignore-buffers'."
     "C-c g"   "magit"
     "C-S-h"   "help(ful)"
     "C-c m"   "multiple-cursors"
-    "C-c P"   "projectile"
-    "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 p"   "projectile"
+    "C-c p s" "projectile/search"
+    "C-c p x" "projectile/execute"
+    "C-c p 4" "projectile/other-window"
     "C-c q"   "boxquote"
     "C-c t"   "themes"
     ;; "s-O"     "outline"
@@ -1721,12 +1569,6 @@ This function is intended for use with `ivy-ignore-buffers'."
     "C-c f n" "footnote")
   (which-key-add-major-mode-key-based-replacements 'org-mode
     "C-c C-v" "org-babel")
-  (which-key-add-major-mode-key-based-replacements 'web-mode
-    "C-c C-a" "web/attributes"
-    "C-c C-b" "web/blocks"
-    "C-c C-d" "web/dom"
-    "C-c C-e" "web/element"
-    "C-c C-t" "web/tags")
 
   (which-key-mode)
   :custom
@@ -1736,7 +1578,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)
-         ("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)
@@ -1750,8 +1592,9 @@ This function is intended for use with `ivy-ignore-buffers'."
          ("<end>"  . mwim-end-of-line-or-code)))
 
 (use-package projectile
+  :disabled
   :defer 0.5
-  :bind-keymap ("C-c P" . projectile-command-map)
+  :bind-keymap ("C-c p" . projectile-command-map)
   :config
   (projectile-mode)
 
@@ -1826,46 +1669,18 @@ This function is intended for use with `ivy-ignore-buffers'."
                ("M-w" . boxquote-kill-ring-save)))
 
 (use-package orgalist
-  ;; http://lists.gnu.org/archive/html/emacs-orgmode/2019-04/msg00007.html
-  :disabled t
+  ;; breaks auto-fill-mode, showing this error:
+  ;; orgalist--boundaries: Lisp nesting exceeds ‘max-lisp-eval-depth’
+  :disabled
   :after message
   :hook (message-mode . orgalist-mode))
 
-;; easily type pretty quotes & other typography, like ‘’“”-–—«»‹›
-(use-package typo
-  :defer 0.5
-  :config
-  (typo-global-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
   :defer 0.5
   :config
   (global-hl-todo-mode))
 
-(use-package shrink-path
-  :defer 0.5
-  :after eshell
-  :config
-  (defvar user-@-host (concat (user-login-name) "@" (system-name) ":"))
-  (defun +eshell/prompt ()
-    (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
-  :after eshell
-  :commands eshell-up)
-
 (use-package multi-term
   :disabled
   :defer 0.6
@@ -1939,10 +1754,6 @@ This function is intended for use with `ivy-ignore-buffers'."
                ("p" . mc/mark-previous-like-this)
                ("a" . mc/mark-all-like-this))))
 
-(use-package forge
-  :demand
-  :after magit)
-
 (use-package yasnippet
   :defer 0.6
   :config
@@ -1964,10 +1775,29 @@ This function is intended for use with `ivy-ignore-buffers'."
   (yas-global-mode))
 
 (use-package debbugs
-  :straight (debbugs
-             :host github
-             :repo "emacs-straight/debbugs"
-             :files (:defaults "Debbugs.wsdl")))
+  :bind
+  (("C-c D d" . debbugs-gnu)
+   ("C-c D b" . debbugs-gnu-bugs)
+   ("C-c D e" .
+    (lambda ()
+      (interactive)                     ; bug-gnu-emacs
+      (setq debbugs-gnu-current-suppress t)
+      (debbugs-gnu debbugs-gnu-default-severities '("emacs"))))
+   ("C-c D g" .                         ; bug-gnuzilla
+    (lambda ()
+      (interactive)
+      (setq debbugs-gnu-current-suppress t)
+      (debbugs-gnu debbugs-gnu-default-severities '("gnuzilla"))))
+   ("C-c D G b" .                       ; bug-guix
+    (lambda ()
+      (interactive)
+      (setq debbugs-gnu-current-suppress t)
+      (debbugs-gnu debbugs-gnu-default-severities '("guix"))))
+   ("C-c D G p" .                       ; guix-patches
+    (lambda ()
+      (interactive)
+      (setq debbugs-gnu-current-suppress t)
+      (debbugs-gnu debbugs-gnu-default-severities '("guix-patches"))))))
 
 (use-package org-ref
   :init
@@ -1978,17 +1808,9 @@ This function is intended for use with `ivy-ignore-buffers'."
    org-ref-bibliography-notes "~/usr/org/notes.org"
    org-ref-pdf-directory "~/usr/org/bibtex-pdfs/"))
 
-(use-package alert
-  :commands (alert)
-  :init (setq alert-default-style 'notifications))
-
 ;; (use-package fill-column-indicator)
 
-(use-package emojify
-  :disabled
-  :hook (erc-mode . emojify-mode))
-
-(use-feature window
+(use-package window
   :bind
   (("C-c w e"   . (lambda ()
                     (interactive)
@@ -2007,7 +1829,7 @@ This function is intended for use with `ivy-ignore-buffers'."
   :custom
   (split-width-threshold 150))
 
-(use-feature windmove
+(use-package windmove
   :defer 0.6
   :bind
   (("C-c w h" . windmove-left)
@@ -2040,6 +1862,7 @@ This function is intended for use with `ivy-ignore-buffers'."
   :custom (pdf-view-resize-factor 1.05))
 
 (use-package org-pdftools
+  :disabled
   :straight (:host github :repo "fuxialexander/org-pdftools")
   :demand
   :after org
@@ -2049,10 +1872,10 @@ This function is intended for use with `ivy-ignore-buffers'."
 
 (use-package biblio)
 
-(use-feature reftex
+(use-package reftex
   :hook (latex-mode . reftex-mode))
 
-(use-feature reftex-cite
+(use-package reftex-cite
   :after reftex
   :disabled                             ; enable to disable
                                         ; reftex-cite's default choice
@@ -2085,35 +1908,17 @@ This function is intended for use with `ivy-ignore-buffers'."
   :config
   (eosd-start))
 
-(use-package nnreddit
-  :disabled
-  :demand
-  :after gnus
-  :custom
-  (nnreddit-python-command "python3"))
-
-(use-package hyperbole
+(use-package scpaste
   :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"))
+  (setq scpaste-http-destination "https://p.bndl.org"
+        scpaste-scp-destination "nix:/var/www/p.bndl.org"))
 
-(use-package debpaste
+(use-package eww
+  :bind ("C-c a e w" . eww)
   :custom
-  (debpaste-paste-is-hidden t))
+  (eww-download-directory (file-name-as-directory
+                           (getenv "XDG_DOWNLOAD_DIR"))))
 
 
 ;;; Email (with Gnus)
@@ -2127,10 +1932,10 @@ This function is intended for use with `ivy-ignore-buffers'."
  mail-user-agent   'gnus-user-agent
  read-mail-command 'gnus)
 
-(use-feature gnus
-  :bind (("s-m"     . gnus)
+(use-package gnus
+  :bind (("s-m"     . gnus-plugged)
          ("s-M"     . gnus-unplugged)
-         ("C-c a m" . gnus)
+         ("C-c a m" . gnus-plugged)
          ("C-c a M" . gnus-unplugged))
   :init
   (setq
@@ -2155,6 +1960,10 @@ 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
+                                  (list ".*<\\(.*\\)\\.gnus\\.org>.*" "l.\\1")
+                                  ;; libreplanet
+                                  (list ".*<\\(.*\\)\\.libreplanet\\.org>.*" "l.\\1")
                                   ;; *.lists.sr.ht, omitting one dot if present
                                   ;;    add more \\.?\\([^.]*\\) if needed
                                   (list ".*<~\\(.*\\)/\\([^.]*\\)\\.?\\([^.]*\\)\\.lists.sr.ht>.*" "l.~\\1.\\2\\3")
@@ -2327,7 +2136,7 @@ This function is intended for use with `ivy-ignore-buffers'."
       (to-list    . "webmasters@gnu.org"))
      ("gnu.*"
       (gcc-self . t))
-     ("gnu\\."
+     ("l\\."
       (subscribed . t))
      ("nnimap\\+uw:.*"
       (gcc-self . t)))
@@ -2342,17 +2151,18 @@ This function is intended for use with `ivy-ignore-buffers'."
    gnus-gcc-mark-as-read t)
   :config
   (when (version< emacs-version "27")
-    (add-to-list
-     'nnmail-split-abbrev-alist
-     '(list . "list-id\\|list-post\\|x-mailing-list\\|x-beenthere\\|x-loop")
-     t))
+    (with-eval-after-load 'nnmail
+      (add-to-list
+       'nnmail-split-abbrev-alist
+       '(list . "list-id\\|list-post\\|x-mailing-list\\|x-beenthere\\|x-loop")
+       t)))
 
   ;; (gnus-registry-initialize)
 
   (with-eval-after-load 'recentf
     (add-to-list 'recentf-exclude gnus-home-directory)))
 
-(use-feature gnus-art
+(use-package gnus-art
   :config
   (setq
    gnus-buttonized-mime-types '("multipart/\\(signed\\|encrypted\\)")
@@ -2401,7 +2211,7 @@ This function is intended for use with `ivy-ignore-buffers'."
    :map gnus-article-mode-map
    ("M-L" . org-store-link)))
 
-(use-feature gnus-sum
+(use-package gnus-sum
   :bind (:map gnus-summary-mode-map
               :prefix-map b/gnus-summary-prefix-map
               :prefix "v"
@@ -2418,12 +2228,8 @@ This function is intended for use with `ivy-ignore-buffers'."
                                 gnus-thread-sort-by-subject
                                 gnus-thread-sort-by-date)))
 
-(use-feature gnus-msg
+(use-package gnus-msg
   :config
-  (defvar b/gnu-signature "Amin Bandali
-Free Software Activist | GNU Maintainer & Webmaster
-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
@@ -2431,16 +2237,17 @@ Cheriton School of Computer Science
 University of Waterloo
 https://bandali.eu.org")
   (defvar b/csc-signature "Amin Bandali
-Systems Committee
+System Administrator, Systems Committee
 Computer Science Club, University of Waterloo
 https://csclub.uwaterloo.ca/~abandali")
   (setq gnus-message-replysign t
         gnus-posting-styles
         '((".*"
-           (address "bandali@gnu.org")
-           (signature b/gnu-signature))
+           (address "bandali@gnu.org"))
           ("nnimap\\+gnu:l\\..*"
            (signature nil))
+          ("nnimap\\+gnu:.*"
+           (organization "GNU"))
           ((header "subject" "ThankCRM")
            (to "webmasters-comment@gnu.org")
            (body "")
@@ -2461,57 +2268,61 @@ https://csclub.uwaterloo.ca/~abandali")
            (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
+(use-package gnus-topic
   :hook (gnus-group-mode . gnus-topic-mode)
   :config (setq gnus-topic-line-format "%i[ %A: %(%{%n%}%) ]%v\n"))
 
-(use-feature gnus-agent
+(use-package gnus-agent
   :config
   (setq gnus-agent-synchronize-flags 'ask)
   :hook (gnus-group-mode . gnus-agent-mode))
 
-(use-feature gnus-group
+(use-package gnus-group
   :config
   (setq gnus-permanently-visible-groups "\\(:INBOX$\\|:gnu$\\)"))
 
 (comment
   ;; problematic with ebdb's popup, *EBDB-Gnus*
-  (use-feature gnus-win
+  (use-package gnus-win
     :config
     (setq gnus-use-full-window nil)))
 
-(use-feature gnus-dired
+(use-package gnus-dired
   :commands gnus-dired-mode
   :init
   (add-hook 'dired-mode-hook 'gnus-dired-mode))
 
 (comment
-  (use-feature gnus-utils
+  (use-package gnus-utils
     :custom
     (gnus-completing-read-function 'gnus-ido-completing-read)))
 
-(use-feature mm-decode
+(use-package mm-decode
   :config
   (setq mm-discouraged-alternatives '("text/html" "text/richtext")
         mm-decrypt-option 'known
         mm-verify-option 'known))
 
-(use-feature mm-uu
+(use-package mm-uu
+  :config
+  (when (version< "27" emacs-version)
+    (set-face-attribute 'mm-uu-extract nil :extend t))
   :custom
   (mm-uu-diff-groups-regexp
    "\\(gmane\\|gnu\\|l\\)\\..*\\(diff\\|commit\\|cvs\\|bug\\|dev\\)"))
 
-(use-feature sendmail
+(use-package sendmail
   :config
   (setq sendmail-program (executable-find "msmtp")
         ;; message-sendmail-extra-arguments '("-v" "-d")
         mail-specify-envelope-from t
         mail-envelope-from 'header))
 
-(use-feature message
+(use-package message
   :bind (:map message-mode-map ("<C-return>" . b/insert-asterism))
   :config
   ;; redefine for a simplified In-Reply-To header
@@ -2544,13 +2355,13 @@ https://csclub.uwaterloo.ca/~abandali")
         message-subscribed-address-functions
         '(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\\)\\)")
+        "\\(\\(amin@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)
          (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
@@ -2560,14 +2371,14 @@ https://csclub.uwaterloo.ca/~abandali")
   :custom
   (message-elide-ellipsis "[...]\n"))
 
-(use-feature mml)
+(use-package mml)
 
-(use-feature mml-sec
+(use-package mml-sec
   :custom
   (mml-secure-openpgp-encrypt-to-self t)
   (mml-secure-openpgp-sign-with-sender t))
 
-(use-feature footnote
+(use-package footnote
   :after message
   ;; :config
   ;; (setq footnote-start-tag ""
@@ -2585,59 +2396,47 @@ https://csclub.uwaterloo.ca/~abandali")
         ("r" . footnote-renumber-footnotes)
         ("s" . footnote-set-style)))
 
-(use-package bbdb
+(use-package ebdb
   :demand
   :after gnus
-  :bind (:map gnus-group-mode-map ("e" . bbdb))
+  :bind (:map gnus-group-mode-map ("e" . ebdb))
   :config
-  (bbdb-initialize 'gnus 'message)
-  :custom
-  (bbdb-complete-mail-allow-cycling t)
-  (bbdb-user-mail-address-re message-dont-reply-to-names))
+  (setq ebdb-sources (b/var "ebdb"))
+  (with-eval-after-load 'swiper
+    (add-to-list 'swiper-font-lock-exclude 'ebdb-mode t)))
 
-(comment
-  (use-package ebdb
-    :demand
-    :after gnus
-    :bind (:map gnus-group-mode-map ("e" . ebdb))
-    :config
-    (setq ebdb-sources (b/var "ebdb"))
-    (with-eval-after-load 'swiper
-      (add-to-list 'swiper-font-lock-exclude 'ebdb-mode t)))
-
-  (use-feature ebdb-com
-    :after ebdb)
+(use-package ebdb-com
+  :after ebdb)
 
-  (use-feature ebdb-complete
-    :after ebdb
-    :config
-    ;; (setq ebdb-complete-mail 'capf)
-    (ebdb-complete-enable))
+(use-package ebdb-complete
+  :after ebdb
+  :config
+  ;; (setq ebdb-complete-mail 'capf)
+  (ebdb-complete-enable))
 
-  (use-feature ebdb-message
-    :demand
-    :after ebdb)
+(use-package ebdb-message
+  :demand
+  :after ebdb)
 
-  ;; (use-package company-ebdb
-  ;;   :config
-  ;;   (defun company-ebdb--post-complete (_) nil))
+;; (use-package company-ebdb
+;;   :config
+;;   (defun company-ebdb--post-complete (_) nil))
 
-  (use-feature ebdb-gnus
-    :after ebdb
-    :custom
-    (ebdb-gnus-window-size 0.3))
+(use-package ebdb-gnus
+  :after ebdb
+  :custom
+  (ebdb-gnus-window-size 0.3))
 
-  (use-feature ebdb-mua
-    :demand
-    :after ebdb
-    :custom (ebdb-mua-pop-up t))
+(use-package ebdb-mua
+  :demand
+  :after ebdb
+  :custom (ebdb-mua-pop-up t))
 
-  ;; (use-package ebdb-message
-  ;;   :after ebdb)
+;; (use-package ebdb-message
+;;   :after ebdb)
 
-  ;; (use-package ebdb-vcard
-  ;;   :after ebdb)
-  )
+;; (use-package ebdb-vcard
+;;   :after ebdb)
 
 (use-package message-x)
 
@@ -2662,7 +2461,7 @@ https://csclub.uwaterloo.ca/~abandali")
         (gnus-harvest-install 'message-x)
       (gnus-harvest-install))))
 
-(use-feature gnus-article-treat-patch
+(use-package gnus-article-treat-patch
   :disabled
   :demand
   :load-path "lisp/"
@@ -2675,7 +2474,7 @@ https://csclub.uwaterloo.ca/~abandali")
 
 ;;; IRC (with ERC and ZNC)
 
-(use-feature erc
+(use-package erc
   :bind (("C-c b b" . erc-switch-to-buffer)
          :map erc-mode-map
          ("M-a" . erc-track-switch-buffer))
@@ -2699,23 +2498,24 @@ https://csclub.uwaterloo.ca/~abandali")
     (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 'smiley)
   (add-to-list 'erc-modules 'spelling)
   (add-to-list 'erc-modules 'scrolltoplace)
   (erc-update-modules))
 
-(use-feature erc-fill
+(use-package erc-fill
   :after erc
   :custom
   (erc-fill-column 77)
   (erc-fill-function 'erc-fill-static)
   (erc-fill-static-center 18))
 
-(use-feature erc-pcomplete
+(use-package erc-pcomplete
   :after erc
   :custom
   (erc-pcomplete-nick-postfix ", "))
 
-(use-feature erc-track
+(use-package erc-track
   :after erc
   :bind (("C-c a e t d" . erc-track-disable)
          ("C-c a e t e" . erc-track-enable))
@@ -2734,7 +2534,6 @@ https://csclub.uwaterloo.ca/~abandali")
   :after erc)
 
 (use-package znc
-  :straight (:host nil :repo "https://git.shemshak.org/amin/znc.el")
   :bind (("C-c a e e" . znc-erc)
          ("C-c a e a" . znc-all))
   :config
@@ -2745,8 +2544,6 @@ https://csclub.uwaterloo.ca/~abandali")
     (setq znc-servers
           `(("znc.shemshak.org" 1337 t
              ((freenode "amin/freenode" ,pwd)))
-            ("znc.shemshak.org" 1337 t
-             ((moznet "amin/moznet" ,pwd)))
             ("znc.shemshak.org" 1337 t
              ((oftc "amin/oftc" ,pwd)))))))