scripts: pull current scripts out of rc.org & clean up

[~bandali/configs] / init.org

diff --git a/init.org b/init.org
index 7c49ca2..d02ed3b 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 <bandali@gnu.org>
+;; Copyright (C) 2018-2019  Amin Bandali <bandali@gnu.org>

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


@@ -97,38 +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, found [[https://github.com/hlissner/doom-emacs/blob/5dacbb7cb1c6ac246a9ccd15e6c4290def67757c/core/core.el#L3-L17][here]].
-
-#+begin_src emacs-lisp :comments none
-;; Naming conventions:
-;;
-;;   amin-...   public variables or non-interactive functions
-;;   amin--...  private anything (non-interactive), not safe for direct use
-;;   amin/...   an interactive function; safe for M-x or keybinding
-;;   amin:...   an evil operator, motion, or command
-;;   amin|...   a hook function
-;;   amin*...   an advising function
-;;   amin@...   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,


@@ -136,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 amin--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 amin--before-user-init-time
+         (float-time (time-subtract a/before-user-init-time

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


@@ -149,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 amin--gc-cons-threshold gc-cons-threshold)
-(defvar amin--gc-cons-percentage gc-cons-percentage)
-(defvar amin--file-name-handler-alist file-name-handler-alist)
+(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


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

-   (setq gc-cons-threshold amin--gc-cons-threshold
-         gc-cons-percentage amin--gc-cons-percentage
-         file-name-handler-alist amin--file-name-handler-alist)))
+   (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*=


@@ -191,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)


@@ -211,40 +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
 
 #+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)
+;; Main engine start...

 
 

-;; (require 'borg-nix-shell)
-;; (setq borg-build-shell-command 'borg-nix-shell-build-command)
+(setq straight-repository-branch "develop"
+      straight-check-for-modifications '(check-on-save find-when-checking))

 
 

-(with-eval-after-load 'bind-key
-  (bind-keys
-   :package borg
-   ("C-c b A" . borg-activate)
-   ("C-c b a" . borg-assimilate)
-   ("C-c b b" . borg-build)
-   ("C-c b c" . borg-clone)
-   ("C-c b r" . borg-remove)))
+(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
+(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=


@@ -258,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


@@ -280,11 +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
   :bind

-  (("C-c b d" . epkg-describe-package)
-   ("C-c b p" . epkg-list-packages)
-   ("C-c b u" . epkg-update)))
+  (("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=


@@ -315,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"))


@@ -340,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


@@ -369,8 +444,8 @@ 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
-  :defer 1
+(use-feature server
+  :defer 0.4

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


@@ -379,7 +454,7 @@ See [[https://www.gnu.org/software/emacs/manual/html_node/emacs/Emacs-Server.htm
 Font stack with better unicode support, around =Ubuntu Mono= and
 =Hack=.
 
 Font stack with better unicode support, around =Ubuntu Mono= and
 =Hack=.
 

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

 (dolist (ft (fontset-list))
   (set-fontset-font
    ft
 (dolist (ft (fontset-list))
   (set-fontset-font
    ft


@@ -431,62 +506,76 @@ Let’s define a function to conveniently disable this for certain
 buffers and/or modes.
 
 #+begin_src emacs-lisp
 buffers and/or modes.
 
 #+begin_src emacs-lisp

-(defun amin--no-mouse-autoselect-window ()
+(defun a/no-mouse-autoselect-window ()

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

-** Libraries
+** Better scrolling (arguably)

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

-(require 'cl-lib)
-(require 'subr-x)
+(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
 
 #+end_src
 

-** Useful utilities
+** Ask for GPG passphrase in minibuffer

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

-(defun amin-enlist (exp)
-  "Return EXP wrapped in a list, or as-is if already a list."
-(if (listp exp) exp (list exp)))
+(setq epg-pinentry-mode 'loopback)
+#+end_src

 
 

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

 #+end_src
 
 #+end_src
 

+** Useful utilities
+

 Convenience macro for =setq='ing multiple variables to the same value:
 
 #+begin_src emacs-lisp
 Convenience macro for =setq='ing multiple variables to the same value:
 
 #+begin_src emacs-lisp

-(defmacro setq-every! (value &rest vars)
+(defmacro a/setq-every (value &rest vars)

   "Set all the variables from VARS to value VALUE."
   (declare (indent defun) (debug t))
   `(progn ,@(mapcar (lambda (x) (list 'setq x value)) vars)))
 #+end_src
 
   "Set all the variables from VARS to value VALUE."
   (declare (indent defun) (debug t))
   `(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
 :PROPERTIES:
 :CUSTOM_ID: core
 * Core
 :PROPERTIES:
 :CUSTOM_ID: core


@@ -651,18 +740,30 @@ Enable =winner-mode=.
 (winner-mode 1)
 #+end_src
 
 (winner-mode 1)
 #+end_src
 

-*** Close =*compilation*= on success
+*** 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
 
 #+begin_src emacs-lisp

-(setq compilation-exit-message-function
-      (lambda (status code msg)
-        "Close the compilation window if successful."
-        ;; if M-x compile exits with 0
-         (when (and (eq status 'exit) (zerop code))
-           (bury-buffer)
-           (delete-window (get-buffer-window (get-buffer "*compilation*"))))
-         ;; return the result of compilation-exit-message-function
-         (cons msg code)))
+(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
 #+end_src
 
 *** Search for non-ASCII characters


@@ -678,15 +779,79 @@ for this.
 ;; (setq replace-char-fold t)
 #+end_src
 
 ;; (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
 
 ** Bindings
 

+Some bindings for functions from built-in GNU Emacs packages:
+

 #+begin_src emacs-lisp
 (bind-keys
 #+begin_src emacs-lisp
 (bind-keys

- ("s-c e b" . eval-buffer)
- ("s-c e r" . eval-region)
+ ("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))
 
  ("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
 #+end_src
 
 ** Packages


@@ -713,152 +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/noctuid/general.el][general]]
-
-#+begin_src emacs-lisp
-(use-package general
-  :demand t
-  :config
-  (general-evil-setup t)
-  (general-override-mode)
-
-  (general-create-definer
-   amin--leader-keys
-   :keymaps 'override
-   :states '(emacs normal visual motion insert)
-   :non-normal-prefix "M-m"
-   :prefix "SPC"))
-#+end_src
-
-*** [[https://github.com/emacs-evil/evil][evil]]
-
-#+begin_src emacs-lisp
-(use-package evil
-  :demand t
-  ;; :hook (org-src-mode . evil-motion-state)
-  :config
-  (evil-mode 1)
-  (general-swap-key nil '(normal motion) ";" ":")
-
-  (setq evil-want-visual-char-semi-exclusive t
-        evil-cross-lines t)
-
-  ;; custom mode state mappings
-  (dolist (mspair '((ebdb-mode        . emacs)
-                    (term-mode        . emacs)
-                    (helpful-mode     . motion)
-                    (magit-blame-mode . motion)
-                    (view-mode        . motion)))
-    (evil-set-initial-state (car mspair) (cdr mspair)))
-
-  ;; fix tab and indentation in src blocks inside org-mode buffer
-  ;; also see https://git.sr.ht/~bandali/dotfiles/commit/0e2ffd584aafdd4cf256bcdf2473f01c3aaaed55
-  (unbind-key "TAB" evil-motion-state-map)
-
-  (unbind-key "C-d" evil-insert-state-map)
-  (unbind-key "C-v" evil-insert-state-map)
-  (unbind-key "C-y" evil-insert-state-map)
-  (unbind-key "C-a" evil-insert-state-map)
-  (unbind-key "C-e" evil-insert-state-map)
-  (unbind-key "C-p" evil-insert-state-map)
-  (unbind-key "C-n" evil-insert-state-map)
-  (unbind-key "C-k" evil-insert-state-map)
-  (bind-keys
-    :map evil-insert-state-map
-    ("C-k"   . kill-line)
-    ("C-S-k" . evil-insert-digraph)
-    :map evil-motion-state-map
-    ([down-mouse-1] . nil)))
-#+end_src
-
-#+begin_src emacs-lisp
-(use-package evil-escape
-  :after evil
-  :init
-  (setq evil-escape-excluded-states '(normal visual multiedit emacs motion)
-        evil-escape-excluded-major-modes '(neotree-mode)
-        evil-escape-key-sequence "jk"
-        evil-escape-delay 0.25)
-  ;; :general
-  ;; (:states '(insert replace visual operator)
-  ;;          "C-g" #'evil-escape)
-  :config
-  (evil-escape-mode 1)
-  ;; no `evil-escape' in minibuffer
-  (push #'minibufferp evil-escape-inhibit-functions))
-#+end_src
-
-#+begin_src emacs-lisp
-(use-package evil-nerd-commenter
-  :after evil
-  :general
-  (nmap
-    "gc" 'evilnc-comment-operator
-    "gy" 'evilnc-copy-and-comment-lines))
-#+end_src
-
-#+begin_src emacs-lisp
-(use-package evil-surround
-  :after evil
-  :general
-  (omap
-    "s" 'evil-surround-edit
-    "S" 'evil-Surround-edit)
-  (vmap
-    "S" 'evil-surround-region
-    "gS" 'evil-Surround-region))
-#+end_src
-
-#+begin_src emacs-lisp
-(amin--leader-keys
-  "/"   '(:ignore t :wk "search")
-
-  "a"   '(:ignore t :wk "apps")
-  "a i" 'ielm
-
-  "a s" '(:ignore t :wk "shells/terms")
-
-  "b"   '(:ignore t :wk "buffers")
-  "b k" 'kill-this-buffer
-  "b s" 'save-buffer
-
-  "e"   '(:ignore t :wk "eval")
-  "e b" 'eval-buffer
-  "e r" 'eval-region
-
-  "f"   '(:ignore t :wk "files")
-
-  "F"   '(:ignore t :wk "frames")
-  "F m" 'make-frame-command
-  "F d" 'delete-frame
-  "F D" 'delete-other-frames
-
-  "h"   '(:ignore t :wk "help(ful)")
-  "h c" 'describe-char
-  "h f" 'describe-function
-  "h F" 'describe-face
-  "h H" 'view-hello-file
-  "h i" 'info
-  "h k" 'describe-key
-  "h l" 'view-lossage
-  "h v" 'describe-variable
-
-  "o"   'other-window
-
-  "w"   '(:ignore t :wk "window")
-  "w o" 'other-window
-  "w 0" 'delete-window
-  "w 1" 'delete-other-windows
-  "w 2" 'split-window-below
-  "w 3" 'split-window-right
-  "w u" 'winner-undo
-  "w r" 'winner-redo
-
-  "q"   '(:ignore t :wk "quit")
-  "q q" 'save-buffers-kill-terminal)
-#+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


@@ -868,140 +888,120 @@ 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
-  :defer 1
-  :general
-  (amin--leader-keys
-    :states 'normal
-    :keymaps 'org-mode-map
-    "'" 'org-edit-special)
-  (amin--leader-keys
-    :definer 'minor-mode
-    :states 'normal
-    :keymaps 'org-src-mode
-    "'" 'org-edit-src-exit
-    "k" 'org-edit-src-abort)
-  (general-define-key
-   :definer 'minor-mode
-   :states 'normal
-   :keymaps 'org-src-mode
-   "q" 'org-edit-src-exit)
+(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-email-link-description-format "Email %c: %s" ; %.30s
+        org-link-email-description-format "Email %c: %s" ; %.30s

         org-highlight-latex-and-related '(entities)
         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)
         org-log-done 'time)
   (add-to-list 'org-structure-template-alist '("L" . "src emacs-lisp") t)

-  (after! org-src
-    (define-key org-src-mode-map [remap evil-write] 'org-edit-src-save)
-    (define-key org-src-mode-map [remap evil-save-and-close]
-      (lambda () (interactive)
-        (org-edit-src-save)
-        (org-edit-src-exit)))
-    (define-key org-src-mode-map [remap evil-save-modified-and-close]
-      (lambda () (interactive)
-        (org-edit-src-save)
-        (org-edit-src-exit)))
-    (define-key org-src-mode-map [remap evil-quit] 'org-edit-src-abort))
-  (font-lock-add-keywords
-   'org-mode
-   '(("[ \t]*\\(#\\+\\(BEGIN\\|END\\|begin\\|end\\)_\\(\\S-+\\)\\)[ \t]*\\([^\n:]*\\)"
-      (1 '(:foreground "#5a5b5a" :background "#292b2b") t) ; directive
-      (3 '(:foreground "#81a2be" :background "#292b2b") t) ; kind
-      (4 '(:foreground "#c5c8c6") t))) ; title
-   t)
-  :bind (:map org-mode-map ("M-L" . org-insert-last-stored-link))
+  :bind
+  (("C-c a o a" . org-agenda)
+   :map org-mode-map
+   ("M-L" . org-insert-last-stored-link)
+   ("s-T" . org-todo))

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

+  (org-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")))))
 
   (org-latex-packages-alist '(("" "listings") ("" "color")))
   :custom-face
   '(org-block-begin-line ((t (:foreground "#5a5b5a" :background "#1d1f21"))))
   '(org-block ((t (:background "#1d1f21"))))
   '(org-latex-and-related ((t (:foreground "#b294bb")))))
 

-(use-package ox-latex
+(use-feature ox-latex

   :after ox
   :config
   (setq org-latex-listings 'listings
         ;; org-latex-prefer-user-labels t
         )
   :after ox
   :config
   (setq org-latex-listings 'listings
         ;; org-latex-prefer-user-labels t
         )

-  (add-to-list 'org-latex-packages-alist '("" "listings"))
-  (add-to-list 'org-latex-packages-alist '("" "color"))

   (add-to-list 'org-latex-classes
                '("IEEEtran" "\\documentclass[11pt]{IEEEtran}"
   (add-to-list 'org-latex-classes
                '("IEEEtran" "\\documentclass[11pt]{IEEEtran}"

-                 ("\\section{%s}" . "\\section*{%s}")
-                 ("\\subsection{%s}" . "\\subsection*{%s}")
+                 ("\\section{%s}"       . "\\section*{%s}")
+                 ("\\subsection{%s}"    . "\\subsection*{%s}")

                  ("\\subsubsection{%s}" . "\\subsubsection*{%s}")
                  ("\\subsubsection{%s}" . "\\subsubsection*{%s}")

-                 ("\\paragraph{%s}" . "\\paragraph*{%s}")
-                 ("\\subparagraph{%s}" . "\\subparagraph*{%s}"))
-               t))
-
-(use-package ox-beamer
-  :after ox)
-
-(use-package ob-tangle
-  :general
-  (amin--leader-keys
-    :states 'normal
-    :keymaps 'org-mode-map
-    "b t" 'org-babel-tangle))
-
-(use-package orgalist
-  :after message
-  :hook (message-mode . orgalist-mode))
+                 ("\\paragraph{%s}"     . "\\paragraph*{%s}")
+                 ("\\subparagraph{%s}"  . "\\subparagraph*{%s}"))
+               t)
+  (require 'ox-beamer))

 #+end_src
 
 **** asynchronous tangle
 
 #+end_src
 
 **** asynchronous tangle
 

-=amin/async-babel-tangle= is a function closely inspired by [[https://github.com/dieggsy/dotfiles/tree/cc10edf7701958eff1cd94d4081da544d882a28c/emacs.d#dotfiles][dieggsy's
+=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
 d/async-babel-tangle]] which uses [[https://github.com/jwiegley/emacs-async][async]] to asynchronously tangle an org
 file.
 
 #+begin_src emacs-lisp

-(after! org
-  (defvar amin-show-async-tangle-results nil
+(with-eval-after-load 'org
+  (defvar a/show-async-tangle-results nil

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

-  (defvar amin-show-async-tangle-time nil
+  (defvar a/show-async-tangle-time nil

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

-  (defvar amin-async-tangle-post-compile "make ti"
+  (defvar a/async-tangle-post-compile
+    (when a/byte-compiled-init "make build-init")

     "If non-nil, pass to `compile' after successful tangle.")
 
     "If non-nil, pass to `compile' after successful tangle.")
 

-  (defun amin/async-babel-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))
     "Tangle org file asynchronously."
     (interactive)
     (let* ((file-tangle-start-time (current-time))
            (file (buffer-file-name))
            (file-nodir (file-name-nondirectory file))

-           (async-quiet-switch "-q"))
+           ;; (async-quiet-switch "-q")
+           (file-noext (file-name-sans-extension file)))

       (async-start
        `(lambda ()
           (require 'org)
           (org-babel-tangle-file ,file))
       (async-start
        `(lambda ()
           (require 'org)
           (org-babel-tangle-file ,file))

-       (unless amin-show-async-tangle-results
+       (unless a/show-async-tangle-results

          `(lambda (result)
             (if result
                 (progn
          `(lambda (result)
             (if result
                 (progn

+                  ;; (setq byte-compile-warnings '(not noruntime unresolved))

                   (message "Tangled %s%s"
                            ,file-nodir
                   (message "Tangled %s%s"
                            ,file-nodir

-                           (if amin-show-async-tangle-time
+                           (if a/show-async-tangle-time

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

-                  (when amin-async-tangle-post-compile
-                    (compile amin-async-tangle-post-compile)))
+                  (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
               (message "Tangling %s failed" ,file-nodir))))))))
 
 (add-to-list
  'safe-local-variable-values

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

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


@@ -1014,12 +1014,10 @@ 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

-  :defer 1
-  :general
-  (amin--leader-keys
-    "g s" 'magit-status
-    "g l" 'magit-log-buffer-file)
-  :bind ("s-g" . magit-status)
+  :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
   :config
   (magit-add-section-hook 'magit-status-sections-hook
                           'magit-insert-modules


@@ -1034,6 +1032,30 @@ Not just how I do git, but /the/ way to do git.
   :custom-face (magit-diff-file-heading ((t (:weight normal)))))
 #+end_src
 
   :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)
 
 #+begin_quote
 *** [[https://github.com/abo-abo/swiper][Ivy]] (and friends)
 
 #+begin_quote


@@ -1047,8 +1069,7 @@ 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
-  :general (amin--leader-keys "," 'ivy-switch-buffer)
+  :defer 0.3

   :bind
   (:map ivy-minibuffer-map
    ([escape] . keyboard-escape-quit)
   :bind
   (:map ivy-minibuffer-map
    ([escape] . keyboard-escape-quit)


@@ -1069,21 +1090,17 @@ There's no way I could top that, so I won't attempt to.
 
 #+begin_src emacs-lisp
 (use-package swiper
 
 #+begin_src emacs-lisp
 (use-package swiper

-  :general (:states '(normal motion) "/" 'swiper)
-  :bind (("C-s" . swiper)
-         ("C-r" . 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
-  :general
-  (amin--leader-keys
-    "r" 'counsel-recentf
-    "SPC" 'counsel-M-x
-    "."   'counsel-find-file)
+  :after ivy

   :bind (([remap execute-extended-command] . counsel-M-x)
          ([remap find-file]                . counsel-find-file)
          ("s-r"                            . counsel-recentf)
   :bind (([remap execute-extended-command] . counsel-M-x)
          ([remap find-file]                . counsel-find-file)
          ("s-r"                            . counsel-recentf)


@@ -1099,33 +1116,35 @@ There's no way I could top that, so I won't attempt to.
 *** eshell
 
 #+begin_src emacs-lisp
 *** eshell
 
 #+begin_src emacs-lisp

-(use-package eshell
-  :defer 1
+(use-feature eshell
+  :defer 0.5

   :commands eshell
   :commands eshell

+  :bind ("C-c a s e" . eshell)

   :config
   (eval-when-compile (defvar eshell-prompt-regexp))
   :config
   (eval-when-compile (defvar eshell-prompt-regexp))

-  (defun amin/eshell-quit-or-delete-char (arg)
+  (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)))
 
     (interactive "p")
     (if (and (eolp) (looking-back eshell-prompt-regexp nil))
         (eshell-life-is-too-much)
       (delete-char arg)))
 

-  (defun amin/eshell-clear ()
+  (defun a/eshell-clear ()

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

-  (defun amin|eshell-setup ()
+  (defun a/eshell-setup ()

     (make-local-variable 'company-idle-delay)
     (make-local-variable 'company-idle-delay)

+    (defvar company-idle-delay)

     (setq company-idle-delay nil)
     (bind-keys :map eshell-mode-map
     (setq company-idle-delay nil)
     (bind-keys :map eshell-mode-map

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

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

-  :hook (eshell-mode . amin|eshell-setup)
+  :hook (eshell-mode . a/eshell-setup)

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


@@ -1134,9 +1153,7 @@ There's no way I could top that, so I won't attempt to.
 *** Ibuffer
 
 #+begin_src emacs-lisp
 *** Ibuffer
 
 #+begin_src emacs-lisp

-(use-package ibuffer
-  :defer t
-  :general (amin--leader-keys "b b" 'ibuffer-other-window)
+(use-feature ibuffer

   :bind
   (("C-x C-b" . ibuffer-other-window)
    :map ibuffer-mode-map
   :bind
   (("C-x C-b" . ibuffer-other-window)
    :map ibuffer-mode-map


@@ -1158,6 +1175,13 @@ There's no way I could top that, so I won't attempt to.
    '(("default"
       ("dired" (mode . dired-mode))
       ("org"   (mode . org-mode))
    '(("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)
       ("web"
        (or
         (mode . web-mode)


@@ -1167,20 +1191,23 @@ There's no way I could top that, so I won't attempt to.
       ("shell"
        (or
         (mode . eshell-mode)
       ("shell"
        (or
         (mode . eshell-mode)

-        (mode . shell-mode)))
-      ("notmuch" (name . "\*notmuch\*"))
+        (mode . shell-mode)
+        (mode . term-mode)))

       ("programming"
        (or
         (mode . python-mode)
       ("programming"
        (or
         (mode . python-mode)

+        (mode . c-mode)

         (mode . c++-mode)
         (mode . c++-mode)

-        (mode . emacs-lisp-mode)))
+        (mode . java-mode)
+        (mode . emacs-lisp-mode)
+        (mode . scheme-mode)
+        (mode . haskell-mode)
+        (mode . lean-mode)))

       ("emacs"
        (or
         (name . "^\\*scratch\\*$")
         (name . "^\\*Messages\\*$")))
       ("emacs"
        (or
         (name . "^\\*scratch\\*$")
         (name . "^\\*Messages\\*$")))

-      ("slack"
-       (or
-        (name . "^\\*Slack*"))))))
+      ("erc" (mode . erc-mode)))))

   (ibuffer-formats
    '((mark modified read-only locked " "
            (name 18 18 :left :elide)
   (ibuffer-formats
    '((mark modified read-only locked " "
            (name 18 18 :left :elide)


@@ -1198,8 +1225,7 @@ There's no way I could top that, so I won't attempt to.
 *** Outline
 
 #+begin_src emacs-lisp
 *** Outline
 
 #+begin_src emacs-lisp

-(use-package outline
-  :defer t
+(use-feature outline

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


@@ -1207,7 +1233,7 @@ There's no way I could top that, so I won't attempt to.
    ("<s-tab>"  . outline-toggle-children)
    ("M-p"      . outline-previous-visible-heading)
    ("M-n"      . outline-next-visible-heading)
    ("<s-tab>"  . outline-toggle-children)
    ("M-p"      . outline-previous-visible-heading)
    ("M-n"      . outline-next-visible-heading)

-   :prefix-map amin--outline-prefix-map
+   :prefix-map a/outline-prefix-map

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


@@ -1217,104 +1243,164 @@ There's no way I could top that, so I won't attempt to.
    ("s"   . outline-show-subtree)))
 #+end_src
 
    ("s"   . outline-show-subtree)))
 #+end_src
 

-* Borg's =layer/essentials=
+*** 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

 
 

-TODO: break this giant source block down into individual org sections.
+*** Tramp
+
+#+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

 
 

-(use-package dired
-  :defer t
-  :config (setq dired-listing-switches "-alh"))
+** ElDoc

 
 

-(use-package eldoc
+Display Lisp objects at point in the echo area.
+
+#+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)
-  (setq help-window-select t))
+** 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
-  :defer 0.5
-  :config
-  (add-to-list 'recentf-exclude "^/\\(?:ssh\\|su\\|sudo\\)?:")
-  (setq recentf-max-saved-items 40))
+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)
-  (add-hook 'text-mode-hook #'abbrev-mode))
+#+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
-  :config
-  (global-undo-tree-mode -1))
-  ;; :bind (("C-?" . undo-tree-undo)
-  ;;        ("M-_" . undo-tree-redo))
-  ;; :config
-  ;; (global-undo-tree-mode)
-  ;; (setq undo-tree-mode-lighter ""
-  ;;       undo-tree-auto-save-history t))
+#+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 1
+  :defer 0.6

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


@@ -1329,10 +1415,11 @@ TODO: break this giant source block down into individual org sections.
   (global-company-mode t))
 #+end_src
 
   (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 3
+  :defer 0.6

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


@@ -1347,7 +1434,7 @@ TODO: break this giant source block down into individual org sections.
 
 ;; http://endlessparentheses.com/ispell-and-apostrophes.html
 (use-package ispell
 
 ;; http://endlessparentheses.com/ispell-and-apostrophes.html
 (use-package ispell

-  :defer 3
+  :defer 0.6

   :config
   ;; ’ can be part of a word
   (setq ispell-local-dictionary-alist
   :config
   ;; ’ can be part of a word
   (setq ispell-local-dictionary-alist


@@ -1371,13 +1458,30 @@ TODO: break this giant source block down into individual org sections.
   (advice-add #'ispell-parse-output :filter-args
               #'endless/replace-quote))
 #+end_src
   (advice-add #'ispell-parse-output :filter-args
               #'endless/replace-quote))
 #+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

-  :defer t
+  :straight (:host github :repo "dwwmmn/alloy-mode")
+  :mode "\\.als\\'"

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


@@ -1385,8 +1489,7 @@ 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

-  :defer t
-  :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]])
 #+end_src
 
 ** [[https://leanprover.github.io][Lean]] (with [[https://github.com/leanprover/lean-mode][lean-mode]])


@@ -1394,7 +1497,7 @@ TODO: break this giant source block down into individual org sections.
 #+begin_src emacs-lisp
 (eval-when-compile (defvar lean-mode-map))
 (use-package lean-mode
 #+begin_src emacs-lisp
 (eval-when-compile (defvar lean-mode-map))
 (use-package lean-mode

-  :defer 1
+  :defer 0.4

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


@@ -1413,7 +1516,6 @@ TODO: break this giant source block down into individual org sections.
 
 #+begin_src emacs-lisp
 (use-package haskell-mode
 
 #+begin_src emacs-lisp
 (use-package haskell-mode

-  :defer t

   :config
   (setq haskell-indentation-layout-offset 4
         haskell-indentation-left-offset 4
   :config
   (setq haskell-indentation-layout-offset 4
         haskell-indentation-left-offset 4


@@ -1596,13 +1698,12 @@ instead.
               ("C-c l l" . hs-lint)))
 #+end_src
 
               ("C-c l l" . hs-lint)))
 #+end_src
 

-** Web dev
+** Web

 
 *** SGML and HTML
 
 #+begin_src emacs-lisp
 (use-package sgml-mode
 
 *** SGML and HTML
 
 #+begin_src emacs-lisp
 (use-package sgml-mode

-  :defer t

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


@@ -1611,7 +1712,6 @@ instead.
 
 #+begin_src emacs-lisp
 (use-package css-mode
 
 #+begin_src emacs-lisp
 (use-package css-mode

-  :defer t

   :config
   (setq css-indent-offset 2))
 #+end_src
   :config
   (setq css-indent-offset 2))
 #+end_src


@@ -1620,10 +1720,9 @@ instead.
 
 #+begin_src emacs-lisp
 (use-package web-mode
 
 #+begin_src emacs-lisp
 (use-package web-mode

-  :defer t

   :mode "\\.html\\'"
   :config
   :mode "\\.html\\'"
   :config

-  (setq-every! 2
+  (a/setq-every 2

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


@@ -1642,19 +1741,11 @@ instead.
   :hook (web-mode css-mode html-mode sgml-mode))
 #+end_src
 
   :hook (web-mode css-mode html-mode sgml-mode))
 #+end_src
 

-** Nix
-
-#+begin_src emacs-lisp
-(use-package nix-mode
-  :defer t
-  :mode "\\.nix\\'")
-#+end_src
-

 ** Java
 
 ** Java
 

-*** meghanada
+*** COMMENT meghanada

 
 

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

 (use-package meghanada
   :bind
   (:map meghanada-mode-map
 (use-package meghanada
   :bind
   (:map meghanada-mode-map


@@ -1663,7 +1754,7 @@ instead.
   :hook (java-mode . meghanada-mode))
 #+end_src
 
   :hook (java-mode . meghanada-mode))
 #+end_src
 

-*** lsp-java
+*** COMMENT lsp-java

 
 #+begin_comment
 dependencies:
 
 #+begin_comment
 dependencies:


@@ -1681,7 +1772,7 @@ tree-mode
 treemacs
 #+end_comment
 
 treemacs
 #+end_comment
 

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

 (use-package treemacs
   :config (setq treemacs-never-persist t))
 
 (use-package treemacs
   :config (setq treemacs-never-persist t))
 


@@ -1731,7 +1822,51 @@ treemacs
   :after (treemacs))
 #+end_src
 
   :after (treemacs))
 #+end_src
 

-* Emacs Enhancements
+*** 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]]
 


@@ -1741,8 +1876,61 @@ 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
 
 ** theme
 #+end_src
 
 ** theme


@@ -1752,13 +1940,14 @@ Emacs package that displays available keybindings in popup
 (load-theme 'tangomod t)
 #+end_src
 
 (load-theme 'tangomod t)
 #+end_src
 

-** doom-modeline
+** smart-mode-line

 
 #+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))
+(use-package smart-mode-line
+  :commands (sml/apply-theme)
+  :demand
+  :config
+  (sml/setup))

 #+end_src
 
 ** doom-themes
 #+end_src
 
 ** doom-themes


@@ -1770,53 +1959,54 @@ Emacs package that displays available keybindings in popup
 ** theme helper functions
 
 #+begin_src emacs-lisp
 ** theme helper functions
 
 #+begin_src emacs-lisp

-(defun amin/lights-on ()
+(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)
   "Enable my favourite light theme."
   (interactive)

-  (progn
-    (mapc #'disable-theme custom-enabled-themes)
-    (load-theme 'tangomod t)))
+  (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 amin/lights-off ()
+(defun a/lights-off ()

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

-  (progn
-    (mapc #'disable-theme custom-enabled-themes)
-    (load-theme 'doom-tomorrow-night t)))
+  (mapc #'disable-theme custom-enabled-themes)
+  (load-theme 'doom-tomorrow-night t)
+  (sml/apply-theme 'automatic)
+  (font-lock-add-keywords
+   'org-mode a/org-mode-font-lock-keywords t))

 
 

-(amin--leader-keys
-  "t"   '(:ignore t :wk "theme")
-  "t d" 'amin/lights-off
-  "t l" 'amin/lights-on)
+(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
-  :defer 1
-  :general
-  (amin--leader-keys
-    "b K" 'crux-kill-other-buffers
-    "c d" 'crux-duplicate-current-line-or-region
-    "c D" 'crux-duplicate-and-comment-current-line-or-region
-    "f c" 'crux-copy-file-preserve-attributes
-    "f d" 'crux-delete-file-and-buffer
-    "f r" 'crux-rename-file-and-buffer)
-  :bind (("C-c d" . crux-duplicate-current-line-or-region)
-         ("C-c D" . crux-duplicate-and-comment-current-line-or-region)
-         ("C-S-j" . crux-top-join-line)
-         ("C-c j" . crux-top-join-line)))
+(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]]
 
 #+begin_src emacs-lisp
 (use-package mwim
 #+end_src
 
 ** [[https://github.com/alezost/mwim.el][mwim]]
 
 #+begin_src emacs-lisp
 (use-package mwim

-  :general
-  (:states '(normal visual)
-           "0" 'mwim-beginning-of-code-or-line
-           "$" 'mwim-end-of-code-or-line)

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


@@ -1827,8 +2017,7 @@ Emacs package that displays available keybindings in popup
 
 #+begin_src emacs-lisp
 (use-package projectile
 
 #+begin_src emacs-lisp
 (use-package projectile

-  :defer t
-  :bind-keymap ("C-c p" . projectile-command-map)
+  :bind-keymap ("C-c P" . projectile-command-map)

   :config
   (projectile-mode)
 
   :config
   (projectile-mode)
 


@@ -1841,70 +2030,21 @@ Emacs package that displays available keybindings in popup
        (advice-add 'magit-checkout
                    :after #'my-projectile-invalidate-cache)
        (advice-add 'magit-branch-and-checkout
        (advice-add 'magit-checkout
                    :after #'my-projectile-invalidate-cache)
        (advice-add 'magit-branch-and-checkout

-                   :after #'my-projectile-invalidate-cache))))
+                   :after #'my-projectile-invalidate-cache)))
+  :custom (projectile-completion-system 'ivy))

 #+end_src
 
 ** [[https://github.com/Wilfred/helpful][helpful]]
 
 #+begin_src emacs-lisp
 (use-package helpful
 #+end_src
 
 ** [[https://github.com/Wilfred/helpful][helpful]]
 
 #+begin_src emacs-lisp
 (use-package helpful

-  :defer 1
-  :general
-  (amin--leader-keys
-    "h h"   '(:ignore t :wk "helpful")
-    "h h c" 'helpful-command
-    "h h f" 'helpful-callable           ; helpful-function
-    "h h v" 'helpful-variable
-    "h h k" 'helpful-key
-    "h h p" 'helpful-at-point))
-#+end_src
-
-** [[https://github.com/knu/shell-toggle.el][shell-toggle]]
-
-#+begin_src emacs-lisp
-(use-package shell-toggle
-  :after eshell
-  :general (amin--leader-keys "a s e" 'amin/shell-toggle)
-  :bind ("C-c e" . amin/shell-toggle)
-  :config
-  (defun amin/shell-toggle (make-cd)
-    "Toggle between the shell buffer and whatever buffer you are editing.
-With a prefix argument MAKE-CD also insert a \"cd DIR\" command
-into the shell, where DIR is the directory of the current buffer.
-
-When called in the shell buffer returns you to the buffer you were editing
-before calling this the first time.
-
-Options: `shell-toggle-goto-eob'"
-    (interactive "P")
-    ;; Try to decide on one of three possibilities:
-    ;; If not in shell-buffer, switch to it.
-    ;; If in shell-buffer, return to state before going to the shell-buffer
-    (if (eq (current-buffer) shell-toggle-shell-buffer)
-        (shell-toggle-buffer-return-from-shell)
-      (progn
-        (shell-toggle-buffer-goto-shell make-cd)
-        (if shell-toggle-full-screen-window-only (delete-other-windows)))))
-
-  ;; override to split horizontally instead
-  (defun shell-toggle-buffer-switch-to-other-window ()
-    "Switch to other window.
-If the current window is the only window in the current frame,
-create a new window and switch to it.
-
-\(This is less intrusive to the current window configuration than
-`switch-buffer-other-window')"
-    (let ((this-window (selected-window)))
-      (other-window 1)
-      ;; If we did not switch window then we only have one window and need to
-      ;; create a new one.
-      (if (eq this-window (selected-window))
-             (progn
-               (split-window-horizontally)
-            (other-window 1)))))
-
-  :custom
-  (shell-toggle-launch-shell 'shell-toggle-eshell))
+  :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]]
 #+end_src
 
 ** [[https://github.com/EricCrosson/unkillable-scratch][unkillable-scratch]]


@@ -1913,11 +2053,10 @@ Make =*scratch*= and =*Messages*= unkillable.
 
 #+begin_src emacs-lisp
 (use-package unkillable-scratch
 
 #+begin_src emacs-lisp
 (use-package unkillable-scratch

-  :defer 3
+  :defer 0.6

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

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

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


@@ -1931,9 +2070,9 @@ Make =*scratch*= and =*Messages*= unkillable.
 
 #+begin_src emacs-lisp
 (use-package boxquote
 
 #+begin_src emacs-lisp
 (use-package boxquote

-  :defer 3
+  :defer 0.6

   :bind
   :bind

-  (:prefix-map amin--boxquote-prefix-map
+  (:prefix-map a/boxquote-prefix-map

    :prefix "C-c q"
    ("b"   . boxquote-buffer)
    ("B"   . boxquote-insert-buffer)
    :prefix "C-c q"
    ("b"   . boxquote-buffer)
    ("B"   . boxquote-insert-buffer)


@@ -1959,53 +2098,20 @@ Make =*scratch*= and =*Messages*= unkillable.
 
 Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
 
 
 Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
 

-** COMMENT [[https://github.com/DarthFennec/highlight-indent-guides][highlight-indent-guides]]                                 :ARCHIVE:
+** orgalist

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

-(use-package highlight-indent-guides
-  :defer 3
-  :hook ((prog-mode . highlight-indent-guides-mode)
-         ;; (org-mode  . highlight-indent-guides-mode)
-         )
-  :config
-  (setq highlight-indent-guides-character ?\|)
-  (setq highlight-indent-guides-auto-enabled nil)
-  (setq highlight-indent-guides-method 'character)
-  (setq highlight-indent-guides-responsive 'top)
-  (set-face-foreground 'highlight-indent-guides-character-face "gainsboro")
-  (set-face-foreground 'highlight-indent-guides-top-character-face "grey40")) ; grey13 is nice too
-#+end_src
-
-** pdf-tools
-
-#+begin_src emacs-lisp
-(use-package pdf-tools
-  :defer t
-  :magic ("%PDF" . pdf-view-mode)
-  :config
-  (setq pdf-view-resize-factor 1.05)
-  (pdf-tools-install)
-  :bind
-  (:map pdf-view-mode-map
-        ("C-s" . isearch-forward)
-        ("C-r" . isearch-backward)
-        ("j"   . pdf-view-next-line-or-next-page)
-        ("k"   . pdf-view-previous-line-or-previous-page)
-        ("h"   . image-backward-hscroll)
-        ("l"   . image-forward-hscroll)))
-#+end_src
-
-** anzu
-
-#+begin_src emacs-lisp
-(use-package anzu)
+(use-package orgalist
+  :disabled t
+  :after message
+  :hook (message-mode . orgalist-mode))

 #+end_src
 
 ** typo.el
 
 #+begin_src emacs-lisp
 (use-package typo
 #+end_src
 
 ** typo.el
 
 #+begin_src emacs-lisp
 (use-package typo

-  :defer 2
+  :defer 0.5

   :config
   (typo-global-mode 1)
   :hook (text-mode . typo-mode))
   :config
   (typo-global-mode 1)
   :hook (text-mode . typo-mode))


@@ -2015,7 +2121,7 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
 
 #+begin_src emacs-lisp
 (use-package hl-todo
 
 #+begin_src emacs-lisp
 (use-package hl-todo

-  :defer 4
+  :defer 0.5

   :config
   (global-hl-todo-mode))
 #+end_src
   :config
   (global-hl-todo-mode))
 #+end_src


@@ -2024,11 +2130,9 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
 
 #+begin_src emacs-lisp
 (use-package shrink-path
 
 #+begin_src emacs-lisp
 (use-package shrink-path

+  :defer 0.5

   :after eshell
   :config
   :after eshell
   :config

-  (setq eshell-prompt-regexp "\\(.*\n\\)*λ "
-        eshell-prompt-function #'+eshell/prompt)
-

   (defun +eshell/prompt ()
     (let ((base/dir (shrink-path-prompt default-directory)))
       (concat (propertize (car base/dir)
   (defun +eshell/prompt ()
     (let ((base/dir (shrink-path-prompt default-directory)))
       (concat (propertize (car base/dir)


@@ -2038,9 +2142,10 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
               (propertize (+eshell--current-git-branch)
                           'face 'font-lock-function-name-face)
               "\n"
               (propertize (+eshell--current-git-branch)
                           'face 'font-lock-function-name-face)
               "\n"

-              (propertize "λ" 'face 'eshell-prompt-face)
+              ;; "λ"
+              ;; (propertize "λ" 'face 'eshell-prompt)

               ;; needed for the input text to not have prompt face
               ;; needed for the input text to not have prompt face

-              (propertize " " 'face 'default))))
+              (propertize "λ " 'face 'default))))

 
   (defun +eshell--current-git-branch ()
     (let ((branch (car (loop for match in (split-string (shell-command-to-string "git branch") "\n")
 
   (defun +eshell--current-git-branch ()
     (let ((branch (car (loop for match in (split-string (shell-command-to-string "git branch") "\n")


@@ -2048,102 +2153,29 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
                              collect match))))
       (if (not (eq branch nil))
           (concat " " (substring branch 2))
                              collect match))))
       (if (not (eq branch nil))
           (concat " " (substring branch 2))

-        ""))))
-#+end_src
-
-** COMMENT slack                                                   :ARCHIVE:
-
-Hopefully temporary.
-
-#+begin_src emacs-lisp
-(use-package slack
-  :commands (slack-start)
-  :init
-  (eval-when-compile                    ; silence the byte-compiler
-    (defvar url-http-data nil)
-    (defvar url-http-extra-headers nil)
-    (defvar url-http-method nil)
-    (defvar url-callback-function nil)
-    (defvar url-callback-arguments nil)
-    (defvar oauth--token-data nil))
-  (setq slack-buffer-emojify t
-        slack-prefer-current-team t)
-  :config
-  (slack-register-team
-   :name "uw-apv"
-   :default t
-   :client-id uw-apv-client-id
-   :client-secret uw-apv-client-secret
-   :token uw-apv-token
-   :subscribed-channels '(general)
-   :full-and-display-names t)
-  (slack-register-team
-   :name "watform"
-   :default nil
-   :client-id watform-client-id
-   :client-secret watform-client-secret
-   :token watform-token
-   :subscribed-channels '(general)
-   :full-and-display-names t)
-  (add-to-list 'swiper-font-lock-exclude 'slack-message-buffer-mode t)
-  (setq lui-time-stamp-format "[%Y-%m-%d %H:%M:%S]"
-        lui-time-stamp-only-when-changed-p t
-        lui-time-stamp-position 'right)
-  :bind
-  (("C-c s s" . slack-start)
-   ("C-c s u" . slack-select-unread-rooms)
-   ("C-c s b" . slack-select-rooms)
-   ("C-c s t" . slack-change-current-team)
-   ("C-c s c" . slack-ws-close)
-   :map slack-mode-map
-   ("M-p"     . slack-buffer-goto-prev-message)
-   ("M-n"     . slack-buffer-goto-next-message)
-   ("C-c e"   . slack-message-edit)
-   ("C-c k"   . slack-message-delete)
-   ("C-c C-k" . slack-channel-leave)
-   ("C-c r a" . slack-message-add-reaction)
-   ("C-c r r" . slack-message-remove-reaction)
-   ("C-c r s" . slack-message-show-reaction-users)
-   ("C-c p l" . slack-room-pins-list)
-   ("C-c p a" . slack-message-pins-add)
-   ("C-c p r" . slack-message-pins-remove)
-   ("@"       . slack-message-embed-mention)
-   ("#"       . slack-message-embed-channel)))
-
-(use-package alert
-  :commands (alert)
-  :init
-  (setq alert-default-style 'notifier))
-#+end_src
-
-** COMMENT magithub                                                :ARCHIVE:
-
-For when I /have to/ use GH.
-
-#+begin_src emacs-lisp
-(use-package magithub
-  :after magit
-  :config
-  (magithub-feature-autoinject t)
-  (setq magithub-clone-default-directory "~/src/git"))
+        "")))
+  (setq eshell-prompt-regexp "\\(.*\n\\)*λ "
+                         eshell-prompt-function #'+eshell/prompt))

 #+end_src
 
 ** [[https://github.com/peterwvj/eshell-up][eshell-up]]
 
 #+begin_src emacs-lisp
 (use-package eshell-up
 #+end_src
 
 ** [[https://github.com/peterwvj/eshell-up][eshell-up]]
 
 #+begin_src emacs-lisp
 (use-package eshell-up

-  :after eshell)
+  :after eshell
+  :commands eshell-up)

 #+end_src
 
 ** multi-term
 
 #+begin_src emacs-lisp
 (use-package multi-term
 #+end_src
 
 ** multi-term
 
 #+begin_src emacs-lisp
 (use-package multi-term

-  :defer 1
-  :general (amin--leader-keys
-             "a s m" 'multi-term
-             "a s p" 'multi-term-dedicated-toggle)
-  :bind ("C-c C-j" . term-line-mode)
+  :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
   :config
   (setq multi-term-program "/bin/screen"
         ;; TODO: add separate bindings for connecting to existing


@@ -2169,29 +2201,80 @@ For when I /have to/ use GH.
         '("C-z" "C-x" "C-c" "C-h" "C-y" "<ESC>")))
 #+end_src
 
         '("C-z" "C-x" "C-c" "C-h" "C-y" "<ESC>")))
 #+end_src
 

+** page-break-lines
+
+#+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
 * Email

+:PROPERTIES:
+:CUSTOM_ID: email
+:END:

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

-(defvar amin-maildir (expand-file-name "~/mail/"))
-(after! recentf
-  (add-to-list 'recentf-exclude amin-maildir))
+(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
 #+end_src
 
 ** Gnus
 
 #+begin_src emacs-lisp
 (setq

- amin-gnus-init-file (no-littering-expand-etc-file-name "gnus")
- mail-user-agent     'gnus-user-agent
- read-mail-command   'gnus)
-
-(use-package gnus
-  :general
-  (amin--leader-keys
-    "m" 'gnus
-    "M" 'gnus-unplugged)
-  :bind (("s-m" . gnus)
-         ("s-M" . gnus-unplugged))
+ 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 "")
   :init
   (setq
    gnus-select-method '(nnnil "")


@@ -2201,17 +2284,94 @@ For when I /have to/ use GH.
             (nnimap-address "127.0.0.1")
             (nnimap-server-port 143)
             (nnimap-authenticator plain)
             (nnimap-address "127.0.0.1")
             (nnimap-server-port 143)
             (nnimap-authenticator plain)

-            (nnimap-user "amin@aminb.org"))
+            (nnimap-user "amin@bndl.org"))

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

-             (nnimap-user "abandali@uwaterloo.ca")))
+             (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
    gnus-message-archive-group "nnimap+amin:Sent"
    gnus-parameters

-   '(("gnu.*"
-      (gcc-self . t)))
+   '(("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/")
    gnus-large-newsgroup  50
    gnus-home-directory   (no-littering-expand-var-file-name "gnus/")
    gnus-directory        (concat gnus-home-directory "news/")


@@ -2220,9 +2380,13 @@ For when I /have to/ use GH.
    gnus-save-newsrc-file nil
    gnus-read-newsrc-file nil
    gnus-interactive-exit nil
    gnus-save-newsrc-file nil
    gnus-read-newsrc-file nil
    gnus-interactive-exit nil

-   gnus-gcc-mark-as-read t))
+   gnus-gcc-mark-as-read t)
+  :config
+  (require 'ebdb)
+  (require 'ebdb-mua)
+  (require 'ebdb-gnus))

 
 

-(use-package gnus-art
+(use-feature gnus-art

   :config
   (setq
    gnus-visible-headers
   :config
   (setq
    gnus-visible-headers


@@ -2247,13 +2411,11 @@ For when I /have to/ use GH.
       (concat local lapsed))))
   (bind-keys
    :map gnus-article-mode-map
       (concat local lapsed))))
   (bind-keys
    :map gnus-article-mode-map

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

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

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

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

-              :prefix-map amin--gnus-summary-prefix-map
+              :prefix-map a/gnus-summary-prefix-map

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


@@ -2261,41 +2423,44 @@ For when I /have to/ use GH.
   :config
   (bind-keys
    :map gnus-summary-mode-map
   :config
   (bind-keys
    :map gnus-summary-mode-map

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

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

-  :hook (gnus-summary-mode . amin--no-mouse-autoselect-window))
+  :hook (gnus-summary-mode . a/no-mouse-autoselect-window))

 
 

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

   :config
   (setq gnus-posting-styles
         '((".*"
   :config
   (setq gnus-posting-styles
         '((".*"

-           (address "amin@aminb.org")
-           (body "\nBest,\namin\n")
-           (eval (setq amin--message-cite-say-hi t)))
+           (address "amin@bndl.org")
+           (body "\nBest,\n")
+           (eval (setq a/message-cite-say-hi t)))

           ("gnu.*"
           ("gnu.*"

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

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

-           (body "\nAdded  to 2018supporters.html.\n\nMoving to campaigns.\n\n-amin\n")
-           (eval (setq amin--message-cite-say-hi nil)))
+           (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")
           ("nnimap\\+uwaterloo:.*"
            (address "abandali@uwaterloo.ca")

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

 
 

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

 
 

-(use-package gnus-agent
+(use-feature gnus-agent

   :config
   (setq gnus-agent-synchronize-flags 'ask)
   :hook (gnus-group-mode . gnus-agent-mode))
 
   :config
   (setq gnus-agent-synchronize-flags 'ask)
   :hook (gnus-group-mode . gnus-agent-mode))
 

-(use-package gnus-group
+(use-feature gnus-group

   :config
   :config

-  (setq gnus-permanently-visible-groups "\\((INBOX\\|gnu$\\)"))
+  (setq gnus-permanently-visible-groups "\\(:INBOX$\\|:gnu$\\)"))

 
 

-(use-package mm-decode
+(use-feature mm-decode

   :config
   (setq mm-discouraged-alternatives '("text/html" "text/richtext")))
 #+end_src
   :config
   (setq mm-discouraged-alternatives '("text/html" "text/richtext")))
 #+end_src


@@ -2303,7 +2468,7 @@ For when I /have to/ use GH.
 ** sendmail
 
 #+begin_src emacs-lisp
 ** sendmail
 
 #+begin_src emacs-lisp

-(use-package sendmail
+(use-feature sendmail

   :config
   (setq sendmail-program "/usr/bin/msmtp"
         ;; message-sendmail-extra-arguments '("-v" "-d")
   :config
   (setq sendmail-program "/usr/bin/msmtp"
         ;; message-sendmail-extra-arguments '("-v" "-d")


@@ -2314,9 +2479,19 @@ For when I /have to/ use GH.
 ** message
 
 #+begin_src emacs-lisp
 ** message
 
 #+begin_src emacs-lisp

-(use-package message
+(use-feature message

   :config
   :config

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


@@ -2325,17 +2500,19 @@ For when I /have to/ use GH.
       (message-yank-cited-prefix  ">")
       (message-yank-empty-prefix  ">")
       (message-citation-line-format
       (message-yank-cited-prefix  ">")
       (message-yank-empty-prefix  ">")
       (message-citation-line-format

-       (if amin--message-cite-say-hi
-           (concat "Hi %F,\n\n" amin--message-cite-style-format)
-         amin--message-cite-style-format)))
+       (if 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
     "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-subscribed-address-functions
+        '(gnus-find-subscribed-addresses)

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

-        "\\(\\(.*@aminb\\.org\\)\\|\\(amin@bandali\\.me\\)\\|\\(\\(aminb?\\|mab\\|bandali\\)@gnu\\.org\\)\\|\\(\\(m\\|a\\(min\\.\\)?\\)bandali@uwaterloo\\.ca\\)\\)"
-        message-user-fqdn "aminb.org")
+        "\\(\\(amin@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 ()
   :hook (;; (message-setup . mml-secure-message-sign-pgpmime)
          (message-mode . flyspell-mode)
          (message-mode . (lambda ()


@@ -2349,7 +2526,7 @@ For when I /have to/ use GH.
   ;; (message-header-cc      ((t (:foreground "#333" :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))
 #+end_src
   (setq mml-secure-openpgp-encrypt-to-self t
         mml-secure-openpgp-sign-with-sender t))
 #+end_src


@@ -2359,11 +2536,15 @@ For when I /have to/ use GH.
 Convenient footnotes in =message-mode=.
 
 #+begin_src emacs-lisp
 Convenient footnotes in =message-mode=.
 
 #+begin_src emacs-lisp

-(use-package footnote
+(use-feature footnote

   :after message
   :after message

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

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

-        :prefix-map amin--footnote-prefix-map
+        :prefix-map a/footnote-prefix-map

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


@@ -2371,49 +2552,64 @@ Convenient footnotes in =message-mode=.
         ("d" . footnote-delete-footnote)
         ("g" . footnote-goto-footnote)
         ("r" . footnote-renumber-footnotes)
         ("d" . footnote-delete-footnote)
         ("g" . footnote-goto-footnote)
         ("r" . footnote-renumber-footnotes)

-        ("s" . footnote-set-style))
-  :config
-  (setq footnote-start-tag ""
-        footnote-end-tag   ""
-        footnote-style     'unicode))
+        ("s" . footnote-set-style)))

 #+end_src
 
 #+end_src
 

-** bbdb
+** 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)))

 
 

-Manually install bbdb (=lisp/bbdb= copied from an ELPA-based setup),
-because installing it from source on Emacs 27 using the following
-submodule configuration for some reason doesn’t work and results in
-very strange errors when using any of the functions.
+(use-feature ebdb-com
+  :after ebdb)

 
 

-#+begin_src conf :tangle no
-[submodule "bbdb"]
-       path = lib/bbdb
-       url = https://git.savannah.nongnu.org/git/bbdb.git
-       load-path = lisp
-       info-path = doc
-       build-step = ./autogen.sh
-       build-step = ./configure
-       build-step = make
-       build-step = make install
-#+end_src
+;; (use-package ebdb-complete
+;;   :after ebdb
+;;   :config
+;;   (ebdb-complete-enable))

 
 

-I tried using =borg-elpa= instead of doing it like this, but it added
-2 seconds to my startup time, which is unacceptable to me.
+(use-package company-ebdb
+  :config
+  (defun company-ebdb--post-complete (_) nil))

 
 

-#+begin_src emacs-lisp
-(use-package bbdb
-  :load-path "lisp/bbdb"
-  :init
-  (load (expand-file-name "lisp/bbdb/bbdb-autoloads.el" user-emacs-directory))
-  ;; (bbdb-mua-auto-update-init 'message)
-  (setq bbdb-mua-auto-update-p 'query
-        bbdb-complete-mail nil)
-  (bbdb-initialize 'gnus 'message))
+(use-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)
+  )
+
+;; (use-package ebdb-message
+;;   :after ebdb)
+
+
+;; (use-package ebdb-vcard
+;;   :after ebdb)

 #+end_src
 
 #+end_src
 

-** COMMENT message-x
+** message-x

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

+(use-package message-x)
+#+end_src
+
+#+begin_src emacs-lisp :tangle no

 (use-package message-x
   :custom
   (message-x-completion-alist
 (use-package message-x
   :custom
   (message-x-completion-alist


@@ -2438,15 +2634,28 @@ I tried using =borg-elpa= instead of doing it like this, but it added
     (gnus-harvest-install)))
 #+end_src
 
     (gnus-harvest-install)))
 #+end_src
 

-* Blogging
-** [[https://ox-hugo.scripter.co][ox-hugo]]
+* IRC
+:PROPERTIES:
+:CUSTOM_ID: irc
+:END:
+
+Now with ERC!

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

-(use-package ox-hugo
-  :after ox)
-
-(use-package ox-hugo-auto-export
-  :load-path "lib/ox-hugo")
+(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
+  (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


@@ -2459,7 +2668,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)

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

 #+end_src
 
 * Footer
 #+end_src
 
 * Footer


@@ -2473,5 +2682,6 @@ Display how long it took to load the init file.
 
 * COMMENT Local Variables                                           :ARCHIVE:
 # Local Variables:
 
 * COMMENT Local Variables                                           :ARCHIVE:
 # Local Variables:

-# eval: (add-hook 'after-save-hook #'amin/async-babel-tangle 'append 'local)
+# eval: (add-hook 'after-save-hook #'a/async-babel-tangle 'append 'local)
+# eval: (when (featurep 'typo (typo-mode -1)))

 # End:
 # End: