emacs: update custom-file

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

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 61a15b9..6210f90 100644 (file)
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -1,4 +1,4 @@
-;;; init.el --- Amin Bandali's Emacs config -*- lexical-binding: t -*-
+;;; init.el --- bandali's emacs configuration -*- lexical-binding: t -*-

 
 ;; Copyright (C) 2018-2019  Amin Bandali <bandali@gnu.org>
 
 
 ;; Copyright (C) 2018-2019  Amin Bandali <bandali@gnu.org>
 


@@ -18,8 +18,9 @@
 ;;; Commentary:
 
 ;; Emacs configuration of Amin Bandali, computer scientist, functional
 ;;; 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.
+;; programmer, and free software activist.  Used to use straight.el
+;; for purely functional and fully reproducible package management.
+;; Now I just use Guix.

 
 ;; 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:
 
 ;; 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:


@@ -37,18 +38,18 @@
 
 ;;; Emacs initialization
 
 
 ;;; Emacs initialization
 

-(defvar mab/before-user-init-time (current-time)
+(defvar b/before-user-init-time (current-time)

   "Value of `current-time' when Emacs begins loading `user-init-file'.")
 (message "Loading Emacs...done (%.3fs)"
   "Value of `current-time' when Emacs begins loading `user-init-file'.")
 (message "Loading Emacs...done (%.3fs)"

-         (float-time (time-subtract mab/before-user-init-time
+         (float-time (time-subtract b/before-user-init-time

                                     before-init-time)))
 
 ;; temporarily increase `gc-cons-threshhold' and `gc-cons-percentage'
 ;; during startup to reduce garbage collection frequency.  clearing
 ;; `file-name-handler-alist' seems to help reduce startup time too.
                                     before-init-time)))
 
 ;; temporarily increase `gc-cons-threshhold' and `gc-cons-percentage'
 ;; during startup to reduce garbage collection frequency.  clearing
 ;; `file-name-handler-alist' seems to help reduce startup time too.

-(defvar mab/gc-cons-threshold gc-cons-threshold)
-(defvar mab/gc-cons-percentage gc-cons-percentage)
-(defvar mab/file-name-handler-alist file-name-handler-alist)
+(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
       gc-cons-percentage 0.6
       file-name-handler-alist nil
 (setq gc-cons-threshold (* 400 1024 1024)  ; 400 MiB
       gc-cons-percentage 0.6
       file-name-handler-alist nil


@@ -56,11 +57,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

-(defun mab/post-init ()
-  (setq gc-cons-threshold mab/gc-cons-threshold
-        gc-cons-percentage mab/gc-cons-percentage
-        file-name-handler-alist mab/file-name-handler-alist))
-(add-hook 'after-init-hook #'mab/post-init)
+(defun b/post-init ()
+  (setq gc-cons-threshold b/gc-cons-threshold
+        gc-cons-percentage b/gc-cons-percentage
+        file-name-handler-alist b/file-name-handler-alist))
+(add-hook 'after-init-hook #'b/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)


@@ -74,7 +75,7 @@
 ;;; whoami
 
 (setq user-full-name "Amin Bandali"
 ;;; whoami
 
 (setq user-full-name "Amin Bandali"

-      user-mail-address "amin@shemshak.org")
+      user-mail-address "bandali@gnu.org")

 
 \f
 ;;; comment macro
 
 \f
 ;;; comment macro


@@ -86,71 +87,7 @@
   nil)
 
 \f
   nil)
 
 \f

-;;; 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"))
-  (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 mab/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...
-
-(mab/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 defun))
-  `(use-package ,name
-     :straight nil
-     ,@args))
-
-(with-eval-after-load 'recentf
-  (add-to-list 'recentf-exclude
-               (expand-file-name "~/.emacs.d/straight/build/")))
-
-(defun mab/reload-init ()
-  "Reload init.el."
-  (interactive)
-  (setq mab/file-name-handler-alist file-name-handler-alist)
-  (load user-init-file nil 'nomessage)
-  (mab/post-init))
-
-;; use-package
-(straight-use-package 'use-package)
+;;; use-package

 (if nil                             ; set to t when need to debug init
     (progn
       (setq use-package-verbose t
 (if nil                             ; set to t when need to debug init
     (progn
       (setq use-package-verbose t


@@ -166,46 +103,46 @@
 
 (use-package delight)
 
 
 (use-package delight)
 

-;; for browsing the Emacsmirror package database
-(comment
-  (use-package epkg
-    :commands (epkg-list-packages epkg-describe-package)
-    :bind
-    (("C-c p e d" . epkg-describe-package)
-     ("C-c p e p" . epkg-list-packages))
-    :config
-    (setq epkg-repository "~/.emacs.d/straight/repos/epkgs/")
-    (eval-when-compile (defvar ivy-initial-inputs-alist))
-    (with-eval-after-load 'ivy
-      (add-to-list
-       'ivy-initial-inputs-alist '(epkg-describe-package . "^") t))))
-

 \f
 ;;; Initial setup
 
 ;; keep ~/.emacs.d clean
 \f
 ;;; Initial setup
 
 ;; keep ~/.emacs.d clean

-(use-package no-littering
-  :demand t
-  :config
-  (savehist-mode 1)
-  (add-to-list 'savehist-additional-variables 'kill-ring)
-  (save-place-mode 1)
-  (setq auto-save-file-name-transforms
-        `((".*" ,(no-littering-expand-var-file-name "auto-save/") t))))
+(defvar b/etc-dir
+  (expand-file-name
+   (convert-standard-filename "etc/") user-emacs-directory)
+  "The directory where packages place their configuration files.")
+
+(defvar b/var-dir
+  (expand-file-name
+   (convert-standard-filename "var/") user-emacs-directory)
+  "The directory where packages place their persistent data files.")
+
+(defun b/etc (file)
+  "Expand filename FILE relative to `b/etc-dir'."
+  (expand-file-name (convert-standard-filename file) b/etc-dir))
+
+(defun b/var (file)
+  "Expand filename FILE relative to `b/var-dir'."
+  (expand-file-name (convert-standard-filename file) b/var-dir))
+
+(setq
+ auto-save-list-file-prefix (b/var "auto-save/sessions/")
+ nsm-settings-file (b/var "nsm-settings.el"))

 
 ;; separate custom file (don't want it mixing with init.el)
 
 ;; separate custom file (don't want it mixing with init.el)

-(use-feature custom
+(use-package custom

   :no-require t
   :config
   :no-require t
   :config

-  (setq custom-file (no-littering-expand-etc-file-name "custom.el"))
+  (setq custom-file (b/etc "custom.el"))

   (when (file-exists-p custom-file)
     (load custom-file))
   ;; while at it, treat themes as safe
   (setf custom-safe-themes t))
 
 ;; load the secrets file if it exists, otherwise show a warning
   (when (file-exists-p custom-file)
     (load custom-file))
   ;; while at it, treat themes as safe
   (setf custom-safe-themes t))
 
 ;; load the secrets file if it exists, otherwise show a warning

-(with-demoted-errors
-    (load (no-littering-expand-etc-file-name "secrets")))
+(comment
+  (with-demoted-errors
+      (load (b/etc "secrets"))))

 
 ;; better $PATH (and other environment variable) handling
 (use-package exec-path-from-shell
 
 ;; better $PATH (and other environment variable) handling
 (use-package exec-path-from-shell


@@ -227,7 +164,7 @@
 
 ;; start up emacs server.  see
 ;; https://www.gnu.org/software/emacs/manual/html_node/emacs/Emacs-Server.html#Emacs-Server
 
 ;; 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)))
 
   :defer 0.4
   :config (or (server-running-p) (server-mode)))
 


@@ -270,7 +207,7 @@
 ;; focus follows mouse
 (setq mouse-autoselect-window t)
 
 ;; focus follows mouse
 (setq mouse-autoselect-window t)
 

-(defun mab/no-mouse-autoselect-window ()
+(defun b/no-mouse-autoselect-window ()

   "Conveniently disable `focus-follows-mouse'.
 For disabling the behaviour for certain buffers and/or modes."
   (make-local-variable 'mouse-autoselect-window)
   "Conveniently disable `focus-follows-mouse'.
 For disabling the behaviour for certain buffers and/or modes."
   (make-local-variable 'mouse-autoselect-window)


@@ -283,28 +220,35 @@ For disabling the behaviour for certain buffers and/or modes."
       scroll-conservatively 10
       scroll-preserve-screen-position 1)
 
       scroll-conservatively 10
       scroll-preserve-screen-position 1)
 

-(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
 
   :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))
 
 ;; ask for GPG passphrase in minibuffer
   :defer 0.4
   :config (pixel-scroll-mode 1))
 
 ;; ask for GPG passphrase in minibuffer

-(use-feature epg-config
+(use-package epa
+  :custom
+  ; this will fail if gpg>=2.1 is not available
+  (epa-pinentry-mode 'loopback))
+
+(use-package epg-config

   :defer 0.4
   :custom
   ((epg-gpg-program (executable-find "gpg"))
    (epg-pinentry-mode 'loopback)))
   :defer 0.4
   :custom
   ((epg-gpg-program (executable-find "gpg"))
    (epg-pinentry-mode 'loopback)))

-(use-feature epg
+
+(use-package epg

   :after epg-config)
   :after epg-config)

+

 (use-package pinentry
   :demand
 (use-package pinentry
   :demand

-  :after (epg server)
+  :after (epa epg server)

   :config
   (setq pinentry--socket-dir server-socket-dir)
   (pinentry-start))
   :config
   (setq pinentry--socket-dir server-socket-dir)
   (pinentry-start))


@@ -316,12 +260,12 @@ For disabling the behaviour for certain buffers and/or modes."
 \f
 ;;; Useful utilities
 
 \f
 ;;; Useful utilities
 

-(defmacro mab/setq-every (value &rest vars)
+(defmacro b/setq-every (value &rest vars)

   "Set all the variables from VARS to value VALUE."
   (declare (indent defun) (debug t))
   `(progn ,@(mapcar (lambda (x) (list 'setq x value)) vars)))
 
   "Set all the variables from VARS to value VALUE."
   (declare (indent defun) (debug t))
   `(progn ,@(mapcar (lambda (x) (list 'setq x value)) vars)))
 

-(defun mab/start-process (program &rest args)
+(defun b/start-process (program &rest args)

   "Same as `start-process', but doesn't bother about name and buffer."
   (let ((process-name (concat program "_process"))
         (buffer-name  (generate-new-buffer-name
   "Same as `start-process', but doesn't bother about name and buffer."
   (let ((process-name (concat program "_process"))
         (buffer-name  (generate-new-buffer-name


@@ -329,15 +273,15 @@ For disabling the behaviour for certain buffers and/or modes."
     (apply #'start-process
            process-name buffer-name program args)))
 
     (apply #'start-process
            process-name buffer-name program args)))
 

-(defun mab/dired-start-process (program &optional args)
+(defun b/dired-start-process (program &optional args)

   "Open current file with a PROGRAM."
   ;; Shell command looks like this: "program [ARGS]... FILE" (ARGS can
   ;; be nil, so remove it).
   "Open current file with a PROGRAM."
   ;; Shell command looks like this: "program [ARGS]... FILE" (ARGS can
   ;; be nil, so remove it).

-  (apply #'mab/start-process
+  (apply #'b/start-process

          program
          (remove nil (list args (dired-get-file-for-visit)))))
 
          program
          (remove nil (list args (dired-get-file-for-visit)))))
 

-(defun mab/add-elisp-section ()
+(defun b/add-elisp-section ()

   (interactive)
   (insert "\n")
   (previous-line)
   (interactive)
   (insert "\n")
   (previous-line)


@@ -404,6 +348,7 @@ For disabling the behaviour for certain buffers and/or modes."
 
 ;; backups (C-h v make-backup-files RET)
 (setq backup-by-copying t
 
 ;; backups (C-h v make-backup-files RET)
 (setq backup-by-copying t

+      backup-directory-alist (list (cons "." (b/var "backup/")))

       version-control t
       delete-old-versions t)
 
       version-control t
       delete-old-versions t)
 


@@ -425,12 +370,12 @@ For disabling the behaviour for certain buffers and/or modes."
 ;; https://stackoverflow.com/a/17788551, with changes to use `cl-letf'
 ;; instead of the now obsolete `flet'.
 (with-eval-after-load 'compile
 ;; https://stackoverflow.com/a/17788551, with changes to use `cl-letf'
 ;; instead of the now obsolete `flet'.
 (with-eval-after-load 'compile

-  (defun mab/compilation-finish-function (buffer outstr)
+  (defun b/compilation-finish-function (buffer outstr)

     (unless (string-match "finished" outstr)
       (switch-to-buffer-other-window buffer))
     t)
 
     (unless (string-match "finished" outstr)
       (switch-to-buffer-other-window buffer))
     t)
 

-  (setq compilation-finish-functions #'mab/compilation-finish-function)
+  (setq compilation-finish-functions #'b/compilation-finish-function)

 
   (require 'cl-macs)
 
 
   (require 'cl-macs)
 


@@ -461,14 +406,18 @@ For disabling the behaviour for certain buffers and/or modes."
 ;; (enables niceties like `q' for quit)
 (setq view-read-only t)
 
 ;; (enables niceties like `q' for quit)
 (setq view-read-only t)
 

-(use-feature vc
+(use-package vc

   :bind ("C-x v C-=" . vc-ediff))
 
   :bind ("C-x v C-=" . vc-ediff))
 

-(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)))
 
   :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)))
 

+;; i don't feel like jumping out of my chair every now and again; so
+;; don't BEEP! at me, emacs
+(setq ring-bell-function 'ignore)
+

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


@@ -480,6 +429,7 @@ For disabling the behaviour for certain buffers and/or modes."
 
  ("C-c e i" . emacs-init-time)
  ("C-c e u" . emacs-uptime)
 
  ("C-c e i" . emacs-init-time)
  ("C-c e u" . emacs-uptime)

+ ("C-c e v" . emacs-version)

 
  ("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)


@@ -491,13 +441,8 @@ For disabling the behaviour for certain buffers and/or modes."
  ("C-x k"   . kill-this-buffer)
  ("C-x K"   . kill-buffer)
 
  ("C-x k"   . kill-this-buffer)
  ("C-x K"   . kill-buffer)
 

- ("s-p"     . beginning-of-buffer)
- ("s-n"     . end-of-buffer)
-
- ("M-O"     . facemenu-keymap)
-

  :map emacs-lisp-mode-map
  :map emacs-lisp-mode-map

- ("<C-return>" . mab/add-elisp-section))
+ ("<C-return>" . b/add-elisp-section))

 
 (when (display-graphic-p)
   (unbind-key "C-z" global-map))
 
 (when (display-graphic-p)
   (unbind-key "C-z" global-map))


@@ -511,52 +456,10 @@ For disabling the behaviour for certain buffers and/or modes."
  ("<drag-mouse-2>" . kill-this-buffer)
  ("<drag-mouse-3>" . ivy-switch-buffer))
 
  ("<drag-mouse-2>" . kill-this-buffer)
  ("<drag-mouse-3>" . ivy-switch-buffer))
 

-(bind-keys
- :prefix-map mab/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" . mab/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))
-

 \f
 ;;; Essential packages
 
 \f
 ;;; Essential packages
 

-(use-package auto-compile
-  :demand t
-  :config
-  (auto-compile-on-load-mode)
-  (auto-compile-on-save-mode)
-  (setq auto-compile-display-buffer               nil
-        auto-compile-mode-line-counter            t
-        auto-compile-source-recreate-deletes-dest t
-        auto-compile-toggle-deletes-nonlib-dest   t
-        auto-compile-update-autoloads             t)
-  (add-hook 'auto-compile-inhibit-compile-hook
-            'auto-compile-inhibit-compile-detached-git-head))
-
-;; use the org-plus-contrib package to get the whole deal
-(straight-use-package 'org-plus-contrib)
-
-(use-feature org
+(use-package org

   :defer 0.5
   :config
   (setq org-src-tab-acts-natively t
   :defer 0.5
   :config
   (setq org-src-tab-acts-natively t


@@ -568,21 +471,24 @@ For disabling the behaviour for certain buffers and/or modes."
         org-startup-folded 'content
         org-catch-invisible-edits 'show-and-error
         org-log-done 'time)
         org-startup-folded 'content
         org-catch-invisible-edits 'show-and-error
         org-log-done 'time)

+  (when (version< org-version "9.3")
+    (setq org-email-link-description-format
+          org-link-email-description-format))

   (add-to-list 'org-structure-template-alist '("L" . "src emacs-lisp") t)
   (add-to-list 'org-modules 'org-habit)
   :bind
   (("C-c a o a" . org-agenda)
    :map org-mode-map
    ("M-L" . org-insert-last-stored-link)
   (add-to-list 'org-structure-template-alist '("L" . "src emacs-lisp") t)
   (add-to-list 'org-modules 'org-habit)
   :bind
   (("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))
+   ("M-O" . org-toggle-link-display))

   :hook ((org-mode . org-indent-mode)
          (org-mode . auto-fill-mode)
          (org-mode . flyspell-mode))
   :custom
   :hook ((org-mode . org-indent-mode)
          (org-mode . auto-fill-mode)
          (org-mode . flyspell-mode))
   :custom

+  (org-pretty-entities t)

   (org-agenda-files '("~/usr/org/todos/personal.org"
                       "~/usr/org/todos/habits.org"
   (org-agenda-files '("~/usr/org/todos/personal.org"
                       "~/usr/org/todos/habits.org"

-                      "~/usr/org/todos/masters.org"))
+                      "~/src/git/masters-thesis/todo.org"))

   (org-agenda-start-on-weekday 0)
   (org-agenda-time-leading-zero t)
   (org-habit-graph-column 44)
   (org-agenda-start-on-weekday 0)
   (org-agenda-time-leading-zero t)
   (org-habit-graph-column 44)


@@ -592,7 +498,7 @@ For disabling the behaviour for certain buffers and/or modes."
   '(org-block ((t (:background "#1d1f21"))))
   '(org-latex-and-related ((t (:foreground "#b294bb")))))
 
   '(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
   :after ox
   :config
   (setq org-latex-listings 'listings


@@ -608,7 +514,7 @@ For disabling the behaviour for certain buffers and/or modes."
                t)
   (require 'ox-beamer))
 
                t)
   (require 'ox-beamer))
 

-(use-feature ox-extra
+(use-package ox-extra

   :config
   (ox-extras-activate '(latex-header-blocks ignore-headlines)))
 
   :config
   (ox-extras-activate '(latex-header-blocks ignore-headlines)))
 


@@ -616,13 +522,13 @@ For disabling the behaviour for certain buffers and/or modes."
 ;; org file.  closely inspired by
 ;; https://github.com/dieggsy/dotfiles/tree/cc10edf7701958eff1cd94d4081da544d882a28c/emacs.d#dotfiles
 (with-eval-after-load 'org
 ;; org file.  closely inspired by
 ;; https://github.com/dieggsy/dotfiles/tree/cc10edf7701958eff1cd94d4081da544d882a28c/emacs.d#dotfiles
 (with-eval-after-load 'org

-  (defvar mab/show-async-tangle-results nil
+  (defvar b/show-async-tangle-results nil

     "Keep *emacs* async buffers around for later inspection.")
 
     "Keep *emacs* async buffers around for later inspection.")
 

-  (defvar mab/show-async-tangle-time nil
+  (defvar b/show-async-tangle-time nil

     "Show the time spent tangling the file.")
 
     "Show the time spent tangling the file.")
 

-  (defun mab/async-babel-tangle ()
+  (defun b/async-babel-tangle ()

     "Tangle org file asynchronously."
     (interactive)
     (let* ((file-tangle-start-time (current-time))
     "Tangle org file asynchronously."
     (interactive)
     (let* ((file-tangle-start-time (current-time))


@@ -634,12 +540,12 @@ For disabling the behaviour for certain buffers and/or modes."
        `(lambda ()
           (require 'org)
           (org-babel-tangle-file ,file))
        `(lambda ()
           (require 'org)
           (org-babel-tangle-file ,file))

-       (unless mab/show-async-tangle-results
+       (unless b/show-async-tangle-results

          `(lambda (result)
             (if result
                 (message "Tangled %s%s"
                          ,file-nodir
          `(lambda (result)
             (if result
                 (message "Tangled %s%s"
                          ,file-nodir

-                         (if mab/show-async-tangle-time
+                         (if b/show-async-tangle-time

                              (format " (%.3fs)"
                                      (float-time (time-subtract (current-time)
                                                                 ',file-tangle-start-time)))
                              (format " (%.3fs)"
                                      (float-time (time-subtract (current-time)
                                                                 ',file-tangle-start-time)))


@@ -648,36 +554,48 @@ For disabling the behaviour for certain buffers and/or modes."
 
 (add-to-list
  'safe-local-variable-values
 
 (add-to-list
  'safe-local-variable-values

- '(eval add-hook 'after-save-hook #'mab/async-babel-tangle 'append 'local))
+ '(eval add-hook 'after-save-hook #'b/async-babel-tangle 'append 'local))

 
 ;; *the* right way to do git
 (use-package magit
   :defer 0.5
 
 ;; *the* right way to do git
 (use-package magit
   :defer 0.5

-  :bind (("C-x g" . magit-status)
-         ("s-g s" . magit-status)
-         ("s-g l" . magit-log-buffer-file))
+  :bind (("C-c g g" . magit-status)
+         ("C-c g s" . magit-status)
+         ("C-c g b" . magit-blame-addition)
+         ("C-c g l" . magit-log-buffer-file))

   :config
   (magit-add-section-hook 'magit-status-sections-hook
                           'magit-insert-modules
                           'magit-insert-stashes
                           'append)
   :config
   (magit-add-section-hook 'magit-status-sections-hook
                           'magit-insert-modules
                           'magit-insert-stashes
                           'append)

+  ;; (magit-add-section-hook 'magit-status-sections-hook
+  ;;                         'magit-insert-ignored-files
+  ;;                         'magit-insert-untracked-files
+  ;;                         'append)

   (setq magit-repository-directories '(("~/" . 0)
                                        ("~/src/git/" . 1)))
   (nconc magit-section-initial-visibility-alist
          '(([unpulled status] . show)
            ([unpushed status] . show)))
   (setq magit-repository-directories '(("~/" . 0)
                                        ("~/src/git/" . 1)))
   (nconc magit-section-initial-visibility-alist
          '(([unpulled status] . show)
            ([unpushed status] . show)))

+  (setq transient-history-file (b/var "transient/history.el")
+        transient-levels-file  (b/etc "transient/levels.el")
+        transient-values-file  (b/etc "transient/values.el"))

   :custom (magit-display-buffer-function #'magit-display-buffer-fullframe-status-v1)
   :custom-face (magit-diff-file-heading ((t (:weight normal)))))
 
 ;; recently opened files
   :custom (magit-display-buffer-function #'magit-display-buffer-fullframe-status-v1)
   :custom-face (magit-diff-file-heading ((t (:weight normal)))))
 
 ;; recently opened files

-(use-feature recentf
+(use-package recentf

   :defer 0.2
   :defer 0.2

-  :config
+  ;; :config

   ;; (add-to-list 'recentf-exclude "^/\\(?:ssh\\|su\\|sudo\\)?:")
   ;; (add-to-list 'recentf-exclude "^/\\(?:ssh\\|su\\|sudo\\)?:")

-  (setq recentf-max-saved-items 2000))
+  :custom
+  (recentf-max-saved-items 2000)
+  (recentf-save-file (b/var "recentf-save.el")))

 
 ;; smart M-x enhancement (needed by counsel for history)
 
 ;; smart M-x enhancement (needed by counsel for history)

-(use-package smex)
+(use-package smex
+  :config
+  (setq smex-save-file (b/var "smex-save.el")))

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


@@ -694,6 +612,19 @@ For disabling the behaviour for certain buffers and/or modes."
         ivy-use-virtual-buffers t
         ivy-virtual-abbreviate 'abbreviate
         ivy-count-format "%d/%d ")
         ivy-use-virtual-buffers t
         ivy-virtual-abbreviate 'abbreviate
         ivy-count-format "%d/%d ")

+
+  (defvar b/ivy-ignore-buffer-modes '(magit-mode erc-mode dired-mode))
+  (defun b/ivy-ignore-buffer-p (str)
+    "Return non-nil if str names a buffer with a major mode
+derived from one of `b/ivy-ignore-buffer-modes'.
+
+This function is intended for use with `ivy-ignore-buffers'."
+    (let* ((buf (get-buffer str))
+           (mode (and buf (buffer-local-value 'major-mode buf))))
+      (and mode
+           (apply #'provided-mode-derived-p mode b/ivy-ignore-buffer-modes))))
+  (add-to-list 'ivy-ignore-buffers 'b/ivy-ignore-buffer-p)
+

   (ivy-mode 1)
   ;; :custom-face
   ;; (ivy-minibuffer-match-face-2 ((t (:background "#e99ce8" :weight semi-bold))))
   (ivy-mode 1)
   ;; :custom-face
   ;; (ivy-minibuffer-match-face-2 ((t (:background "#e99ce8" :weight semi-bold))))


@@ -712,12 +643,11 @@ For disabling the behaviour for certain buffers and/or modes."
   :delight
   :bind (([remap execute-extended-command] . counsel-M-x)
          ([remap find-file]                . counsel-find-file)
   :delight
   :bind (([remap execute-extended-command] . counsel-M-x)
          ([remap find-file]                . counsel-find-file)

-         ("C-c x"                          . counsel-M-x)
+         ("C-c b b"                        . ivy-switch-buffer)

          ("C-c f ."                        . counsel-find-file)
          ("C-c f l"                        . counsel-find-library)
          ("C-c f r"                        . counsel-recentf)
          ("C-c f ."                        . counsel-find-file)
          ("C-c f l"                        . counsel-find-library)
          ("C-c f r"                        . counsel-recentf)

-         ("s-."                            . counsel-find-file)
-         ("s-r"                            . ivy-switch-buffer)
+         ("C-c x"                          . counsel-M-x)

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


@@ -733,7 +663,6 @@ For disabling the behaviour for certain buffers and/or modes."
            ("C-x C-b" . helm-buffers-list)
            ("C-x C-f" . helm-find-files)
            ("C-h r"   . helm-info-emacs)
            ("C-x C-b" . helm-buffers-list)
            ("C-x C-f" . helm-find-files)
            ("C-h r"   . helm-info-emacs)

-           ("s-r"     . helm-recentf)

            ("C-s-r"   . helm-resume)
            :map helm-map
            ("<tab>" . helm-execute-persistent-action)
            ("C-s-r"   . helm-resume)
            :map helm-map
            ("<tab>" . helm-execute-persistent-action)


@@ -741,42 +670,43 @@ For disabling the behaviour for certain buffers and/or modes."
            ("C-z"   . helm-select-action))            ; List actions
     :config (helm-mode 1)))
 
            ("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)
   :config
   (eval-when-compile (defvar eshell-prompt-regexp))
   :defer 0.5
   :commands eshell
   :bind ("C-c a s e" . eshell)
   :config
   (eval-when-compile (defvar eshell-prompt-regexp))

-  (defun mab/eshell-quit-or-delete-char (arg)
+  (defun b/eshell-quit-or-delete-char (arg)

     (interactive "p")
     (if (and (eolp) (looking-back eshell-prompt-regexp nil))
         (eshell-life-is-too-much)
       (delete-char arg)))
 
     (interactive "p")
     (if (and (eolp) (looking-back eshell-prompt-regexp nil))
         (eshell-life-is-too-much)
       (delete-char arg)))
 

-  (defun mab/eshell-clear ()
+  (defun b/eshell-clear ()

     (interactive)
     (let ((inhibit-read-only t))
       (erase-buffer))
     (eshell-send-input))
 
     (interactive)
     (let ((inhibit-read-only t))
       (erase-buffer))
     (eshell-send-input))
 

-  (defun mab/eshell-setup ()
+  (defun b/eshell-setup ()

     (make-local-variable 'company-idle-delay)
     (defvar company-idle-delay)
     (setq company-idle-delay nil)
     (bind-keys :map eshell-mode-map
     (make-local-variable 'company-idle-delay)
     (defvar company-idle-delay)
     (setq company-idle-delay nil)
     (bind-keys :map eshell-mode-map

-               ("C-d"   . mab/eshell-quit-or-delete-char)
-               ("C-S-l" . mab/eshell-clear)
+               ("C-d"   . b/eshell-quit-or-delete-char)
+               ("C-S-l" . b/eshell-clear)

                ("M-r"   . counsel-esh-history)
                ([tab]   . company-complete)))
 
                ("M-r"   . counsel-esh-history)
                ([tab]   . company-complete)))
 

-  :hook (eshell-mode . mab/eshell-setup)
+  :hook (eshell-mode . b/eshell-setup)

   :custom
   :custom

+  (eshell-directory-name (b/var "eshell/"))

   (eshell-hist-ignoredups t)
   (eshell-input-filter 'eshell-input-filter-initial-space))
 
   (eshell-hist-ignoredups t)
   (eshell-input-filter 'eshell-input-filter-initial-space))
 

-(use-feature ibuffer
+(use-package ibuffer

   :bind
   :bind

-  (("C-x C-b" . ibuffer-other-window)
+  (("C-x C-b" . ibuffer)

    :map ibuffer-mode-map
    ("P"   . ibuffer-backward-filter-group)
    ("N"   . ibuffer-forward-filter-group)
    :map ibuffer-mode-map
    ("P"   . ibuffer-backward-filter-group)
    ("N"   . ibuffer-forward-filter-group)


@@ -848,7 +778,8 @@ For disabling the behaviour for certain buffers and/or modes."
            " " filename)))
   :hook (ibuffer . (lambda () (ibuffer-switch-to-saved-filter-groups "default"))))
 
            " " filename)))
   :hook (ibuffer . (lambda () (ibuffer-switch-to-saved-filter-groups "default"))))
 

-(use-feature outline
+(use-package outline
+  :disabled

   :hook (prog-mode . outline-minor-mode)
   :delight (outline-minor-mode " outl")
   :bind
   :hook (prog-mode . outline-minor-mode)
   :delight (outline-minor-mode " outl")
   :bind


@@ -857,7 +788,7 @@ For disabling the behaviour for certain buffers and/or modes."
    ("<s-tab>"  . outline-toggle-children)
    ("M-p"      . outline-previous-visible-heading)
    ("M-n"      . outline-next-visible-heading)
    ("<s-tab>"  . outline-toggle-children)
    ("M-p"      . outline-previous-visible-heading)
    ("M-n"      . outline-next-visible-heading)

-   :prefix-map mab/outline-prefix-map
+   :prefix-map b/outline-prefix-map

    :prefix "s-O"
    ("TAB" . outline-toggle-children)
    ("a"   . outline-hide-body)
    :prefix "s-O"
    ("TAB" . outline-toggle-children)
    ("a"   . outline-hide-body)


@@ -866,10 +797,10 @@ For disabling the behaviour for certain buffers and/or modes."
    ("h"   . outline-hide-subtree)
    ("s"   . outline-show-subtree)))
 
    ("h"   . outline-hide-subtree)
    ("s"   . outline-show-subtree)))
 

-(use-feature ls-lisp
+(use-package ls-lisp

   :custom (ls-lisp-dirs-first t))
 
   :custom (ls-lisp-dirs-first t))
 

-(use-feature dired
+(use-package dired

   :config
   (setq dired-listing-switches "-alh"
         ls-lisp-use-insert-directory-program nil)
   :config
   (setq dired-listing-switches "-alh"
         ls-lisp-use-insert-directory-program nil)


@@ -915,15 +846,15 @@ For disabling the behaviour for certain buffers and/or modes."
               ("\\" . dired-hide-details-mode)
               ("z"  . (lambda ()
                         (interactive)
               ("\\" . dired-hide-details-mode)
               ("z"  . (lambda ()
                         (interactive)

-                        (mab/dired-start-process "zathura"))))
+                        (b/dired-start-process "zathura"))))

   :hook (dired-mode . dired-hide-details-mode))
 
   :hook (dired-mode . dired-hide-details-mode))
 

-(use-feature help
+(use-package help

   :config
   (temp-buffer-resize-mode)
   (setq help-window-select t))
 
   :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))
   :config
   (add-to-list 'tramp-default-proxies-alist '(nil "\\`root\\'" "/ssh:%h:"))
   (add-to-list 'tramp-default-proxies-alist '("localhost" nil nil))


@@ -949,46 +880,51 @@ For disabling the behaviour for certain buffers and/or modes."
   :hook (magit-post-refresh . diff-hl-magit-post-refresh))
 
 ;; display Lisp objects at point in the echo area
   :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)
   :delight " eldoc"
   :config (global-eldoc-mode))
 
 ;; highlight matching parens
   :when (version< "25" emacs-version)
   :delight " eldoc"
   :config (global-eldoc-mode))
 
 ;; highlight matching parens

-(use-feature paren
+(use-package paren

   :demand
   :config (show-paren-mode))
 
   :demand
   :config (show-paren-mode))
 

-(use-feature elec-pair
+(use-package elec-pair

   :demand
   :config (electric-pair-mode))
 
   :demand
   :config (electric-pair-mode))
 

-(use-feature simple
+(use-package simple

   :delight (auto-fill-function " fill")
   :config (column-number-mode))
 
 ;; save minibuffer history
   :delight (auto-fill-function " fill")
   :config (column-number-mode))
 
 ;; save minibuffer history

-(use-feature savehist
-  :config (savehist-mode))
+(use-package savehist
+  :config
+  (savehist-mode)
+  :custom
+  (savehist-file (b/var "savehist.el")))

 
 ;; automatically save place in files
 
 ;; automatically save place in files

-(use-feature saveplace
+(use-package saveplace

   :when (version< "25" emacs-version)
   :when (version< "25" emacs-version)

-  :config (save-place-mode))
+  :config (save-place-mode)
+  :custom
+  (save-place-file (b/var "save-place.el")))

 
 

-(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))
 
   :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

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

-(use-feature conf-mode
+(use-package conf-mode

   :mode "\\.*rc$")
 
   :mode "\\.*rc$")
 

-(use-feature sh-mode
+(use-package sh-mode

   :mode "\\.bashrc$")
 
 (use-package company
   :mode "\\.bashrc$")
 
 (use-package company


@@ -1022,7 +958,7 @@ For disabling the behaviour for certain buffers and/or modes."
   (setq flycheck-check-syntax-automatically '(mode-enabled save))
   :custom (flycheck-mode-line-prefix "flyc"))
 
   (setq flycheck-check-syntax-automatically '(mode-enabled save))
   :custom (flycheck-mode-line-prefix "flyc"))
 

-(use-feature flyspell
+(use-package flyspell

   :delight " flysp")
 
 ;; http://endlessparentheses.com/ispell-and-apostrophes.html
   :delight " flysp")
 
 ;; http://endlessparentheses.com/ispell-and-apostrophes.html


@@ -1052,70 +988,75 @@ 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
+(use-package abbrev

   :delight " abbr"
   :delight " abbr"

-  :hook (text-mode . abbrev-mode))
+  :hook (text-mode . abbrev-mode)
+  :custom
+  (abbrev-file-name (b/var "abbrev.el")))

 
 \f
 ;;; Programming modes
 
 
 \f
 ;;; 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))
 
   :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

   :delight (reveal-mode " reveal")
   :hook (emacs-lisp-mode . reveal-mode))
 
   :delight (reveal-mode " reveal")
   :hook (emacs-lisp-mode . reveal-mode))
 

-(use-feature elisp-mode
+(use-package elisp-mode

   :delight (emacs-lisp-mode "Elisp" :major))
 
   :delight (emacs-lisp-mode "Elisp" :major))
 

-(use-package alloy-mode
-  :straight (:host github :repo "dwwmmn/alloy-mode")
-  :mode "\\.als\\'"
-  :config (setq alloy-basic-offset 2))
-
-(use-package proof-site                 ; for Coq
-  :straight proof-general)
-
-(eval-when-compile (defvar lean-mode-map))
-(use-package lean-mode
-  :defer 0.4
-  :bind (:map lean-mode-map
-              ("S-SPC" . company-complete))
-  :config
-  (require 'lean-input)
-  (setq default-input-method "Lean"
-        lean-input-tweak-all '(lean-input-compose
-                               (lean-input-prepend "/")
-                               (lean-input-nonempty))
-        lean-input-user-translations '(("/" "/")))
-  (lean-input-setup))
-
-(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
+(comment
+  ;; TODO
+  (use-package alloy-mode
+    :straight (:host github :repo "dwwmmn/alloy-mode")
+    :mode "\\.als\\'"
+    :config (setq alloy-basic-offset 2))
+
+  (use-package proof-site                 ; for Coq
+    :straight proof-general)
+
+  (eval-when-compile (defvar lean-mode-map))
+  (use-package lean-mode
+    :defer 0.4
+    :bind (:map lean-mode-map
+                ("S-SPC" . company-complete))
+    :config
+    (require 'lean-input)
+    (setq default-input-method "Lean"
+          lean-input-tweak-all '(lean-input-compose
+                                 (lean-input-prepend "/")
+                                 (lean-input-nonempty))
+          lean-input-user-translations '(("/" "/")))
+    (lean-input-setup))
+
+  (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-package sgml-mode
   :config
 
 (use-package sgml-mode
   :config


@@ -1128,7 +1069,7 @@ For disabling the behaviour for certain buffers and/or modes."
 (use-package web-mode
   :mode "\\.html\\'"
   :config
 (use-package web-mode
   :mode "\\.html\\'"
   :config

-  (mab/setq-every 2
+  (b/setq-every 2

     web-mode-code-indent-offset
     web-mode-css-indent-offset
     web-mode-markup-indent-offset))
     web-mode-code-indent-offset
     web-mode-css-indent-offset
     web-mode-markup-indent-offset))


@@ -1214,9 +1155,12 @@ For disabling the behaviour for certain buffers and/or modes."
     (eclim-executable "~/.p2/pool/plugins/org.eclim_2.8.0/bin/eclim")
     (eclim-eclipse-dirs '("~/usr/eclipse/dsl-2018-09/eclipse"))))
 
     (eclim-executable "~/.p2/pool/plugins/org.eclim_2.8.0/bin/eclim")
     (eclim-eclipse-dirs '("~/usr/eclipse/dsl-2018-09/eclipse"))))
 

-(use-package geiser)
+(use-package geiser
+  :config
+  (make-directory (b/var "geiser/") t)
+  (setq geiser-repl-history-filename (b/var "geiser/repl-history")))

 
 

-(use-feature geiser-guile
+(use-package geiser-guile

   :config
   (setq geiser-guile-load-path "~/src/git/guix"))
 
   :config
   (setq geiser-guile-load-path "~/src/git/guix"))
 


@@ -1233,10 +1177,18 @@ For disabling the behaviour for certain buffers and/or modes."
   :hook
   (po-mode . (lambda () (run-with-timer 0.1 nil 'View-exit))))
 
   :hook
   (po-mode . (lambda () (run-with-timer 0.1 nil 'View-exit))))
 

+(use-package tex-mode
+  :config
+  (cl-delete-if
+   (lambda (p) (string-match "^---?" (car p)))
+   tex--prettify-symbols-alist))
+

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

-(add-to-list 'custom-theme-load-path "~/.emacs.d/lisp")
+(add-to-list 'custom-theme-load-path
+             (expand-file-name
+              (convert-standard-filename "lisp") user-emacs-directory))

 (load-theme 'tangomod t)
 
 (use-package smart-mode-line
 (load-theme 'tangomod t)
 
 (use-package smart-mode-line


@@ -1246,40 +1198,42 @@ For disabling the behaviour for certain buffers and/or modes."
   (sml/setup)
   (smart-mode-line-enable))
 
   (sml/setup)
   (smart-mode-line-enable))
 

-(use-package doom-themes)
+(comment
+  ;; TODO
+  (use-package doom-themes))

 
 

-(defvar mab/org-mode-font-lock-keywords
+(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
 
   '(("[ \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
 

-(defun mab/lights-on ()
+(defun b/lights-on ()

   "Enable my favourite light theme."
   (interactive)
   (mapc #'disable-theme custom-enabled-themes)
   (load-theme 'tangomod t)
   (sml/apply-theme 'automatic)
   (font-lock-remove-keywords
   "Enable my favourite light theme."
   (interactive)
   (mapc #'disable-theme custom-enabled-themes)
   (load-theme 'tangomod t)
   (sml/apply-theme 'automatic)
   (font-lock-remove-keywords

-   'org-mode mab/org-mode-font-lock-keywords))
+   'org-mode b/org-mode-font-lock-keywords))

 
 

-(defun mab/lights-off ()
+(defun b/lights-off ()

   "Go dark."
   (interactive)
   (mapc #'disable-theme custom-enabled-themes)
   "Go dark."
   (interactive)
   (mapc #'disable-theme custom-enabled-themes)

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

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

-   'org-mode mab/org-mode-font-lock-keywords t))
+   'org-mode b/org-mode-font-lock-keywords t))

 
 (bind-keys
 
 (bind-keys

- ("s-t d" . mab/lights-off)
- ("s-t l" . mab/lights-on))
+ ("C-c t d" . b/lights-off)
+ ("C-c t l" . b/lights-on))

 
 \f
 ;;; Emacs enhancements & auxiliary packages
 
 
 \f
 ;;; Emacs enhancements & auxiliary packages
 

-(use-feature man
+(use-package man

   :config (setq Man-width 80))
 
 (use-package which-key
   :config (setq Man-width 80))
 
 (use-package which-key


@@ -1303,15 +1257,12 @@ For disabling the behaviour for certain buffers and/or modes."
     "C-c a e" "erc"
     "C-c a o" "org"
     "C-c a s" "shells"
     "C-c a e" "erc"
     "C-c a o" "org"
     "C-c a s" "shells"

-    "C-c p"   "package-management"
-    ;; "C-c p e" "package-management/epkg"
-    "C-c p s" "straight.el"
-    "C-c psa" "all"
-    "C-c psp" "package"
+    "C-c b"   "buffers"

     "C-c c"   "compile-and-comments"
     "C-c e"   "eval"
     "C-c f"   "files"
     "C-c F"   "frames"
     "C-c c"   "compile-and-comments"
     "C-c e"   "eval"
     "C-c f"   "files"
     "C-c F"   "frames"

+    "C-c g"   "magit"

     "C-S-h"   "help(ful)"
     "C-c m"   "multiple-cursors"
     "C-c P"   "projectile"
     "C-S-h"   "help(ful)"
     "C-c m"   "multiple-cursors"
     "C-c P"   "projectile"


@@ -1319,9 +1270,9 @@ For disabling the behaviour for certain buffers and/or modes."
     "C-c P x" "projectile/execute"
     "C-c P 4" "projectile/other-window"
     "C-c q"   "boxquote"
     "C-c P x" "projectile/execute"
     "C-c P 4" "projectile/other-window"
     "C-c q"   "boxquote"

-    "s-g"     "magit"
-    "s-O"     "outline"
-    "s-t"     "themes")
+    "C-c t"   "themes"
+    ;; "s-O"     "outline"
+    )

 
   ;; prefixes for major modes
   (which-key-add-major-mode-key-based-replacements 'message-mode
 
   ;; prefixes for major modes
   (which-key-add-major-mode-key-based-replacements 'message-mode


@@ -1361,9 +1312,10 @@ For disabling the behaviour for certain buffers and/or modes."
   :defer 0.5
   :bind-keymap ("C-c P" . projectile-command-map)
   :config
   :defer 0.5
   :bind-keymap ("C-c P" . projectile-command-map)
   :config

+  (make-directory (b/var "projectile/") t)

   (projectile-mode)
 
   (projectile-mode)
 

-  (defun mab/projectile-mode-line-fun ()
+  (defun b/projectile-mode-line-fun ()

   "Report project name and type in the modeline."
   (let ((project-name (projectile-project-name))
         (project-type (projectile-project-type)))
   "Report project name and type in the modeline."
   (let ((project-name (projectile-project-name))
         (project-type (projectile-project-type)))


@@ -1372,7 +1324,7 @@ For disabling the behaviour for certain buffers and/or modes."
             (if project-type
                 (format ":%s" project-type)
               ""))))
             (if project-type
                 (format ":%s" project-type)
               ""))))

-  (setq projectile-mode-line-function 'mab/projectile-mode-line-fun)
+  (setq projectile-mode-line-function 'b/projectile-mode-line-fun)

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


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

+  (projectile-cache-file (b/var "projectile/cache.el"))

   (projectile-completion-system 'ivy)
   (projectile-completion-system 'ivy)

+  (projectile-known-projects-file (b/var "projectile/known-projects.el"))

   (projectile-mode-line-prefix " proj"))
 
 (use-package helpful
   (projectile-mode-line-prefix " proj"))
 
 (use-package helpful


@@ -1410,28 +1364,28 @@ For disabling the behaviour for certain buffers and/or modes."
 (use-package boxquote
   :defer 0.6
   :bind
 (use-package boxquote
   :defer 0.6
   :bind

-  (:prefix-map mab/boxquote-prefix-map
-   :prefix "C-c q"
-   ("b"   . boxquote-buffer)
-   ("B"   . boxquote-insert-buffer)
-   ("d"   . boxquote-defun)
-   ("F"   . boxquote-insert-file)
-   ("hf"  . boxquote-describe-function)
-   ("hk"  . boxquote-describe-key)
-   ("hv"  . boxquote-describe-variable)
-   ("hw"  . boxquote-where-is)
-   ("k"   . boxquote-kill)
-   ("p"   . boxquote-paragraph)
-   ("q"   . boxquote-boxquote)
-   ("r"   . boxquote-region)
-   ("s"   . boxquote-shell-command)
-   ("t"   . boxquote-text)
-   ("T"   . boxquote-title)
-   ("u"   . boxquote-unbox)
-   ("U"   . boxquote-unbox-region)
-   ("y"   . boxquote-yank)
-   ("M-q" . boxquote-fill-paragraph)
-   ("M-w" . boxquote-kill-ring-save)))
+  (:prefix-map b/boxquote-prefix-map
+               :prefix "C-c q"
+               ("b"   . boxquote-buffer)
+               ("B"   . boxquote-insert-buffer)
+               ("d"   . boxquote-defun)
+               ("F"   . boxquote-insert-file)
+               ("hf"  . boxquote-describe-function)
+               ("hk"  . boxquote-describe-key)
+               ("hv"  . boxquote-describe-variable)
+               ("hw"  . boxquote-where-is)
+               ("k"   . boxquote-kill)
+               ("p"   . boxquote-paragraph)
+               ("q"   . boxquote-boxquote)
+               ("r"   . boxquote-region)
+               ("s"   . boxquote-shell-command)
+               ("t"   . boxquote-text)
+               ("T"   . boxquote-title)
+               ("u"   . boxquote-unbox)
+               ("U"   . boxquote-unbox-region)
+               ("y"   . boxquote-yank)
+               ("M-q" . boxquote-fill-paragraph)
+               ("M-w" . boxquote-kill-ring-save)))

 
 (use-package orgalist
   ;; http://lists.gnu.org/archive/html/emacs-orgmode/2019-04/msg00007.html
 
 (use-package orgalist
   ;; http://lists.gnu.org/archive/html/emacs-orgmode/2019-04/msg00007.html


@@ -1445,7 +1399,8 @@ For disabling the behaviour for certain buffers and/or modes."
   :delight " typo"
   :config
   (typo-global-mode 1)
   :delight " typo"
   :config
   (typo-global-mode 1)

-  :hook ((text-mode erc-mode) . typo-mode))
+  :hook (((text-mode erc-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


@@ -1539,88 +1494,53 @@ For disabling the behaviour for certain buffers and/or modes."
 (use-package multiple-cursors
   :bind
   (("C-S-<mouse-1>" . mc/add-cursor-on-click)
 (use-package multiple-cursors
   :bind
   (("C-S-<mouse-1>" . mc/add-cursor-on-click)

-   (:prefix-map mab/mc-prefix-map
+   (:prefix-map b/mc-prefix-map

                :prefix "C-c m"
                ("c" . mc/edit-lines)
                ("n" . mc/mark-next-like-this)
                ("p" . mc/mark-previous-like-this)
                :prefix "C-c m"
                ("c" . mc/edit-lines)
                ("n" . mc/mark-next-like-this)
                ("p" . mc/mark-previous-like-this)

-               ("a" . mc/mark-all-like-this))))
+               ("a" . mc/mark-all-like-this)))
+  :config
+  (setq mc/list-file (b/var "mc-list.el")))

 
 

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

 
 (use-package yasnippet
   :defer 0.6
   :config
   (defconst yas-verbosity-cur yas-verbosity)
   (setq yas-verbosity 2)
 
 (use-package yasnippet
   :defer 0.6
   :config
   (defconst yas-verbosity-cur yas-verbosity)
   (setq yas-verbosity 2)

+  (setq yas-snippet-dirs (list (b/etc "yasnippet/snippets/")))

   (add-to-list 'yas-snippet-dirs "~/src/git/guix/etc/snippets" t)
   (yas-reload-all)
   (setq yas-verbosity yas-verbosity-cur)
   (add-to-list 'yas-snippet-dirs "~/src/git/guix/etc/snippets" t)
   (yas-reload-all)
   (setq yas-verbosity yas-verbosity-cur)

+
+  (defun b/yas--maybe-expand-key-filter (cmd)
+    (when (and (yas--maybe-expand-key-filter cmd)
+               (not (bound-and-true-p git-commit-mode)))
+      cmd))
+  (defconst b/yas-maybe-expand
+    '(menu-item "" yas-expand :filter b/yas--maybe-expand-key-filter))
+  (define-key yas-minor-mode-map
+    (kbd "SPC") b/yas-maybe-expand)
+

   (yas-global-mode))
 
   (yas-global-mode))
 

-(use-package debbugs
-  :straight (debbugs
-             :host github
-             :repo "emacs-straight/debbugs"
-             :files (:defaults "Debbugs.wsdl")))
+(use-package debbugs)

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

-  (mab/setq-every '("~/usr/org/references.bib")
+  (b/setq-every '("~/usr/org/references.bib")

     reftex-default-bibliography
     org-ref-default-bibliography)
   (setq
    org-ref-bibliography-notes "~/usr/org/notes.org"
    org-ref-pdf-directory "~/usr/org/bibtex-pdfs/"))
 
     reftex-default-bibliography
     org-ref-default-bibliography)
   (setq
    org-ref-bibliography-notes "~/usr/org/notes.org"
    org-ref-pdf-directory "~/usr/org/bibtex-pdfs/"))
 

-;; ugh, temporary (still better than using the proprietary web app)
-(use-package slack
-  :commands (slack-start)
-  :init
-  (eval-when-compile                    ; silence the byte-compiler
-    (defvar url-http-data nil)
-    (defvar url-http-extra-headers nil)
-    (defvar url-http-method nil)
-    (defvar url-callback-function nil)
-    (defvar url-callback-arguments nil)
-    (defvar oauth--token-data nil))
-  (setq slack-buffer-emojify t
-        slack-prefer-current-team t)
-  :config
-  (slack-register-team
-   :name "nday-students"
-   :default t
-   :token nday-students-token
-   :subscribed-channels '(general)
-   :full-and-display-names t)
-  (with-eval-after-load 'swiper
-    (add-to-list 'swiper-font-lock-exclude 'slack-message-buffer-mode t))
-  (setq lui-time-stamp-format "[%Y-%m-%d %H:%M:%S]"
-        lui-time-stamp-only-when-changed-p t
-        lui-time-stamp-position 'right)
-  :bind
-  (("C-c s s" . slack-start)
-   ("C-c s u" . slack-select-unread-rooms)
-   ("C-c s b" . slack-select-rooms)
-   ("C-c s t" . slack-change-current-team)
-   ("C-c s c" . slack-ws-close)
-   :map slack-mode-map
-   ("M-p"     . slack-buffer-goto-prev-message)
-   ("M-n"     . slack-buffer-goto-next-message)
-   ("C-c e"   . slack-message-edit)
-   ("C-c k"   . slack-message-delete)
-   ("C-c C-k" . slack-channel-leave)
-   ("C-c r a" . slack-message-add-reaction)
-   ("C-c r r" . slack-message-remove-reaction)
-   ("C-c r s" . slack-message-show-reaction-users)
-   ("C-c p l" . slack-room-pins-list)
-   ("C-c p a" . slack-message-pins-add)
-   ("C-c p r" . slack-message-pins-remove)
-   ("@"       . slack-message-embed-mention)
-   ("#"       . slack-message-embed-channel)))
-

 (use-package alert
   :commands (alert)
   :init (setq alert-default-style 'notifications))
 (use-package alert
   :commands (alert)
   :init (setq alert-default-style 'notifications))


@@ -1628,49 +1548,80 @@ For disabling the behaviour for certain buffers and/or modes."
 ;; (use-package fill-column-indicator)
 
 (use-package emojify
 ;; (use-package fill-column-indicator)
 
 (use-package emojify

+  :config
+  (make-directory (b/var "emojify/") t)
+  (setq emojify-emojis-dir (b/var "emojify/"))

   :hook (erc-mode . emojify-mode))
 
   :hook (erc-mode . emojify-mode))
 

-(use-feature window
+(use-package window

   :bind
   :bind

-  (("s-o"   . other-window)
-   ("M-o"   . other-window)
-   ("s-/ ." . split-window-right)
-   ("s-/ ," . split-window-below)
-   ("s-/ 0" . delete-window)
-   ("s-q"   . delete-window)))
-
-(use-feature windmove
+  (("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))
+  :custom
+  (split-width-threshold 150))
+
+(use-package windmove

   :defer 0.6
   :bind
   :defer 0.6
   :bind

-  (("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)))
+  (("C-c w h" . windmove-left)
+   ("C-c w j" . windmove-down)
+   ("C-c w k" . windmove-up)
+   ("C-c w l" . windmove-right)
+   ("C-c w H" . windmove-swap-states-left)
+   ("C-c w J" . windmove-swap-states-down)
+   ("C-c w K" . windmove-swap-states-up)
+   ("C-c w L" . windmove-swap-states-right)))

 
 (use-package pass
   :commands pass
   :bind ("C-c a p" . pass)
   :hook (pass-mode . View-exit))
 
 
 (use-package pass
   :commands pass
   :bind ("C-c a p" . pass)
   :hook (pass-mode . View-exit))
 

+(use-package pdf-tools
+  :defer 0.5
+  :bind (:map pdf-view-mode-map
+              ("M-RET" . image-previous-line))
+  :config (pdf-tools-install nil t))
+
+(use-package biblio)
+
+(use-package reftex
+  :hook (latex-mode . reftex-mode))
+
+(use-package reftex-cite
+  :after reftex
+  :disabled                             ; enable to disable
+                                        ; reftex-cite's default choice
+                                        ; of previous word
+  :config
+  (defun reftex-get-bibkey-default ()
+    "If the cursor is in a citation macro, return the word before the macro."
+    (let* ((macro (reftex-what-macro 1)))
+      (save-excursion
+        (when (and macro (string-match "cite" (car macro)))
+          (goto-char (cdr macro)))
+        (reftex-this-word)))))
+

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

-(defvar mab/maildir (expand-file-name "~/mail/"))
+(defvar b/maildir (expand-file-name "~/mail/"))

 (with-eval-after-load 'recentf
 (with-eval-after-load 'recentf

-  (add-to-list 'recentf-exclude mab/maildir))
+  (add-to-list 'recentf-exclude b/maildir))

 
 (setq
 
 (setq

- mab/gnus-init-file  (no-littering-expand-etc-file-name "gnus")
+ b/gnus-init-file  (b/etc "gnus")

  mail-user-agent   'gnus-user-agent
  read-mail-command 'gnus)
 
  mail-user-agent   'gnus-user-agent
  read-mail-command 'gnus)
 

-(use-feature gnus
-  :bind (("s-m"   . gnus)
-         ("s-M"   . gnus-unplugged))
+(use-package gnus
+  :bind (("s-m"     . gnus)
+         ("s-M"     . gnus-unplugged)
+         ("C-c a m" . gnus)
+         ("C-c a M" . gnus-unplugged))

   :init
   (setq
    gnus-select-method '(nnnil "")
   :init
   (setq
    gnus-select-method '(nnnil "")


@@ -1693,45 +1644,23 @@ For disabling the behaviour for certain buffers and/or modes."
                                  ;; (: gnus-registry-split-fancy-with-parent)
                                  ;; (: gnus-group-split-fancy "INBOX" t "INBOX")
                                  ;; gnu
                                  ;; (: 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 ".*emacsconf-register.gnu.org" "l.gnu.emacsconf.register")
-                                 (list ".*emacsconf-submit.gnu.org" "l.gnu.emacsconf.submit")
-                                 (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 ".*help-guix.gnu.org" "l.gnu.guix.help")
-                                 (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")
+                                 (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")
                                  ;; 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 ".*atreus.freelists.org" "l.atreus")
                                  (list ".*deepspec.lists.cs.princeton.edu" "l.deepspec")
                                  ;; other
                                  (list ".*atreus.freelists.org" "l.atreus")
                                  (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/free-writers-club@lists.sr.ht" "l.~sircmpwn.free-writers-club")
-                                 (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")
+                                 ;; (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)
                                  "INBOX")))
      (nnimap "uw"
              (nnimap-stream plain)


@@ -1743,9 +1672,9 @@ For disabling the behaviour for certain buffers and/or modes."
              (nnimap-split-methods 'nnimap-split-fancy)
              (nnimap-split-fancy (|
                                   ;; (: gnus-registry-split-fancy-with-parent)
              (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")
+                                  ;; se212-f19
+                                  ("subject" "SE\\s-?212" "course.se212-f19")
+                                  (from "SE\\s-?212" "course.se212-f19")

                                   ;; catch-all
                                   "INBOX")))
      (nnimap "csc"
                                   ;; catch-all
                                   "INBOX")))
      (nnimap "csc"


@@ -1763,90 +1692,102 @@ For disabling the behaviour for certain buffers and/or modes."
       (to-address . "deepspec@lists.cs.princeton.edu")
       (to-list    . "deepspec@lists.cs.princeton.edu")
       (list-identifier . "\\[deepspec\\]"))
       (to-address . "deepspec@lists.cs.princeton.edu")
       (to-list    . "deepspec@lists.cs.princeton.edu")
       (list-identifier . "\\[deepspec\\]"))

-     ("l\\.gnu\\.emacs\\.devel"
+     ("l\\.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"))

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

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

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

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

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

       (to-address . "emacs-orgmode@gnu.org")
       (to-list    . "emacs-orgmode@gnu.org")
       (list-identifier . "\\[O\\]"))
       (to-address . "emacs-orgmode@gnu.org")
       (to-list    . "emacs-orgmode@gnu.org")
       (list-identifier . "\\[O\\]"))

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

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

-     ("l\\.gnu\\.emacsconf\\.discuss"
+     ("l\\.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"))

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

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

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

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

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

       (to-address . "fencepost-users@gnu.org")
       (to-list    . "fencepost-users@gnu.org")
       (list-identifier . "\\[Fencepost-users\\]"))
       (to-address . "fencepost-users@gnu.org")
       (to-list    . "fencepost-users@gnu.org")
       (list-identifier . "\\[Fencepost-users\\]"))

-     ("l\\.gnu\\.gnunet\\.developers"
+     ("l\\.gnewsense-art"
+      (to-address . "gnewsense-art@nongnu.org")
+      (to-list    . "gnewsense-art@nongnu.org")
+      (list-identifier . "\\[gNewSense-art\\]"))
+     ("l\\.gnewsense-dev"
+      (to-address . "gnewsense-dev@nongnu.org")
+      (to-list    . "gnewsense-dev@nongnu.org")
+      (list-identifier . "\\[Gnewsense-dev\\]"))
+     ("l\\.gnewsense-users"
+      (to-address . "gnewsense-users@nongnu.org")
+      (to-list    . "gnewsense-users@nongnu.org")
+      (list-identifier . "\\[gNewSense-users\\]"))
+     ("l\\.gnunet-developers"

       (to-address . "gnunet-developers@gnu.org")
       (to-list    . "gnunet-developers@gnu.org")
       (list-identifier . "\\[GNUnet-developers\\]"))
       (to-address . "gnunet-developers@gnu.org")
       (to-list    . "gnunet-developers@gnu.org")
       (list-identifier . "\\[GNUnet-developers\\]"))

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

       (to-address . "help-gnunet@gnu.org")
       (to-list    . "help-gnunet@gnu.org")
       (list-identifier . "\\[Help-gnunet\\]"))
       (to-address . "help-gnunet@gnu.org")
       (to-list    . "help-gnunet@gnu.org")
       (list-identifier . "\\[Help-gnunet\\]"))

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

       (to-address . "bug-gnuzilla@gnu.org")
       (to-list    . "bug-gnuzilla@gnu.org")
       (list-identifier . "\\[Bug-gnuzilla\\]"))
       (to-address . "bug-gnuzilla@gnu.org")
       (to-list    . "bug-gnuzilla@gnu.org")
       (list-identifier . "\\[Bug-gnuzilla\\]"))

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

       (to-address . "gnuzilla-dev@gnu.org")
       (to-list    . "gnuzilla-dev@gnu.org")
       (list-identifier . "\\[Gnuzilla-dev\\]"))
       (to-address . "gnuzilla-dev@gnu.org")
       (to-list    . "gnuzilla-dev@gnu.org")
       (list-identifier . "\\[Gnuzilla-dev\\]"))

-     ("l\\.gnu\\.guile\\.devel"
+     ("l\\.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"))

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

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

-     ("l\\.gnu\\.guix\\.devel"
+     ("l\\.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"))

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

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

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

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

-     ("l\\.gnu\\.savannah\\.hackers\\.public"
+     ("l\\.savannah-hackers-public"

       (to-address . "savannah-hackers-public@gnu.org")
       (to-list    . "savannah-hackers-public@gnu.org"))
       (to-address . "savannah-hackers-public@gnu.org")
       (to-list    . "savannah-hackers-public@gnu.org"))

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

       (to-address . "savannah-users@gnu.org")
       (to-list    . "savannah-users@gnu.org"))
       (to-address . "savannah-users@gnu.org")
       (to-list    . "savannah-users@gnu.org"))

-     ("l\\.gnu\\.www\\.commits"
+     ("l\\.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"))

-     ("l\\.gnu\\.www\\.discuss"
+     ("l\\.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"))

-     ("l\\.haskell\\.art"
+     ("l\\.haskell-art"

       (to-address . "haskell-art@we.lurk.org")
       (to-list    . "haskell-art@we.lurk.org")
       (list-identifier . "\\[haskell-art\\]"))
       (to-address . "haskell-art@we.lurk.org")
       (to-list    . "haskell-art@we.lurk.org")
       (list-identifier . "\\[haskell-art\\]"))

-     ("l\\.haskell\\.cafe"
+     ("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"))
       (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"
+     ("l\\.parabola-dev"

       (to-address . "dev@lists.parabola.nu")
       (to-list    . "dev@lists.parabola.nu")
       (list-identifier . "\\[Dev\\]"))
       (to-address . "dev@lists.parabola.nu")
       (to-list    . "dev@lists.parabola.nu")
       (list-identifier . "\\[Dev\\]"))


@@ -1856,16 +1797,16 @@ For disabling the behaviour for certain buffers and/or modes."
      ("l\\.~sircmpwn\\.free-writers-club"
       (to-address . "~sircmpwn/free-writers-club@lists.sr.ht")
       (to-list    . "~sircmpwn/free-writers-club@lists.sr.ht"))
      ("l\\.~sircmpwn\\.free-writers-club"
       (to-address . "~sircmpwn/free-writers-club@lists.sr.ht")
       (to-list    . "~sircmpwn/free-writers-club@lists.sr.ht"))

-     ("l\\.~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"))

-     ("l\\.~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"))

-     ("l\\.~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"))

-     ("l\\.~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"))
      ("webmasters"
       (to-address . "~sircmpwn/sr.ht-discuss@lists.sr.ht")
       (to-list    . "~sircmpwn/sr.ht-discuss@lists.sr.ht"))
      ("webmasters"


@@ -1878,7 +1819,7 @@ For disabling the behaviour for certain buffers and/or modes."
      ("nnimap\\+uw:.*"
       (gcc-self . t)))
    gnus-large-newsgroup  50
      ("nnimap\\+uw:.*"
       (gcc-self . t)))
    gnus-large-newsgroup  50

-   gnus-home-directory   (no-littering-expand-var-file-name "gnus/")
+   gnus-home-directory   (b/var "gnus/")

    gnus-directory        (concat gnus-home-directory "news/")
    message-directory     (concat gnus-home-directory "mail/")
    nndraft-directory     (concat gnus-home-directory "drafts/")
    gnus-directory        (concat gnus-home-directory "news/")
    message-directory     (concat gnus-home-directory "mail/")
    nndraft-directory     (concat gnus-home-directory "drafts/")


@@ -1891,12 +1832,18 @@ For disabling the behaviour for certain buffers and/or modes."
   (require 'ebdb-mua)
   (require 'ebdb-gnus)
 
   (require 'ebdb-mua)
   (require 'ebdb-gnus)
 

+  (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))
+

   ;; (gnus-registry-initialize)
 
   (with-eval-after-load 'recentf
     (add-to-list 'recentf-exclude gnus-home-directory)))
 
   ;; (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\\)")
   :config
   (setq
    gnus-buttonized-mime-types '("multipart/\\(signed\\|encrypted\\)")


@@ -1924,9 +1871,9 @@ For disabling the behaviour for certain buffers and/or modes."
    :map gnus-article-mode-map
    ("M-L" . org-store-link)))
 
    :map gnus-article-mode-map
    ("M-L" . org-store-link)))
 

-(use-feature gnus-sum
+(use-package gnus-sum

   :bind (:map gnus-summary-mode-map
   :bind (:map gnus-summary-mode-map

-              :prefix-map mab/gnus-summary-prefix-map
+              :prefix-map b/gnus-summary-prefix-map

               :prefix "v"
               ("r" . gnus-summary-reply)
               ("w" . gnus-summary-wide-reply)
               :prefix "v"
               ("r" . gnus-summary-reply)
               ("w" . gnus-summary-wide-reply)


@@ -1935,88 +1882,88 @@ For disabling the behaviour for certain buffers and/or modes."
   (bind-keys
    :map gnus-summary-mode-map
    ("M-L" . org-store-link))
   (bind-keys
    :map gnus-summary-mode-map
    ("M-L" . org-store-link))

-  :hook (gnus-summary-mode . mab/no-mouse-autoselect-window))
+  :hook (gnus-summary-mode . b/no-mouse-autoselect-window))

 
 

-(use-feature gnus-msg
+(use-package gnus-msg

   :config
   :config

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

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

 Free Software Activist | GNU Webmaster & Volunteer
 GPG: BE62 7373 8E61 6D6D 1B3A  08E8 A21A 0202 4881 6103
 Free Software Activist | GNU Webmaster & Volunteer
 GPG: BE62 7373 8E61 6D6D 1B3A  08E8 A21A 0202 4881 6103

-https://bandalis.org")
-  (defvar mab/uw-signature "Amin Bandali, MMath Student
+https://bandali.eu.org")
+  (defvar b/uw-signature "Amin Bandali, MMath Student

 Cheriton School of Computer Science
 University of Waterloo
 Cheriton School of Computer Science
 University of Waterloo

-https://bandalis.org")
-  (defvar mab/csc-signature "Amin Bandali
-Termcom, Computer Science Club
-University of Waterloo
-https://bandalis.org")
+https://bandali.eu.org")
+  (defvar b/csc-signature "Amin Bandali
+Systems Committee
+Computer Science Club, University of Waterloo
+https://csclub.uwaterloo.ca/~abandali")

   (setq gnus-posting-styles
         '((".*"
            (address "amin@shemshak.org")
            (body "\nBest,\n")
   (setq gnus-posting-styles
         '((".*"
            (address "amin@shemshak.org")
            (body "\nBest,\n")

-           (signature mab/signature)
-           (eval (setq mab/message-cite-say-hi t)))
+           (signature b/signature)
+           (eval (setq b/message-cite-say-hi t)))

           ("nnimap\\+gnu:.*"
            (address "bandali@gnu.org")
           ("nnimap\\+gnu:.*"
            (address "bandali@gnu.org")

-           (signature mab/gnu-signature)
+           (signature b/gnu-signature)

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

-           (eval (setq mab/message-cite-say-hi nil)))
+           (eval (setq b/message-cite-say-hi nil)))

           ("nnimap\\+uw:.*"
            (address "abandali@uwaterloo.ca")
           ("nnimap\\+uw:.*"
            (address "abandali@uwaterloo.ca")

-           (signature mab/uw-signature))
+           (signature b/uw-signature))

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

-           (signature mab/csc-signature)
+           (signature b/csc-signature)

            (gcc "nnimap+csc:Sent")))))
 
            (gcc "nnimap+csc:Sent")))))
 

-(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"))
 
   :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))
 
   :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*
   :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)))
 
     :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))
 
   :commands gnus-dired-mode
   :init
   (add-hook 'dired-mode-hook 'gnus-dired-mode))
 

-(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))
 
   :config
   (setq mm-discouraged-alternatives '("text/html" "text/richtext")
         mm-decrypt-option 'known
         mm-verify-option 'known))
 

-(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))
 
   :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

   :config
   ;; redefine for a simplified In-Reply-To header
   ;; (see https://todo.sr.ht/~sircmpwn/lists.sr.ht/67)
   :config
   ;; redefine for a simplified In-Reply-To header
   ;; (see https://todo.sr.ht/~sircmpwn/lists.sr.ht/67)


@@ -2028,7 +1975,7 @@ https://bandalis.org")
         (when from
           msg-id))))
 
         (when from
           msg-id))))
 

-  (defconst mab/message-cite-style-format "On %Y-%m-%d %l:%M %p, %N wrote:")
+  (defconst b/message-cite-style-format "On %Y-%m-%d %l:%M %p, %N wrote:")

   (defconst message-cite-style-bandali
     '((message-cite-function  'message-cite-original)
       (message-citation-line-function  'message-insert-formatted-citation-line)
   (defconst message-cite-style-bandali
     '((message-cite-function  'message-cite-original)
       (message-citation-line-function  'message-insert-formatted-citation-line)


@@ -2037,9 +1984,9 @@ https://bandalis.org")
       (message-yank-cited-prefix  ">")
       (message-yank-empty-prefix  ">")
       (message-citation-line-format
       (message-yank-cited-prefix  ">")
       (message-yank-empty-prefix  ">")
       (message-citation-line-format

-       (if mab/message-cite-say-hi
-           (concat "Hi %F,\n\n" mab/message-cite-style-format)
-         mab/message-cite-style-format)))
+       (if b/message-cite-say-hi
+           (concat "Hi %F,\n\n" b/message-cite-style-format)
+         b/message-cite-style-format)))

     "Citation style based on Mozilla Thunderbird's. Use with message-cite-style.")
   (setq ;; message-cite-style 'message-cite-style-bandali
         message-kill-buffer-on-exit t
     "Citation style based on Mozilla Thunderbird's. Use with message-cite-style.")
   (setq ;; message-cite-style 'message-cite-style-bandali
         message-kill-buffer-on-exit t


@@ -2063,15 +2010,15 @@ https://bandalis.org")
   ;; (message-header-cc      ((t (:foreground "#333" :weight normal))))
   )
 
   ;; (message-header-cc      ((t (:foreground "#333" :weight normal))))
   )
 

-(use-feature mml
+(use-package mml

   :delight " mml")
 
   :delight " mml")
 

-(use-feature mml-sec
+(use-package mml-sec

   :custom
   (mml-secure-openpgp-encrypt-to-self t)
   (mml-secure-openpgp-sign-with-sender t))
 
   :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 ""
   :after message
   ;; :config
   ;; (setq footnote-start-tag ""


@@ -2079,7 +2026,7 @@ https://bandalis.org")
   ;;       footnote-style     'unicode)
   :bind
   (:map message-mode-map
   ;;       footnote-style     'unicode)
   :bind
   (:map message-mode-map

-        :prefix-map mab/footnote-prefix-map
+        :prefix-map b/footnote-prefix-map

         :prefix "C-c f"
         ("a" . footnote-add-footnote)
         ("b" . footnote-back-to-message)
         :prefix "C-c f"
         ("a" . footnote-add-footnote)
         ("b" . footnote-back-to-message)


@@ -2090,15 +2037,14 @@ https://bandalis.org")
         ("s" . footnote-set-style)))
 
 (use-package ebdb
         ("s" . footnote-set-style)))
 
 (use-package ebdb

-  :straight (:host github :repo "girzel/ebdb")

   :after gnus
   :bind (:map gnus-group-mode-map ("e" . ebdb))
   :config
   :after gnus
   :bind (:map gnus-group-mode-map ("e" . ebdb))
   :config

-  (setq ebdb-sources (no-littering-expand-var-file-name "ebdb"))
+  (setq ebdb-sources (b/var "ebdb"))

   (with-eval-after-load 'swiper
     (add-to-list 'swiper-font-lock-exclude 'ebdb-mode t)))
 
   (with-eval-after-load 'swiper
     (add-to-list 'swiper-font-lock-exclude 'ebdb-mode t)))
 

-(use-feature ebdb-com
+(use-package ebdb-com

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


@@ -2110,7 +2056,7 @@ https://bandalis.org")
   :config
   (defun company-ebdb--post-complete (_) nil))
 
   :config
   (defun company-ebdb--post-complete (_) nil))
 

-(use-feature ebdb-gnus
+(use-package ebdb-gnus

   :after ebdb
   :custom
   (ebdb-gnus-window-configuration
   :after ebdb
   :custom
   (ebdb-gnus-window-configuration


@@ -2121,7 +2067,7 @@ https://bandalis.org")
                            (article 1.0)
                            (ebdb-gnus 0.3))))))
 
                            (article 1.0)
                            (ebdb-gnus 0.3))))))
 

-(use-feature ebdb-mua
+(use-package ebdb-mua

   :after ebdb
   ;; :custom (ebdb-mua-pop-up nil)
   )
   :after ebdb
   ;; :custom (ebdb-mua-pop-up nil)
   )


@@ -2129,7 +2075,6 @@ https://bandalis.org")
 ;; (use-package ebdb-message
 ;;   :after ebdb)
 
 ;; (use-package ebdb-message
 ;;   :after ebdb)
 

-

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


@@ -2159,21 +2104,19 @@ https://bandalis.org")
 \f
 ;;; IRC (with ERC and ZNC)
 
 \f
 ;;; IRC (with ERC and ZNC)
 

-(use-feature erc
-  :bind (("C-c a e b" . erc-switch-to-buffer)
+(use-package erc
+  :bind (("C-c b e" . 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")
          :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-prompt "erc>")

   (erc-rename-buffers t)
   (erc-server-reconnect-attempts 5)
   (erc-server-reconnect-timeout 3)
   :config
   (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"
   (defun erc-cmd-OPME ()
     "Request chanserv to op me."
     (erc-message "PRIVMSG"


@@ -2187,21 +2130,97 @@ https://bandalis.org")
   (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))
-
-(use-feature erc-fill
+  (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))))))))
+
+(use-package erc-fill

   :after erc
   :custom
   :after erc
   :custom

+  (erc-fill-column 77)

   (erc-fill-function 'erc-fill-static)
   (erc-fill-static-center 18))
 
   (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 ","))
 
   :after erc
   :custom
   (erc-pcomplete-nick-postfix ","))
 

-(use-feature erc-track
+(use-package erc-track

   :after erc
   :after erc

+  :bind (("C-c a e t d" . erc-track-disable)
+         ("C-c a e t e" . erc-track-enable))

   :custom
   (erc-track-enable-keybindings nil)
   (erc-track-exclude-types '("JOIN" "MODE" "NICK" "PART" "QUIT"
   :custom
   (erc-track-enable-keybindings nil)
   (erc-track-exclude-types '("JOIN" "MODE" "NICK" "PART" "QUIT"


@@ -2216,7 +2235,7 @@ https://bandalis.org")
   :after erc)
 
 (use-package znc
   :after erc)
 
 (use-package znc

-  :straight (:host nil :repo "https://git.shemshak.org/amin/znc.el")
+  :load-path "lisp/znc.el/"

   :bind (("C-c a e e" . znc-erc)
          ("C-c a e a" . znc-all))
   :config
   :bind (("C-c a e e" . znc-erc)
          ("C-c a e a" . znc-all))
   :config


@@ -2237,6 +2256,6 @@ https://bandalis.org")
 
 (message "Loading %s...done (%.3fs)" user-init-file
          (float-time (time-subtract (current-time)
 
 (message "Loading %s...done (%.3fs)" user-init-file
          (float-time (time-subtract (current-time)

-                                    mab/before-user-init-time)))
+                                    b/before-user-init-time)))

 
 ;;; init.el ends here
 
 ;;; init.el ends here