[emacs] update packages

[~bandali/configs] / init.org

diff --git a/init.org b/init.org
index 795f6fc..ee75041 100644 (file)
--- a/init.org
+++ b/init.org
@@ -1,4 +1,4 @@
-#+title: =aminb='s Literate Emacs Configuration
+#+title: Literate Emacs Configuration of Amin Bandali

 #+author: Amin Bandali
 #+babel: :cache yes
 #+property: header-args :tangle yes
 #+author: Amin Bandali
 #+babel: :cache yes
 #+property: header-args :tangle yes


@@ -9,10 +9,10 @@
 :END:
 
 This org file is my literate configuration for GNU Emacs, and is
 :END:
 
 This org file is my literate configuration for GNU Emacs, and is

-tangled to [[./init.el][init.el]]. Packages are installed and managed using
-[[https://github.com/emacscollective/borg][Borg]]. Over the years, I've taken inspiration from configurations of
-many different people. Some of the configurations that I can remember
-off the top of my head are:
+tangled to [[./init.el][init.el]].  Packages are installed and managed using
+[[https://github.com/raxod502/straight.el][straight.el]].  Over the years, I've taken inspiration from
+configurations of many different people.  Some of the configurations
+that I can remember off the top of my head are:

 
 - [[https://github.com/dieggsy/dotfiles][dieggsy/dotfiles]]: literate Emacs and dotfiles configuration, uses
   straight.el for managing packages
 
 - [[https://github.com/dieggsy/dotfiles][dieggsy/dotfiles]]: literate Emacs and dotfiles configuration, uses
   straight.el for managing packages


@@ -28,32 +28,61 @@ off the top of my head are:
 I'd like to have a fully reproducible Emacs setup (part of the reason
 why I store my configuration in this repository) but unfortunately out
 of the box, that's not achievable with =package.el=, not currently
 I'd like to have a fully reproducible Emacs setup (part of the reason
 why I store my configuration in this repository) but unfortunately out
 of the box, that's not achievable with =package.el=, not currently

-anyway. So, I've opted to use Borg. For what it's worth, I briefly
-experimented with [[https://github.com/raxod502/straight.el][straight.el]], but found that it added about 2 seconds
-to my init time; which is unacceptable for me: I use Emacs as my
-window manager (via EXWM) and coming from bspwm, I'm too used to
-having fast startup times.
+anyway.  So, I've opted to use =straight.el=.  I also used Borg for a
+few months, but decided to try =straight.el= which allows direct use
+of the various package archives.

 
 ** Installation
 
 ** Installation

+:PROPERTIES:
+:CUSTOM_ID: installation
+:END:

 
 To use this config for your Emacs, first you need to clone this repo,
 
 To use this config for your Emacs, first you need to clone this repo,

-then bootstrap Borg, tell Borg to retrieve package submodules, and
-byte-compiled the packages. Something along these lines should work:
+then tangle =init.org= into =init.el=, and optionally byte-compile
+=init.el=.
+
+First, clone the repository and =cd= into it:

 
 #+begin_src sh :tangle no
 
 #+begin_src sh :tangle no

-git clone https://github.com/aminb/dotfiles ~/.emacs.d
+git clone https://git.sr.ht/~bandali/dotfiles ~/.emacs.d

 cd ~/.emacs.d
 cd ~/.emacs.d

-make bootstrap-borg
-make bootstrap
-make build

 #+end_src
 
 #+end_src
 

+Then, decide if you would like to use a byte-compiled init file, and
+set the [[#byte-compiled-init][a/byte-compiled-init]] variable accordingly.
+
+Now, first tangle =init.org=, and only if you chose to have a
+byte-compiled init, build init as well:
+
+#+begin_src sh :tangle no
+make tangle-init
+make build-init
+#+end_src
+
+If you'd like to use a byte-compiled init, it's important that it be
+recompiled whenever =init.el= is generated from an updated =init.org=.
+Not only does my setup automatically and asynchronously tangle
+=init.org= to =init.el= every time you edit and save =init.org= in GNU
+Emacs, it will also invoke =make build-init= if you set
+=a/byte-compiled-init= to =t= above, so you wouldn't have to worry
+about manually tangling and compiling your init file whenever you
+change it.  The output of the last byte-compilation in the current
+session is kept in a =*compilation*= buffer, which will automatically
+be displayed if compilation fails.
+

 * Contents                                                   :toc_1:noexport:
 
 - [[#about][About]]
 - [[#header][Header]]
 - [[#initial-setup][Initial setup]]
 - [[#core][Core]]
 * Contents                                                   :toc_1:noexport:
 
 - [[#about][About]]
 - [[#header][Header]]
 - [[#initial-setup][Initial setup]]
 - [[#core][Core]]

+- [[#borg-essentials][Borg's =layer/essentials=]]
+- [[#editing][Editing]]
+- [[#syntax-spell-checking][Syntax and spell checking]]
+- [[#programming-modes][Programming modes]]
+- [[#emacs-enhancements][Emacs enhancements]]
+- [[#email][Email]]
+- [[#blogging][Blogging]]

 - [[#post-initialization][Post initialization]]
 - [[#footer][Footer]]
 
 - [[#post-initialization][Post initialization]]
 - [[#footer][Footer]]
 


@@ -65,7 +94,7 @@ make build
 ** First line
 
 #+begin_src emacs-lisp :comments none
 ** First line
 
 #+begin_src emacs-lisp :comments none

-;;; init.el --- Amin Bandali's Emacs config -*- lexical-binding: t ; eval: (view-mode 1)-*-
+;;; init.el --- Amin Bandali's Emacs config -*- lexical-binding: t; eval: (view-mode 1) -*-

 #+end_src
 
 Enable =view-mode=, which both makes the file read-only (as a reminder
 #+end_src
 
 Enable =view-mode=, which both makes the file read-only (as a reminder


@@ -76,7 +105,7 @@ file.
 ** License
 
 #+begin_src emacs-lisp :comments none
 ** License
 
 #+begin_src emacs-lisp :comments none

-;; Copyright (C) 2018  Amin Bandali <amin@aminb.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


@@ -97,39 +126,32 @@ file.
 #+begin_src emacs-lisp :comments none
 ;;; Commentary:
 
 #+begin_src emacs-lisp :comments none
 ;;; Commentary:
 

-;; Emacs configuration of Amin Bandali, computer scientist and functional
-;; programmer.
+;; Emacs configuration of Amin Bandali, computer scientist, functional
+;; programmer, and free software advocate.

 
 ;; THIS FILE IS AUTO-GENERATED FROM `init.org'.
 #+end_src
 
 
 ;; THIS FILE IS AUTO-GENERATED FROM `init.org'.
 #+end_src
 

-** Naming conventions
-
-The conventions below were inspired by [[https://github.com/hlissner/doom-emacs][Doom]]'s conventions, found
-[[https://github.com/hlissner/doom-emacs/blob/5dacbb7cb1c6ac246a9ccd15e6c4290def67757c/core/core.el#L3-L17][here]]. Naturally, I use my initials, =ab=, instead of =doom=.
-
-#+begin_src emacs-lisp :comments none
-;; Naming conventions:
-;;
-;;   ab-...   public variables or non-interactive functions
-;;   ab--...  private anything (non-interactive), not safe for direct use
-;;   ab/...   an interactive function; safe for M-x or keybinding
-;;   ab:...   an evil operator, motion, or command
-;;   ab|...   a hook function
-;;   ab*...   an advising function
-;;   ab@...   a hydra command
-;;   ...!     a macro
-#+end_src
-

 * Initial setup
 :PROPERTIES:
 :CUSTOM_ID: initial-setup
 :END:
 
 * Initial setup
 :PROPERTIES:
 :CUSTOM_ID: initial-setup
 :END:
 

-#+begin_src emacs-lisp :comments none
-;;; Code:
+** Byte-compiled init preference
+:PROPERTIES:
+:CUSTOM_ID: byte-compiled-init
+:END:
+
+If you would like a byte-compiled init file, set the following
+variable to ~t~, otherwise set it to ~nil~.
+
+#+begin_src emacs-lisp
+(defvar a/byte-compiled-init t
+  "If non-nil, byte-(re)compile init.el on successful tangles.")

 #+end_src
 
 #+end_src
 

+You can click on [[#installation][Installation]] to jump back up there if you like :)
+

 ** Emacs initialization
 
 I'd like to do a couple of measurements of Emacs' startup time. First,
 ** Emacs initialization
 
 I'd like to do a couple of measurements of Emacs' startup time. First,


@@ -137,10 +159,10 @@ let's see how long Emacs takes to start up, before even loading
 =init.el=, i.e. =user-init-file=:
 
 #+begin_src emacs-lisp
 =init.el=, i.e. =user-init-file=:
 
 #+begin_src emacs-lisp

-(defvar ab--before-user-init-time (current-time)
+(defvar a/before-user-init-time (current-time)

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

-         (float-time (time-subtract ab--before-user-init-time
+         (float-time (time-subtract a/before-user-init-time

                                     before-init-time)))
 #+end_src
 
                                     before-init-time)))
 #+end_src
 


@@ -150,9 +172,9 @@ frequency. Clearing the ~file-name-handler-alist~ seems to help reduce
 startup time as well.
 
 #+begin_src emacs-lisp
 startup time as well.
 
 #+begin_src emacs-lisp

-(defvar ab--gc-cons-threshold gc-cons-threshold)
-(defvar ab--gc-cons-percentage gc-cons-percentage)
-(defvar ab--file-name-handler-alist file-name-handler-alist)
+(defvar a/gc-cons-threshold gc-cons-threshold)
+(defvar a/gc-cons-percentage gc-cons-percentage)
+(defvar a/file-name-handler-alist file-name-handler-alist)

 (setq gc-cons-threshold (* 400 1024 1024)  ; 400 MiB
       gc-cons-percentage 0.6
       file-name-handler-alist nil
 (setq gc-cons-threshold (* 400 1024 1024)  ; 400 MiB
       gc-cons-percentage 0.6
       file-name-handler-alist nil


@@ -167,9 +189,9 @@ done initializing.
 (add-hook
  'after-init-hook
  (lambda ()
 (add-hook
  'after-init-hook
  (lambda ()

-   (setq gc-cons-threshold ab--gc-cons-threshold
-         gc-cons-percentage ab--gc-cons-percentage
-         file-name-handler-alist ab--file-name-handler-alist)))
+   (setq gc-cons-threshold a/gc-cons-threshold
+         gc-cons-percentage a/gc-cons-percentage
+         file-name-handler-alist a/file-name-handler-alist)))

 #+end_src
 
 Increase the number of lines kept in message logs (the =*Messages*=
 #+end_src
 
 Increase the number of lines kept in message logs (the =*Messages*=


@@ -192,16 +214,16 @@ but for now I've decided to keep them enabled. See documentation for
 
 #+begin_src emacs-lisp
 (setq user-full-name "Amin Bandali"
 
 #+begin_src emacs-lisp
 (setq user-full-name "Amin Bandali"

-      user-mail-address "amin@aminb.org")
+      user-mail-address "amin@bndl.org")

 #+end_src
 
 ** Package management
 
 *** No =package.el=
 
 #+end_src
 
 ** Package management
 
 *** No =package.el=
 

-I can do all my package management things with Borg, and don't need
-Emacs' built-in =package.el=. Emacs 27 lets us disable =package.el= in
-the =early-init-file= (see [[https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=24acb31c04b4048b85311d794e600ecd7ce60d3b][here]]).
+I can do all my package management things with =straight.el=, and
+don't need Emacs' built-in =package.el=.  Emacs 27 lets us disable
+=package.el= in the =early-init-file= (see [[https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=24acb31c04b4048b85311d794e600ecd7ce60d3b][here]]).

 
 #+begin_src emacs-lisp :tangle early-init.el
 (setq package-enable-at-startup nil)
 
 #+begin_src emacs-lisp :tangle early-init.el
 (setq package-enable-at-startup nil)


@@ -212,28 +234,81 @@ right now), and even when released it'll be long before most distros
 ship in their repos, I'll still put the old workaround with the
 commented call to ~package-initialize~ here anyway.
 
 ship in their repos, I'll still put the old workaround with the
 commented call to ~package-initialize~ here anyway.
 

-#+begin_src emacs-lisp
+#+begin_src emacs-lisp :tangle no

 (setq package-enable-at-startup nil)
 ;; (package-initialize)
 #+end_src
 
 (setq package-enable-at-startup nil)
 ;; (package-initialize)
 #+end_src
 

-*** Borg
+Update: the above is not necessary, since =straight.el= automatically
+does that (and more).  See =straight-package-neutering-mode=.
+
+*** =straight.el=

 
 #+begin_quote
 
 #+begin_quote

-Assimilate Emacs packages as Git submodules
+Next-generation, purely functional package manager for the Emacs
+hacker.

 #+end_quote
 
 #+end_quote
 

-[[https://github.com/emacscollective/borg][Borg]] is at the heart of package management of my Emacs setup. In
-short, it creates a git submodule in =lib/= for each package, which
-can then be managed with the help of Magit or other tools.
+=straight.el= allows me to have a fully reproducible Emacs setup.
+
+#+begin_src emacs-lisp
+;; Main engine start...
+
+(setq straight-repository-branch "develop"
+      straight-check-for-modifications '(check-on-save find-when-checking))
+
+(defun a/bootstrap-straight ()
+  (defvar bootstrap-version)
+  (let ((bootstrap-file
+         (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory))
+        (bootstrap-version 5))
+    (unless (file-exists-p bootstrap-file)
+      (with-current-buffer
+          (url-retrieve-synchronously
+           "https://raw.githubusercontent.com/raxod502/straight.el/develop/install.el"
+           'silent 'inhibit-cookies)
+        (goto-char (point-max))
+        (eval-print-last-sexp)))
+    (load bootstrap-file nil 'nomessage)))
+
+;; Solid rocket booster ignition...
+
+(defun a/build-init ()
+  (a/bootstrap-straight)
+  (byte-compile-file "init.el"))
+
+(a/bootstrap-straight)
+
+;; We have lift off!
+
+(setq straight-use-package-by-default t)
+#+end_src
+
+Since we enable =straight.el='s =straight-use-package-by-default=
+integration, we will define a =use-feature= for plain ole
+=use-package= without any of the =straight.el= stuff.

 
 #+begin_src emacs-lisp
 
 #+begin_src emacs-lisp

-(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)
+(defmacro use-feature (name &rest args)
+  "Like `use-package', but with `straight-use-package-by-default' disabled."
+  (declare (indent defun))
+  `(use-package ,name
+     :straight nil
+     ,@args))
+#+end_src
+
+Also, here's a useful function for reloading the init file (useful
+after running =straight-check-all=:
+
+#+begin_src emacs-lisp
+(defun a/reload-init ()
+  "Reload init.el."
+  (interactive)
+  (straight-transaction
+    (straight-mark-transaction-as-init)
+    (load (if a/byte-compiled-init
+              (concat (file-name-sans-extension user-init-file) ".elc")
+            user-init-file))))

 #+end_src
 
 *** =use-package=
 #+end_src
 
 *** =use-package=


@@ -247,17 +322,22 @@ packages (in our case especially the latter) in a neatly organized way
 and without compromising on performance.
 
 #+begin_src emacs-lisp
 and without compromising on performance.
 
 #+begin_src emacs-lisp

-(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)
+(straight-use-package '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))

+
+(setq use-package-always-defer t)
+(require 'bind-key)

 #+end_src
 
 #+end_src
 

-*** Epkg
+*** COMMENT Epkg

 
 #+begin_quote
 Browse the Emacsmirror package database
 
 #+begin_quote
 Browse the Emacsmirror package database


@@ -269,7 +349,16 @@ database, low-level functions for querying the database, and a
 
 #+begin_src emacs-lisp
 (use-package epkg
 
 #+begin_src emacs-lisp
 (use-package epkg

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

 #+end_src
 
 ** No littering in =~/.emacs.d=
 #+end_src
 
 ** No littering in =~/.emacs.d=


@@ -300,7 +389,7 @@ definitely don't want it mixing with =init.el=. So, here; let's give
 it it's own file. While at it, treat themes as safe.
 
 #+begin_src emacs-lisp
 it it's own file. While at it, treat themes as safe.
 
 #+begin_src emacs-lisp

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

   :no-require t
   :config
   (setq custom-file (no-littering-expand-etc-file-name "custom.el"))
   :no-require t
   :config
   (setq custom-file (no-littering-expand-etc-file-name "custom.el"))


@@ -309,6 +398,15 @@ it it's own file. While at it, treat themes as safe.
   (setf custom-safe-themes t))
 #+end_src
 
   (setf custom-safe-themes t))
 #+end_src
 

+** Secrets file
+
+Load the secrets file if it exists, otherwise show a warning.
+
+#+begin_src emacs-lisp
+(with-demoted-errors
+    (load (no-littering-expand-etc-file-name "secrets")))
+#+end_src
+

 ** Better =$PATH= handling
 
 Let's use [[https://github.com/purcell/exec-path-from-shell][exec-path-from-shell]] to make Emacs use the =$PATH= as set up
 ** Better =$PATH= handling
 
 Let's use [[https://github.com/purcell/exec-path-from-shell][exec-path-from-shell]] to make Emacs use the =$PATH= as set up


@@ -316,9 +414,10 @@ in my shell.
 
 #+begin_src emacs-lisp
 (use-package exec-path-from-shell
 
 #+begin_src emacs-lisp
 (use-package exec-path-from-shell

-  :defer 1
+  :defer 0.4

   :init
   :init

-  (setq exec-path-from-shell-check-startup-files nil)
+  (setq exec-path-from-shell-arguments           nil
+        exec-path-from-shell-check-startup-files nil)

   :config
   (exec-path-from-shell-initialize)
   ;; while we're at it, let's fix access to our running ssh-agent
   :config
   (exec-path-from-shell-initialize)
   ;; while we're at it, let's fix access to our running ssh-agent


@@ -326,7 +425,7 @@ in my shell.
   (exec-path-from-shell-copy-env "SSH_AUTH_SOCK"))
 #+end_src
 
   (exec-path-from-shell-copy-env "SSH_AUTH_SOCK"))
 #+end_src
 

-** Only one custom theme at a time
+** COMMENT Only one custom theme at a time

 
 #+begin_src emacs-lisp
 (defadvice load-theme (before clear-previous-themes activate)
 
 #+begin_src emacs-lisp
 (defadvice load-theme (before clear-previous-themes activate)


@@ -345,11 +444,12 @@ login; so starting the server from inside Emacs is good enough for me.
 See [[https://www.gnu.org/software/emacs/manual/html_node/emacs/Emacs-Server.html#Emacs-Server][Using Emacs as a Server]].
 
 #+begin_src emacs-lisp
 See [[https://www.gnu.org/software/emacs/manual/html_node/emacs/Emacs-Server.html#Emacs-Server][Using Emacs as a Server]].
 
 #+begin_src emacs-lisp

-(use-package server
+(use-feature server
+  :defer 0.4

   :config (or (server-running-p) (server-mode)))
 #+end_src
 
   :config (or (server-running-p) (server-mode)))
 #+end_src
 

-** Unicode support
+** COMMENT Unicode support

 
 Font stack with better unicode support, around =Ubuntu Mono= and
 =Hack=.
 
 Font stack with better unicode support, around =Ubuntu Mono= and
 =Hack=.


@@ -359,7 +459,7 @@ Font stack with better unicode support, around =Ubuntu Mono= and
   (set-fontset-font
    ft
    'unicode
   (set-fontset-font
    ft
    'unicode

-   (font-spec :name "Ubuntu Mono"))
+   (font-spec :name "Source Code Pro" :size 14))

   (set-fontset-font
    ft
    'unicode
   (set-fontset-font
    ft
    'unicode


@@ -387,6 +487,57 @@ Font stack with better unicode support, around =Ubuntu Mono= and
    'prepend))
 #+end_src
 
    'prepend))
 #+end_src
 

+** Gentler font resizing
+
+#+begin_src emacs-lisp
+(setq text-scale-mode-step 1.05)
+#+end_src
+
+** Focus follows mouse
+
+I’d like focus to follow the mouse when I move the cursor from one
+window to the next.
+
+#+begin_src emacs-lisp
+(setq mouse-autoselect-window t)
+#+end_src
+
+Let’s define a function to conveniently disable this for certain
+buffers and/or modes.
+
+#+begin_src emacs-lisp
+(defun a/no-mouse-autoselect-window ()
+  (make-local-variable 'mouse-autoselect-window)
+  (setq mouse-autoselect-window nil))
+#+end_src
+
+** Better scrolling (arguably)
+
+#+begin_src emacs-lisp
+(setq ;; scroll-margin 1
+      ;; scroll-conservatively 10000
+      scroll-step 1
+      scroll-conservatively 10
+      scroll-preserve-screen-position 1)
+
+(use-feature mwheel
+  :defer 0.4
+  :config
+  (setq mouse-wheel-scroll-amount '(1 ((shift) . 1)) ; one line at a time
+        mouse-wheel-progressive-speed nil            ; don't accelerate scrolling
+        mouse-wheel-follow-mouse t))                 ; scroll window under mouse
+
+(use-feature pixel-scroll
+  :defer 0.4
+  :config (pixel-scroll-mode 1))
+#+end_src
+
+** Ask for GPG passphrase in minibuffer
+
+#+begin_src emacs-lisp
+(setq epg-pinentry-mode 'loopback)
+#+end_src
+

 ** Libraries
 
 #+begin_src emacs-lisp
 ** Libraries
 
 #+begin_src emacs-lisp


@@ -396,37 +547,33 @@ Font stack with better unicode support, around =Ubuntu Mono= and
 
 ** Useful utilities
 
 
 ** Useful utilities
 

-#+begin_src emacs-lisp
-(defun ab-enlist (exp)
-  "Return EXP wrapped in a list, or as-is if already a list."
-(if (listp exp) exp (list exp)))
+Convenience macro for =setq='ing multiple variables to the same value:

 
 

-; 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."
+#+begin_src emacs-lisp
+(defmacro a/setq-every (value &rest vars)
+  "Set all the variables from VARS to value VALUE."

   (declare (indent defun) (debug t))
   (declare (indent defun) (debug t))

-  (list (if (or (not (bound-and-true-p byte-compile-current-file))
-                (dolist (next (ab-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)))))
+  `(progn ,@(mapcar (lambda (x) (list 'setq x value)) vars)))
+#+end_src
+
+The following process-related stuff from [[https://github.com/alezost/emacs-config][alezost's emacs-config]].
+
+#+begin_src emacs-lisp
+(defun a/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 a/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 #'a/start-process
+         program
+         (remove nil (list args (dired-get-file-for-visit)))))

 #+end_src
 
 * Core
 #+end_src
 
 * Core


@@ -442,16 +589,16 @@ Enable displaying time and battery in the mode-line, since I'm not
 using the Xfce panel anymore. Also, I don't need to see the load
 average on a regular basis, so disable that.
 
 using the Xfce panel anymore. Also, I don't need to see the load
 average on a regular basis, so disable that.
 

-#+begin_src emacs-lisp
+Note: using =i3status= on sway at the moment, so disabling this.
+
+#+begin_src emacs-lisp :tangle no

 (use-package time
 (use-package time

-  :ensure nil

   :init
   (setq display-time-default-load-average nil)
   :config
   (display-time-mode))
 
 (use-package battery
   :init
   (setq display-time-default-load-average nil)
   :config
   (display-time-mode))
 
 (use-package battery

-  :ensure nil

   :config
   (display-battery-mode))
 #+end_src
   :config
   (display-battery-mode))
 #+end_src


@@ -562,7 +709,8 @@ variable.
 
 #+begin_src emacs-lisp
 (setq backup-by-copying t
 
 #+begin_src emacs-lisp
 (setq backup-by-copying t

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

 #+end_src
 
 *** Auto revert
 #+end_src
 
 *** Auto revert


@@ -572,7 +720,7 @@ Enable automatic reloading of changed buffers and files.
 #+begin_src emacs-lisp
 (global-auto-revert-mode 1)
 (setq auto-revert-verbose nil
 #+begin_src emacs-lisp
 (global-auto-revert-mode 1)
 (setq auto-revert-verbose nil

-      global-auto-revert-non-file-buffers t)
+      global-auto-revert-non-file-buffers nil)

 #+end_src
 
 *** Always use space for indentation
 #+end_src
 
 *** Always use space for indentation


@@ -584,6 +732,128 @@ Enable automatic reloading of changed buffers and files.
  tab-width 4)
 #+end_src
 
  tab-width 4)
 #+end_src
 

+*** Winner mode
+
+Enable =winner-mode=.
+
+#+begin_src emacs-lisp
+(winner-mode 1)
+#+end_src
+
+*** Don’t display =*compilation*= on success
+
+Based on https://stackoverflow.com/a/17788551, with changes to use
+=cl-letf= instead of the now obsolete =flet=.
+
+#+begin_src emacs-lisp
+(with-eval-after-load 'compile
+  (defun a/compilation-finish-function (buffer outstr)
+    (unless (string-match "finished" outstr)
+      (switch-to-buffer-other-window buffer))
+    t)
+
+  (setq compilation-finish-functions #'a/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))
+#+end_src
+
+*** 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][endlessparentheses]]
+for this.
+
+#+begin_src emacs-lisp
+(setq search-default-mode #'char-fold-to-regexp)
+
+;; uncomment to extend this behaviour to query-replace
+;; (setq replace-char-fold t)
+#+end_src
+
+*** Cursor shape
+
+#+begin_src emacs-lisp
+(setq-default cursor-type 'bar)
+#+end_src
+
+*** Allow scrolling in Isearch
+
+#+begin_src emacs-lisp
+(setq isearch-allow-scroll t)
+#+end_src
+
+** Bindings
+
+Some bindings for functions from built-in GNU Emacs packages:
+
+#+begin_src emacs-lisp
+(bind-keys
+ ("C-c a i" . ielm)
+
+ ("C-c e b" . eval-buffer)
+ ("C-c e r" . eval-region)
+
+ ("C-c e i" . emacs-init-time)
+ ("C-c e u" . emacs-uptime)
+
+ ("C-c F m" . make-frame-command)
+ ("C-c F d" . delete-frame)
+ ("C-c F D" . delete-other-frames)
+
+ ("C-c o"   . other-window)
+
+ ("C-S-h C" . describe-char)
+ ("C-S-h F" . describe-face)
+
+ ("C-x k"   . kill-this-buffer)
+ ("C-x K"   . kill-buffer)
+
+ ("s-p"     . beginning-of-buffer)
+ ("s-n"     . end-of-buffer))
+
+(when (display-graphic-p)
+  (unbind-key "C-z" global-map))
+#+end_src
+
+While at it, let's bind a few for some =straight-*= functions too:
+
+#+begin_src emacs-lisp
+(bind-keys
+ :prefix-map a/straight-prefix-map
+ :prefix "C-c p s"
+ ("u" . straight-use-package)
+ ("f" . straight-freeze-versions)
+ ("t" . straight-thaw-versions)
+ ("P" . straight-prune-build)
+ ("g" . straight-get-recipe)
+ ("r" . a/reload-init)
+ ;; M-x ^straight-.*-all$
+ ("a c" . straight-check-all)
+ ("a f" . straight-fetch-all)
+ ("a m" . straight-merge-all)
+ ("a n" . straight-normalize-all)
+ ("a F" . straight-pull-all)
+ ("a P" . straight-push-all)
+ ("a r" . straight-rebuild-all)
+ ;; M-x ^straight-.*-package$
+ ("p c" . straight-check-package)
+ ("p f" . straight-fetch-package)
+ ("p m" . straight-merge-package)
+ ("p n" . straight-normalize-package)
+ ("p F" . straight-pull-package)
+ ("p P" . straight-push-package)
+ ("p r" . straight-rebuild-package))
+#+end_src
+

 ** Packages
 
 The packages in this section are absolutely essential to my everyday
 ** Packages
 
 The packages in this section are absolutely essential to my everyday


@@ -608,71 +878,7 @@ customizing it.
             'auto-compile-inhibit-compile-detached-git-head))
 #+end_src
 
             'auto-compile-inhibit-compile-detached-git-head))
 #+end_src
 

-*** [[https://github.com/Kungsgeten/ryo-modal][ryo-modal]]
-
-#+begin_quote
-Roll your own modal mode
-#+end_quote
-
-#+begin_src emacs-lisp
-(use-package ryo-modal
-  :commands ryo-modal-mode
-  :bind ("M-m" . ryo-modal-mode)
-  :after which-key
-  :config
-  (push '((nil . "ryo:.*:") . (nil . "")) which-key-replacement-alist)
-  (ryo-modal-keys
-   ("," ryo-modal-repeat)
-   ("b" backward-char)
-   ("n" next-line)
-   ("p" previous-line)
-   ("f" forward-char)
-   ("/" undo)
-   ("i" ryo-modal-mode)
-   ("l" recenter-top-bottom)
-   ("v" scroll-up-command)
-   ("V" scroll-down-command)
-   ("x" delete-forward-char)
-   ("SPC" (("b" (("b" ibuffer-list-buffers)
-                 ("k" kill-this-buffer)
-                 ("o" other-window)
-                 ("s" save-buffer)))
-           ("B" (("A" borg-activate)
-                 ("a" borg-assimilate)
-                 ("b" borg-build)
-                 ("c" borg-clone)
-                 ("r" borg-remove)))
-           ("h" (("c" describe-char)
-                 ("f" describe-function)
-                 ("F" describe-face)
-                 ("i" info)
-                 ("k" describe-key)
-                 ("l" view-lossage)
-                 ("v" describe-variable)))
-           ("q" (("q" save-buffers-kill-terminal)))))
-   ("d" (("w" kill-word)
-         ("b" backward-kill-word)))
-   ("c w" kill-word :exit t))
-
-  (ryo-modal-keys
-   ;; First argyment to ryo-modal-keys may be a list of keywords.
-   ;; These keywords will be applied to all keybindings.
-   (:norepeat t)
-   ("0" "M-0")
-   ("1" "M-1")
-   ("2" "M-2")
-   ("3" "M-3")
-   ("4" "M-4")
-   ("5" "M-5")
-   ("6" "M-6")
-   ("7" "M-7")
-   ("8" "M-8")
-   ("9" "M-9"))
-  :hook ((text-mode . ryo-modal-mode)
-         (prog-mode . ryo-modal-mode)))
-#+end_src
-
-*** [[https://orgmode.org/][Org mode]]
+*** [[https://orgmode.org/][Org]]

 
 #+begin_quote
 Org mode is for keeping notes, maintaining TODO lists, planning
 
 #+begin_quote
 Org mode is for keeping notes, maintaining TODO lists, planning


@@ -682,24 +888,119 @@ system.
 
 In short, my favourite way of life.
 
 
 In short, my favourite way of life.
 

+We will use the =org-plus-contrib= package to get the whole deal:
+

 #+begin_src emacs-lisp
 #+begin_src emacs-lisp

-(use-package org
-  :ryo ("SPC b t" org-babel-tangle)
+(straight-use-package 'org-plus-contrib)
+#+end_src
+
+And here's where my actual Org configurations begin:
+
+#+begin_src emacs-lisp
+(use-feature org
+  :defer 0.5

   :config
   (setq org-src-tab-acts-natively t
         org-src-preserve-indentation nil
         org-edit-src-content-indentation 0
   :config
   (setq org-src-tab-acts-natively t
         org-src-preserve-indentation nil
         org-edit-src-content-indentation 0

-        org-html-divs '((preamble  "header" "preamble")
-                        (content   "main"   "content")
-                        (postamble "footer" "postamble"))
-        org-html-doctype "html5"
-        org-html-html5-fancy t
-        org-html-postamble nil)
-  :hook (org-mode . org-indent-mode))
-(use-package htmlize
-  :after org)
-(use-package org-notmuch
-  :after (:any org notmuch))
+        org-link-email-description-format "Email %c: %s" ; %.30s
+        org-highlight-latex-and-related '(entities)
+        org-use-speed-commands t
+        org-startup-folded 'content
+        org-catch-invisible-edits 'show-and-error
+        org-log-done 'time)
+  (add-to-list 'org-structure-template-alist '("L" . "src emacs-lisp") t)
+  :bind
+  (("C-c a o a" . org-agenda)
+   :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-agenda-files '("~/usr/org/todos/personal.org"
+                      "~/usr/org/todos/masters.org"))
+  (org-agenda-start-on-weekday 0)
+  (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-feature ox-latex
+  :after ox
+  :config
+  (setq org-latex-listings 'listings
+        ;; org-latex-prefer-user-labels t
+        )
+  (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)
+  (require 'ox-beamer))
+#+end_src
+
+**** asynchronous tangle
+
+=a/async-babel-tangle= is a function closely inspired by [[https://github.com/dieggsy/dotfiles/tree/cc10edf7701958eff1cd94d4081da544d882a28c/emacs.d#dotfiles][dieggsy's
+d/async-babel-tangle]] which uses [[https://github.com/jwiegley/emacs-async][async]] to asynchronously tangle an org
+file.
+
+#+begin_src emacs-lisp
+(with-eval-after-load 'org
+  (defvar a/show-async-tangle-results nil
+    "Keep *emacs* async buffers around for later inspection.")
+
+  (defvar a/show-async-tangle-time nil
+    "Show the time spent tangling the file.")
+
+  (defvar a/async-tangle-post-compile
+    (when a/byte-compiled-init "make build-init")
+    "If non-nil, pass to `compile' after successful tangle.")
+
+  ;; TODO: look into why directly byte-compiling init.el causes a
+  ;; number of problems, including magit-status not loading (busy
+  ;; waiting).
+  (defvar a/async-tangle-byte-recompile nil
+    "If non-nil, byte-recompile the file on successful tangle.")
+
+  (defun a/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")
+           (file-noext (file-name-sans-extension file)))
+      (async-start
+       `(lambda ()
+          (require 'org)
+          (org-babel-tangle-file ,file))
+       (unless a/show-async-tangle-results
+         `(lambda (result)
+            (if result
+                (progn
+                  ;; (setq byte-compile-warnings '(not noruntime unresolved))
+                  (message "Tangled %s%s"
+                           ,file-nodir
+                           (if a/show-async-tangle-time
+                               (format " (%.3fs)"
+                                       (float-time (time-subtract (current-time)
+                                                                  ',file-tangle-start-time)))
+                             ""))
+                  (when a/async-tangle-post-compile
+                    (compile a/async-tangle-post-compile))
+                  (when a/async-tangle-byte-recompile
+                    (byte-recompile-file (concat ,file-noext ".el"))))
+              (message "Tangling %s failed" ,file-nodir))))))))
+
+(add-to-list
+ 'safe-local-variable-values
+ '(eval add-hook 'after-save-hook #'a/async-babel-tangle 'append 'local))

 #+end_src
 
 *** [[https://magit.vc/][Magit]]
 #+end_src
 
 *** [[https://magit.vc/][Magit]]


@@ -712,16 +1013,46 @@ Not just how I do git, but /the/ way to do git.
 
 #+begin_src emacs-lisp
 (use-package magit
 
 #+begin_src emacs-lisp
 (use-package magit

-  :ryo ("SPC" (("g s" magit-status)))
-  :defer t
-  :bind (("s-g"     . magit-status)
-         ("C-x g"   . magit-status)
-         ("C-x M-g" . magit-dispatch-popup))
+  :defer 0.5
+  :bind (("C-x g" . magit-status)
+         ("s-g s" . magit-status)
+         ("s-g l" . magit-log-buffer-file))

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

-                          'append))
+                          'append)
+  (setq
+   magit-repository-directories '(("~/.emacs.d/" . 0)
+                                  ("~/src/git/" . 1)))
+  (nconc magit-section-initial-visibility-alist
+         '(([unpulled status] . show)
+           ([unpushed status] . show)))
+  :custom-face (magit-diff-file-heading ((t (:weight normal)))))
+#+end_src
+
+*** recentf
+
+Recently opened files.
+
+#+begin_src emacs-lisp
+(use-feature recentf
+  :defer 0.2
+  :config
+  (add-to-list 'recentf-exclude "^/\\(?:ssh\\|su\\|sudo\\)?:")
+  (setq recentf-max-saved-items 40))
+#+end_src
+
+*** smex
+
+#+begin_quote
+A smart M-x enhancement for Emacs.
+#+end_quote
+
+Mostly because =counsel= needs it to remember history.
+
+#+begin_src emacs-lisp
+(use-package smex)

 #+end_src
 
 *** [[https://github.com/abo-abo/swiper][Ivy]] (and friends)
 #+end_src
 
 *** [[https://github.com/abo-abo/swiper][Ivy]] (and friends)


@@ -737,44 +1068,43 @@ There's no way I could top that, so I won't attempt to.
 
 #+begin_src emacs-lisp
 (use-package ivy
 
 #+begin_src emacs-lisp
 (use-package ivy

-  :defer 1
+  :defer 0.3

   :bind
   (:map ivy-minibuffer-map
   :bind
   (:map ivy-minibuffer-map

-        ([escape] . keyboard-escape-quit)
-        ;; ("C-j"    . ivy-next-line)
-        ;; ("C-k"    . ivy-previous-line)
-        ([S-up]   . ivy-previous-history-element)
-        ([S-down] . ivy-next-history-element)
-        ("DEL"    . ivy-backward-delete-char))
-  :ryo ("SPC ," ivy-switch-buffer)
+   ([escape] . keyboard-escape-quit)
+   ([S-up]   . ivy-previous-history-element)
+   ([S-down] . ivy-next-history-element)
+   ("DEL"    . ivy-backward-delete-char))

   :config
   (setq ivy-wrap t)
   :config
   (setq ivy-wrap t)

-  (ivy-mode 1))
+  (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))))
+)

 #+end_src
 
 **** Swiper
 
 #+begin_src emacs-lisp
 (use-package swiper
 #+end_src
 
 **** Swiper
 
 #+begin_src emacs-lisp
 (use-package swiper

-  :ryo
-  ("SPC /" swiper)
-  ("s" swiper)
-  :bind (([remap isearch-forward]  . swiper)
-         ([remap isearch-backward] . swiper)))
+  :after ivy
+  :bind (("C-s"   . swiper)
+         ("C-r"   . swiper)
+         ("C-S-s" . isearch-forward)))

 #+end_src
 
 **** Counsel
 
 #+begin_src emacs-lisp
 (use-package counsel
 #+end_src
 
 **** Counsel
 
 #+begin_src emacs-lisp
 (use-package counsel

-  :defer 1
-  :ryo
-  ("SPC" (("f r" counsel-recentf)
-          ("SPC" counsel-M-x)
-          ("."   counsel-find-file)))
+  :after ivy

   :bind (([remap execute-extended-command] . counsel-M-x)
   :bind (([remap execute-extended-command] . counsel-M-x)

-         ([remap find-file] . counsel-find-file)
-         ("s-r"     . counsel-recentf)
+         ([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))
   :config
          :map minibuffer-local-map
          ("C-r" . counsel-minibuffer-history))
   :config


@@ -782,129 +1112,374 @@ There's no way I could top that, so I won't attempt to.
   (defalias 'locate #'counsel-locate))
 #+end_src
 
   (defalias 'locate #'counsel-locate))
 #+end_src
 

-* Borg's =layer/essentials=
+*** eshell
+
+#+begin_src emacs-lisp
+(use-feature eshell
+  :defer 0.5
+  :commands eshell
+  :bind ("C-c a s e" . eshell)
+  :config
+  (eval-when-compile (defvar eshell-prompt-regexp))
+  (defun a/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 a/eshell-clear ()
+    (interactive)
+    (let ((inhibit-read-only t))
+      (erase-buffer))
+    (eshell-send-input))
+
+  (defun a/eshell-setup ()
+    (make-local-variable 'company-idle-delay)
+    (defvar company-idle-delay)
+    (setq company-idle-delay nil)
+    (bind-keys :map eshell-mode-map
+               ("C-d"   . a/eshell-quit-or-delete-char)
+               ("C-S-l" . a/eshell-clear)
+               ("M-r"   . counsel-esh-history)
+               ([tab]   . company-complete)))
+
+  :hook (eshell-mode . a/eshell-setup)
+  :custom
+  (eshell-hist-ignoredups t)
+  (eshell-input-filter 'eshell-input-filter-initial-space))
+#+end_src
+
+*** Ibuffer
+
+#+begin_src emacs-lisp
+(use-feature ibuffer
+  :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))
+      ("gnus"
+       (or
+        (mode . gnus-group-mode)
+        (mode . gnus-summary-mode)
+        (mode . gnus-article-mode)
+        ;; not really, but...
+        (mode . message-mode)))
+      ("web"
+       (or
+        (mode . web-mode)
+        (mode . css-mode)
+        (mode . scss-mode)
+        (mode . js2-mode)))
+      ("shell"
+       (or
+        (mode . eshell-mode)
+        (mode . shell-mode)
+        (mode . term-mode)))
+      ("programming"
+       (or
+        (mode . python-mode)
+        (mode . c-mode)
+        (mode . c++-mode)
+        (mode . java-mode)
+        (mode . emacs-lisp-mode)
+        (mode . scheme-mode)
+        (mode . haskell-mode)
+        (mode . lean-mode)))
+      ("emacs"
+       (or
+        (name . "^\\*scratch\\*$")
+        (name . "^\\*Messages\\*$")))
+      ("erc" (mode . erc-mode)))))
+  (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"))))
+#+end_src
+
+*** Outline
+
+#+begin_src emacs-lisp
+(use-feature outline
+  :hook (prog-mode . outline-minor-mode)
+  :bind
+  (:map
+   outline-minor-mode-map
+   ("<s-tab>"  . outline-toggle-children)
+   ("M-p"      . outline-previous-visible-heading)
+   ("M-n"      . outline-next-visible-heading)
+   :prefix-map a/outline-prefix-map
+   :prefix "s-o"
+   ("TAB" . outline-toggle-children)
+   ("a"   . outline-hide-body)
+   ("H"   . outline-hide-body)
+   ("S"   . outline-show-all)
+   ("h"   . outline-hide-subtree)
+   ("s"   . outline-show-subtree)))
+#+end_src
+
+*** Dired
+
+#+begin_src emacs-lisp
+(use-feature ls-lisp
+  :custom (ls-lisp-dirs-first t))
+
+(use-feature dired
+  :config
+  (setq dired-listing-switches "-alh"
+        ls-lisp-use-insert-directory-program nil)
+
+  ;; easily diff 2 marked files
+  ;; https://oremacs.com/2017/03/18/dired-ediff/
+  (defun dired-ediff-files ()
+    (interactive)
+    (require 'dired-aux)
+    (defvar ediff-after-quit-hook-internal)
+    (let ((files (dired-get-marked-files))
+          (wnd (current-window-configuration)))
+      (if (<= (length files) 2)
+          (let ((file1 (car files))
+                (file2 (if (cdr files)
+                           (cadr files)
+                         (read-file-name
+                          "file: "
+                          (dired-dwim-target-directory)))))
+            (if (file-newer-than-file-p file1 file2)
+                (ediff-files file2 file1)
+              (ediff-files file1 file2))
+            (add-hook 'ediff-after-quit-hook-internal
+                      (lambda ()
+                        (setq ediff-after-quit-hook-internal nil)
+                        (set-window-configuration wnd))))
+        (error "no more than 2 files should be marked"))))
+  :bind (:map dired-mode-map
+              ("b"  . dired-up-directory)
+              ("e"  . dired-ediff-files)
+              ("E"  . dired-toggle-read-only)
+              ("\\" . dired-hide-details-mode)
+              ("z"  . (lambda ()
+                        (interactive)
+                        (a/dired-start-process "zathura"))))
+  :hook (dired-mode . dired-hide-details-mode))
+#+end_src
+
+*** Help
+
+#+begin_src emacs-lisp
+(use-feature help
+  :config
+  (temp-buffer-resize-mode)
+  (setq help-window-select t))
+#+end_src
+
+*** Tramp

 
 

-TODO: break this giant source block down into individual org sections.
+#+begin_src emacs-lisp
+(use-feature 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)))
+#+end_src
+
+*** Dash

 
 #+begin_src emacs-lisp
 (use-package dash
   :config (dash-enable-font-lock))
 
 #+begin_src emacs-lisp
 (use-package dash
   :config (dash-enable-font-lock))

+#+end_src

 
 

+* Editing
+:PROPERTIES:
+:CUSTOM_ID: editing
+:END:
+
+** =diff-hl=
+
+Highlight uncommitted changes in the left fringe.
+
+#+begin_src emacs-lisp

 (use-package diff-hl
   :config
   (setq diff-hl-draw-borders nil)
   (global-diff-hl-mode)
 (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))
+  :hook (magit-post-refresh . diff-hl-magit-post-refresh))
+#+end_src
+
+** ElDoc

 
 

-(use-package dired
-  :defer t
-  :config (setq dired-listing-switches "-alh"))
+Display Lisp objects at point in the echo area.

 
 

-(use-package eldoc
+#+begin_src emacs-lisp
+(use-feature eldoc

   :when (version< "25" emacs-version)
   :config (global-eldoc-mode))
   :when (version< "25" emacs-version)
   :config (global-eldoc-mode))

+#+end_src

 
 

-(use-package help
-  :defer t
-  :config (temp-buffer-resize-mode))
+** paren

 
 

-(progn ;    `isearch'
-  (setq isearch-allow-scroll t))
+Highlight matching parens.

 
 

-(use-package lisp-mode
-  :config
-  (add-hook 'emacs-lisp-mode-hook 'outline-minor-mode)
-  (add-hook 'emacs-lisp-mode-hook 'reveal-mode)
-  (defun indent-spaces-mode ()
-    (setq indent-tabs-mode nil))
-  (add-hook 'lisp-interaction-mode-hook #'indent-spaces-mode))
+#+begin_src emacs-lisp
+(use-feature paren
+  :demand
+  :config (show-paren-mode))
+#+end_src

 
 

-(use-package man
-  :defer t
-  :config (setq Man-width 80))
+** simple (for column numbers)

 
 

-(use-package paren
-  :config (show-paren-mode))
+#+begin_src emacs-lisp
+(use-feature simple
+  :config (column-number-mode))
+#+end_src

 
 

-(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))
+** =savehist=

 
 

-(use-package recentf
-  :demand t
-  :config (add-to-list 'recentf-exclude "^/\\(?:ssh\\|su\\|sudo\\)?:"))
+Save minibuffer history.

 
 

-(use-package savehist
+#+begin_src emacs-lisp
+(use-feature savehist

   :config (savehist-mode))
   :config (savehist-mode))

+#+end_src
+
+** =saveplace=

 
 

-(use-package saveplace
+Automatically save place in each file.
+
+#+begin_src emacs-lisp
+(use-feature saveplace

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

+#+end_src

 
 

-(use-package simple
-  :config (column-number-mode))
+** =prog-mode=

 
 

-(progn ;    `text-mode'
-  (add-hook 'text-mode-hook #'indicate-buffer-boundaries-left))
+#+begin_src emacs-lisp
+(use-feature 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))
+#+end_src

 
 

-(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)))
+** =text-mode=

 
 

-(use-package undo-tree
-  :ryo
-  ("?" undo-tree-undo)
-  ("_" undo-tree-redo)
-  :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))
+#+begin_src emacs-lisp
+(use-feature text-mode
+  :hook ((text-mode . indicate-buffer-boundaries-left)
+         (text-mode . abbrev-mode)))

 #+end_src
 
 #+end_src
 

-* Editing
-

 ** Company
 
 #+begin_src emacs-lisp
 (use-package company
 ** Company
 
 #+begin_src emacs-lisp
 (use-package company

-  :defer 5
+  :defer 0.6

   :bind
   (:map company-active-map
   :bind
   (:map company-active-map

-        ([tab] . company-complete-common-or-cycle))
+        ([tab]    . company-complete-common-or-cycle)
+        ([escape] . company-abort))

   :custom
   :custom

-  (company-idle-delay 0.3)

   (company-minimum-prefix-length 1)
   (company-selection-wrap-around t)
   (company-dabbrev-char-regexp "\\sw\\|\\s_\\|[-_]")
   (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))
 #+end_src
 
   :config
   (global-company-mode t))
 #+end_src
 

-* Syntax and spell checking
+** Flycheck
+

 #+begin_src emacs-lisp
 (use-package flycheck
 #+begin_src emacs-lisp
 (use-package flycheck

+  :defer 0.6

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

+  :bind
+  (:map flycheck-mode-map
+        ("M-P" . flycheck-previous-error)
+        ("M-N" . flycheck-next-error))

   :config
   ;; Use the load-path from running Emacs when checking elisp files
   (setq flycheck-emacs-lisp-load-path 'inherit)
 
   ;; Only flycheck when I actually save the buffer
   (setq flycheck-check-syntax-automatically '(mode-enabled save)))
   :config
   ;; Use the load-path from running Emacs when checking elisp files
   (setq flycheck-emacs-lisp-load-path 'inherit)
 
   ;; Only flycheck when I actually save the buffer
   (setq flycheck-check-syntax-automatically '(mode-enabled save)))

+
+;; http://endlessparentheses.com/ispell-and-apostrophes.html
+(use-package ispell
+  :defer 0.6
+  :config
+  ;; ’ can be part of a word
+  (setq ispell-local-dictionary-alist
+        `((nil "[[:alpha:]]" "[^[:alpha:]]"
+               "['\x2019]" nil ("-B") nil utf-8)))
+  ;; don't send ’ to the subprocess
+  (defun endless/replace-apostrophe (args)
+    (cons (replace-regexp-in-string
+           "’" "'" (car args))
+          (cdr args)))
+  (advice-add #'ispell-send-string :filter-args
+              #'endless/replace-apostrophe)
+
+  ;; convert ' back to ’ from the subprocess
+  (defun endless/replace-quote (args)
+    (if (not (derived-mode-p 'org-mode))
+        args
+      (cons (replace-regexp-in-string
+             "'" "’" (car args))
+            (cdr args))))
+  (advice-add #'ispell-parse-output :filter-args
+              #'endless/replace-quote))

 #+end_src
 #+end_src

+

 * Programming modes
 * Programming modes

+:PROPERTIES:
+:CUSTOM_ID: programming-modes
+:END:
+
+** Lisp
+
+#+begin_src emacs-lisp
+(use-feature lisp-mode
+  :config
+  (add-hook 'emacs-lisp-mode-hook 'outline-minor-mode)
+  (add-hook 'emacs-lisp-mode-hook 'reveal-mode)
+  (defun indent-spaces-mode ()
+    (setq indent-tabs-mode nil))
+  (add-hook 'lisp-interaction-mode-hook #'indent-spaces-mode))
+#+end_src

 
 ** [[http://alloytools.org][Alloy]] (with [[https://github.com/dwwmmn/alloy-mode][alloy-mode]])
 
 #+begin_src emacs-lisp
 (use-package alloy-mode
 
 ** [[http://alloytools.org][Alloy]] (with [[https://github.com/dwwmmn/alloy-mode][alloy-mode]])
 
 #+begin_src emacs-lisp
 (use-package alloy-mode

+  :straight (:host github :repo "dwwmmn/alloy-mode")

   :config (setq alloy-basic-offset 2))
 #+end_src
 
   :config (setq alloy-basic-offset 2))
 #+end_src
 


@@ -912,16 +1487,26 @@ TODO: break this giant source block down into individual org sections.
 
 #+begin_src emacs-lisp
 (use-package proof-site  ; Proof General
 
 #+begin_src emacs-lisp
 (use-package proof-site  ; Proof General

-  :load-path "lib/proof-site/generic/")
+  :straight proof-general)

 #+end_src
 
 ** [[https://leanprover.github.io][Lean]] (with [[https://github.com/leanprover/lean-mode][lean-mode]])
 
 #+begin_src emacs-lisp
 #+end_src
 
 ** [[https://leanprover.github.io][Lean]] (with [[https://github.com/leanprover/lean-mode][lean-mode]])
 
 #+begin_src emacs-lisp

+(eval-when-compile (defvar lean-mode-map))

 (use-package lean-mode
 (use-package lean-mode

+  :defer 0.4

   :bind (:map lean-mode-map
   :bind (:map lean-mode-map

-              ("S-SPC" . company-complete)))
-#+end_src
+              ("S-SPC" . company-complete))
+  :config
+  (require 'lean-input)
+  (setq default-input-method "Lean"
+        lean-input-tweak-all '(lean-input-compose
+                               (lean-input-prepend "/")
+                               (lean-input-nonempty))
+        lean-input-user-translations '(("/" "/")))
+  (lean-input-setup))
+  #+end_src

 
 ** Haskell
 
 
 ** Haskell
 


@@ -952,6 +1537,7 @@ executable from [[https://github.com/mpickering/apply-refact][apply-refact]].
 
 #+begin_src emacs-lisp
 (use-package hlint-refactor
 
 #+begin_src emacs-lisp
 (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))
   :bind (:map hlint-refactor-mode-map
               ("C-c l b" . hlint-refactor-refactor-buffer)
               ("C-c l r" . hlint-refactor-refactor-at-point))


@@ -961,7 +1547,8 @@ executable from [[https://github.com/mpickering/apply-refact][apply-refact]].
 *** [[https://github.com/flycheck/flycheck-haskell][flycheck-haskell]]
 
 #+begin_src emacs-lisp
 *** [[https://github.com/flycheck/flycheck-haskell][flycheck-haskell]]
 
 #+begin_src emacs-lisp

-(use-package flycheck-haskell)
+(use-package flycheck-haskell
+  :after haskell-mode)

 #+end_src
 
 *** [[https://github.com/ndmitchell/hlint/blob/20e116a043f2073c57b17b24ae6364b5e433ba7e/data/hs-lint.el][hs-lint.el]]
 #+end_src
 
 *** [[https://github.com/ndmitchell/hlint/blob/20e116a043f2073c57b17b24ae6364b5e433ba7e/data/hs-lint.el][hs-lint.el]]


@@ -1108,7 +1695,176 @@ instead.
   :bind (:map haskell-mode-map
               ("C-c l l" . hs-lint)))
 #+end_src
   :bind (:map haskell-mode-map
               ("C-c l l" . hs-lint)))
 #+end_src

-* Emacs Enhancements
+
+** Web
+
+*** SGML and HTML
+
+#+begin_src emacs-lisp
+(use-package sgml-mode
+  :config
+  (setq sgml-basic-offset 2))
+#+end_src
+
+*** CSS and SCSS
+
+#+begin_src emacs-lisp
+(use-package css-mode
+  :config
+  (setq css-indent-offset 2))
+#+end_src
+
+*** Web mode
+
+#+begin_src emacs-lisp
+(use-package web-mode
+  :mode "\\.html\\'"
+  :config
+  (a/setq-every 2
+    web-mode-code-indent-offset
+    web-mode-css-indent-offset
+    web-mode-markup-indent-offset))
+#+end_src
+
+*** Emmet mode
+
+#+begin_src emacs-lisp
+(use-package emmet-mode
+  :after (:any web-mode css-mode sgml-mode)
+  :bind* (("C-)" . emmet-next-edit-point)
+          ("C-(" . emmet-prev-edit-point))
+  :config
+  (unbind-key "C-j" emmet-mode-keymap)
+  (setq emmet-move-cursor-between-quotes t)
+  :hook (web-mode css-mode html-mode sgml-mode))
+#+end_src
+
+** Java
+
+*** COMMENT meghanada
+
+#+begin_src emacs-lisp
+(use-package meghanada
+  :bind
+  (:map meghanada-mode-map
+        (("C-M-o" . meghanada-optimize-import)
+         ("C-M-t" . meghanada-import-all)))
+  :hook (java-mode . meghanada-mode))
+#+end_src
+
+*** COMMENT lsp-java
+
+#+begin_comment
+dependencies:
+
+ace-window
+avy
+bui
+company-lsp
+dap-mode
+lsp-java
+lsp-mode
+lsp-ui
+pfuture
+tree-mode
+treemacs
+#+end_comment
+
+#+begin_src emacs-lisp
+(use-package treemacs
+  :config (setq treemacs-never-persist t))
+
+(use-package yasnippet
+  :config
+  ;; (yas-global-mode)
+  )
+
+(use-package lsp-mode
+  :init (setq lsp-eldoc-render-all nil
+              lsp-highlight-symbol-at-point nil)
+  )
+
+(use-package hydra)
+
+(use-package company-lsp
+  :after  company
+  :config
+  (setq company-lsp-cache-candidates t
+        company-lsp-async t))
+
+(use-package lsp-ui
+  :config
+  (setq lsp-ui-sideline-update-mode 'point))
+
+(use-package lsp-java
+  :config
+  (add-hook 'java-mode-hook
+           (lambda ()
+             (setq-local company-backends (list 'company-lsp))))
+
+  (add-hook 'java-mode-hook 'lsp-java-enable)
+  (add-hook 'java-mode-hook 'flycheck-mode)
+  (add-hook 'java-mode-hook 'company-mode)
+  (add-hook 'java-mode-hook 'lsp-ui-mode))
+
+(use-package dap-mode
+  :after lsp-mode
+  :config
+  (dap-mode t)
+  (dap-ui-mode t))
+
+(use-package dap-java
+  :after (lsp-java))
+
+(use-package lsp-java-treemacs
+  :after (treemacs))
+#+end_src
+
+*** COMMENT eclim
+
+#+begin_src emacs-lisp
+(use-package eclim
+  :bind (:map eclim-mode-map ("S-SPC" . company-complete))
+  :hook ((java-mode . eclim-mode)
+         (eclim-mode . (lambda ()
+                         (make-local-variable 'company-idle-delay)
+                         (defvar company-idle-delay)
+                         ;; (setq company-idle-delay 0.7)
+                         (setq company-idle-delay nil))))
+  :custom
+  (eclim-auto-save nil)
+  ;; (eclimd-default-workspace "~/src/eclipse-workspace-exp")
+  (eclim-executable "~/.p2/pool/plugins/org.eclim_2.8.0/bin/eclim")
+  (eclim-eclipse-dirs '("~/usr/eclipse/dsl-2018-09/eclipse")))
+#+end_src
+
+** geiser
+
+#+begin_src emacs-lisp
+(use-package geiser)
+
+(use-feature geiser-guile
+  :config
+  (setq geiser-guile-load-path "~/src/git/guix"))
+#+end_src
+
+** guix
+
+#+begin_src emacs-lisp
+(use-package guix)
+#+end_src
+
+* Emacs enhancements
+:PROPERTIES:
+:CUSTOM_ID: emacs-enhancements
+:END:
+
+** man
+
+#+begin_src emacs-lisp
+(use-feature man
+  :config (setq Man-width 80))
+#+end_src

 
 ** [[https://github.com/justbur/emacs-which-key][which-key]]
 
 
 ** [[https://github.com/justbur/emacs-which-key][which-key]]
 


@@ -1118,48 +1874,131 @@ Emacs package that displays available keybindings in popup
 
 #+begin_src emacs-lisp
 (use-package which-key
 
 #+begin_src emacs-lisp
 (use-package which-key

-  :defer 1
-  :config (which-key-mode))
+  :defer 0.4
+  :config
+  (which-key-add-key-based-replacements
+    ;; prefixes for global prefixes and minor modes
+    "C-c @"   "outline"
+    "C-c !"   "flycheck"
+    "C-c 8"   "typo"
+    "C-c 8 -" "typo/dashes"
+    "C-c 8 <" "typo/left-brackets"
+    "C-c 8 >" "typo/right-brackets"
+    "C-x 8"   "unicode"
+    "C-x a"   "abbrev/expand"
+    "C-x r"   "rectangle/register/bookmark"
+    "C-x v"   "version control"
+    ;; prefixes for my personal bindings
+    "C-c a"   "applications"
+    "C-c a e" "erc"
+    "C-c a o" "org"
+    "C-c a s" "shells"
+    "C-c p"   "package-management"
+    ;; "C-c p e" "package-management/epkg"
+    "C-c p s" "straight.el"
+    "C-c psa" "all"
+    "C-c psp" "package"
+    "C-c c"   "compile-and-comments"
+    "C-c e"   "eval"
+    "C-c f"   "files"
+    "C-c F"   "frames"
+    "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"
+    "s-g"     "magit"
+    "s-o"     "outline"
+    "s-t"     "themes")
+
+  ;; prefixes for major modes
+  (which-key-add-major-mode-key-based-replacements 'message-mode
+    "C-c f"   "footnote")
+  (which-key-add-major-mode-key-based-replacements 'org-mode
+    "C-c C-v" "org-babel")
+  (which-key-add-major-mode-key-based-replacements 'web-mode
+    "C-c C-a" "web/attributes"
+    "C-c C-b" "web/blocks"
+    "C-c C-d" "web/dom"
+    "C-c C-e" "web/element"
+    "C-c C-t" "web/tags")
+
+  (which-key-mode)
+  :custom
+  (which-key-add-column-padding 5)
+  (which-key-max-description-length 32))

 #+end_src
 
 #+end_src
 

-** [[https://github.com/seagle0128/doom-modeline][doom-modeline]]
+** theme

 
 #+begin_src emacs-lisp
 
 #+begin_src emacs-lisp

-(use-package doom-modeline
-  :demand t
-  :config (setq doom-modeline-height 32)
-  :hook (after-init . doom-modeline-init))
+(add-to-list 'custom-theme-load-path "~/.emacs.d/lisp")
+(load-theme 'tangomod t)

 #+end_src
 
 #+end_src
 

-** [[https://github.com/11111000000/tao-theme-emacs][tao-theme]]
+** smart-mode-line

 
 

-#+begin_src emacs-lisp :tangle no
-(use-package tao-theme
-  :demand t
-  :config (load-theme 'tao-yang t))
+#+begin_src emacs-lisp
+(use-package smart-mode-line
+  :commands (sml/apply-theme)
+  :demand
+  :config
+  (sml/setup))
+#+end_src
+
+** doom-themes
+
+#+begin_src emacs-lisp
+(use-package doom-themes)

 #+end_src
 
 #+end_src
 

-** [[https://github.com/maio/eink-emacs][eink-theme]]
+** theme helper functions

 
 #+begin_src emacs-lisp
 
 #+begin_src emacs-lisp

-(load-theme 'eink t)
+(defvar a/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
+
+(defun a/lights-on ()
+  "Enable my favourite light theme."
+  (interactive)
+  (mapc #'disable-theme custom-enabled-themes)
+  (load-theme 'tangomod t)
+  (sml/apply-theme 'automatic)
+  (font-lock-remove-keywords
+   'org-mode a/org-mode-font-lock-keywords))
+
+(defun a/lights-off ()
+  "Go dark."
+  (interactive)
+  (mapc #'disable-theme custom-enabled-themes)
+  (load-theme 'doom-tomorrow-night t)
+  (sml/apply-theme 'automatic)
+  (font-lock-add-keywords
+   'org-mode a/org-mode-font-lock-keywords t))
+
+(bind-keys
+ ("s-t d" . a/lights-off)
+ ("s-t l" . a/lights-on))

 #+end_src
 
 ** [[https://github.com/bbatsov/crux][crux]]
 
 #+begin_src emacs-lisp
 #+end_src
 
 ** [[https://github.com/bbatsov/crux][crux]]
 
 #+begin_src emacs-lisp

-(use-package crux
-  :bind (("C-c d"    . crux-duplicate-current-line-or-region)
-         ("C-c M-d"  . crux-duplicate-and-comment-current-line-or-region))
-  :ryo
-  ("o" crux-smart-open-line :exit t)
-  ("O" crux-smart-open-line-above :exit t)
-  ("SPC b K" crux-kill-other-buffers)
-  ("d d" crux-kill-whole-line)
-  ("c c" crux-kill-whole-line :then '(crux-smart-open-line-above) :exit t)
-  ("SPC f" (("c" crux-copy-file-preserve-attributes)
-            ("D" crux-delete-file-and-buffer)
-            ("R" crux-rename-file-and-buffer))))
+(use-package crux                       ; results in Waiting for git... [2 times]
+  :defer 0.4
+  :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 j"   . crux-top-join-line)
+         ("C-S-j"   . crux-top-join-line)))

 #+end_src
 
 ** [[https://github.com/alezost/mwim.el][mwim]]
 #+end_src
 
 ** [[https://github.com/alezost/mwim.el][mwim]]


@@ -1169,240 +2008,651 @@ Emacs package that displays available keybindings in popup
   :bind (("C-a"    . mwim-beginning-of-code-or-line)
          ("C-e"    . mwim-end-of-code-or-line)
          ("<home>" . mwim-beginning-of-line-or-code)
   :bind (("C-a"    . mwim-beginning-of-code-or-line)
          ("C-e"    . mwim-end-of-code-or-line)
          ("<home>" . mwim-beginning-of-line-or-code)

-         ("<end>"  . mwim-end-of-line-or-code))
-  :ryo
-  ("a" mwim-beginning-of-code-or-line)
-  ("e" mwim-end-of-code-or-line))
+         ("<end>"  . mwim-end-of-line-or-code)))

 #+end_src
 
 #+end_src
 

-** [[https://www.emacswiki.org/emacs/KeyChord][key-chord]]
+** projectile

 
 #+begin_src emacs-lisp
 
 #+begin_src emacs-lisp

-(use-package key-chord
-  :demand t
+(use-package projectile
+  :bind-keymap ("C-c P" . projectile-command-map)

   :config
   :config

-  (key-chord-mode 1)
-  (key-chord-define-global "jk" 'ryo-modal-mode)
-  (setq key-chord-one-key-delay 0 ; i don't need one-key chords for now
-        key-chord-two-keys-delay 0.005))
+  (projectile-mode)
+
+  (defun my-projectile-invalidate-cache (&rest _args)
+    ;; ignore the args to `magit-checkout'
+    (projectile-invalidate-cache nil))
+
+  (eval-after-load 'magit-branch
+    '(progn
+       (advice-add 'magit-checkout
+                   :after #'my-projectile-invalidate-cache)
+       (advice-add 'magit-branch-and-checkout
+                   :after #'my-projectile-invalidate-cache)))
+  :custom (projectile-completion-system 'ivy))

 #+end_src
 
 #+end_src
 

-* Email
-** [[https://notmuchmail.org][notmuch]]
+** [[https://github.com/Wilfred/helpful][helpful]]

 
 

-See [[notmuch:id:87muuqsvci.fsf@fencepost.gnu.org][bug follow-up]].
+#+begin_src emacs-lisp
+(use-package helpful
+  :defer 0.6
+  :bind
+  (("C-S-h c" . helpful-command)
+   ("C-S-h f" . helpful-callable)        ; helpful-function
+   ("C-S-h v" . helpful-variable)
+   ("C-S-h k" . helpful-key)
+   ("C-S-h p" . helpful-at-point)))
+#+end_src
+
+** [[https://github.com/EricCrosson/unkillable-scratch][unkillable-scratch]]
+
+Make =*scratch*= and =*Messages*= unkillable.

 
 #+begin_src emacs-lisp
 
 #+begin_src emacs-lisp

-(defun ab/notmuch ()
-  "Delete other windows, then launch `notmuch'."
-  (interactive)
-  (require 'notmuch)
-  (delete-other-windows)
-  (notmuch))
+(use-package unkillable-scratch
+  :defer 0.6
+  :config
+  (unkillable-scratch 1)
+  :custom
+  (unkillable-buffers '("^\\*scratch\\*$" "^\\*Messages\\*$")))
+#+end_src
+
+** [[https://github.com/davep/boxquote.el][boxquote.el]]
+
+#+begin_example
+,----
+| make pretty boxed quotes like this
+`----
+#+end_example
+
+#+begin_src emacs-lisp
+(use-package boxquote
+  :defer 0.6
+  :bind
+  (:prefix-map a/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)))
+#+end_src
+
+Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
+
+** orgalist
+
+#+begin_src emacs-lisp
+(use-package orgalist
+  :after message
+  :hook (message-mode . orgalist-mode))
+#+end_src
+
+** typo.el
+
+#+begin_src emacs-lisp
+(use-package typo
+  :defer 0.5
+  :config
+  (typo-global-mode 1)
+  :hook (text-mode . typo-mode))
+#+end_src
+
+** hl-todo
+
+#+begin_src emacs-lisp
+(use-package hl-todo
+  :defer 0.5
+  :config
+  (global-hl-todo-mode))
+#+end_src
+
+** shrink-path
+
+#+begin_src emacs-lisp
+(use-package shrink-path
+  :defer 0.5
+  :after eshell
+  :config
+  (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)
+              ;; 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))
+        "")))
+  (setq eshell-prompt-regexp "\\(.*\n\\)*λ "
+                         eshell-prompt-function #'+eshell/prompt))
+#+end_src
+
+** [[https://github.com/peterwvj/eshell-up][eshell-up]]

 
 

-;; (map!
-;;  :leader
-;;  :desc "notmuch" :n "m" #'ab/notmuch
-;;  (:desc "search" :prefix "/"
-;;    :desc "notmuch" :n "m" #'counsel-notmuch))
+#+begin_src emacs-lisp
+(use-package eshell-up
+  :after eshell
+  :commands eshell-up)

 #+end_src
 
 #+end_src
 

+** multi-term
+

 #+begin_src emacs-lisp
 #+begin_src emacs-lisp

-(defvar ab-maildir "~/mail")
+(use-package multi-term
+  :defer 0.6
+  :bind (("C-c a s m" . multi-term-dedicated-toggle)
+         :map term-mode-map
+         ("C-c C-j" . term-char-mode)
+         :map term-raw-map
+         ("C-c C-j" . term-line-mode))
+  :config
+  (setq multi-term-program "/bin/screen"
+        ;; TODO: add separate bindings for connecting to existing
+        ;; session vs. always creating a new one
+        multi-term-dedicated-select-after-open-p t
+        multi-term-dedicated-window-height 20
+        multi-term-dedicated-max-window-height 30
+        term-bind-key-alist
+        '(("C-c C-c" . term-interrupt-subjob)
+          ("C-c C-e" . term-send-esc)
+          ("C-k" . kill-line)
+          ("C-y" . term-paste)
+          ("M-f" . term-send-forward-word)
+          ("M-b" . term-send-backward-word)
+          ("M-p" . term-send-up)
+          ("M-n" . term-send-down)
+          ("<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>")))
+#+end_src
+
+** page-break-lines

 
 

-(use-package sendmail
-  ;; :ensure nil
+#+begin_src emacs-lisp
+(use-package page-break-lines
+  :config
+  (global-page-break-lines-mode))
+#+end_src
+
+** expand-region
+
+#+begin_src emacs-lisp
+(use-package expand-region
+  :bind ("C-=" . er/expand-region))
+#+end_src
+
+** multiple-cursors
+
+#+begin_src emacs-lisp
+(use-package multiple-cursors
+  :bind
+  (("C-S-<mouse-1>" . mc/add-cursor-on-click)
+   (:prefix-map a/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))))
+#+end_src
+
+** forge
+
+#+begin_src emacs-lisp
+(use-package forge
+  :after magit
+  :demand)
+#+end_src
+
+** yasnippet
+
+#+begin_src emacs-lisp
+(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")
+  (yas-reload-all)
+  (setq yas-verbosity yas-verbosity-cur)
+  :hook
+  (text-mode . yas-minor-mode))
+#+end_src
+
+* Email
+:PROPERTIES:
+:CUSTOM_ID: email
+:END:
+
+#+begin_src emacs-lisp
+(defvar a/maildir (expand-file-name "~/mail/"))
+(with-eval-after-load 'recentf
+  (add-to-list 'recentf-exclude a/maildir))
+#+end_src
+
+** Gnus
+
+#+begin_src emacs-lisp
+(setq
+ a/gnus-init-file  (no-littering-expand-etc-file-name "gnus")
+ mail-user-agent   'gnus-user-agent
+ read-mail-command 'gnus)
+
+(use-feature gnus
+  :bind (("s-m"   . gnus)
+         ("s-M"   . gnus-unplugged))
+  :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@bndl.org"))
+     (nnimap "uwaterloo"
+             (nnimap-stream plain)
+             (nnimap-address "127.0.0.1")
+             (nnimap-server-port 143)
+             (nnimap-authenticator plain)
+             (nnimap-user "abandali@uwaterloo.ca"))
+     (nnimap "csclub"
+             (nnimap-stream plain)
+             (nnimap-address "127.0.0.1")
+             (nnimap-server-port 143)
+             (nnimap-authenticator plain)
+             (nnimap-user "abandali@csclub.uw")))
+   gnus-message-archive-group "nnimap+amin:Sent"
+   gnus-parameters
+   '(("gnu\\.deepspec"
+      (to-address . "deepspec@lists.cs.princeton.edu")
+      (to-list    . "deepspec@lists.cs.princeton.edu"))
+     ("gnu\\.emacs-devel"
+      (to-address . "emacs-devel@gnu.org")
+      (to-list    . "emacs-devel@gnu.org"))
+     ("gnu\\.emacs-orgmode"
+      (to-address . "emacs-orgmode@gnu.org")
+      (to-list    . "emacs-orgmode@gnu.org"))
+     ("gnu\\.emacsconf-discuss"
+      (to-address . "emacsconf-discuss@gnu.org")
+      (to-list    . "emacsconf-discuss@gnu.org"))
+     ("gnu\\.fencepost-users"
+      (to-address . "fencepost-users@gnu.org")
+      (to-list    . "fencepost-users@gnu.org"))
+     ("gnu\\.gnunet-developers"
+      (to-address . "gnunet-developers@gnu.org")
+      (to-list    . "gnunet-developers@gnu.org"))
+     ("gnu\\.guile-devel"
+      (to-address . "guile-devel@gnu.org")
+      (to-list    . "guile-devel@gnu.org"))
+     ("gnu\\.guix-devel"
+      (to-address . "guix-devel@gnu.org")
+      (to-list    . "guix-devel@gnu.org"))
+     ("gnu\\.haskell-art"
+      (to-address . "haskell-art@we.lurk.org")
+      (to-list    . "haskell-art@we.lurk.org"))
+     ("gnu\\.haskell-cafe"
+      (to-address . "haskell-cafe@haskell.org")
+      (to-list    . "haskell-cafe@haskell.org"))
+     ("gnu\\.help-gnu-emacs"
+      (to-address . "help-gnu-emacs@gnu.org")
+      (to-list    . "help-gnu-emacs@gnu.org"))
+     ("gnu\\.info-gnu-emacs"
+      (to-address . "info-gnu-emacs@gnu.org")
+      (to-list    . "info-gnu-emacs@gnu.org"))
+     ("gnu\\.info-guix"
+      (to-address . "info-guix@gnu.org")
+      (to-list    . "info-guix@gnu.org"))
+     ("gnu\\.notmuch"
+      (to-address . "notmuch@notmuchmail.org")
+      (to-list    . "notmuch@notmuchmail.org"))
+     ("gnu\\.parabola-dev"
+      (to-address . "dev@lists.parabola.nu")
+      (to-list    . "dev@lists.parabola.nu"))
+     ("gnu\\.webmasters"
+      (to-address . "webmasters@gnu.org")
+      (to-list    . "webmasters@gnu.org"))
+     ("gnu\\.www-commits"
+      (to-address . "www-commits@gnu.org")
+      (to-list    . "www-commits@gnu.org"))
+     ("gnu\\.www-discuss"
+      (to-address . "www-discuss@gnu.org")
+      (to-list    . "www-discuss@gnu.org"))
+     ("gnu\\.~bandali\\.public-inbox"
+      (to-address . "~bandali/public-inbox@lists.sr.ht")
+      (to-list    . "~bandali/public-inbox@lists.sr.ht"))
+     ("gnu\\.~sircmpwn\\.srht-admins"
+      (to-address . "~sircmpwn/sr.ht-admins@lists.sr.ht")
+      (to-list    . "~sircmpwn/sr.ht-admins@lists.sr.ht"))
+     ("gnu\\.~sircmpwn\\.srht-announce"
+      (to-address . "~sircmpwn/sr.ht-announce@lists.sr.ht")
+      (to-list    . "~sircmpwn/sr.ht-announce@lists.sr.ht"))
+     ("gnu\\.~sircmpwn\\.srht-dev"
+      (to-address . "~sircmpwn/sr.ht-dev@lists.sr.ht")
+      (to-list    . "~sircmpwn/sr.ht-dev@lists.sr.ht"))
+     ("gnu\\.~sircmpwn\\.srht-discuss"
+      (to-address . "~sircmpwn/sr.ht-discuss@lists.sr.ht")
+      (to-list    . "~sircmpwn/sr.ht-discuss@lists.sr.ht"))
+     ("gnu.*"
+      (gcc-self . t))
+     ("gnu\\."
+      (subscribed . t)))
+   gnus-large-newsgroup  50
+   gnus-home-directory   (no-littering-expand-var-file-name "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-gcc-mark-as-read t)
+  :config
+  (require 'ebdb)
+  (require 'ebdb-mua)
+  (require 'ebdb-gnus))
+
+(use-feature 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:")
+  ;; local-lapsed article dates
+  ;; from https://www.emacswiki.org/emacs/GnusFormatting#toc11
+  gnus-article-date-headers '(user-defined)
+  gnus-article-time-format
+  (lambda (time)
+    (let* ((date (format-time-string "%a, %d %b %Y %T %z" time))
+           (local (article-make-date-line date 'local))
+           (combined-lapsed (article-make-date-line date
+                                                    'combined-lapsed))
+           (lapsed (progn
+                     (string-match " (.+" combined-lapsed)
+                     (match-string 0 combined-lapsed))))
+      (concat local lapsed))))
+  (bind-keys
+   :map gnus-article-mode-map
+   ("M-L" . org-store-link)))
+
+(use-feature gnus-sum
+  :bind (:map gnus-summary-mode-map
+              :prefix-map a/gnus-summary-prefix-map
+              :prefix "v"
+              ("r" . gnus-summary-reply)
+              ("w" . gnus-summary-wide-reply)
+              ("v" . gnus-summary-show-raw-article))
+  :config
+  (bind-keys
+   :map gnus-summary-mode-map
+   ("M-L" . org-store-link))
+  :hook (gnus-summary-mode . a/no-mouse-autoselect-window))
+
+(use-feature gnus-msg
+  :config
+  (setq gnus-posting-styles
+        '((".*"
+           (address "amin@bndl.org")
+           (body "\nBest,\n")
+           (eval (setq a/message-cite-say-hi t)))
+          ("gnu.*"
+           (address "bandali@gnu.org")
+           (eval (set (make-local-variable 'message-user-fqdn) "fencepost.gnu.org")))
+          ((header "subject" "ThankCRM")
+           (to "webmasters-comment@gnu.org")
+           (body "Added  to 2019supporters.html.\n\nMoving to campaigns.\n\n-amin\n")
+           (eval (setq a/message-cite-say-hi nil)))
+          ("nnimap\\+uwaterloo:.*"
+           (address "abandali@uwaterloo.ca")
+           (gcc "\"nnimap+uwaterloo:Sent Items\""))
+          ("nnimap\\+csclub:.*"
+           (address "abandali@csclub.uwaterloo.ca")
+           (gcc "nnimap+csclub:Sent")))))
+
+(use-feature gnus-topic
+  :hook (gnus-group-mode . gnus-topic-mode)
+  :config (setq gnus-topic-line-format "%i[ %A: %(%{%n%}%) ]%v\n"))
+
+(use-feature gnus-agent
+  :config
+  (setq gnus-agent-synchronize-flags 'ask)
+  :hook (gnus-group-mode . gnus-agent-mode))
+
+(use-feature gnus-group
+  :config
+  (setq gnus-permanently-visible-groups "\\(:INBOX$\\|:gnu$\\)"))
+
+(use-feature mm-decode
+  :config
+  (setq mm-discouraged-alternatives '("text/html" "text/richtext")))
+#+end_src
+
+** sendmail
+
+#+begin_src emacs-lisp
+(use-feature sendmail

   :config
   (setq sendmail-program "/usr/bin/msmtp"
   :config
   (setq sendmail-program "/usr/bin/msmtp"

-        ; message-sendmail-extra-arguments '("-v" "-d")
+        ;; message-sendmail-extra-arguments '("-v" "-d")

         mail-specify-envelope-from t
         mail-envelope-from 'header))
         mail-specify-envelope-from t
         mail-envelope-from 'header))

+#+end_src

 
 

-(use-package message
-  ;; :ensure nil
+** message
+
+#+begin_src emacs-lisp
+(use-feature message

   :config
   :config

-  (setq message-kill-buffer-on-exit t
+  ;; 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 a/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)
+      (message-cite-reply-position 'traditional)
+      (message-yank-prefix  "> ")
+      (message-yank-cited-prefix  ">")
+      (message-yank-empty-prefix  ">")
+      (message-citation-line-format
+       (if a/message-cite-say-hi
+           (concat "Hi %F,\n\n" a/message-cite-style-format)
+         a/message-cite-style-format)))
+    "Citation style based on Mozilla Thunderbird's. Use with message-cite-style.")
+  (setq message-cite-style 'message-cite-style-bandali
+        message-kill-buffer-on-exit t

         message-send-mail-function 'message-send-mail-with-sendmail
         message-sendmail-envelope-from 'header
         message-send-mail-function 'message-send-mail-with-sendmail
         message-sendmail-envelope-from 'header

-        message-directory "drafts"
-        message-user-fqdn "aminb.org")
-  (add-hook 'message-mode-hook
-            (lambda () (setq fill-column 65
-                        message-fill-column 65)))
-  (add-hook 'message-mode-hook
-            #'flyspell-mode)
-  ;; (add-hook 'notmuch-message-mode-hook #'+doom-modeline|set-special-modeline)
-  ;; TODO: is there a way to only run this when replying and not composing?
-  ;; (add-hook 'notmuch-message-mode-hook
-  ;;           (lambda () (progn
-  ;;                   (newline)
-  ;;                   (newline)
-  ;;                   (forward-line -1)
-  ;;                   (forward-line -1))))
-  ;; (add-hook 'message-setup-hook
-  ;;           #'mml-secure-message-sign-pgpmime)
+        message-subscribed-address-functions
+        '(gnus-find-subscribed-addresses)
+        message-dont-reply-to-names
+        "\\(\\(amin@bndl\\.org\\)\\|\\(.*@\\(aminb\\|amin\\.bndl\\)\\.org\\)\\|\\(\\(bandali\\|aminb?\\|mab\\)@gnu\\.org\\)\\|\\(a\\(min\\.\\)?bandali@uwaterloo\\.ca\\)\\|\\(abandali@csclub\\.uwaterloo\\.ca\\)\\)")
+  (require 'company-ebdb)
+  :hook (;; (message-setup . mml-secure-message-sign-pgpmime)
+         (message-mode . flyspell-mode)
+         (message-mode . (lambda ()
+                           ;; (setq fill-column 65
+                           ;;       message-fill-column 65)
+                           (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))))

   )
 
   )
 

-(after! mml-sec
+(with-eval-after-load 'mml-sec

   (setq mml-secure-openpgp-encrypt-to-self t
         mml-secure-openpgp-sign-with-sender t))
   (setq mml-secure-openpgp-encrypt-to-self t
         mml-secure-openpgp-sign-with-sender t))

+#+end_src

 
 

-(use-package notmuch
-  :ryo ("SPC m" ab/notmuch)
-  :config
-  (setq notmuch-hello-sections
-        '(notmuch-hello-insert-header
-          notmuch-hello-insert-saved-searches
-          ;; notmuch-hello-insert-search
-          notmuch-hello-insert-alltags)
-        notmuch-search-oldest-first nil
-        notmuch-show-all-tags-list t
-        notmuch-message-headers  ; see bug follow-up above
-        '("Subject" "To" "Cc" "Date" "List-Id" "X-RT-Originator")
-        notmuch-hello-thousands-separator ","
-        notmuch-fcc-dirs
-        '(("amin@aminb.org"            . "amin/Sent")
-          ("abandali@uwaterloo.ca"     . "\"uwaterloo/Sent Items\"")
-          ("mab@gnu.org"               . "gnu/Sent")
-          ("aminb@gnu.org"             . "gnu/Sent")
-          (".*"                        . "sent"))
-        notmuch-search-result-format
-        '(("date" . "%12s ")
-          ("count" . "%-7s ")
-          ("authors" . "%-40s ")
-          ("subject" . "%s ")
-          ("tags" . "(%s)")))
-  ;; (add-hook 'visual-fill-column-mode-hook
-  ;;           (lambda ()
-  ;;             (when (string= major-mode 'notmuch-message-mode)
-  ;;               (setq visual-fill-column-width 70))))
-  ;; (set! :evil-state 'notmuch-message-mode 'insert)
-  ;; (advice-add #'notmuch-bury-or-kill-this-buffer
-  ;;             :override #'kill-this-buffer)
+** footnote
+
+Convenient footnotes in =message-mode=.
+
+#+begin_src emacs-lisp
+(use-feature footnote
+  :after message
+  ;; :config
+  ;; (setq footnote-start-tag ""
+  ;;       footnote-end-tag   ""
+  ;;       footnote-style     'unicode)

   :bind
   :bind

-  (:map notmuch-hello-mode-map
-        ("g" . notmuch-poll-and-refresh-this-buffer)
-        ("i" . (lambda ()
-                 "Search for `inbox' tagged messages"
-                 (interactive)
-                 (notmuch-hello-search "tag:inbox")))
-        ("u" . (lambda ()
-                 "Search for `unread' tagged messages"
-                 (interactive)
-                 (notmuch-hello-search "tag:unread")))
-        ("l" . (lambda ()
-                 "Search for `latest tagged messages"
-                 (interactive)
-                 (notmuch-hello-search "tag:latest")))
-        ("M" . (lambda ()
-                 "Compose new mail and prompt for sender"
-                 (interactive)
-                 (let ((current-prefix-arg t))
-                   (call-interactively #'notmuch-mua-new-mail)))))
-  (:map notmuch-search-mode-map
-        ("g" . notmuch-poll-and-refresh-this-buffer)
-        ("k" . (lambda ()
-                 "Mark message read"
-                 (interactive)
-                 (notmuch-search-tag '("-unread"))
-                 ;; (notmuch-search-archive-thread)
-                 (notmuch-search-next-thread)))
-        ("u" . (lambda ()
-                 "Mark message unread"
-                 (interactive)
-                 (notmuch-search-tag '("+unread"))
-                 (notmuch-search-next-thread)))
-        ("K" . (lambda ()
-                 "Mark message deleted"
-                 (interactive)
-                 (notmuch-search-tag '("-unread" "-inbox" "+deleted"))
-                 (notmuch-search-archive-thread)))
-        ("S" . (lambda ()
-                 "Mark message as spam"
-                 (interactive)
-                 (notmuch-search-tag '("-unread" "-inbox" "-webmasters" "+spam"))
-                 (notmuch-search-archive-thread))))
-  (:map notmuch-tree-mode-map  ; TODO: additional bindings
-        ("S" . (lambda ()
-                 "Mark message as spam"
-                 (interactive)
-                 (notmuch-tree-tag '("-unread" "-inbox" "-webmasters" "+spam"))
-                 (notmuch-tree-archive-thread))))
-)
+  (:map message-mode-map
+        :prefix-map a/footnote-prefix-map
+        :prefix "C-c f"
+        ("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)))
+#+end_src
+
+** ebdb
+
+#+begin_src emacs-lisp
+(use-package ebdb
+  :straight (:host github :repo "girzel/ebdb")
+  :after gnus
+  :bind (:map gnus-group-mode-map ("e" . ebdb))
+  :config
+  (setq ebdb-sources (no-littering-expand-var-file-name "ebdb"))
+  (with-eval-after-load 'swiper
+    (add-to-list 'swiper-font-lock-exclude 'ebdb-mode t)))
+
+(use-feature ebdb-com
+  :after ebdb)

 
 

-;; (use-package counsel-notmuch
-;;   :commands counsel-notmuch)
+;; (use-package ebdb-complete
+;;   :after ebdb
+;;   :config
+;;   (ebdb-complete-enable))
+
+(use-package company-ebdb
+  :config
+  (defun company-ebdb--post-complete (_) nil))
+
+(use-feature ebdb-gnus
+  :after ebdb
+  :custom
+  (ebdb-gnus-window-configuration
+   '(article
+     (vertical 1.0
+               (summary 0.25 point)
+               (horizontal 1.0
+                           (article 1.0)
+                           (ebdb-gnus 0.3))))))
+
+(use-feature ebdb-mua
+  :after ebdb
+  ;; :custom (ebdb-mua-pop-up nil)
+  )

 
 

-(after! notmuch-crypto
-  (setq notmuch-crypto-process-mime t))
+;; (use-package ebdb-message
+;;   :after ebdb)

 
 

-;; (after! evil
-;;   (mapc (lambda (str) (evil-set-initial-state (car str) (cdr str)))
-;;         '((notmuch-hello-mode . emacs)
-;;           (notmuch-search-mode . emacs)
-;;           (notmuch-tree-mode . emacs))))

 
 

-(after! recentf
-  (add-to-list 'recentf-exclude (expand-file-name ab-maildir)))
+;; (use-package ebdb-vcard
+;;   :after ebdb)

 #+end_src
 
 #+end_src
 

-** supercite
+** message-x
+
+#+begin_src emacs-lisp
+(use-package message-x)
+#+end_src

 
 #+begin_src emacs-lisp :tangle no
 
 #+begin_src emacs-lisp :tangle no

-(use-package supercite
-  :commands sc-cite-original
-  :init
-  (add-hook 'mail-citation-hook 'sc-cite-original)
+(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)))))
+#+end_src

 
 

-  (defun sc-remove-existing-signature ()
-    (save-excursion
-      (goto-char (region-beginning))
-      (when (re-search-forward message-signature-separator (region-end) t)
-        (delete-region (match-beginning 0) (region-end)))))
+** COMMENT gnus-harvest

 
 

-  (add-hook 'mail-citation-hook 'sc-remove-existing-signature)
+#+begin_src emacs-lisp
+(use-package gnus-harvest
+  :commands gnus-harvest-install
+  :demand t
+  :config
+  (if (featurep 'message-x)
+      (gnus-harvest-install 'message-x)
+    (gnus-harvest-install)))
+#+end_src

 
 

-  (defun sc-remove-if-not-mailing-list ()
-    (unless (assoc "list-id" sc-mail-info)
-      (setq attribution sc-default-attribution
-            citation (concat sc-citation-delimiter
-                             sc-citation-separator))))
+* IRC
+:PROPERTIES:
+:CUSTOM_ID: irc
+:END:

 
 

-  (add-hook 'sc-attribs-postselect-hook 'sc-remove-if-not-mailing-list)
+Now with ERC!

 
 

+#+begin_src emacs-lisp
+(use-package znc
+  :straight (:host nil :repo "https://git.bndl.org/amin/znc.el")
+  :bind (("C-c a e e" . znc-erc)
+         ("C-c a e a" . znc-all))

   :config
   :config

-  (defun sc-fill-if-different (&optional prefix)
-    "Fill the region bounded by `sc-fill-begin' and point.
-Only fill if optional PREFIX is different than
-`sc-fill-line-prefix'.  If `sc-auto-fill-region-p' is nil, do not
-fill region.  If PREFIX is not supplied, initialize fill
-variables.  This is useful for a regi `begin' frame-entry."
-    (if (not prefix)
-        (setq sc-fill-line-prefix ""
-              sc-fill-begin (line-beginning-position))
-      (if (and sc-auto-fill-region-p
-               (not (string= prefix sc-fill-line-prefix)))
-          (let ((fill-prefix sc-fill-line-prefix))
-            (unless (or (string= fill-prefix "")
-                        (save-excursion
-                          (goto-char sc-fill-begin)
-                          (or (looking-at ">+  +")
-                              (< (length
-                                  (buffer-substring (point)
-                                                    (line-end-position)))
-                                 65))))
-              (fill-region sc-fill-begin (line-beginning-position)))
-            (setq sc-fill-line-prefix prefix
-                  sc-fill-begin (line-beginning-position)))))
-nil))
-#+end_src
-
-* Blogging
-** [[https://ox-hugo.scripter.co][ox-hugo]]
-
-#+begin_src emacs-lisp
-(use-package ox-hugo
-  :after ox)
+  (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.bndl.org" 1337 t
+             ((freenode "amin/freenode" ,pwd)))
+            ("znc.bndl.org" 1337 t
+             ((moznet "amin/moznet" ,pwd)))))))

 #+end_src
 
 * Post initialization
 #+end_src
 
 * Post initialization


@@ -1415,7 +2665,7 @@ Display how long it took to load the init file.
 #+begin_src emacs-lisp
 (message "Loading %s...done (%.3fs)" user-init-file
          (float-time (time-subtract (current-time)
 #+begin_src emacs-lisp
 (message "Loading %s...done (%.3fs)" user-init-file
          (float-time (time-subtract (current-time)

-                                    ab--before-user-init-time)))
+                                    a/before-user-init-time)))

 #+end_src
 
 * Footer
 #+end_src
 
 * Footer


@@ -1426,3 +2676,9 @@ Display how long it took to load the init file.
 #+begin_src emacs-lisp :comments none
 ;;; init.el ends here
 #+end_src
 #+begin_src emacs-lisp :comments none
 ;;; init.el ends here
 #+end_src

+
+* COMMENT Local Variables                                           :ARCHIVE:
+# Local Variables:
+# eval: (add-hook 'after-save-hook #'a/async-babel-tangle 'append 'local)
+# eval: (when (featurep 'typo (typo-mode -1)))
+# End: