Move dired, eshell, ibuffer, ido, and ivy to separate files in lisp/

[~bandali/configs] / init.el

diff --git a/init.el b/init.el
index b80e00f..184ae64 100644 (file)
--- a/init.el
+++ b/init.el
@@ -1,6 +1,6 @@
-;;; init.el --- Amin Bandali's Emacs config -*- lexical-binding: t -*-
+;;; init.el --- bandali's emacs configuration -*- lexical-binding: t -*-

 
 

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

 
 ;; This program is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 
 ;; This program is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by


@@ -17,548 +17,584 @@
 
 ;;; Commentary:
 
 
 ;;; Commentary:
 

-;; Emacs configuration of Amin Bandali, computer scientist and functional
-;; programmer.
+;; GNU Emacs configuration of Amin Bandali, computer scientist,
+;; Free Software activist, and GNU maintainer & webmaster.  Packages
+;; are installed through using Borg for a fully reproducible setup.

 
 

-;; THIS FILE IS AUTO-GENERATED FROM `init.org'.
-
-;; Naming conventions:
+;; 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:

 ;;
 ;;

-;;   amin-...   public variables or non-interactive functions
-;;   amin--...  private anything (non-interactive), not safe for direct use
-;;   amin/...   an interactive function; safe for M-x or keybinding
-;;   amin|...   a hook function
-;;   amin*...   an advising function
-;;   amin@...   a hydra command
-;;   ...!       a macro
+;; - https://github.com/dieggsy/dotfiles
+;; - https://github.com/dakra/dmacs
+;; - http://pages.sachachua.com/.emacs.d/Sacha.html
+;; - https://github.com/dakrone/eos
+;; - http://doc.rix.si/cce/cce.html
+;; - https://github.com/jwiegley/dot-emacs
+;; - https://github.com/wasamasa/dotemacs
+;; - https://github.com/hlissner/doom-emacs

 
 ;;; Code:
 
 
 ;;; Code:
 

-\f
-;; * Initial setup
+;;; Emacs initialization

 
 

-(defvar amin--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'.")
   "Value of `current-time' when Emacs begins loading `user-init-file'.")

-(message "Loading Emacs...done (%.3fs)"
-         (float-time (time-subtract amin--before-user-init-time
-                                    before-init-time)))
-
-(defvar amin--gc-cons-threshold gc-cons-threshold)
-(defvar amin--gc-cons-percentage gc-cons-percentage)
-(defvar amin--file-name-handler-alist file-name-handler-alist)
-(setq gc-cons-threshold (* 400 1024 1024)  ; 400 MiB
+(defvar b/emacs-initialized nil
+  "Whether Emacs has been initialized.")
+(defvar b/exwm-p (string= (system-name) "chaman")
+  "Whether or not we will be using `exwm'.")
+
+(when (not (bound-and-true-p b/emacs-initialized))
+  (message "Loading Emacs...done (%.3fs)"
+           (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.
+(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 (* 30 1024 1024)  ; 30 MiB

       gc-cons-percentage 0.6
       file-name-handler-alist nil
       ;; sidesteps a bug when profiling with esup
       esup-child-profile-require-level 0)
 
       gc-cons-percentage 0.6
       file-name-handler-alist nil
       ;; sidesteps a bug when profiling with esup
       esup-child-profile-require-level 0)
 

-(add-hook
- 'after-init-hook
- (lambda ()
-   (setq gc-cons-threshold amin--gc-cons-threshold
-         gc-cons-percentage amin--gc-cons-percentage
-         file-name-handler-alist amin--file-name-handler-alist)))
-
+;; set them back to their defaults once we're done initializing
+(defun b/post-init ()
+  "My post-initialize function, run after loading `user-init-file'."
+  (setq b/emacs-initialized     t
+        gc-cons-threshold       b/gc-cons-threshold
+        gc-cons-percentage      b/gc-cons-percentage
+        file-name-handler-alist b/file-name-handler-alist)
+  (when b/exwm-p
+    (with-eval-after-load 'exwm-workspace
+      (setq-default
+       mode-line-format
+       (append
+        mode-line-format
+        '((:eval
+           (format
+            "[%s]" (number-to-string
+                    exwm-workspace-current-index)))))))))
+(add-hook 'after-init-hook #'b/post-init)
+
+;; increase number of lines kept in *Messages* log

 (setq message-log-max 20000)
 
 (setq message-log-max 20000)
 

+;; optionally, uncomment to supress some byte-compiler warnings
+;;   (see C-h v byte-compile-warnings RET for more info)

 ;; (setq byte-compile-warnings
 ;;       '(not free-vars unresolved noruntime lexical make-local))
 
 ;; (setq byte-compile-warnings
 ;;       '(not free-vars unresolved noruntime lexical make-local))
 

-(setq user-full-name "Amin Bandali"
-      user-mail-address "amin@aminb.org")
+\f
+;;; whoami

 
 

-(setq package-enable-at-startup nil)
-;; (package-initialize)
+(setq user-full-name "Amin Bandali"
+      user-mail-address "bandali@gnu.org")

 
 

-(setq user-init-file (or load-file-name buffer-file-name)
-      user-emacs-directory (file-name-directory user-init-file))
-(add-to-list 'load-path
-             (expand-file-name "lib/borg" user-emacs-directory))
-(require 'borg)
-(borg-initialize)
+\f
+;;; comment macro

 
 

-;; (require 'borg-nix-shell)
-;; (setq borg-build-shell-command 'borg-nix-shell-build-command)
+;; useful for commenting out multiple sexps at a time
+(defmacro comment (&rest _)
+  "Comment out one or more s-expressions."
+  (declare (indent defun))
+  nil)

 
 

-(with-eval-after-load 'bind-key
-  (bind-keys
-   :package borg
-   ("C-c b A" . borg-activate)
-   ("C-c b a" . borg-assimilate)
-   ("C-c b b" . borg-build)
-   ("C-c b c" . borg-clone)
-   ("C-c b r" . borg-remove)))
-
-(require 'use-package)
-(if nil  ; set to t when need to debug init
-    (setq use-package-verbose t
-          use-package-expand-minimally nil
-          use-package-compute-statistics t
-          debug-on-error t)
+\f
+;;; Package management
+
+(progn ;   `borg'
+  (add-to-list 'load-path
+               (expand-file-name "lib/borg" user-emacs-directory))
+  (require 'borg)
+  (borg-initialize)
+  (setq borg-rewrite-urls-alist
+        '(("git@github.com:" . "https://github.com/")
+          ("git@gitlab.com:" . "https://gitlab.com/"))))
+
+;; use-package
+(if nil                             ; set to t when need to debug init
+    (progn
+      (setq use-package-verbose t
+            use-package-expand-minimally nil
+            use-package-compute-statistics t
+            debug-on-error t)
+      (require 'use-package))

   (setq use-package-verbose nil
         use-package-expand-minimally t))
 
   (setq use-package-verbose nil
         use-package-expand-minimally t))
 

-(use-package epkg
-  :defer t
-  :bind
-  (("C-c b d" . epkg-describe-package)
-   ("C-c b p" . epkg-list-packages)
-   ("C-c b u" . epkg-update)))
+(setq use-package-always-defer t)
+(require 'bind-key)

 
 

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

 (use-package no-littering
 (use-package no-littering

-  :demand t
+  :demand
+  :config
+  (defalias 'b/etc 'no-littering-expand-etc-file-name)
+  (defalias 'b/var 'no-littering-expand-var-file-name))
+
+(use-package auto-compile
+  :demand

   :config
   :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))))
+  (auto-compile-on-load-mode)
+  (auto-compile-on-save-mode)
+  (setq auto-compile-display-buffer               nil)
+  (setq auto-compile-mode-line-counter            t)
+  (setq auto-compile-source-recreate-deletes-dest t)
+  (setq auto-compile-toggle-deletes-nonlib-dest   t)
+  (setq auto-compile-update-autoloads             t))

 
 

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

 (use-package custom
 (use-package custom

-  :no-require t
+  :no-require

   :config
   :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))
   (when (file-exists-p custom-file)
     (load custom-file))

-  (setf custom-safe-themes t))
+  ;; while at it, treat themes as safe
+  (setf custom-safe-themes t)
+  ;; only one custom theme at a time
+  (comment
+    (defadvice load-theme (before clear-previous-themes activate)
+      "Clear existing theme settings instead of layering them"
+      (mapc #'disable-theme custom-enabled-themes))))
+
+;; load the secrets file if it exists, otherwise show a warning
+(comment
+  (with-demoted-errors
+      (load (b/etc "secrets"))))
+
+;; start up emacs server.  see
+;; https://www.gnu.org/software/emacs/manual/html_node/emacs/Emacs-Server.html#Emacs-Server
+(use-package server
+  :defer 0.5
+  :config (or (server-running-p) (server-mode)))

 
 

-(with-demoted-errors
-    (load (no-littering-expand-etc-file-name "secrets")))
+\f
+;;; Useful utilities

 
 

-(use-package exec-path-from-shell
-  :defer 1
-  :init
-  (setq exec-path-from-shell-check-startup-files nil)
-  :config
-  (exec-path-from-shell-initialize)
-  ;; while we're at it, let's fix access to our running ssh-agent
-  (exec-path-from-shell-copy-env "SSH_AGENT_PID")
-  (exec-path-from-shell-copy-env "SSH_AUTH_SOCK"))
+(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)))

 
 

-;; only one custom theme at a time
-;;
-;; (defadvice load-theme (before clear-previous-themes activate)
-;;   "Clear existing theme settings instead of layering them"
-;;   (mapc #'disable-theme custom-enabled-themes))
+(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
+                       (concat program "_output"))))
+    (apply #'start-process
+           process-name buffer-name program 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).
+  (apply #'b/start-process
+         program
+         (remove nil (list args (dired-get-file-for-visit)))))
+
+(defun b/add-elisp-section ()
+  (interactive)
+  (insert "\n")
+  (forward-line -1)
+  (insert "\n\f\n;;; "))

 
 

-(use-package server
-  :defer 1
-  :config (or (server-running-p) (server-mode)))
+;; (defvar b/fill-column 47
+;;   "My custom `fill-column'.")

 
 

-;; unicode support
-;;
-;; (dolist (ft (fontset-list))
-;;   (set-fontset-font
-;;    ft
-;;    'unicode
-;;    (font-spec :name "Source Code Pro" :size 14))
-;;   (set-fontset-font
-;;    ft
-;;    'unicode
-;;    (font-spec :name "DejaVu Sans Mono")
-;;    nil
-;;    'append)
-;;   ;; (set-fontset-font
-;;   ;;  ft
-;;   ;;  'unicode
-;;   ;;  (font-spec
-;;   ;;   :name "Symbola monospacified for DejaVu Sans Mono")
-;;   ;;  nil
-;;   ;;  'append)
-;;   ;; (set-fontset-font
-;;   ;;  ft
-;;   ;;  #x2115  ; ℕ
-;;   ;;  (font-spec :name "DejaVu Sans Mono")
-;;   ;;  nil
-;;   ;;  'append)
-;;   (set-fontset-font
-;;    ft
-;;    (cons ?Α ?ω)
-;;    (font-spec :name "DejaVu Sans Mono" :size 14)
-;;    nil
-;;    'prepend))
-
-(setq text-scale-mode-step 1.05)
-
-(setq mouse-autoselect-window t)
-
-(defun amin--no-mouse-autoselect-window ()
+(defconst b/asterism "* * *")
+
+(defun b/insert-asterism ()
+  "Insert a centred asterism."
+  (interactive)
+  (insert
+   (concat
+    "\n\n"
+    (make-string (floor (/ (- fill-column (length b/asterism)) 2))
+                 ?\s)
+    b/asterism
+    "\n\n")))
+
+(defun b/no-mouse-autoselect-window ()
+  "Conveniently disable `focus-follows-mouse'.
+For disabling the behaviour for certain buffers and/or modes."

   (make-local-variable 'mouse-autoselect-window)
   (setq mouse-autoselect-window nil))
 
   (make-local-variable 'mouse-autoselect-window)
   (setq mouse-autoselect-window nil))
 

-(require 'cl-lib)
-(require 'subr-x)
+(defun b/kill-current-buffer ()
+  "Kill the current buffer."
+  ;; also see https://redd.it/64xb3q
+  (interactive)
+  (kill-buffer (current-buffer)))

 
 

-(defun amin-enlist (exp)
-  "Return EXP wrapped in a list, or as-is if already a list."
-(if (listp exp) exp (list exp)))
+\f
+;;; Defaults

 
 

-; from https://github.com/hlissner/doom-emacs/commit/589108fdb270f24a98ba6209f6955fe41530b3ef
-(defmacro after! (features &rest body)
-  "A smart wrapper around `with-eval-after-load'. Supresses warnings during
-compilation."
-  (declare (indent defun) (debug t))
-  (list (if (or (not (bound-and-true-p byte-compile-current-file))
-                (dolist (next (amin-enlist features))
-                  (if (symbolp next)
-                      (require next nil :no-error)
-                    (load next :no-message :no-error))))
-            #'progn
-          #'with-no-warnings)
-        (cond ((symbolp features)
-               `(eval-after-load ',features '(progn ,@body)))
-              ((and (consp features)
-                    (memq (car features) '(:or :any)))
-               `(progn
-                  ,@(cl-loop for next in (cdr features)
-                             collect `(after! ,next ,@body))))
-              ((and (consp features)
-                    (memq (car features) '(:and :all)))
-               (dolist (next (cdr features))
-                 (setq body `(after! ,next ,@body)))
-               body)
-              ((listp features)
-               `(after! (:all ,@features) ,@body)))))
-
-(defmacro 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)))
+;;;; C-level customizations

 
 

-\f
-;; * Core
+(setq
+ ;; minibuffer
+ enable-recursive-minibuffers t
+ resize-mini-windows t
+ ;; more useful frame titles
+ frame-title-format '("" invocation-name " - "
+                      (:eval
+                       (if (buffer-file-name)
+                           (abbreviate-file-name (buffer-file-name))
+                         "%b")))
+ ;; i don't feel like jumping out of my chair every now and again; so
+ ;; don't BEEP! at me, emacs
+ ring-bell-function 'ignore
+ ;; better scrolling
+ ;; scroll-margin 1
+ ;; scroll-conservatively 10000
+ scroll-step 1
+ scroll-conservatively 10
+ scroll-preserve-screen-position 1
+ ;; focus follows mouse
+ mouse-autoselect-window t)

 
 

-;; (fringe-mode '(3 . 1))
-(fringe-mode nil)
+(setq-default
+ ;; always use space for indentation
+ indent-tabs-mode nil
+ tab-width 4
+ ;; cursor shape
+ cursor-type t)

 
 

-(setq disabled-command-function nil)
+;; unicode support
+(comment
+  (dolist (ft (fontset-list))
+    (set-fontset-font
+     ft
+     'unicode
+     (font-spec :name "Source Code Pro" :size 14))
+    (set-fontset-font
+     ft
+     'unicode
+     (font-spec :name "DejaVu Sans Mono")
+     nil
+     'append)
+    ;; (set-fontset-font
+    ;;  ft
+    ;;  'unicode
+    ;;  (font-spec
+    ;;   :name "Symbola monospacified for DejaVu Sans Mono")
+    ;;  nil
+    ;;  'append)
+    ;; (set-fontset-font
+    ;;  ft
+    ;;  #x2115  ; ℕ
+    ;;  (font-spec :name "DejaVu Sans Mono")
+    ;;  nil
+    ;;  'append)
+    (set-fontset-font
+     ft
+     (cons ?Α ?ω)
+     (font-spec :name "DejaVu Sans Mono" :size 14)
+     nil
+     'prepend)))
+
+;;;; Elisp-level customizations
+
+(use-package startup
+  :no-require
+  :demand
+  :config
+  ;; don't need to see the startup echo area message
+  (advice-add #'display-startup-echo-area-message :override #'ignore)
+  :custom
+  ;; i want *scratch* as my startup buffer
+  (initial-buffer-choice t)
+  ;; i don't need the default hint
+  (initial-scratch-message nil)
+  ;; use customizable text-mode as major mode for *scratch*
+  ;; (initial-major-mode 'text-mode)
+  ;; inhibit buffer list when more than 2 files are loaded
+  (inhibit-startup-buffer-menu t)
+  ;; don't need to see the startup screen or echo area message
+  (inhibit-startup-screen t)
+  (inhibit-startup-echo-area-message user-login-name))
+
+(use-package files
+  :no-require
+  :demand
+  :custom
+  ;; backups (C-h v make-backup-files RET)
+  (backup-by-copying t)
+  (version-control t)
+  (delete-old-versions t)

 
 

-(setq save-interprogram-paste-before-kill t)
+  ;; auto-save
+  (auto-save-file-name-transforms
+   `((".*" ,(b/var "auto-save/") t)))

 
 

-(setq enable-recursive-minibuffers t
-      resize-mini-windows t)
+  ;; insert newline at the end of files
+  (require-final-newline t)

 
 

+  ;; open read-only file buffers in view-mode
+  ;; (enables niceties like `q' for quit)
+  (view-read-only t))
+
+;; disable disabled commands
+(setq disabled-command-function nil)
+
+;; lazy-person-friendly yes/no prompts

 (defalias 'yes-or-no-p #'y-or-n-p)
 
 (defalias 'yes-or-no-p #'y-or-n-p)
 

-(setq initial-buffer-choice t)
+;; enable automatic reloading of changed buffers and files
+(use-package autorevert
+  :demand
+  :config
+  (global-auto-revert-mode 1)
+  :custom
+  (auto-revert-verbose nil)
+  (global-auto-revert-non-file-buffers nil))
+
+;; time and battery in mode-line
+(use-package time
+  :demand
+  :config
+  (display-time-mode)
+  :custom
+  (display-time-default-load-average nil)
+  (display-time-format " %a %b %-e %-l:%M%P")
+  (display-time-mail-icon '(image :type xpm :file "gnus/gnus-pointer.xpm" :ascent center))
+  (display-time-use-mail-icon t))
+
+(use-package battery
+  :demand
+  :config
+  (display-battery-mode)
+  :custom
+  (battery-mode-line-format "%p%% %t"))

 
 

-(setq initial-scratch-message nil)
+(use-package fringe
+  :demand
+  :config
+  ;; smaller fringe
+  ;; (fringe-mode '(3 . 1))
+  (fringe-mode nil))

 
 

-(setq initial-major-mode 'text-mode)
+(use-package winner
+  :demand
+  :config
+  ;; enable winner-mode (C-h f winner-mode RET)
+  (winner-mode 1))

 
 

-(setq inhibit-startup-buffer-menu t)
+(use-package compile
+  :config
+  ;; don't display *compilation* buffer on success.  based on
+  ;; https://stackoverflow.com/a/17788551, with changes to use `cl-letf'
+  ;; instead of the now obsolete `flet'.
+  (defun b/compilation-finish-function (buffer outstr)
+    (unless (string-match "finished" outstr)
+      (switch-to-buffer-other-window buffer))
+    t)
+
+  (setq compilation-finish-functions #'b/compilation-finish-function)
+
+  (require 'cl-macs)
+
+  (defadvice compilation-start
+      (around inhibit-display
+              (command &optional mode name-function highlight-regexp))
+    (if (not (string-match "^\\(find\\|grep\\)" command))
+        (cl-letf (((symbol-function 'display-buffer) #'ignore))
+          (save-window-excursion ad-do-it))
+      ad-do-it))
+  (ad-activate 'compilation-start))
+
+(use-package isearch
+  :custom
+  ;; allow scrolling in Isearch
+  (isearch-allow-scroll t)
+  ;; search for non-ASCII characters: i’d like non-ASCII characters such
+  ;; as ‘’“”«»‹›áⓐ𝒶 to be selected when i search for their ASCII
+  ;; counterpart.  shoutout to
+  ;; http://endlessparentheses.com/new-in-emacs-25-1-easily-search-non-ascii-characters.html
+  (search-default-mode #'char-fold-to-regexp))
+
+;; uncomment to extend the above behaviour to query-replace
+(comment
+  (use-package replace
+    :custom
+    (replace-char-fold t)))
+
+(use-package vc
+  :bind ("C-x v C-=" . vc-ediff))
+
+(use-package vc-git
+  :after vc
+  :custom
+  (vc-git-print-log-follow t))

 
 

-(advice-add #'display-startup-echo-area-message :override #'ignore)
-(setq inhibit-startup-screen t
-      inhibit-startup-echo-area-message user-login-name)
+(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)))

 
 

-(setq frame-title-format
-      '("" invocation-name " - "
-        (:eval (if (buffer-file-name)
-                   (abbreviate-file-name (buffer-file-name))
-                 "%b"))))
+(use-package face-remap
+  :custom
+  ;; gentler font resizing
+  (text-scale-mode-step 1.05))

 
 

-(setq backup-by-copying t
-      version-control t
-      delete-old-versions t)
+(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

 
 

-(global-auto-revert-mode 1)
-(setq auto-revert-verbose nil
-      global-auto-revert-non-file-buffers nil)
+(use-package pixel-scroll
+  :defer 0.4
+  :config (pixel-scroll-mode 1))

 
 

-(setq-default
- indent-tabs-mode nil
- require-final-newline t
- tab-width 4)
+(use-package epg-config
+  :config
+  ;; ask for GPG passphrase in minibuffer
+  ;; this will fail if gpg>=2.1 is not available
+  (setq epg-pinentry-mode 'loopback)
+  :custom
+  (epg-gpg-program (executable-find "gpg")))

 
 

-(winner-mode 1)
+(use-package epg
+  :after epg-config)

 
 

-(setq compilation-exit-message-function
-      (lambda (status code msg)
-        "Close the compilation window if successful."
-        ;; if M-x compile exits with 0
-         (when (and (eq status 'exit) (zerop code))
-           (bury-buffer)
-           (delete-window (get-buffer-window (get-buffer "*compilation*"))))
-         ;; return the result of compilation-exit-message-function
-         (cons msg code)))
+(use-package pinentry
+  :disabled
+  :demand
+  :after (epa epg server)
+  :config
+  ;; workaround for systemd-based distros:
+  ;; (setq pinentry--socket-dir server-socket-dir)
+  (pinentry-start))

 
 

-(setq search-default-mode #'char-fold-to-regexp)
+(use-package auth-source
+  :custom
+  (auth-sources '("~/.authinfo.gpg"))
+  (authinfo-hidden (regexp-opt '("password" "client-secret" "token"))))

 
 

-;; uncomment to extend this behaviour to query-replace
-;; (setq replace-char-fold t)
+\f
+;;; General bindings

 
 (bind-keys
  ("C-c a i" . ielm)
 
  ("C-c e b" . eval-buffer)
 
 (bind-keys
  ("C-c a i" . ielm)
 
  ("C-c e b" . eval-buffer)

+ ("C-c e e" . eval-last-sexp)

  ("C-c e r" . eval-region)
 
  ("C-c e r" . eval-region)
 

- ("C-c F m" . make-frame-command)
- ("C-c F d" . delete-frame)
- ("C-c F D" . delete-other-frames)
+ ("C-c e i" . emacs-init-time)
+ ("C-c e u" . emacs-uptime)
+ ("C-c e v" . emacs-version)

 
 

- ("C-c o"   . other-window)
+ ("C-c f ." . find-file)
+ ("C-c f d" . find-name-dired)
+ ("C-c f l" . find-library)

 
 

- ("C-c Q"   . save-buffers-kill-terminal)
+ ("C-c F m" . make-frame-command)
+ ("C-c F d" . delete-frame)
+ ("C-c F D" . server-edit)

 
  ("C-S-h C" . describe-char)
  ("C-S-h F" . describe-face)
 
 
  ("C-S-h C" . describe-char)
  ("C-S-h F" . describe-face)
 

- ("C-x K"   . kill-this-buffer)
+ ("C-c x"   . execute-extended-command)

 
 

- ("s-p"     . beginning-of-buffer)
- ("s-n"     . end-of-buffer))
+ ("C-x k"   . b/kill-current-buffer)
+ ("C-x K"   . kill-buffer)
+ ("C-x s"   . save-buffer)
+ ("C-x S"   . save-some-buffers)

 
 

-(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-package org
-  :defer 1
-  :config
-  (setq org-src-tab-acts-natively t
-        org-src-preserve-indentation nil
-        org-edit-src-content-indentation 0
-        org-email-link-description-format "Email %c: %s" ; %.30s
-        org-highlight-latex-and-related '(entities)
-        org-log-done 'time)
-  (add-to-list 'org-structure-template-alist '("L" . "src emacs-lisp") t)
-  (font-lock-add-keywords
-   'org-mode
-   '(("[ \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)
-  :bind (:map org-mode-map ("M-L" . org-insert-last-stored-link))
-  :hook ((org-mode . org-indent-mode)
-         (org-mode . auto-fill-mode)
-         (org-mode . flyspell-mode))
-  :custom
-  (org-latex-packages-alist '(("" "listings") ("" "color")))
-  :custom-face
-  '(org-block-begin-line ((t (:foreground "#5a5b5a" :background "#1d1f21"))))
-  '(org-block ((t (:background "#1d1f21"))))
-  '(org-latex-and-related ((t (:foreground "#b294bb")))))
-
-(use-package ox-latex
-  :after ox
-  :config
-  (setq org-latex-listings 'listings
-        ;; org-latex-prefer-user-labels t
-        )
-  (add-to-list 'org-latex-packages-alist '("" "listings"))
-  (add-to-list 'org-latex-packages-alist '("" "color"))
-  (add-to-list 'org-latex-classes
-               '("IEEEtran" "\\documentclass[11pt]{IEEEtran}"
-                 ("\\section{%s}" . "\\section*{%s}")
-                 ("\\subsection{%s}" . "\\subsection*{%s}")
-                 ("\\subsubsection{%s}" . "\\subsubsection*{%s}")
-                 ("\\paragraph{%s}" . "\\paragraph*{%s}")
-                 ("\\subparagraph{%s}" . "\\subparagraph*{%s}"))
-               t))
-
-(use-package ox-beamer
-  :after ox)
+ :map emacs-lisp-mode-map
+ ("<C-return>" . b/add-elisp-section))

 
 

-(use-package orgalist
-  :after message
-  :hook (message-mode . orgalist-mode))
+(when (display-graphic-p)
+  (unbind-key "C-z" global-map))
+
+(bind-keys
+ ;; for back and forward mouse keys
+ ("<XF86Back>"     . previous-buffer)
+ ("<mouse-8>"      . previous-buffer)
+ ;; ("<drag-mouse-8>" . previous-buffer)
+ ("<XF86Forward>"  . next-buffer)
+ ("<mouse-9>"      . next-buffer)
+ ;; ("<drag-mouse-9>" . next-buffer)
+ ;; ("<drag-mouse-2>" . kill-this-buffer)
+ ;; ("<drag-mouse-3>" . switch-to-buffer)
+ )

 
 

-(after! org
-  (defvar amin-show-async-tangle-results nil
-    "Keep *emacs* async buffers around for later inspection.")
-
-  (defvar amin-show-async-tangle-time nil
-    "Show the time spent tangling the file.")
-
-  (defvar amin-async-tangle-post-compile "make ti"
-    "If non-nil, pass to `compile' after successful tangle.")
-
-  (defun amin/async-babel-tangle ()
-    "Tangle org file asynchronously."
-    (interactive)
-    (let* ((file-tangle-start-time (current-time))
-           (file (buffer-file-name))
-           (file-nodir (file-name-nondirectory file))
-           (async-quiet-switch "-q"))
-      (async-start
-       `(lambda ()
-          (require 'org)
-          (org-babel-tangle-file ,file))
-       (unless amin-show-async-tangle-results
-         `(lambda (result)
-            (if result
-                (progn
-                  (message "Tangled %s%s"
-                           ,file-nodir
-                           (if amin-show-async-tangle-time
-                               (format " (%.3fs)"
-                                       (float-time (time-subtract (current-time)
-                                                                  ',file-tangle-start-time)))
-                             ""))
-                  (when amin-async-tangle-post-compile
-                    (compile amin-async-tangle-post-compile)))
-              (message "Tangling %s failed" ,file-nodir))))))))
+\f
+;;; Essential packages

 
 (add-to-list
 
 (add-to-list

- 'safe-local-variable-values
- '(eval add-hook 'after-save-hook #'amin/async-babel-tangle 'append 'local))
+ 'load-path
+ (expand-file-name
+  (convert-standard-filename "lisp") user-emacs-directory))
+
+(when b/exwm-p
+  (require 'bandali-exwm))

 
 

+(require 'bandali-org)
+
+;; *the* right way to do git

 (use-package magit
 (use-package magit

-  :defer 1
-  :bind (("C-x g" . magit-status)
-         ("s-g s" . magit-status)
-         ("s-g l" . magit-log-buffer-file))
+  :bind (("C-x g"   . magit-status)
+         ("C-c g g" . 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)

-  (setq
-   magit-repository-directories '(("~/.emacs.d/" . 0)
-                                  ("~/src/git/" . 1)))
+  ;; (magit-add-section-hook 'magit-status-sections-hook
+  ;;                         'magit-insert-ignored-files
+  ;;                         'magit-insert-untracked-files
+  ;;                         'append)
+  (setq magit-repository-directories '(("~/.emacs.d/" . 0)
+                                       ("~/src/git/" . 2)))

   (nconc magit-section-initial-visibility-alist
          '(([unpulled status] . show)
            ([unpushed status] . show)))
   (nconc magit-section-initial-visibility-alist
          '(([unpulled status] . show)
            ([unpushed status] . show)))

+  :custom
+  (magit-diff-refine-hunk t)
+  (magit-display-buffer-function #'magit-display-buffer-fullframe-status-v1)
+  ;; (magit-completing-read-function 'magit-ido-completing-read)

   :custom-face (magit-diff-file-heading ((t (:weight normal)))))
 
   :custom-face (magit-diff-file-heading ((t (:weight normal)))))
 

-(use-package ivy
-  :defer 1
-  :bind
-  (:map ivy-minibuffer-map
-   ([escape] . keyboard-escape-quit)
-   ([S-up]   . ivy-previous-history-element)
-   ([S-down] . ivy-next-history-element)
-   ("DEL"    . ivy-backward-delete-char))
+;; recently opened files
+(use-package recentf
+  :defer 0.2
+  ;; :config
+  ;; (add-to-list 'recentf-exclude "^/\\(?:ssh\\|su\\|sudo\\)?:")

   :config
   :config

-  (setq ivy-wrap t)
-  (ivy-mode 1)
-  ;; :custom-face
-  ;; (ivy-minibuffer-match-face-2 ((t (:background "#e99ce8" :weight semi-bold))))
-  ;; (ivy-minibuffer-match-face-3 ((t (:background "#bbbbff" :weight semi-bold))))
-  ;; (ivy-minibuffer-match-face-4 ((t (:background "#ffbbff" :weight semi-bold))))
-)
+  (recentf-mode)
+  :custom
+  (recentf-max-saved-items 2000))

 
 

-(use-package swiper
-  :bind (("C-s" . swiper)
-         ("C-r" . swiper)))
-
-(use-package counsel
-  :defer 1
-  :bind (([remap execute-extended-command] . counsel-M-x)
-         ([remap find-file]                . counsel-find-file)
-         ("s-r"                            . counsel-recentf)
-         ("C-c x"                          . counsel-M-x)
-         ("C-c f ."                        . counsel-find-file)
-         :map minibuffer-local-map
-         ("C-r" . counsel-minibuffer-history))
+;; needed for history for counsel
+(use-package amx
+  :defer 0.3

   :config
   :config

-  (counsel-mode 1)
-  (defalias 'locate #'counsel-locate))
+  (amx-mode))

 
 

-(use-package eshell
-  :defer 1
-  :commands eshell
-  :config
-  (eval-when-compile (defvar eshell-prompt-regexp))
-  (defun amin/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)))
-
-  (defun amin/eshell-clear ()
-    (interactive)
-    (let ((inhibit-read-only t))
-      (erase-buffer))
-    (eshell-send-input))
-
-  (defun amin|eshell-setup ()
-    (make-local-variable 'company-idle-delay)
-    (setq company-idle-delay nil)
-    (bind-keys :map eshell-mode-map
-               ("C-d"   . amin/eshell-quit-or-delete-char)
-               ("C-S-l" . amin/eshell-clear)
-               ("M-r"   . counsel-esh-history)
-               ([tab]   . company-complete)))
-
-  :hook (eshell-mode . amin|eshell-setup)
-  :custom
-  (eshell-hist-ignoredups t)
-  (eshell-input-filter 'eshell-input-filter-initial-space))
+;; (require 'bandali-ido)
+(require 'bandali-ivy)

 
 

-(use-package ibuffer
-  :defer t
-  :bind
-  (("C-x C-b" . ibuffer-other-window)
-   :map ibuffer-mode-map
-   ("P"   . ibuffer-backward-filter-group)
-   ("N"   . ibuffer-forward-filter-group)
-   ("M-p" . ibuffer-do-print)
-   ("M-n" . ibuffer-do-shell-command-pipe-replace))
-  :config
-  ;; Use human readable Size column instead of original one
-  (define-ibuffer-column size-h
-    (:name "Size" :inline t)
-    (cond
-     ((> (buffer-size) 1000000) (format "%7.1fM" (/ (buffer-size) 1000000.0)))
-     ((> (buffer-size) 100000) (format "%7.0fk" (/ (buffer-size) 1000.0)))
-     ((> (buffer-size) 1000) (format "%7.1fk" (/ (buffer-size) 1000.0)))
-     (t (format "%8d" (buffer-size)))))
-  :custom
-  (ibuffer-saved-filter-groups
-   '(("default"
-      ("dired" (mode . dired-mode))
-      ("org"   (mode . org-mode))
-      ("web"
-       (or
-        (mode . web-mode)
-        (mode . css-mode)
-        (mode . scss-mode)
-        (mode . js2-mode)))
-      ("shell"
-       (or
-        (mode . eshell-mode)
-        (mode . shell-mode)))
-      ("notmuch" (name . "\*notmuch\*"))
-      ("programming"
-       (or
-        (mode . python-mode)
-        (mode . c++-mode)
-        (mode . emacs-lisp-mode)))
-      ("emacs"
-       (or
-        (name . "^\\*scratch\\*$")
-        (name . "^\\*Messages\\*$")))
-      ("slack"
-       (or
-        (name . "^\\*Slack*"))))))
-  (ibuffer-formats
-   '((mark modified read-only locked " "
-           (name 18 18 :left :elide)
-           " "
-           (size-h 9 -1 :right)
-           " "
-           (mode 16 16 :left :elide)
-           " " filename-and-process)
-     (mark " "
-           (name 16 -1)
-           " " filename)))
-  :hook (ibuffer . (lambda () (ibuffer-switch-to-saved-filter-groups "default"))))
+(require 'bandali-eshell)
+
+(require 'bandali-ibuffer)

 
 (use-package outline
 
 (use-package outline

-  :defer t
+  :disabled

   :hook (prog-mode . outline-minor-mode)
   :bind
   (:map
   :hook (prog-mode . outline-minor-mode)
   :bind
   (:map


@@ -566,8 +602,8 @@ compilation."
    ("<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 amin--outline-prefix-map
-   :prefix "s-o"
+   :prefix-map b/outline-prefix-map
+   :prefix "s-O"

    ("TAB" . outline-toggle-children)
    ("a"   . outline-hide-body)
    ("H"   . outline-hide-body)
    ("TAB" . outline-toggle-children)
    ("a"   . outline-hide-body)
    ("H"   . outline-hide-body)


@@ -575,117 +611,111 @@ compilation."
    ("h"   . outline-hide-subtree)
    ("s"   . outline-show-subtree)))
 
    ("h"   . outline-hide-subtree)
    ("s"   . outline-show-subtree)))
 

-\f
-;; * Borg's `layer/essentials'
-
-(use-package dash
-  :config (dash-enable-font-lock))
+(comment
+(use-package ls-lisp
+  :custom (ls-lisp-dirs-first t))

 
 

-(use-package diff-hl
-  :config
-  (setq diff-hl-draw-borders nil)
-  (global-diff-hl-mode)
-  (add-hook 'magit-post-refresh-hook 'diff-hl-magit-post-refresh t))
-
-(use-package dired
-  :defer t
-  :config (setq dired-listing-switches "-alh"))
-
-(use-package eldoc
-  :when (version< "25" emacs-version)
-  :config (global-eldoc-mode))
+(require 'bandali-dired)

 
 (use-package help
 
 (use-package help

-  :defer t

   :config
   (temp-buffer-resize-mode)
   (setq help-window-select t))
 
   :config
   (temp-buffer-resize-mode)
   (setq help-window-select t))
 

-(progn ;    `isearch'
-  (setq isearch-allow-scroll t))
+(use-package tramp
+  :config
+  (add-to-list 'tramp-default-proxies-alist '(nil "\\`root\\'" "/ssh:%h:"))
+  (add-to-list 'tramp-default-proxies-alist '("localhost" nil nil))
+  (add-to-list 'tramp-default-proxies-alist
+               (list (regexp-quote (system-name)) nil nil)))

 
 

-(use-package lisp-mode
+(use-package doc-view
+  :bind (:map doc-view-mode-map
+              ("M-RET" . image-previous-line)))
+
+\f
+;;; Editing
+
+;; highlight uncommitted changes in the left fringe
+(use-package diff-hl
+  :defer 0.6

   :config
   :config

-  (add-hook 'emacs-lisp-mode-hook 'outline-minor-mode)
-  (add-hook 'emacs-lisp-mode-hook 'reveal-mode)
-  (defun indent-spaces-mode ()
-    (setq indent-tabs-mode nil))
-  (add-hook 'lisp-interaction-mode-hook #'indent-spaces-mode))
+  (setq diff-hl-draw-borders nil)
+  (global-diff-hl-mode)
+  :hook (magit-post-refresh . diff-hl-magit-post-refresh))

 
 

-(use-package man
-  :defer t
-  :config (setq Man-width 80))
+;; display Lisp objects at point in the echo area
+(use-package eldoc
+  :when (version< "25" emacs-version)
+  :config (global-eldoc-mode))

 
 

+;; highlight matching parens

 (use-package paren
 (use-package paren

+  :demand

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

-(use-package prog-mode
-  :config (global-prettify-symbols-mode)
-  (defun indicate-buffer-boundaries-left ()
-    (setq indicate-buffer-boundaries 'left))
-  (add-hook 'prog-mode-hook #'indicate-buffer-boundaries-left))
+(use-package elec-pair
+  :demand
+  :config (electric-pair-mode))

 
 

-(use-package recentf
-  :defer 0.5
-  :config
-  (add-to-list 'recentf-exclude "^/\\(?:ssh\\|su\\|sudo\\)?:")
-  (setq recentf-max-saved-items 40))
+(use-package simple
+  :config (column-number-mode)
+  :custom
+  ;; Save what I copy into clipboard from other applications into Emacs'
+  ;; kill-ring, which would allow me to still be able to easily access
+  ;; it in case I kill (cut or copy) something else inside Emacs before
+  ;; yanking (pasting) what I'd originally intended to.
+  (save-interprogram-paste-before-kill t))

 
 

+;; save minibuffer history

 (use-package savehist
 (use-package savehist

-  :config (savehist-mode))
+  :demand
+  :config
+  (savehist-mode)
+  (add-to-list 'savehist-additional-variables 'kill-ring))

 
 

+;; automatically save place in files

 (use-package saveplace
   :when (version< "25" emacs-version)
   :config (save-place-mode))
 
 (use-package saveplace
   :when (version< "25" emacs-version)
   :config (save-place-mode))
 

-(use-package simple
-  :config (column-number-mode))
-
-(progn ;    `text-mode'
-  (add-hook 'text-mode-hook #'indicate-buffer-boundaries-left)
-  (add-hook 'text-mode-hook #'abbrev-mode))
+(use-package prog-mode
+  :config (global-prettify-symbols-mode)
+  (defun indicate-buffer-boundaries-left ()
+    (setq indicate-buffer-boundaries 'left))
+  (add-hook 'prog-mode-hook #'indicate-buffer-boundaries-left))

 
 

-(use-package tramp
-  :defer t
-  :config
-  (add-to-list 'tramp-default-proxies-alist '(nil "\\`root\\'" "/ssh:%h:"))
-  (add-to-list 'tramp-default-proxies-alist '("localhost" nil nil))
-  (add-to-list 'tramp-default-proxies-alist
-               (list (regexp-quote (system-name)) nil nil)))
+(use-package text-mode
+  :bind (:map text-mode-map ("C-*" . b/insert-asterism))
+  :hook ((text-mode . indicate-buffer-boundaries-left)
+         (text-mode . flyspell-mode)))

 
 

-(use-package undo-tree
-  :config
-  (global-undo-tree-mode -1))
-  ;; :bind (("C-?" . undo-tree-undo)
-  ;;        ("M-_" . undo-tree-redo))
-  ;; :config
-  ;; (global-undo-tree-mode)
-  ;; (setq undo-tree-mode-lighter ""
-  ;;       undo-tree-auto-save-history t))
+(use-package conf-mode
+  :mode "\\.*rc$")

 
 

-\f
-;; * Editing
+(use-package sh-mode
+  :mode "\\.bashrc$")

 
 (use-package company
 
 (use-package company

-  :defer 1
+  :disabled

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

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

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

-  :config
-  (global-company-mode t))
-
-\f
-;; * Syntax and spell checking
+  ;; :config
+  ;; (global-company-mode t)
+  )

 
 (use-package flycheck
 
 (use-package flycheck

-  :defer 3
+  :defer 0.6

   :hook (prog-mode . flycheck-mode)
   :bind
   (:map flycheck-mode-map
   :hook (prog-mode . flycheck-mode)
   :bind
   (:map flycheck-mode-map


@@ -696,16 +726,20 @@ compilation."
   (setq flycheck-emacs-lisp-load-path 'inherit)
 
   ;; Only flycheck when I actually save the buffer
   (setq flycheck-emacs-lisp-load-path 'inherit)
 
   ;; Only flycheck when I actually save the buffer

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

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

-  :defer 3
+  :defer 0.6

   :config
   ;; ’ can be part of a word
   (setq ispell-local-dictionary-alist
         `((nil "[[:alpha:]]" "[^[:alpha:]]"
   :config
   ;; ’ can be part of a word
   (setq ispell-local-dictionary-alist
         `((nil "[[:alpha:]]" "[^[:alpha:]]"

-               "['\x2019]" nil ("-B") nil utf-8)))
+               "['\x2019]" nil ("-B") nil utf-8))
+        ispell-program-name (executable-find "hunspell"))

   ;; don't send ’ to the subprocess
   (defun endless/replace-apostrophe (args)
     (cons (replace-regexp-in-string
   ;; don't send ’ to the subprocess
   (defun endless/replace-apostrophe (args)
     (cons (replace-regexp-in-string


@@ -724,20 +758,46 @@ compilation."
   (advice-add #'ispell-parse-output :filter-args
               #'endless/replace-quote))
 
   (advice-add #'ispell-parse-output :filter-args
               #'endless/replace-quote))
 

+(use-package abbrev
+  :hook (text-mode . abbrev-mode))
+

 \f
 \f

-;; * Programming modes
+;;; Programming modes

 
 

-(use-package alloy-mode
-  :defer t
-  :config (setq alloy-basic-offset 2))
+(use-package lisp-mode
+  :config
+  (defun indent-spaces-mode ()
+    (setq indent-tabs-mode nil))
+  (add-hook 'lisp-interaction-mode-hook #'indent-spaces-mode))

 
 

-(use-package proof-site  ; Proof General
-  :defer t
-  :load-path "lib/proof-site/generic/")
+(use-package reveal
+  :hook (emacs-lisp-mode . reveal-mode))
+
+(use-package elisp-mode)
+
+;; (use-package alloy-mode
+;;   :straight (:host github :repo "dwwmmn/alloy-mode")
+;;   :mode "\\.\\(als\\|dsh\\)\\'"
+;;   :config
+;;   (setq alloy-basic-offset 2)
+;;   ;; (defun b/alloy-simple-indent (start end)
+;;   ;;   (interactive "r")
+;;   ;;   ;; (if (region-active-p)
+;;   ;;   ;;     (indent-rigidly start end alloy-basic-offset)
+;;   ;;   ;;   (if (bolp)
+;;   ;;   ;;       (indent-rigidly (line-beginning-position)
+;;   ;;   ;;                       (line-end-position)
+;;   ;;   ;;                       alloy-basic-offset)))
+;;   ;;   (indent-to (+ (current-column) alloy-basic-offset)))
+;;   :bind (:map alloy-mode-map
+;;               ("RET" . electric-newline-and-maybe-indent)
+;;               ;; ("TAB" . b/alloy-simple-indent)
+;;               ("TAB" . indent-for-tab-command))
+;;   :hook (alloy-mode . (lambda () (setq-local indent-tabs-mode nil))))

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

-  :defer 1
+  :defer 0.4

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


@@ -749,104 +809,207 @@ compilation."
         lean-input-user-translations '(("/" "/")))
   (lean-input-setup))
 
         lean-input-user-translations '(("/" "/")))
   (lean-input-setup))
 

-(use-package haskell-mode
-  :defer t
-  :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)
+(use-package mhtml-mode)

 
 (use-package sgml-mode
 
 (use-package sgml-mode

-  :defer t

   :config
   :config

-  (setq sgml-basic-offset 2))
+  (setq sgml-basic-offset 0))

 
 (use-package css-mode
 
 (use-package css-mode

-  :defer t

   :config
   (setq css-indent-offset 2))
 
   :config
   (setq css-indent-offset 2))
 

-(use-package web-mode
-  :defer t
-  :mode "\\.html\\'"
-  :config
-  (setq-every! 2
-    web-mode-code-indent-offset
-    web-mode-css-indent-offset
-    web-mode-markup-indent-offset))
-

 (use-package emmet-mode
 (use-package emmet-mode

-  :after (:any web-mode css-mode sgml-mode)
+  :after (:any mhtml-mode css-mode sgml-mode)

   :bind* (("C-)" . emmet-next-edit-point)
           ("C-(" . emmet-prev-edit-point))
   :config
   (unbind-key "C-j" emmet-mode-keymap)
   (setq emmet-move-cursor-between-quotes t)
   :bind* (("C-)" . emmet-next-edit-point)
           ("C-(" . emmet-prev-edit-point))
   :config
   (unbind-key "C-j" emmet-mode-keymap)
   (setq emmet-move-cursor-between-quotes t)

-  :hook (web-mode css-mode html-mode sgml-mode))
+  :hook (css-mode html-mode sgml-mode))

 
 

-(use-package nix-mode
-  :defer t
-  :mode "\\.nix\\'")
+(use-package geiser)

 
 

-\f
-;; * Emacs Enhancements
+(use-package geiser-guile
+  :config
+  (setq geiser-guile-load-path "~/src/git/guix"))

 
 

-(use-package which-key
-  :defer 1
-  :config (which-key-mode))
+(use-package guix)
+
+(comment
+  (use-package auctex
+    :custom
+    (font-latex-fontify-sectioning 'color)))
+
+(use-package go-mode
+  :disabled)
+
+(use-package po-mode
+  :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)
+  :hook ((tex-mode . auto-fill-mode)
+         (tex-mode . flyspell-mode)))
+
+;; (use-package george-mode
+;;   :straight (:host nil :repo "https://git.shemshak.org/amin/george-mode")
+;;   :mode "\\.grg\\'")

 
 

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

 (load-theme 'tangomod t)
 
 (load-theme 'tangomod t)
 

+(use-package smart-mode-line
+  :commands (sml/apply-theme)
+  :demand
+  :config
+  ;; thanks, but no thnaks; don't make fixed-width fills.
+  (defun sml/fill-for-buffer-identification () "")
+  (setq sml/theme 'tangomod)
+  (sml/setup)
+  (smart-mode-line-enable))
+

 (use-package doom-modeline
 (use-package doom-modeline

-  :demand t
-  :config (setq doom-modeline-height 32)
-  :hook (after-init . doom-modeline-init))
+  :disabled
+  :demand
+  :hook (after-init . doom-modeline-init)
+  :custom
+  (doom-modeline-buffer-file-name-style 'relative-to-project))

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

-(defun amin/lights-on ()
+(use-package moody
+  :disabled
+  :demand
+  :config
+  (setq x-underline-at-descent-line t)
+  (let ((line (face-attribute 'mode-line :underline)))
+    (set-face-attribute 'mode-line          nil :overline   line)
+    (set-face-attribute 'mode-line-inactive nil :overline   line)
+    (set-face-attribute 'mode-line-inactive nil :underline  line)
+    (set-face-attribute 'mode-line          nil :box        nil)
+    (set-face-attribute 'mode-line-inactive nil :box        nil)
+    (set-face-attribute 'mode-line-inactive nil :background "#e1e1e1")) ; d3d7cf
+  (moody-replace-mode-line-buffer-identification)
+  (moody-replace-vc-mode))
+
+(use-package mini-modeline
+  :disabled
+  :demand
+  :config (mini-modeline-mode))
+
+(defvar b/org-mode-font-lock-keywords
+  '(("[ \t]*\\(#\\+\\(BEGIN\\|END\\|begin\\|end\\)_\\(\\S-+\\)\\)[ \t]*\\([^\n:]*\\)"
+      (1 '(:foreground "#5a5b5a" :background "#292b2b") t) ; directive
+      (3 '(:foreground "#81a2be" :background "#292b2b") t) ; kind
+      (4 '(:foreground "#c5c8c6") t)))                     ; title
+  "For use with the `doom-tomorrow-night' theme.")
+
+(defun b/lights-on ()

   "Enable my favourite light theme."
   (interactive)
   "Enable my favourite light theme."
   (interactive)

-  (progn
-    (mapc #'disable-theme custom-enabled-themes)
-    (load-theme 'tangomod t)))
-
-(defun amin/lights-off ()
+  (mapc #'disable-theme custom-enabled-themes)
+  (load-theme 'tangomod t)
+  (when (featurep 'smart-mode-line)
+    (sml/apply-theme 'tangomod))
+  (font-lock-remove-keywords
+   'org-mode b/org-mode-font-lock-keywords)
+  (when (featurep 'erc-hl-nicks)
+    (erc-hl-nicks-reset-face-table))
+  (when (featurep 'exwm-systemtray)
+    (exwm-systemtray--refresh)))
+
+(defun b/lights-off ()

   "Go dark."
   (interactive)
   "Go dark."
   (interactive)

-  (progn
-    (mapc #'disable-theme custom-enabled-themes)
-    (load-theme 'doom-tomorrow-night t)))
+  (mapc #'disable-theme custom-enabled-themes)
+  (load-theme 'doom-one t)
+  (when (featurep 'smart-mode-line)
+    (sml/apply-theme 'automatic))
+  (font-lock-add-keywords
+   'org-mode b/org-mode-font-lock-keywords t)
+  (when (featurep 'erc-hl-nicks)
+    (erc-hl-nicks-reset-face-table))
+  (when (featurep 'exwm-systemtray)
+    (exwm-systemtray--refresh)))

 
 (bind-keys
 
 (bind-keys

- ("s-t d" . amin/lights-off)
- ("s-t l" . amin/lights-on))
-
-(use-package crux
-  :defer 1
-  :bind (("C-c b k" . crux-kill-other-buffers)
-         ("C-c d"   . crux-duplicate-current-line-or-region)
-         ("C-c D"   . crux-duplicate-and-comment-current-line-or-region)
-         ("C-c f c" . crux-copy-file-preserve-attributes)
-         ("C-c f d" . crux-delete-file-and-buffer)
-         ("C-c f r" . crux-rename-file-and-buffer)
+ ("C-c t d" . b/lights-off)
+ ("C-c t l" . b/lights-on))
+
+\f
+;;; Emacs enhancements & auxiliary packages
+
+(use-package man
+  :config (setq Man-width 80))
+
+(use-package which-key
+  :defer 0.4
+  :config
+  (which-key-add-key-based-replacements
+    ;; prefixes for global prefixes and minor modes
+    "C-c @"   "outline"
+    "C-c !"   "flycheck"
+    "C-x RET" "coding system"
+    "C-x 8"   "unicode"
+    "C-x @"   "event modifiers"
+    "C-x a"   "abbrev/expand"
+    "C-x r"   "rectangle/register/bookmark"
+    "C-x t"   "tabs"
+    "C-x v"   "version control"
+    "C-x X"   "edebug"
+    "C-x C-a" "edebug"
+    "C-x C-k" "kmacro"
+    ;; prefixes for my personal bindings
+    "C-c &"   "yasnippet"
+    "C-c a"   "applications"
+    "C-c a e" "erc"
+    "C-c a o" "org"
+    "C-c a s" "shells"
+    "C-c b"   "buffers"
+    "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-c p s" "projectile/search"
+    "C-c p x" "projectile/execute"
+    "C-c p 4" "projectile/other-window"
+    "C-c q"   "boxquote"
+    "C-c t"   "themes"
+    ;; "s-O"     "outline"
+    )
+
+  ;; prefixes for major modes
+  (which-key-add-major-mode-key-based-replacements 'message-mode
+    "C-c f n" "footnote")
+  (which-key-add-major-mode-key-based-replacements 'org-mode
+    "C-c C-v" "org-babel")
+
+  (which-key-mode)
+  :custom
+  (which-key-add-column-padding 5)
+  (which-key-max-description-length 32))
+
+(use-package crux            ; results in Waiting for git... [2 times]
+  :defer 0.4
+  :bind (("C-c d"   . crux-duplicate-current-line-or-region)
+         ("C-c M-d" . crux-duplicate-and-comment-current-line-or-region)
+         ("C-c f C" . crux-copy-file-preserve-attributes)
+         ("C-c f D" . crux-delete-file-and-buffer)
+         ("C-c f R" . crux-rename-file-and-buffer)

          ("C-c j"   . crux-top-join-line)
          ("C-S-j"   . crux-top-join-line)))
 
          ("C-c j"   . crux-top-join-line)
          ("C-S-j"   . crux-top-join-line)))
 


@@ -857,11 +1020,23 @@ compilation."
          ("<end>"  . mwim-end-of-line-or-code)))
 
 (use-package projectile
          ("<end>"  . mwim-end-of-line-or-code)))
 
 (use-package projectile

-  :defer t
+  :disabled
+  :defer 0.5

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

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

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


@@ -871,10 +1046,13 @@ compilation."
        (advice-add 'magit-checkout
                    :after #'my-projectile-invalidate-cache)
        (advice-add 'magit-branch-and-checkout
        (advice-add 'magit-checkout
                    :after #'my-projectile-invalidate-cache)
        (advice-add 'magit-branch-and-checkout

-                   :after #'my-projectile-invalidate-cache))))
+                   :after #'my-projectile-invalidate-cache)))
+  :custom
+  (projectile-completion-system 'ivy)
+  (projectile-mode-line-prefix " proj"))

 
 (use-package helpful
 
 (use-package helpful

-  :defer 1
+  :defer 0.6

   :bind
   (("C-S-h c" . helpful-command)
    ("C-S-h f" . helpful-callable)        ; helpful-function
   :bind
   (("C-S-h c" . helpful-command)
    ("C-S-h f" . helpful-callable)        ; helpful-function


@@ -882,222 +1060,69 @@ compilation."
    ("C-S-h k" . helpful-key)
    ("C-S-h p" . helpful-at-point)))
 
    ("C-S-h k" . helpful-key)
    ("C-S-h p" . helpful-at-point)))
 

-(use-package shell-toggle
-  :after eshell
-  :bind ("C-c a s e" . amin/shell-toggle)
-  :config
-  (defun amin/shell-toggle (make-cd)
-    "Toggle between the shell buffer and whatever buffer you are editing.
-With a prefix argument MAKE-CD also insert a \"cd DIR\" command
-into the shell, where DIR is the directory of the current buffer.
-
-When called in the shell buffer returns you to the buffer you were editing
-before calling this the first time.
-
-Options: `shell-toggle-goto-eob'"
-    (interactive "P")
-    ;; Try to decide on one of three possibilities:
-    ;; If not in shell-buffer, switch to it.
-    ;; If in shell-buffer, return to state before going to the shell-buffer
-    (if (eq (current-buffer) shell-toggle-shell-buffer)
-        (shell-toggle-buffer-return-from-shell)
-      (progn
-        (shell-toggle-buffer-goto-shell make-cd)
-        (if shell-toggle-full-screen-window-only (delete-other-windows)))))
-
-  ;; override to split horizontally instead
-  (defun shell-toggle-buffer-switch-to-other-window ()
-    "Switch to other window.
-If the current window is the only window in the current frame,
-create a new window and switch to it.
-
-\(This is less intrusive to the current window configuration than
-`switch-buffer-other-window')"
-    (let ((this-window (selected-window)))
-      (other-window 1)
-      ;; If we did not switch window then we only have one window and need to
-      ;; create a new one.
-      (if (eq this-window (selected-window))
-             (progn
-               (split-window-horizontally)
-            (other-window 1)))))
-
-  :custom
-  (shell-toggle-launch-shell 'shell-toggle-eshell))
-

 (use-package unkillable-scratch
 (use-package unkillable-scratch

-  :defer 3
+  :defer 0.6

   :config
   (unkillable-scratch 1)
   :custom
   :config
   (unkillable-scratch 1)
   :custom

-  (unkillable-scratch-behavior 'do-nothing)

   (unkillable-buffers '("^\\*scratch\\*$" "^\\*Messages\\*$")))
 
   (unkillable-buffers '("^\\*scratch\\*$" "^\\*Messages\\*$")))
 

+;; ,----
+;; | make pretty boxed quotes like this
+;; `----

 (use-package boxquote
 (use-package boxquote

-  :defer 3
+  :defer 0.6

   :bind
   :bind

-  (:prefix-map amin--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 highlight-indent-guides
-  :disabled t
-  :defer 3
-  :hook ((prog-mode . highlight-indent-guides-mode)
-         ;; (org-mode  . highlight-indent-guides-mode)
-         )
-  :config
-  (setq highlight-indent-guides-character ?\|)
-  (setq highlight-indent-guides-auto-enabled nil)
-  (setq highlight-indent-guides-method 'character)
-  (setq highlight-indent-guides-responsive 'top)
-  (set-face-foreground 'highlight-indent-guides-character-face "gainsboro")
-  (set-face-foreground 'highlight-indent-guides-top-character-face "grey40")) ; grey13 is nice too
+  (: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 pdf-tools
-  :defer t
-  :magic ("%PDF" . pdf-view-mode)
-  :config
-  (setq pdf-view-resize-factor 1.05)
-  (pdf-tools-install)
-  :bind
-  (:map pdf-view-mode-map
-        ("C-s" . isearch-forward)
-        ("C-r" . isearch-backward)
-        ("j"   . pdf-view-next-line-or-next-page)
-        ("k"   . pdf-view-previous-line-or-previous-page)
-        ("h"   . image-backward-hscroll)
-        ("l"   . image-forward-hscroll)))
-
-(use-package anzu)
-
-(use-package typo
-  :defer 2
-  :config
-  (typo-global-mode 1)
-  :hook (text-mode . typo-mode))
+(use-package orgalist
+  ;; breaks auto-fill-mode, showing this error:
+  ;; orgalist--boundaries: Lisp nesting exceeds ‘max-lisp-eval-depth’
+  :disabled
+  :after message
+  :hook (message-mode . orgalist-mode))

 
 

+;; highlight TODOs in buffers

 (use-package hl-todo
 (use-package hl-todo

-  :defer 4
+  :defer 0.5

   :config
   (global-hl-todo-mode))
 
   :config
   (global-hl-todo-mode))
 

-(use-package shrink-path
-  :after eshell
-  :config
-  (setq eshell-prompt-regexp "\\(.*\n\\)*λ "
-        eshell-prompt-function #'+eshell/prompt)
-
-  (defun +eshell/prompt ()
-    (let ((base/dir (shrink-path-prompt default-directory)))
-      (concat (propertize (car base/dir)
-                          'face 'font-lock-comment-face)
-              (propertize (cdr base/dir)
-                          'face 'font-lock-constant-face)
-              (propertize (+eshell--current-git-branch)
-                          'face 'font-lock-function-name-face)
-              "\n"
-              (propertize "λ" 'face 'eshell-prompt-face)
-              ;; needed for the input text to not have prompt face
-              (propertize " " 'face 'default))))
-
-  (defun +eshell--current-git-branch ()
-    (let ((branch (car (loop for match in (split-string (shell-command-to-string "git branch") "\n")
-                             when (string-match "^\*" match)
-                             collect match))))
-      (if (not (eq branch nil))
-          (concat " " (substring branch 2))
-        ""))))
-
-(use-package slack
-  :disabled t
-  :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 "uw-apv"
-   :default t
-   :client-id uw-apv-client-id
-   :client-secret uw-apv-client-secret
-   :token uw-apv-token
-   :subscribed-channels '(general)
-   :full-and-display-names t)
-  (slack-register-team
-   :name "watform"
-   :default nil
-   :client-id watform-client-id
-   :client-secret watform-client-secret
-   :token watform-token
-   :subscribed-channels '(general)
-   :full-and-display-names t)
-  (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 'notifier))
-
-(use-package eshell-up
-  :after eshell)
-

 (use-package multi-term
 (use-package multi-term

-  :defer 1
-  :bind (("C-c C-j"     . term-line-mode)
-         ("C-c a s m m" . multi-term)
-         ("C-c a s m p" . multi-term-dedicated-toggle))
+  :disabled
+  :defer 0.6
+  :bind (("C-c a s m m" . multi-term)
+         ("C-c a s m d" . multi-term-dedicated-toggle)
+         ("C-c a s m p" . multi-term-prev)
+         ("C-c a s m n" . multi-term-next)
+         :map term-mode-map
+         ("C-c C-j" . term-char-mode))

   :config
   :config

-  (setq multi-term-program "/bin/screen"
+  (setq multi-term-program "screen"
+        multi-term-program-switches (concat "-c"
+                                            (getenv "XDG_CONFIG_HOME")
+                                            "/screen/screenrc")

         ;; TODO: add separate bindings for connecting to existing
         ;; session vs. always creating a new one
         multi-term-dedicated-select-after-open-p t
         ;; TODO: add separate bindings for connecting to existing
         ;; session vs. always creating a new one
         multi-term-dedicated-select-after-open-p t


@@ -1106,79 +1131,497 @@ create a new window and switch to it.
         term-bind-key-alist
         '(("C-c C-c" . term-interrupt-subjob)
           ("C-c C-e" . term-send-esc)
         term-bind-key-alist
         '(("C-c C-c" . term-interrupt-subjob)
           ("C-c C-e" . term-send-esc)

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

           ("C-k" . kill-line)
           ("C-k" . kill-line)

-          ("C-y" . term-paste)
+          ;; ("C-y" . term-paste)
+          ("C-y" . term-send-raw)

           ("M-f" . term-send-forward-word)
           ("M-b" . term-send-backward-word)
           ("M-p" . term-send-up)
           ("M-n" . term-send-down)
           ("M-f" . term-send-forward-word)
           ("M-b" . term-send-backward-word)
           ("M-p" . term-send-up)
           ("M-n" . term-send-down)

+          ("M-j" . term-send-raw-meta)
+          ("M-y" . term-send-raw-meta)
+          ("M-/" . term-send-raw-meta)
+          ("M-0" . term-send-raw-meta)
+          ("M-1" . term-send-raw-meta)
+          ("M-2" . term-send-raw-meta)
+          ("M-3" . term-send-raw-meta)
+          ("M-4" . term-send-raw-meta)
+          ("M-5" . term-send-raw-meta)
+          ("M-6" . term-send-raw-meta)
+          ("M-7" . term-send-raw-meta)
+          ("M-8" . term-send-raw-meta)
+          ("M-9" . term-send-raw-meta)

           ("<C-backspace>" . term-send-backward-kill-word)
           ("<M-DEL>" . term-send-backward-kill-word)
           ("M-d" . term-send-delete-word)
           ("M-," . term-send-raw)
           ("M-." . comint-dynamic-complete))
         term-unbind-key-alist
           ("<C-backspace>" . term-send-backward-kill-word)
           ("<M-DEL>" . term-send-backward-kill-word)
           ("M-d" . term-send-delete-word)
           ("M-," . term-send-raw)
           ("M-." . comint-dynamic-complete))
         term-unbind-key-alist

-        '("C-z" "C-x" "C-c" "C-h" "C-y" "<ESC>")))
+        '("C-z" "C-x" "C-c" "C-h"
+          ;; "C-y"
+          "<ESC>")))

 
 (use-package page-break-lines
 
 (use-package page-break-lines

+  :defer 0.5
+  :custom
+  (page-break-lines-max-width fill-column)

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

+(use-package expand-region
+  :bind ("C-=" . er/expand-region))
+
+(use-package multiple-cursors
+  :bind
+  (("C-S-<mouse-1>" . mc/add-cursor-on-click)
+   (: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)
+               ("a" . mc/mark-all-like-this))))
+
+(use-package yasnippet
+  :defer 0.6
+  :config
+  (defconst yas-verbosity-cur yas-verbosity)
+  (setq yas-verbosity 2)
+  (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))
+
+(use-package debbugs
+  :bind
+  (("C-c D d" . debbugs-gnu)
+   ("C-c D b" . debbugs-gnu-bugs)
+   ("C-c D e" .
+    (lambda ()
+      (interactive)                     ; bug-gnu-emacs
+      (setq debbugs-gnu-current-suppress t)
+      (debbugs-gnu debbugs-gnu-default-severities '("emacs"))))
+   ("C-c D g" .                         ; bug-gnuzilla
+    (lambda ()
+      (interactive)
+      (setq debbugs-gnu-current-suppress t)
+      (debbugs-gnu debbugs-gnu-default-severities '("gnuzilla"))))
+   ("C-c D G b" .                       ; bug-guix
+    (lambda ()
+      (interactive)
+      (setq debbugs-gnu-current-suppress t)
+      (debbugs-gnu debbugs-gnu-default-severities '("guix"))))
+   ("C-c D G p" .                       ; guix-patches
+    (lambda ()
+      (interactive)
+      (setq debbugs-gnu-current-suppress t)
+      (debbugs-gnu debbugs-gnu-default-severities '("guix-patches"))))))
+
+(use-package org-ref
+  :init
+  (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/"))
+
+;; (use-package fill-column-indicator)
+
+(use-package window
+  :bind
+  (("C-c w e"   . (lambda ()
+                    (interactive)
+                    (split-window-right)
+                    (other-window 1)
+                    (erc-switch-to-buffer)))
+   ("C-c w s l" . (lambda ()
+                    (interactive)
+                    (split-window-right)
+                    (other-window 1)))
+   ("C-c w s j" . (lambda ()
+                    (interactive)
+                    (split-window-below)
+                    (other-window 1)))
+   ("C-c w q"   . quit-window))
+  :custom
+  (split-width-threshold 150))
+
+(use-package windmove
+  :defer 0.6
+  :bind
+  (("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 pdf-tools
+  :defer 0.5
+  :bind (:map pdf-view-mode-map
+              ("<C-XF86Back>"    . pdf-history-backward)
+              ("<mouse-8>"       . pdf-history-backward)
+              ("<drag-mouse-8>"  . pdf-history-backward)
+              ("<C-XF86Forward>" . pdf-history-forward)
+              ("<mouse-9>"       . pdf-history-forward)
+              ("<drag-mouse-9>"  . pdf-history-forward)
+              ("M-RET"           . image-previous-line)
+              ("C-s"             . isearch-forward)
+              ("s s"             . isearch-forward))
+  :config (pdf-tools-install nil t)
+  :custom (pdf-view-resize-factor 1.05))
+
+(use-package org-pdftools
+  :disabled
+  :straight (:host github :repo "fuxialexander/org-pdftools")
+  :demand
+  :after org
+  :config
+  (with-eval-after-load 'org
+    (require 'org-pdftools)))
+
+(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)))))
+
+(use-package minions
+  :demand
+  :config (minions-mode))
+
+(use-package dmenu
+  :custom
+  (dmenu-prompt-string "run: ")
+  (dmenu-save-file (b/var "dmenu-items")))
+
+(use-package eosd
+  ;; TODO: fix build by properly building the eosd-pixbuf.c module
+  ;; e.g. see https://github.com/raxod502/straight.el/issues/386
+  :disabled
+  :straight (:host github :repo "clarete/eosd")
+  :demand
+  :after exwm
+  :config
+  (eosd-start))
+
+(use-package scpaste
+  :disabled
+  :config
+  (setq scpaste-http-destination "https://p.bndl.org"
+        scpaste-scp-destination "nix:/var/www/p.bndl.org"))
+
+(use-package eww
+  :bind ("C-c a e w" . eww)
+  :custom
+  (eww-download-directory (file-name-as-directory
+                           (getenv "XDG_DOWNLOAD_DIR"))))
+

 \f
 \f

-;; * Email
+;;; Email (with Gnus)

 
 

-(defvar amin-maildir (expand-file-name "~/mail/"))
-(after! recentf
-  (add-to-list 'recentf-exclude amin-maildir))
+(defvar b/maildir (expand-file-name "~/mail/"))
+(with-eval-after-load 'recentf
+  (add-to-list 'recentf-exclude b/maildir))

 
 (setq
 
 (setq

- amin-gnus-init-file (no-littering-expand-etc-file-name "gnus")
- mail-user-agent     'gnus-user-agent
- read-mail-command   'gnus)
+ b/gnus-init-file  (b/etc "gnus")
+ mail-user-agent   'gnus-user-agent
+ read-mail-command 'gnus)

 
 (use-package gnus
 
 (use-package gnus

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

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

-   '((nnimap "amin"
-            (nnimap-stream plain)
-            (nnimap-address "127.0.0.1")
-            (nnimap-server-port 143)
-            (nnimap-authenticator plain)
-            (nnimap-user "amin@aminb.org"))
-     (nnimap "uwaterloo"
+   '((nnimap "shemshak"

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

-             (nnimap-user "abandali@uwaterloo.ca")))
-   gnus-message-archive-group "nnimap+amin:Sent"
+             (nnimap-user "amin@shemshak.local"))
+     (nnimap "gnu"
+             (nnimap-stream plain)
+             (nnimap-address "127.0.0.1")
+             (nnimap-server-port 143)
+             (nnimap-authenticator plain)
+             (nnimap-user "bandali@gnu.local")
+             (nnimap-inbox "INBOX")
+             (nnimap-split-methods 'nnimap-split-fancy)
+             (nnimap-split-fancy (|
+                                  ;; (: gnus-registry-split-fancy-with-parent)
+                                  ;; (: gnus-group-split-fancy "INBOX" t "INBOX")
+                                  ;; gnu
+                                  (list ".*<\\(.*\\)\\.\\(non\\)?gnu\\.org>.*" "l.\\1")
+                                  ;; gnus
+                                  (list ".*<\\(.*\\)\\.gnus\\.org>.*" "l.\\1")
+                                  ;; libreplanet
+                                  (list ".*<\\(.*\\)\\.libreplanet\\.org>.*" "l.\\1")
+                                  ;; *.lists.sr.ht, omitting one dot if present
+                                  ;;    add more \\.?\\([^.]*\\) if needed
+                                  (list ".*<~\\(.*\\)/\\([^.]*\\)\\.?\\([^.]*\\)\\.lists.sr.ht>.*" "l.~\\1.\\2\\3")
+                                  ;; webmasters
+                                  (from "webmasters\\(-comment\\)?@gnu\\.org" "webmasters")
+                                  ;; other
+                                  (list ".*atreus.freelists.org" "l.atreus")
+                                  (list ".*deepspec.lists.cs.princeton.edu" "l.deepspec")
+                                  ;; (list ".*haskell-art.we.lurk.org" "l.haskell.art") ;d
+                                  (list ".*haskell-cafe.haskell.org" "l.haskell-cafe")
+                                  ;; (list ".*notmuch.notmuchmail.org" "l.notmuch") ;u
+                                  ;; (list ".*dev.lists.parabola.nu" "l.parabola-dev") ;u
+                                  ;; ----------------------------------
+                                  ;; legend: (u)nsubscribed | (d)ead
+                                  ;; ----------------------------------
+                                  ;; otherwise, leave mail in INBOX
+                                  "INBOX")))
+     (nnimap "uw"
+             (nnimap-stream plain)
+             (nnimap-address "127.0.0.1")
+             (nnimap-server-port 143)
+             (nnimap-authenticator plain)
+             (nnimap-user "abandali@uw.local")
+             (nnimap-inbox "INBOX")
+             (nnimap-split-methods 'nnimap-split-fancy)
+             (nnimap-split-fancy (|
+                                  ;; (: gnus-registry-split-fancy-with-parent)
+                                  ;; se212-f19
+                                  ("subject" "SE\\s-?212" "course.se212-f19")
+                                  (from "SE\\s-?212" "course.se212-f19")
+                                  ;; catch-all
+                                  "INBOX")))
+     (nnimap "csc"
+             (nnimap-stream plain)
+             (nnimap-address "127.0.0.1")
+             (nnimap-server-port 143)
+             (nnimap-authenticator plain)
+             (nnimap-user "abandali@csc.uw.local")))
+   gnus-message-archive-group "nnimap+gnu:INBOX"

    gnus-parameters
    gnus-parameters

-   '(("gnu.*"
+   '(("l\\.atreus"
+      (to-address . "atreus@freelists.org")
+      (to-list    . "atreus@freelists.org"))
+     ("l\\.deepspec"
+      (to-address . "deepspec@lists.cs.princeton.edu")
+      (to-list    . "deepspec@lists.cs.princeton.edu")
+      (list-identifier . "\\[deepspec\\]"))
+     ("l\\.emacs-devel"
+      (to-address . "emacs-devel@gnu.org")
+      (to-list    . "emacs-devel@gnu.org"))
+     ("l\\.help-gnu-emacs"
+      (to-address . "help-gnu-emacs@gnu.org")
+      (to-list    . "help-gnu-emacs@gnu.org"))
+     ("l\\.info-gnu-emacs"
+      (to-address . "info-gnu-emacs@gnu.org")
+      (to-list    . "info-gnu-emacs@gnu.org"))
+     ("l\\.emacs-orgmode"
+      (to-address . "emacs-orgmode@gnu.org")
+      (to-list    . "emacs-orgmode@gnu.org")
+      (list-identifier . "\\[O\\]"))
+     ("l\\.emacs-tangents"
+      (to-address . "emacs-tangents@gnu.org")
+      (to-list    . "emacs-tangents@gnu.org"))
+     ("l\\.emacsconf-committee"
+      (to-address . "emacsconf-committee@gnu.org")
+      (to-list    . "emacsconf-committee@gnu.org"))
+     ("l\\.emacsconf-discuss"
+      (to-address . "emacsconf-discuss@gnu.org")
+      (to-list    . "emacsconf-discuss@gnu.org"))
+     ("l\\.emacsconf-register"
+      (to-address . "emacsconf-register@gnu.org")
+      (to-list    . "emacsconf-register@gnu.org"))
+     ("l\\.emacsconf-submit"
+      (to-address . "emacsconf-submit@gnu.org")
+      (to-list    . "emacsconf-submit@gnu.org"))
+     ("l\\.fencepost-users"
+      (to-address . "fencepost-users@gnu.org")
+      (to-list    . "fencepost-users@gnu.org")
+      (list-identifier . "\\[Fencepost-users\\]"))
+     ("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\\]"))
+     ("l\\.help-gnunet"
+      (to-address . "help-gnunet@gnu.org")
+      (to-list    . "help-gnunet@gnu.org")
+      (list-identifier . "\\[Help-gnunet\\]"))
+     ("l\\.bug-gnuzilla"
+      (to-address . "bug-gnuzilla@gnu.org")
+      (to-list    . "bug-gnuzilla@gnu.org")
+      (list-identifier . "\\[Bug-gnuzilla\\]"))
+     ("l\\.gnuzilla-dev"
+      (to-address . "gnuzilla-dev@gnu.org")
+      (to-list    . "gnuzilla-dev@gnu.org")
+      (list-identifier . "\\[Gnuzilla-dev\\]"))
+     ("l\\.guile-devel"
+      (to-address . "guile-devel@gnu.org")
+      (to-list    . "guile-devel@gnu.org"))
+     ("l\\.guile-user"
+      (to-address . "guile-user@gnu.org")
+      (to-list    . "guile-user@gnu.org"))
+     ("l\\.guix-devel"
+      (to-address . "guix-devel@gnu.org")
+      (to-list    . "guix-devel@gnu.org"))
+     ("l\\.help-guix"
+      (to-address . "help-guix@gnu.org")
+      (to-list    . "help-guix@gnu.org"))
+     ("l\\.info-guix"
+      (to-address . "info-guix@gnu.org")
+      (to-list    . "info-guix@gnu.org"))
+     ("l\\.savannah-hackers-public"
+      (to-address . "savannah-hackers-public@gnu.org")
+      (to-list    . "savannah-hackers-public@gnu.org"))
+     ("l\\.savannah-users"
+      (to-address . "savannah-users@gnu.org")
+      (to-list    . "savannah-users@gnu.org"))
+     ("l\\.www-commits"
+      (to-address . "www-commits@gnu.org")
+      (to-list    . "www-commits@gnu.org"))
+     ("l\\.www-discuss"
+      (to-address . "www-discuss@gnu.org")
+      (to-list    . "www-discuss@gnu.org"))
+     ("l\\.haskell-art"
+      (to-address . "haskell-art@we.lurk.org")
+      (to-list    . "haskell-art@we.lurk.org")
+      (list-identifier . "\\[haskell-art\\]"))
+     ("l\\.haskell-cafe"
+      (to-address . "haskell-cafe@haskell.org")
+      (to-list    . "haskell-cafe@haskell.org")
+      (list-identifier . "\\[Haskell-cafe\\]"))
+     ("l\\.notmuch"
+      (to-address . "notmuch@notmuchmail.org")
+      (to-list    . "notmuch@notmuchmail.org"))
+     ("l\\.parabola-dev"
+      (to-address . "dev@lists.parabola.nu")
+      (to-list    . "dev@lists.parabola.nu")
+      (list-identifier . "\\[Dev\\]"))
+     ("l\\.~bandali\\.public-inbox"
+      (to-address . "~bandali/public-inbox@lists.sr.ht")
+      (to-list    . "~bandali/public-inbox@lists.sr.ht"))
+     ("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"
+      (to-address . "~sircmpwn/sr.ht-admins@lists.sr.ht")
+      (to-list    . "~sircmpwn/sr.ht-admins@lists.sr.ht"))
+     ("l\\.~sircmpwn\\.srht-announce"
+      (to-address . "~sircmpwn/sr.ht-announce@lists.sr.ht")
+      (to-list    . "~sircmpwn/sr.ht-announce@lists.sr.ht"))
+     ("l\\.~sircmpwn\\.srht-dev"
+      (to-address . "~sircmpwn/sr.ht-dev@lists.sr.ht")
+      (to-list    . "~sircmpwn/sr.ht-dev@lists.sr.ht"))
+     ("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 . "webmasters@gnu.org")
+      (to-list    . "webmasters@gnu.org"))
+     ("gnu.*"
+      (gcc-self . t))
+     ("l\\."
+      (subscribed . t))
+     ("nnimap\\+uw:.*"

       (gcc-self . t)))
    gnus-large-newsgroup  50
       (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-save-newsrc-file nil
    gnus-read-newsrc-file nil
    gnus-interactive-exit nil
    gnus-directory        (concat gnus-home-directory "news/")
    message-directory     (concat gnus-home-directory "mail/")
    nndraft-directory     (concat gnus-home-directory "drafts/")
    gnus-save-newsrc-file nil
    gnus-read-newsrc-file nil
    gnus-interactive-exit nil

-   gnus-gcc-mark-as-read t))
+   gnus-gcc-mark-as-read t)
+  :config
+  (when (version< emacs-version "27")
+    (with-eval-after-load 'nnmail
+      (add-to-list
+       'nnmail-split-abbrev-alist
+       '(list . "list-id\\|list-post\\|x-mailing-list\\|x-beenthere\\|x-loop")
+       t)))
+
+  ;; (gnus-registry-initialize)
+
+  (with-eval-after-load 'recentf
+    (add-to-list 'recentf-exclude gnus-home-directory)))

 
 (use-package gnus-art
   :config
   (setq
 
 (use-package gnus-art
   :config
   (setq

-   gnus-visible-headers
-   (concat gnus-visible-headers "\\|^List-Id:\\|^X-RT-Originator:\\|^User-Agent:")
-   gnus-sorted-header-list
-   '("^From:" "^Subject:" "^Summary:" "^Keywords:"
-     "^Followup-To:" "^To:" "^Cc:" "X-RT-Originator"
-     "^Newsgroups:" "List-Id:" "^Organization:"
-     "^User-Agent:" "^Date:")
+   gnus-buttonized-mime-types '("multipart/\\(signed\\|encrypted\\)")
+   gnus-sorted-header-list '("^From:"
+                             "^X-RT-Originator"
+                             "^Newsgroups:"
+                             "^Subject:"
+                             "^Date:"
+                             "^Envelope-To:"
+                             "^Followup-To:"
+                             "^Reply-To:"
+                             "^Organization:"
+                             "^Summary:"
+                             "^Abstract:"
+                             "^Keywords:"
+                             "^To:"
+                             "^[BGF]?Cc:"
+                             "^Posted-To:"
+                             "^Mail-Copies-To:"
+                             "^Mail-Followup-To:"
+                             "^Apparently-To:"
+                             "^Resent-From:"
+                             "^User-Agent:"
+                             "^X-detected-operating-system:"
+                             "^Message-ID:"
+                             ;; "^References:"
+                             "^List-Id:"
+                             "^Gnus-Warning:")
+   gnus-visible-headers (mapconcat 'identity
+                                   gnus-sorted-header-list
+                                   "\\|")

   ;; local-lapsed article dates
   ;; from https://www.emacswiki.org/emacs/GnusFormatting#toc11
   gnus-article-date-headers '(user-defined)
   ;; local-lapsed article dates
   ;; from https://www.emacswiki.org/emacs/GnusFormatting#toc11
   gnus-article-date-headers '(user-defined)


@@ -1194,13 +1637,11 @@ create a new window and switch to it.
       (concat local lapsed))))
   (bind-keys
    :map gnus-article-mode-map
       (concat local lapsed))))
   (bind-keys
    :map gnus-article-mode-map

-   ("r"   . gnus-article-reply-with-original)
-   ("R"   . gnus-article-wide-reply-with-original)

    ("M-L" . org-store-link)))
 
 (use-package gnus-sum
   :bind (:map gnus-summary-mode-map
    ("M-L" . org-store-link)))
 
 (use-package gnus-sum
   :bind (:map gnus-summary-mode-map

-              :prefix-map amin--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)


@@ -1208,30 +1649,60 @@ create a new window and switch to it.
   :config
   (bind-keys
    :map gnus-summary-mode-map
   :config
   (bind-keys
    :map gnus-summary-mode-map

-   ("r"   . gnus-summary-reply-with-original)
-   ("R"   . gnus-summary-wide-reply-with-original)

    ("M-L" . org-store-link))
    ("M-L" . org-store-link))

-  :hook (gnus-summary-mode . amin--no-mouse-autoselect-window))
+  :hook (gnus-summary-mode . b/no-mouse-autoselect-window)
+  :custom
+  (gnus-thread-sort-functions '(gnus-thread-sort-by-number
+                                gnus-thread-sort-by-subject
+                                gnus-thread-sort-by-date)))

 
 (use-package gnus-msg
   :config
 
 (use-package gnus-msg
   :config

-  (setq gnus-posting-styles
+  (defvar b/shemshak-signature "Amin Bandali
+https://shemshak.org/~amin")
+  (defvar b/uw-signature "Amin Bandali, MMath Student
+Cheriton School of Computer Science
+University of Waterloo
+https://bandali.eu.org")
+  (defvar b/csc-signature "Amin Bandali
+System Administrator, Systems Committee
+Computer Science Club, University of Waterloo
+https://csclub.uwaterloo.ca/~abandali")
+  (setq gnus-message-replysign t
+        gnus-posting-styles

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

-           (address "amin@aminb.org")
-           (body "\nBest,\namin\n")
-           (eval (setq amin--message-cite-say-hi t)))
-          ("gnu.*"

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

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

           ((header "subject" "ThankCRM")
            (to "webmasters-comment@gnu.org")
           ((header "subject" "ThankCRM")
            (to "webmasters-comment@gnu.org")

-           (body "\nAdded  to 2018supporters.html.\n\nMoving to campaigns.\n\n-amin\n")
-           (eval (setq amin--message-cite-say-hi nil)))
-          ("nnimap\\+uwaterloo:.*"
-           (address "abandali@uwaterloo.ca")
-           (gcc "\"nnimap+uwaterloo:Sent Items\"")))))
+           (body "")
+           (eval (setq b/message-cite-say-hi nil)))
+          ("nnimap\\+shemshak:.*"
+           (address "amin@shemshak.org")
+           (body "\nBest,\n")
+           (signature b/shemshak-signature)
+           (gcc "nnimap+shemshak:Sent")
+           (eval (setq b/message-cite-say-hi t)))
+          ("nnimap\\+uw:.*"
+           (address "bandali@uwaterloo.ca")
+           (body "\nBest,\n")
+           (signature b/uw-signature))
+          ("nnimap\\+uw:INBOX"
+           (gcc "\"nnimap+uw:Sent Items\""))
+          ("nnimap\\+csc:.*"
+           (address "bandali@csclub.uwaterloo.ca")
+           (signature b/csc-signature)
+           (gcc "nnimap+csc:Sent"))))
+  :hook (gnus-message-setup . (lambda ()
+                                (unless (mml-secure-is-encrypted-p)
+                                  (mml-secure-message-sign)))))

 
 (use-package gnus-topic
 
 (use-package gnus-topic

-  :hook (gnus-group-mode . gnus-topic-mode))
+  :hook (gnus-group-mode . gnus-topic-mode)
+  :config (setq gnus-topic-line-format "%i[ %A: %(%{%n%}%) ]%v\n"))

 
 (use-package gnus-agent
   :config
 
 (use-package gnus-agent
   :config


@@ -1240,22 +1711,59 @@ create a new window and switch to it.
 
 (use-package gnus-group
   :config
 
 (use-package gnus-group
   :config

-  (setq gnus-permanently-visible-groups "\\((INBOX\\|gnu$\\)"))
+  (setq gnus-permanently-visible-groups "\\(:INBOX$\\|:gnu$\\)"))
+
+(comment
+  ;; problematic with ebdb's popup, *EBDB-Gnus*
+  (use-package gnus-win
+    :config
+    (setq gnus-use-full-window nil)))
+
+(use-package gnus-dired
+  :commands gnus-dired-mode
+  :init
+  (add-hook 'dired-mode-hook 'gnus-dired-mode))
+
+(comment
+  (use-package gnus-utils
+    :custom
+    (gnus-completing-read-function 'gnus-ido-completing-read)))

 
 (use-package mm-decode
   :config
 
 (use-package mm-decode
   :config

-  (setq mm-discouraged-alternatives '("text/html" "text/richtext")))
+  (setq mm-discouraged-alternatives '("text/html" "text/richtext")
+        mm-decrypt-option 'known
+        mm-verify-option 'known))
+
+(use-package mm-uu
+  :config
+  (when (version< "27" emacs-version)
+    (set-face-attribute 'mm-uu-extract nil :extend t))
+  :custom
+  (mm-uu-diff-groups-regexp
+   "\\(gmane\\|gnu\\|l\\)\\..*\\(diff\\|commit\\|cvs\\|bug\\|dev\\)"))

 
 (use-package sendmail
   :config
 
 (use-package sendmail
   :config

-  (setq sendmail-program "/usr/bin/msmtp"
+  (setq sendmail-program (executable-find "msmtp")

         ;; message-sendmail-extra-arguments '("-v" "-d")
         mail-specify-envelope-from t
         mail-envelope-from 'header))
 
 (use-package message
         ;; message-sendmail-extra-arguments '("-v" "-d")
         mail-specify-envelope-from t
         mail-envelope-from 'header))
 
 (use-package message

+  :bind (:map message-mode-map ("<C-return>" . b/insert-asterism))

   :config
   :config

-  (defconst amin--message-cite-style-format "On %Y-%m-%d %l:%M %p, %N wrote:")
+  ;; redefine for a simplified In-Reply-To header
+  ;; (see https://todo.sr.ht/~sircmpwn/lists.sr.ht/67)
+  (defun message-make-in-reply-to ()
+    "Return the In-Reply-To header for this message."
+    (when message-reply-headers
+      (let ((from (mail-header-from message-reply-headers))
+            (msg-id (mail-header-id message-reply-headers)))
+        (when from
+          msg-id))))
+
+  (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)


@@ -1264,96 +1772,215 @@ create a new window and switch to it.
       (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 amin--message-cite-say-hi
-           (concat "Hi %F,\n\n" amin--message-cite-style-format)
-         amin--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.")
     "Citation style based on Mozilla Thunderbird's. Use with message-cite-style.")

-  (setq message-cite-style 'message-cite-style-bandali
+  (setq ;; message-cite-style 'message-cite-style-bandali

         message-kill-buffer-on-exit t
         message-send-mail-function 'message-send-mail-with-sendmail
         message-sendmail-envelope-from 'header
         message-kill-buffer-on-exit t
         message-send-mail-function 'message-send-mail-with-sendmail
         message-sendmail-envelope-from 'header

+        message-subscribed-address-functions
+        '(gnus-find-subscribed-addresses)

         message-dont-reply-to-names
         message-dont-reply-to-names

-        "\\(\\(.*@aminb\\.org\\)\\|\\(amin@bandali\\.me\\)\\|\\(\\(aminb?\\|mab\\|bandali\\)@gnu\\.org\\)\\|\\(\\(m\\|a\\(min\\.\\)?\\)bandali@uwaterloo\\.ca\\)\\)"
-        message-user-fqdn "aminb.org")
+        "\\(\\(amin@shemshak\\.org\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(bandali\\|mab\\|aminb?\\)@gnu\\.org\\)\\|\\(a?bandali@\\(csclub\\.\\)?uwaterloo\\.ca\\)\\)")
+  ;; (require 'company-ebdb)

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

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

                            (make-local-variable 'company-idle-delay)
                            (setq company-idle-delay 0.2))))
   ;; :custom-face
   ;; (message-header-subject ((t (:foreground "#111" :weight semi-bold))))
   ;; (message-header-to      ((t (:foreground "#111" :weight normal))))
   ;; (message-header-cc      ((t (:foreground "#333" :weight normal))))
                            (make-local-variable 'company-idle-delay)
                            (setq company-idle-delay 0.2))))
   ;; :custom-face
   ;; (message-header-subject ((t (:foreground "#111" :weight semi-bold))))
   ;; (message-header-to      ((t (:foreground "#111" :weight normal))))
   ;; (message-header-cc      ((t (:foreground "#333" :weight normal))))

-  )
+  :custom
+  (message-elide-ellipsis "[...]\n"))
+
+(use-package mml)

 
 

-(after! mml-sec
-  (setq mml-secure-openpgp-encrypt-to-self t
-        mml-secure-openpgp-sign-with-sender t))
+(use-package mml-sec
+  :custom
+  (mml-secure-openpgp-encrypt-to-self t)
+  (mml-secure-openpgp-sign-with-sender t))

 
 (use-package footnote
   :after message
 
 (use-package footnote
   :after message

+  ;; :config
+  ;; (setq footnote-start-tag ""
+  ;;       footnote-end-tag   ""
+  ;;       footnote-style     'unicode)

   :bind
   (:map message-mode-map
   :bind
   (:map message-mode-map

-        :prefix-map amin--footnote-prefix-map
-        :prefix "C-c f"
+        :prefix-map b/footnote-prefix-map
+        :prefix "C-c f n"

         ("a" . footnote-add-footnote)
         ("b" . footnote-back-to-message)
         ("c" . footnote-cycle-style)
         ("d" . footnote-delete-footnote)
         ("g" . footnote-goto-footnote)
         ("r" . footnote-renumber-footnotes)
         ("a" . footnote-add-footnote)
         ("b" . footnote-back-to-message)
         ("c" . footnote-cycle-style)
         ("d" . footnote-delete-footnote)
         ("g" . footnote-goto-footnote)
         ("r" . footnote-renumber-footnotes)

-        ("s" . footnote-set-style))
+        ("s" . footnote-set-style)))
+
+(use-package ebdb
+  :demand
+  :after gnus
+  :bind (:map gnus-group-mode-map ("e" . ebdb))

   :config
   :config

-  (setq footnote-start-tag ""
-        footnote-end-tag   ""
-        footnote-style     'unicode))
+  (setq ebdb-sources (b/var "ebdb"))
+  (with-eval-after-load 'swiper
+    (add-to-list 'swiper-font-lock-exclude 'ebdb-mode t)))

 
 

-(use-package bbdb
-  :load-path "lisp/bbdb"
-  :init
-  (load (expand-file-name "lisp/bbdb/bbdb-autoloads.el" user-emacs-directory))
-  ;; (bbdb-mua-auto-update-init 'message)
-  (setq bbdb-mua-auto-update-p 'query
-        bbdb-complete-mail nil)
-  (bbdb-initialize 'gnus 'message))
-
-(use-package message-x
-  :disabled t
+(use-package ebdb-com
+  :after ebdb)
+
+(use-package ebdb-complete
+  :after ebdb
+  :config
+  ;; (setq ebdb-complete-mail 'capf)
+  (ebdb-complete-enable))
+
+(use-package ebdb-message
+  :demand
+  :after ebdb)
+
+;; (use-package company-ebdb
+;;   :config
+;;   (defun company-ebdb--post-complete (_) nil))
+
+(use-package ebdb-gnus
+  :after ebdb

   :custom
   :custom

-  (message-x-completion-alist
-   (quote
-    (("\\([rR]esent-\\|[rR]eply-\\)?[tT]o:\\|[bB]?[cC][cC]:" . gnus-harvest-find-address)
-     ((if
-          (boundp
-           (quote message-newgroups-header-regexp))
-          message-newgroups-header-regexp message-newsgroups-header-regexp)
-      . message-expand-group)))))
-
-(use-package gnus-harvest
-  :disabled t
-  :commands gnus-harvest-install
-  :demand t
+  (ebdb-gnus-window-size 0.3))
+
+(use-package ebdb-mua
+  :demand
+  :after ebdb
+  :custom (ebdb-mua-pop-up t))
+
+;; (use-package ebdb-message
+;;   :after ebdb)
+
+;; (use-package ebdb-vcard
+;;   :after ebdb)
+
+(use-package message-x)
+
+(comment
+  (use-package message-x
+    :custom
+    (message-x-completion-alist
+     (quote
+      (("\\([rR]esent-\\|[rR]eply-\\)?[tT]o:\\|[bB]?[cC][cC]:" . gnus-harvest-find-address)
+       ((if
+            (boundp
+             (quote message-newgroups-header-regexp))
+            message-newgroups-header-regexp message-newsgroups-header-regexp)
+        . message-expand-group))))))
+
+(comment
+  (use-package gnus-harvest
+    :commands gnus-harvest-install
+    :demand t
+    :config
+    (if (featurep 'message-x)
+        (gnus-harvest-install 'message-x)
+      (gnus-harvest-install))))
+
+(use-package gnus-article-treat-patch
+  :disabled
+  :demand
+  :load-path "lisp/"

   :config
   :config

-  (if (featurep 'message-x)
-      (gnus-harvest-install 'message-x)
-    (gnus-harvest-install)))
+  ;; note: be sure to customize faces with `:foreground "white"' when
+  ;; using a theme with a white/light background :)
+  (setq ft/gnus-article-patch-conditions
+        '("^@@ -[0-9]+,[0-9]+ \\+[0-9]+,[0-9]+ @@")))

 
 \f
 
 \f

-;; * Blogging
+;;; IRC (with ERC and ZNC)

 
 

-(use-package ox-hugo
-  :after ox)
+(use-package erc
+  :bind (("C-c b b" . erc-switch-to-buffer)
+         :map erc-mode-map
+         ("M-a" . erc-track-switch-buffer))
+  :custom
+  (erc-join-buffer 'bury)
+  (erc-lurker-hide-list '("JOIN" "PART" "QUIT"))
+  (erc-nick "bandali")
+  (erc-prompt "erc>")
+  (erc-rename-buffers t)
+  (erc-server-reconnect-attempts 5)
+  (erc-server-reconnect-timeout 3)
+  :config
+  (defun erc-cmd-OPME ()
+    "Request chanserv to op me."
+    (erc-message "PRIVMSG"
+                 (format "chanserv op %s %s"
+                         (erc-default-target)
+                         (erc-current-nick)) nil))
+  (defun erc-cmd-DEOPME ()
+    "Deop myself from current channel."
+    (erc-cmd-DEOP (format "%s" (erc-current-nick))))
+  (add-to-list 'erc-modules 'keep-place)
+  (add-to-list 'erc-modules 'notifications)
+  (add-to-list 'erc-modules 'smiley)
+  (add-to-list 'erc-modules 'spelling)
+  (add-to-list 'erc-modules 'scrolltoplace)
+  (erc-update-modules))
+
+(use-package erc-fill
+  :after erc
+  :custom
+  (erc-fill-column 77)
+  (erc-fill-function 'erc-fill-static)
+  (erc-fill-static-center 18))

 
 

-(use-package ox-hugo-auto-export
-  :load-path "lib/ox-hugo")
+(use-package erc-pcomplete
+  :after erc
+  :custom
+  (erc-pcomplete-nick-postfix ", "))
+
+(use-package erc-track
+  :after erc
+  :bind (("C-c a e t d" . erc-track-disable)
+         ("C-c a e t e" . erc-track-enable))
+  :custom
+  (erc-track-enable-keybindings nil)
+  (erc-track-exclude-types '("JOIN" "MODE" "NICK" "PART" "QUIT"
+                             "324" "329" "332" "333" "353" "477"))
+  (erc-track-position-in-mode-line t)
+  (erc-track-priority-faces-only 'all)
+  (erc-track-shorten-function nil))
+
+(use-package erc-hl-nicks
+  :after erc)
+
+(use-package erc-scrolltoplace
+  :after erc)
+
+(use-package znc
+  :bind (("C-c a e e" . znc-erc)
+         ("C-c a e a" . znc-all))
+  :config
+  (let ((pwd (let ((auth (auth-source-search :host "znca")))
+               (cond
+                ((null auth) (error "Couldn't find znca's authinfo"))
+                (t (funcall (plist-get (car auth) :secret)))))))
+    (setq znc-servers
+          `(("znc.shemshak.org" 1337 t
+             ((freenode "amin/freenode" ,pwd)))
+            ("znc.shemshak.org" 1337 t
+             ((oftc "amin/oftc" ,pwd)))))))

 
 \f
 
 \f

-;; * Post initialization
+;;; Post initialization

 
 

+)

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

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

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