emacs: transition to guix (from straight.el)

TODO: submit emacs-xyz packages for (comment)ed out bits

6 files changed, 405 insertions, 577 deletions

diff --git a/.config/guix/home-manifest.scm b/.config/guix/home-manifest.scm
index bd4e6b5..74054fd 100644
--- a/.config/guix/home-manifest.scm
+++ b/.config/guix/home-manifest.scm
@@ -1,9 +1,44 @@
 (specifications->manifest
   '("cvs"
     "emacs"
+    "emacs-alert"
+    "emacs-async"
+    "emacs-company"
+    "emacs-crux"
+    "emacs-dash"
+    "emacs-debbugs"
+    "emacs-diff-hl"
+    "emacs-emmet-mode"
+    "emacs-emojify"
+    "emacs-erc-hl-nicks"
+    "emacs-eshell-up"
+    "emacs-exec-path-from-shell"
+    "emacs-expand-region"
+    "emacs-flycheck"
+    "emacs-geiser"
+    "emacs-go-mode"
+    "emacs-guix"
+    "emacs-helpful"
+    "emacs-hl-todo"
+    "emacs-ivy"
     "emacs-magit"
+    "emacs-multi-term"
+    "emacs-multiple-cursors"
     "emacs-org"
     "emacs-org-contrib"
+    "emacs-org-ref"
+    "emacs-orgalist"
+    "emacs-page-break-lines"
+    "emacs-pass"
+    "emacs-pinentry"
+    "emacs-projectile"
+    "emacs-smart-mode-line"
+    "emacs-smex"
+    "emacs-typo"
+    "emacs-use-package"
+    "emacs-web-mode"
+    "emacs-which-key"
+    "emacs-yasnippet"
     "font-adobe-source-code-pro"
     "font-gnu-freefont-ttf"
     "font-google-roboto"
@@ -13,16 +48,22 @@
     "font-tex-gyre"
     "font-ubuntu"
     "getmail"
+    "gettext"
     "git"
     "git:send-email"
     "gnupg"
+    "guile"
     "haunt"
+    "hunspell"
+    "hunspell-dict-en-ca"
+    "hunspell-dict-en-us"
     "icecat"
     "isync"
-    ;"msmtp"
+    "msmtp"
     "ncdu"
     "notmuch"
     "openssl"
     "password-store"
+    "pinentry-emacs"
     "rsync"
     "screen"))
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 4998cd8..6bf61e4 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -1,4 +1,4 @@
-;;; init.el --- Amin Bandali's Emacs config -*- lexical-binding: t -*-
+;;; init.el --- bandali's emacs configuration -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2018-2019  Amin Bandali <bandali@gnu.org>
 
@@ -18,8 +18,9 @@
 ;;; Commentary:
 
 ;; Emacs configuration of Amin Bandali, computer scientist, functional
-;; programmer, and free software activist.  Uses straight.el for
-;; purely functional and fully reproducible package management.
+;; programmer, and free software activist.  Used to use straight.el
+;; for purely functional and fully reproducible package management.
+;; Now I just use Guix.
 
 ;; Over the years, I've taken inspiration from configurations of many
 ;; great people.  Some that I can remember off the top of my head are:
@@ -37,18 +38,18 @@
 
 ;;; Emacs initialization
 
-(defvar mab/before-user-init-time (current-time)
+(defvar b/before-user-init-time (current-time)
   "Value of `current-time' when Emacs begins loading `user-init-file'.")
 (message "Loading Emacs...done (%.3fs)"
-         (float-time (time-subtract mab/before-user-init-time
+         (float-time (time-subtract b/before-user-init-time
                                     before-init-time)))
 
 ;; temporarily increase `gc-cons-threshhold' and `gc-cons-percentage'
 ;; during startup to reduce garbage collection frequency.  clearing
 ;; `file-name-handler-alist' seems to help reduce startup time too.
-(defvar mab/gc-cons-threshold gc-cons-threshold)
-(defvar mab/gc-cons-percentage gc-cons-percentage)
-(defvar mab/file-name-handler-alist file-name-handler-alist)
+(defvar b/gc-cons-threshold gc-cons-threshold)
+(defvar b/gc-cons-percentage gc-cons-percentage)
+(defvar b/file-name-handler-alist file-name-handler-alist)
 (setq gc-cons-threshold (* 400 1024 1024)  ; 400 MiB
       gc-cons-percentage 0.6
       file-name-handler-alist nil
@@ -56,11 +57,11 @@
       esup-child-profile-require-level 0)
 
 ;; set them back to their defaults once we're done initializing
-(defun mab/post-init ()
-  (setq gc-cons-threshold mab/gc-cons-threshold
-        gc-cons-percentage mab/gc-cons-percentage
-        file-name-handler-alist mab/file-name-handler-alist))
-(add-hook 'after-init-hook #'mab/post-init)
+(defun b/post-init ()
+  (setq gc-cons-threshold b/gc-cons-threshold
+        gc-cons-percentage b/gc-cons-percentage
+        file-name-handler-alist b/file-name-handler-alist))
+(add-hook 'after-init-hook #'b/post-init)
 
 ;; increase number of lines kept in *Messages* log
 (setq message-log-max 20000)
@@ -74,7 +75,7 @@
 ;;; whoami
 
 (setq user-full-name "Amin Bandali"
-      user-mail-address "amin@shemshak.org")
+      user-mail-address "bandali@gnu.org")
 
 
 ;;; comment macro
@@ -86,71 +87,7 @@
   nil)
 
 
-;;; Package management
-
-;; No package.el  (for emacs 26 and before, uncomment the following)
-;; Not necessary when using straight.el
-;;   (C-h v straight-package-neutering-mode RET)
-
-(when (and
-       (not (featurep 'straight))
-       (version< emacs-version "27"))
-  (setq package-enable-at-startup nil)
-  ;; (package-initialize)
-  )
-
-;; for emacs 27 and later, we use early-init.el.  see
-;; https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=24acb31c04b4048b85311d794e600ecd7ce60d3b
-
-;; straight.el
-
-;; Main engine start...
-
-(setq straight-repository-branch "develop"
-      straight-check-for-modifications '(check-on-save find-when-checking))
-
-(defun mab/bootstrap-straight ()
-  (defvar bootstrap-version)
-  (let ((bootstrap-file
-         (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory))
-        (bootstrap-version 5))
-    (unless (file-exists-p bootstrap-file)
-      (with-current-buffer
-          (url-retrieve-synchronously
-           "https://raw.githubusercontent.com/raxod502/straight.el/develop/install.el"
-           'silent 'inhibit-cookies)
-        (goto-char (point-max))
-        (eval-print-last-sexp)))
-    (load bootstrap-file nil 'nomessage)))
-
-;; Solid rocket booster ignition...
-
-(mab/bootstrap-straight)
-
-;; We have lift off!
-
-(setq straight-use-package-by-default t)
-
-(defmacro use-feature (name &rest args)
-  "Like `use-package', but with `straight-use-package-by-default' disabled."
-  (declare (indent defun))
-  `(use-package ,name
-     :straight nil
-     ,@args))
-
-(with-eval-after-load 'recentf
-  (add-to-list 'recentf-exclude
-               (expand-file-name "~/.emacs.d/straight/build/")))
-
-(defun mab/reload-init ()
-  "Reload init.el."
-  (interactive)
-  (setq mab/file-name-handler-alist file-name-handler-alist)
-  (load user-init-file nil 'nomessage)
-  (mab/post-init))
-
-;; use-package
-(straight-use-package 'use-package)
+;;; use-package
 (if nil                             ; set to t when need to debug init
     (progn
       (setq use-package-verbose t
@@ -166,46 +103,44 @@
 
 (use-package delight)
 
-;; for browsing the Emacsmirror package database
-(comment
-  (use-package epkg
-    :commands (epkg-list-packages epkg-describe-package)
-    :bind
-    (("C-c p e d" . epkg-describe-package)
-     ("C-c p e p" . epkg-list-packages))
-    :config
-    (setq epkg-repository "~/.emacs.d/straight/repos/epkgs/")
-    (eval-when-compile (defvar ivy-initial-inputs-alist))
-    (with-eval-after-load 'ivy
-      (add-to-list
-       'ivy-initial-inputs-alist '(epkg-describe-package . "^") t))))
-
 
 ;;; Initial setup
 
 ;; keep ~/.emacs.d clean
-(use-package no-littering
-  :demand t
-  :config
-  (savehist-mode 1)
-  (add-to-list 'savehist-additional-variables 'kill-ring)
-  (save-place-mode 1)
-  (setq auto-save-file-name-transforms
-        `((".*" ,(no-littering-expand-var-file-name "auto-save/") t))))
+(defvar b/etc-dir
+  (expand-file-name
+   (convert-standard-filename "etc/") user-emacs-directory)
+  "The directory where packages place their configuration files.")
+
+(defvar b/var-dir
+  (expand-file-name
+   (convert-standard-filename "var/") user-emacs-directory)
+  "The directory where packages place their persistent data files.")
+
+(defun b/etc (file)
+  "Expand filename FILE relative to `b/etc-dir'."
+  (expand-file-name (convert-standard-filename file) b/etc-dir))
+
+(defun b/var (file)
+  "Expand filename FILE relative to `b/var-dir'."
+  (expand-file-name (convert-standard-filename file) b/var-dir))
+
+(setq auto-save-list-file-prefix (b/var "auto-save/sessions/"))
 
 ;; separate custom file (don't want it mixing with init.el)
-(use-feature custom
+(use-package custom
   :no-require t
   :config
-  (setq custom-file (no-littering-expand-etc-file-name "custom.el"))
+  (setq custom-file (b/etc "custom.el"))
   (when (file-exists-p custom-file)
     (load custom-file))
   ;; while at it, treat themes as safe
   (setf custom-safe-themes t))
 
 ;; load the secrets file if it exists, otherwise show a warning
-(with-demoted-errors
-    (load (no-littering-expand-etc-file-name "secrets")))
+(comment
+  (with-demoted-errors
+      (load (b/etc "secrets"))))
 
 ;; better $PATH (and other environment variable) handling
 (use-package exec-path-from-shell
@@ -227,7 +162,7 @@
 
 ;; start up emacs server.  see
 ;; https://www.gnu.org/software/emacs/manual/html_node/emacs/Emacs-Server.html#Emacs-Server
-(use-feature server
+(use-package server
   :defer 0.4
   :config (or (server-running-p) (server-mode)))
 
@@ -270,7 +205,7 @@
 ;; focus follows mouse
 (setq mouse-autoselect-window t)
 
-(defun mab/no-mouse-autoselect-window ()
+(defun b/no-mouse-autoselect-window ()
   "Conveniently disable `focus-follows-mouse'.
 For disabling the behaviour for certain buffers and/or modes."
   (make-local-variable 'mouse-autoselect-window)
@@ -283,28 +218,35 @@ For disabling the behaviour for certain buffers and/or modes."
       scroll-conservatively 10
       scroll-preserve-screen-position 1)
 
-(use-feature mwheel
+(use-package mwheel
   :defer 0.4
   :config
   (setq mouse-wheel-scroll-amount '(1 ((shift) . 1)) ; one line at a time
         mouse-wheel-progressive-speed nil            ; don't accelerate scrolling
         mouse-wheel-follow-mouse t))                 ; scroll window under mouse
 
-(use-feature pixel-scroll
+(use-package pixel-scroll
   :defer 0.4
   :config (pixel-scroll-mode 1))
 
 ;; ask for GPG passphrase in minibuffer
-(use-feature epg-config
+(use-package epa
+  :custom
+  ; this will fail if gpg>=2.1 is not available
+  (epa-pinentry-mode 'loopback))
+
+(use-package epg-config
   :defer 0.4
   :custom
   ((epg-gpg-program (executable-find "gpg"))
    (epg-pinentry-mode 'loopback)))
-(use-feature epg
+
+(use-package epg
   :after epg-config)
+
 (use-package pinentry
   :demand
-  :after (epg server)
+  :after (epa epg server)
   :config
   (setq pinentry--socket-dir server-socket-dir)
   (pinentry-start))
@@ -316,12 +258,12 @@ For disabling the behaviour for certain buffers and/or modes."
 
 ;;; Useful utilities
 
-(defmacro mab/setq-every (value &rest vars)
+(defmacro b/setq-every (value &rest vars)
   "Set all the variables from VARS to value VALUE."
   (declare (indent defun) (debug t))
   `(progn ,@(mapcar (lambda (x) (list 'setq x value)) vars)))
 
-(defun mab/start-process (program &rest args)
+(defun b/start-process (program &rest args)
   "Same as `start-process', but doesn't bother about name and buffer."
   (let ((process-name (concat program "_process"))
         (buffer-name  (generate-new-buffer-name
@@ -329,15 +271,15 @@ For disabling the behaviour for certain buffers and/or modes."
     (apply #'start-process
            process-name buffer-name program args)))
 
-(defun mab/dired-start-process (program &optional args)
+(defun b/dired-start-process (program &optional args)
   "Open current file with a PROGRAM."
   ;; Shell command looks like this: "program [ARGS]... FILE" (ARGS can
   ;; be nil, so remove it).
-  (apply #'mab/start-process
+  (apply #'b/start-process
          program
          (remove nil (list args (dired-get-file-for-visit)))))
 
-(defun mab/add-elisp-section ()
+(defun b/add-elisp-section ()
   (interactive)
   (insert "\n")
   (previous-line)
@@ -404,6 +346,7 @@ For disabling the behaviour for certain buffers and/or modes."
 
 ;; backups (C-h v make-backup-files RET)
 (setq backup-by-copying t
+      backup-directory-alist (list (cons "." (b/var "backup/")))
       version-control t
       delete-old-versions t)
 
@@ -425,12 +368,12 @@ For disabling the behaviour for certain buffers and/or modes."
 ;; https://stackoverflow.com/a/17788551, with changes to use `cl-letf'
 ;; instead of the now obsolete `flet'.
 (with-eval-after-load 'compile
-  (defun mab/compilation-finish-function (buffer outstr)
+  (defun b/compilation-finish-function (buffer outstr)
     (unless (string-match "finished" outstr)
       (switch-to-buffer-other-window buffer))
     t)
 
-  (setq compilation-finish-functions #'mab/compilation-finish-function)
+  (setq compilation-finish-functions #'b/compilation-finish-function)
 
   (require 'cl-macs)
 
@@ -461,10 +404,10 @@ For disabling the behaviour for certain buffers and/or modes."
 ;; (enables niceties like `q' for quit)
 (setq view-read-only t)
 
-(use-feature vc
+(use-package vc
   :bind ("C-x v C-=" . vc-ediff))
 
-(use-feature ediff
+(use-package ediff
   :config (add-hook 'ediff-after-quit-hook-internal 'winner-undo)
   :custom ((ediff-window-setup-function 'ediff-setup-windows-plain)
            (ediff-split-window-function 'split-window-horizontally)))
@@ -480,6 +423,7 @@ For disabling the behaviour for certain buffers and/or modes."
 
  ("C-c e i" . emacs-init-time)
  ("C-c e u" . emacs-uptime)
+ ("C-c e v" . emacs-version)
 
  ("C-c F m" . make-frame-command)
  ("C-c F d" . delete-frame)
@@ -497,7 +441,7 @@ For disabling the behaviour for certain buffers and/or modes."
  ("M-O"     . facemenu-keymap)
 
  :map emacs-lisp-mode-map
- ("<C-return>" . mab/add-elisp-section))
+ ("<C-return>" . b/add-elisp-section))
 
 (when (display-graphic-p)
   (unbind-key "C-z" global-map))
@@ -511,52 +455,10 @@ For disabling the behaviour for certain buffers and/or modes."
  ("<drag-mouse-2>" . kill-this-buffer)
  ("<drag-mouse-3>" . ivy-switch-buffer))
 
-(bind-keys
- :prefix-map mab/straight-prefix-map
- :prefix "C-c p s"
- ("u" . straight-use-package)
- ("f" . straight-freeze-versions)
- ("t" . straight-thaw-versions)
- ("P" . straight-prune-build)
- ("g" . straight-get-recipe)
- ("r" . mab/reload-init)
- ;; M-x ^straight-.*-all$
- ("a c" . straight-check-all)
- ("a f" . straight-fetch-all)
- ("a m" . straight-merge-all)
- ("a n" . straight-normalize-all)
- ("a F" . straight-pull-all)
- ("a P" . straight-push-all)
- ("a r" . straight-rebuild-all)
- ;; M-x ^straight-.*-package$
- ("p c" . straight-check-package)
- ("p f" . straight-fetch-package)
- ("p m" . straight-merge-package)
- ("p n" . straight-normalize-package)
- ("p F" . straight-pull-package)
- ("p P" . straight-push-package)
- ("p r" . straight-rebuild-package))
-
 
 ;;; Essential packages
 
-(use-package auto-compile
-  :demand t
-  :config
-  (auto-compile-on-load-mode)
-  (auto-compile-on-save-mode)
-  (setq auto-compile-display-buffer               nil
-        auto-compile-mode-line-counter            t
-        auto-compile-source-recreate-deletes-dest t
-        auto-compile-toggle-deletes-nonlib-dest   t
-        auto-compile-update-autoloads             t)
-  (add-hook 'auto-compile-inhibit-compile-hook
-            'auto-compile-inhibit-compile-detached-git-head))
-
-;; use the org-plus-contrib package to get the whole deal
-(straight-use-package 'org-plus-contrib)
-
-(use-feature org
+(use-package org
   :defer 0.5
   :config
   (setq org-src-tab-acts-natively t
@@ -592,7 +494,7 @@ For disabling the behaviour for certain buffers and/or modes."
   '(org-block ((t (:background "#1d1f21"))))
   '(org-latex-and-related ((t (:foreground "#b294bb")))))
 
-(use-feature ox-latex
+(use-package ox-latex
   :after ox
   :config
   (setq org-latex-listings 'listings
@@ -608,7 +510,7 @@ For disabling the behaviour for certain buffers and/or modes."
                t)
   (require 'ox-beamer))
 
-(use-feature ox-extra
+(use-package ox-extra
   :config
   (ox-extras-activate '(latex-header-blocks ignore-headlines)))
 
@@ -616,13 +518,13 @@ For disabling the behaviour for certain buffers and/or modes."
 ;; org file.  closely inspired by
 ;; https://github.com/dieggsy/dotfiles/tree/cc10edf7701958eff1cd94d4081da544d882a28c/emacs.d#dotfiles
 (with-eval-after-load 'org
-  (defvar mab/show-async-tangle-results nil
+  (defvar b/show-async-tangle-results nil
     "Keep *emacs* async buffers around for later inspection.")
 
-  (defvar mab/show-async-tangle-time nil
+  (defvar b/show-async-tangle-time nil
     "Show the time spent tangling the file.")
 
-  (defun mab/async-babel-tangle ()
+  (defun b/async-babel-tangle ()
     "Tangle org file asynchronously."
     (interactive)
     (let* ((file-tangle-start-time (current-time))
@@ -634,12 +536,12 @@ For disabling the behaviour for certain buffers and/or modes."
        `(lambda ()
           (require 'org)
           (org-babel-tangle-file ,file))
-       (unless mab/show-async-tangle-results
+       (unless b/show-async-tangle-results
          `(lambda (result)
             (if result
                 (message "Tangled %s%s"
                          ,file-nodir
-                         (if mab/show-async-tangle-time
+                         (if b/show-async-tangle-time
                              (format " (%.3fs)"
                                      (float-time (time-subtract (current-time)
                                                                 ',file-tangle-start-time)))
@@ -648,7 +550,7 @@ For disabling the behaviour for certain buffers and/or modes."
 
 (add-to-list
  'safe-local-variable-values
- '(eval add-hook 'after-save-hook #'mab/async-babel-tangle 'append 'local))
+ '(eval add-hook 'after-save-hook #'b/async-babel-tangle 'append 'local))
 
 ;; *the* right way to do git
 (use-package magit
@@ -670,11 +572,13 @@ For disabling the behaviour for certain buffers and/or modes."
   :custom-face (magit-diff-file-heading ((t (:weight normal)))))
 
 ;; recently opened files
-(use-feature recentf
+(use-package recentf
   :defer 0.2
-  :config
+  ;; :config
   ;; (add-to-list 'recentf-exclude "^/\\(?:ssh\\|su\\|sudo\\)?:")
-  (setq recentf-max-saved-items 2000))
+  :custom
+  (recentf-max-saved-items 2000)
+  (recentf-save-file (b/var "recentf-save.el")))
 
 ;; smart M-x enhancement (needed by counsel for history)
 (use-package smex)
@@ -741,40 +645,41 @@ For disabling the behaviour for certain buffers and/or modes."
            ("C-z"   . helm-select-action))            ; List actions
     :config (helm-mode 1)))
 
-(use-feature eshell
+(use-package eshell
   :defer 0.5
   :commands eshell
   :bind ("C-c a s e" . eshell)
   :config
   (eval-when-compile (defvar eshell-prompt-regexp))
-  (defun mab/eshell-quit-or-delete-char (arg)
+  (defun b/eshell-quit-or-delete-char (arg)
     (interactive "p")
     (if (and (eolp) (looking-back eshell-prompt-regexp nil))
         (eshell-life-is-too-much)
       (delete-char arg)))
 
-  (defun mab/eshell-clear ()
+  (defun b/eshell-clear ()
     (interactive)
     (let ((inhibit-read-only t))
       (erase-buffer))
     (eshell-send-input))
 
-  (defun mab/eshell-setup ()
+  (defun b/eshell-setup ()
     (make-local-variable 'company-idle-delay)
     (defvar company-idle-delay)
     (setq company-idle-delay nil)
     (bind-keys :map eshell-mode-map
-               ("C-d"   . mab/eshell-quit-or-delete-char)
-               ("C-S-l" . mab/eshell-clear)
+               ("C-d"   . b/eshell-quit-or-delete-char)
+               ("C-S-l" . b/eshell-clear)
                ("M-r"   . counsel-esh-history)
                ([tab]   . company-complete)))
 
-  :hook (eshell-mode . mab/eshell-setup)
+  :hook (eshell-mode . b/eshell-setup)
   :custom
+  (eshell-directory-name (b/var "eshell/"))
   (eshell-hist-ignoredups t)
   (eshell-input-filter 'eshell-input-filter-initial-space))
 
-(use-feature ibuffer
+(use-package ibuffer
   :bind
   (("C-x C-b" . ibuffer-other-window)
    :map ibuffer-mode-map
@@ -848,7 +753,7 @@ For disabling the behaviour for certain buffers and/or modes."
            " " filename)))
   :hook (ibuffer . (lambda () (ibuffer-switch-to-saved-filter-groups "default"))))
 
-(use-feature outline
+(use-package outline
   :hook (prog-mode . outline-minor-mode)
   :delight (outline-minor-mode " outl")
   :bind
@@ -857,7 +762,7 @@ For disabling the behaviour for certain buffers and/or modes."
    ("<s-tab>"  . outline-toggle-children)
    ("M-p"      . outline-previous-visible-heading)
    ("M-n"      . outline-next-visible-heading)
-   :prefix-map mab/outline-prefix-map
+   :prefix-map b/outline-prefix-map
    :prefix "s-O"
    ("TAB" . outline-toggle-children)
    ("a"   . outline-hide-body)
@@ -866,10 +771,10 @@ For disabling the behaviour for certain buffers and/or modes."
    ("h"   . outline-hide-subtree)
    ("s"   . outline-show-subtree)))
 
-(use-feature ls-lisp
+(use-package ls-lisp
   :custom (ls-lisp-dirs-first t))
 
-(use-feature dired
+(use-package dired
   :config
   (setq dired-listing-switches "-alh"
         ls-lisp-use-insert-directory-program nil)
@@ -915,15 +820,15 @@ For disabling the behaviour for certain buffers and/or modes."
               ("\\" . dired-hide-details-mode)
               ("z"  . (lambda ()
                         (interactive)
-                        (mab/dired-start-process "zathura"))))
+                        (b/dired-start-process "zathura"))))
   :hook (dired-mode . dired-hide-details-mode))
 
-(use-feature help
+(use-package help
   :config
   (temp-buffer-resize-mode)
   (setq help-window-select t))
 
-(use-feature tramp
+(use-package tramp
   :config
   (add-to-list 'tramp-default-proxies-alist '(nil "\\`root\\'" "/ssh:%h:"))
   (add-to-list 'tramp-default-proxies-alist '("localhost" nil nil))
@@ -949,46 +854,51 @@ For disabling the behaviour for certain buffers and/or modes."
   :hook (magit-post-refresh . diff-hl-magit-post-refresh))
 
 ;; display Lisp objects at point in the echo area
-(use-feature eldoc
+(use-package eldoc
   :when (version< "25" emacs-version)
   :delight " eldoc"
   :config (global-eldoc-mode))
 
 ;; highlight matching parens
-(use-feature paren
+(use-package paren
   :demand
   :config (show-paren-mode))
 
-(use-feature elec-pair
+(use-package elec-pair
   :demand
   :config (electric-pair-mode))
 
-(use-feature simple
+(use-package simple
   :delight (auto-fill-function " fill")
   :config (column-number-mode))
 
 ;; save minibuffer history
-(use-feature savehist
-  :config (savehist-mode))
+(use-package savehist
+  :config
+  (savehist-mode)
+  :custom
+  (savehist-file (b/var "savehist.el")))
 
 ;; automatically save place in files
-(use-feature saveplace
+(use-package saveplace
   :when (version< "25" emacs-version)
-  :config (save-place-mode))
+  :config (save-place-mode)
+  :custom
+  (save-place-file (b/var "save-place.el")))
 
-(use-feature prog-mode
+(use-package prog-mode
   :config (global-prettify-symbols-mode)
   (defun indicate-buffer-boundaries-left ()
     (setq indicate-buffer-boundaries 'left))
   (add-hook 'prog-mode-hook #'indicate-buffer-boundaries-left))
 
-(use-feature text-mode
+(use-package text-mode
   :hook (text-mode . indicate-buffer-boundaries-left))
 
-(use-feature conf-mode
+(use-package conf-mode
   :mode "\\.*rc$")
 
-(use-feature sh-mode
+(use-package sh-mode
   :mode "\\.bashrc$")
 
 (use-package company
@@ -1022,7 +932,7 @@ For disabling the behaviour for certain buffers and/or modes."
   (setq flycheck-check-syntax-automatically '(mode-enabled save))
   :custom (flycheck-mode-line-prefix "flyc"))
 
-(use-feature flyspell
+(use-package flyspell
   :delight " flysp")
 
 ;; http://endlessparentheses.com/ispell-and-apostrophes.html
@@ -1052,70 +962,75 @@ For disabling the behaviour for certain buffers and/or modes."
   (advice-add #'ispell-parse-output :filter-args
               #'endless/replace-quote))
 
-(use-feature abbrev
+(use-package abbrev
   :delight " abbr"
-  :hook (text-mode . abbrev-mode))
+  :hook (text-mode . abbrev-mode)
+  :custom
+  (abbrev-file-name (b/var "abbrev.el")))
 
 
 ;;; Programming modes
 
-(use-feature lisp-mode
+(use-package lisp-mode
   :config
   (defun indent-spaces-mode ()
     (setq indent-tabs-mode nil))
   (add-hook 'lisp-interaction-mode-hook #'indent-spaces-mode))
 
-(use-feature reveal
+(use-package reveal
   :delight (reveal-mode " reveal")
   :hook (emacs-lisp-mode . reveal-mode))
 
-(use-feature elisp-mode
+(use-package elisp-mode
   :delight (emacs-lisp-mode "Elisp" :major))
 
-(use-package alloy-mode
-  :straight (:host github :repo "dwwmmn/alloy-mode")
-  :mode "\\.als\\'"
-  :config (setq alloy-basic-offset 2))
-
-(use-package proof-site                 ; for Coq
-  :straight proof-general)
-
-(eval-when-compile (defvar lean-mode-map))
-(use-package lean-mode
-  :defer 0.4
-  :bind (:map lean-mode-map
-              ("S-SPC" . company-complete))
-  :config
-  (require 'lean-input)
-  (setq default-input-method "Lean"
-        lean-input-tweak-all '(lean-input-compose
-                               (lean-input-prepend "/")
-                               (lean-input-nonempty))
-        lean-input-user-translations '(("/" "/")))
-  (lean-input-setup))
-
-(use-package haskell-mode
-  :config
-  (setq haskell-indentation-layout-offset 4
-        haskell-indentation-left-offset 4
-        flycheck-checker 'haskell-hlint
-        flycheck-disabled-checkers '(haskell-stack-ghc haskell-ghc)))
-
-(use-package dante
-  :after haskell-mode
-  :commands dante-mode
-  :hook (haskell-mode . dante-mode))
-
-(use-package hlint-refactor
-  :after haskell-mode
-  :bind (:map hlint-refactor-mode-map
-              ("C-c l b" . hlint-refactor-refactor-buffer)
-              ("C-c l r" . hlint-refactor-refactor-at-point))
-  :hook (haskell-mode . hlint-refactor-mode))
-
-(use-package flycheck-haskell
-  :after haskell-mode)
-;; alternative: hs-lint https://github.com/ndmitchell/hlint/blob/20e116a043f2073c57b17b24ae6364b5e433ba7e/data/hs-lint.el
+(comment
+  ;; TODO
+  (use-package alloy-mode
+    :straight (:host github :repo "dwwmmn/alloy-mode")
+    :mode "\\.als\\'"
+    :config (setq alloy-basic-offset 2))
+
+  (use-package proof-site                 ; for Coq
+    :straight proof-general)
+
+  (eval-when-compile (defvar lean-mode-map))
+  (use-package lean-mode
+    :defer 0.4
+    :bind (:map lean-mode-map
+                ("S-SPC" . company-complete))
+    :config
+    (require 'lean-input)
+    (setq default-input-method "Lean"
+          lean-input-tweak-all '(lean-input-compose
+                                 (lean-input-prepend "/")
+                                 (lean-input-nonempty))
+          lean-input-user-translations '(("/" "/")))
+    (lean-input-setup))
+
+  (use-package haskell-mode
+    :config
+    (setq haskell-indentation-layout-offset 4
+          haskell-indentation-left-offset 4
+          flycheck-checker 'haskell-hlint
+          flycheck-disabled-checkers '(haskell-stack-ghc haskell-ghc)))
+
+  (use-package dante
+    :after haskell-mode
+    :commands dante-mode
+    :hook (haskell-mode . dante-mode))
+
+  (use-package hlint-refactor
+    :after haskell-mode
+    :bind (:map hlint-refactor-mode-map
+                ("C-c l b" . hlint-refactor-refactor-buffer)
+                ("C-c l r" . hlint-refactor-refactor-at-point))
+    :hook (haskell-mode . hlint-refactor-mode))
+
+  (use-package flycheck-haskell
+    :after haskell-mode)
+  ;; alternative: hs-lint https://github.com/ndmitchell/hlint/blob/20e116a043f2073c57b17b24ae6364b5e433ba7e/data/hs-lint.el
+  )
 
 (use-package sgml-mode
   :config
@@ -1128,7 +1043,7 @@ For disabling the behaviour for certain buffers and/or modes."
 (use-package web-mode
   :mode "\\.html\\'"
   :config
-  (mab/setq-every 2
+  (b/setq-every 2
     web-mode-code-indent-offset
     web-mode-css-indent-offset
     web-mode-markup-indent-offset))
@@ -1216,7 +1131,7 @@ For disabling the behaviour for certain buffers and/or modes."
 
 (use-package geiser)
 
-(use-feature geiser-guile
+(use-package geiser-guile
   :config
   (setq geiser-guile-load-path "~/src/git/guix"))
 
@@ -1236,7 +1151,9 @@ For disabling the behaviour for certain buffers and/or modes."
 
 ;;; Theme
 
-(add-to-list 'custom-theme-load-path "~/.emacs.d/lisp")
+(add-to-list 'custom-theme-load-path
+             (expand-file-name
+              (convert-standard-filename "lisp") user-emacs-directory))
 (load-theme 'tangomod t)
 
 (use-package smart-mode-line
@@ -1246,40 +1163,42 @@ For disabling the behaviour for certain buffers and/or modes."
   (sml/setup)
   (smart-mode-line-enable))
 
-(use-package doom-themes)
+(comment
+  ;; TODO
+  (use-package doom-themes))
 
-(defvar mab/org-mode-font-lock-keywords
+(defvar b/org-mode-font-lock-keywords
   '(("[ \t]*\\(#\\+\\(BEGIN\\|END\\|begin\\|end\\)_\\(\\S-+\\)\\)[ \t]*\\([^\n:]*\\)"
       (1 '(:foreground "#5a5b5a" :background "#292b2b") t) ; directive
       (3 '(:foreground "#81a2be" :background "#292b2b") t) ; kind
       (4 '(:foreground "#c5c8c6") t))))                    ; title
 
-(defun mab/lights-on ()
+(defun b/lights-on ()
   "Enable my favourite light theme."
   (interactive)
   (mapc #'disable-theme custom-enabled-themes)
   (load-theme 'tangomod t)
   (sml/apply-theme 'automatic)
   (font-lock-remove-keywords
-   'org-mode mab/org-mode-font-lock-keywords))
+   'org-mode b/org-mode-font-lock-keywords))
 
-(defun mab/lights-off ()
+(defun b/lights-off ()
   "Go dark."
   (interactive)
   (mapc #'disable-theme custom-enabled-themes)
-  (load-theme 'doom-tomorrow-night t)
+  ;; (load-theme 'doom-tomorrow-night t)
   (sml/apply-theme 'automatic)
   (font-lock-add-keywords
-   'org-mode mab/org-mode-font-lock-keywords t))
+   'org-mode b/org-mode-font-lock-keywords t))
 
 (bind-keys
- ("s-t d" . mab/lights-off)
- ("s-t l" . mab/lights-on))
+ ("s-t d" . b/lights-off)
+ ("s-t l" . b/lights-on))
 
 
 ;;; Emacs enhancements & auxiliary packages
 
-(use-feature man
+(use-package man
   :config (setq Man-width 80))
 
 (use-package which-key
@@ -1351,11 +1270,13 @@ For disabling the behaviour for certain buffers and/or modes."
          ("C-c j"   . crux-top-join-line)
          ("C-S-j"   . crux-top-join-line)))
 
-(use-package mwim
-  :bind (("C-a"    . mwim-beginning-of-code-or-line)
-         ("C-e"    . mwim-end-of-code-or-line)
-         ("<home>" . mwim-beginning-of-line-or-code)
-         ("<end>"  . mwim-end-of-line-or-code)))
+(comment
+  ;; TODO
+  (use-package mwim
+    :bind (("C-a"    . mwim-beginning-of-code-or-line)
+           ("C-e"    . mwim-end-of-code-or-line)
+           ("<home>" . mwim-beginning-of-line-or-code)
+           ("<end>"  . mwim-end-of-line-or-code))))
 
 (use-package projectile
   :defer 0.5
@@ -1363,7 +1284,7 @@ For disabling the behaviour for certain buffers and/or modes."
   :config
   (projectile-mode)
 
-  (defun mab/projectile-mode-line-fun ()
+  (defun b/projectile-mode-line-fun ()
   "Report project name and type in the modeline."
   (let ((project-name (projectile-project-name))
         (project-type (projectile-project-type)))
@@ -1372,7 +1293,7 @@ For disabling the behaviour for certain buffers and/or modes."
             (if project-type
                 (format ":%s" project-type)
               ""))))
-  (setq projectile-mode-line-function 'mab/projectile-mode-line-fun)
+  (setq projectile-mode-line-function 'b/projectile-mode-line-fun)
 
   (defun my-projectile-invalidate-cache (&rest _args)
     ;; ignore the args to `magit-checkout'
@@ -1397,41 +1318,45 @@ For disabling the behaviour for certain buffers and/or modes."
    ("C-S-h k" . helpful-key)
    ("C-S-h p" . helpful-at-point)))
 
-(use-package unkillable-scratch
-  :defer 0.6
-  :config
-  (unkillable-scratch 1)
-  :custom
-  (unkillable-buffers '("^\\*scratch\\*$" "^\\*Messages\\*$")))
+(comment
+  ;; TODO
+  (use-package unkillable-scratch
+    :defer 0.6
+    :config
+    (unkillable-scratch 1)
+    :custom
+    (unkillable-buffers '("^\\*scratch\\*$" "^\\*Messages\\*$"))))
 
-;; ,----
-;; | make pretty boxed quotes like this
-;; `----
-(use-package boxquote
-  :defer 0.6
-  :bind
-  (:prefix-map mab/boxquote-prefix-map
-   :prefix "C-c q"
-   ("b"   . boxquote-buffer)
-   ("B"   . boxquote-insert-buffer)
-   ("d"   . boxquote-defun)
-   ("F"   . boxquote-insert-file)
-   ("hf"  . boxquote-describe-function)
-   ("hk"  . boxquote-describe-key)
-   ("hv"  . boxquote-describe-variable)
-   ("hw"  . boxquote-where-is)
-   ("k"   . boxquote-kill)
-   ("p"   . boxquote-paragraph)
-   ("q"   . boxquote-boxquote)
-   ("r"   . boxquote-region)
-   ("s"   . boxquote-shell-command)
-   ("t"   . boxquote-text)
-   ("T"   . boxquote-title)
-   ("u"   . boxquote-unbox)
-   ("U"   . boxquote-unbox-region)
-   ("y"   . boxquote-yank)
-   ("M-q" . boxquote-fill-paragraph)
-   ("M-w" . boxquote-kill-ring-save)))
+(comment
+  ;; TODO
+  ;; ,----
+  ;; | make pretty boxed quotes like this
+  ;; `----
+  (use-package boxquote
+    :defer 0.6
+    :bind
+    (:prefix-map b/boxquote-prefix-map
+                 :prefix "C-c q"
+                 ("b"   . boxquote-buffer)
+                 ("B"   . boxquote-insert-buffer)
+                 ("d"   . boxquote-defun)
+                 ("F"   . boxquote-insert-file)
+                 ("hf"  . boxquote-describe-function)
+                 ("hk"  . boxquote-describe-key)
+                 ("hv"  . boxquote-describe-variable)
+                 ("hw"  . boxquote-where-is)
+                 ("k"   . boxquote-kill)
+                 ("p"   . boxquote-paragraph)
+                 ("q"   . boxquote-boxquote)
+                 ("r"   . boxquote-region)
+                 ("s"   . boxquote-shell-command)
+                 ("t"   . boxquote-text)
+                 ("T"   . boxquote-title)
+                 ("u"   . boxquote-unbox)
+                 ("U"   . boxquote-unbox-region)
+                 ("y"   . boxquote-yank)
+                 ("M-q" . boxquote-fill-paragraph)
+                 ("M-w" . boxquote-kill-ring-save))))
 
 (use-package orgalist
   ;; http://lists.gnu.org/archive/html/emacs-orgmode/2019-04/msg00007.html
@@ -1453,21 +1378,23 @@ For disabling the behaviour for certain buffers and/or modes."
   :config
   (global-hl-todo-mode))
 
-(use-package shrink-path
-  :defer 0.5
-  :after eshell
-  :config
-  (defvar user-@-host (concat (user-login-name) "@" (system-name) " "))
-  (defun +eshell/prompt ()
-    (let ((base/dir (shrink-path-prompt default-directory)))
-      (concat (propertize user-@-host 'face 'default)
-              (propertize (car base/dir)
-                          'face 'font-lock-comment-face)
-              (propertize (cdr base/dir)
-                          'face 'font-lock-constant-face)
-              (propertize "> " 'face 'default))))
-  (setq eshell-prompt-regexp (concat user-@-host ".*> ")
-        eshell-prompt-function #'+eshell/prompt))
+(comment
+  ;; TODO
+  (use-package shrink-path
+    :defer 0.5
+    :after eshell
+    :config
+    (defvar user-@-host (concat (user-login-name) "@" (system-name) " "))
+    (defun +eshell/prompt ()
+      (let ((base/dir (shrink-path-prompt default-directory)))
+        (concat (propertize user-@-host 'face 'default)
+                (propertize (car base/dir)
+                            'face 'font-lock-comment-face)
+                (propertize (cdr base/dir)
+                            'face 'font-lock-constant-face)
+                (propertize "> " 'face 'default))))
+    (setq eshell-prompt-regexp (concat user-@-host ".*> ")
+          eshell-prompt-function #'+eshell/prompt)))
 
 (use-package eshell-up
   :after eshell
@@ -1539,16 +1466,18 @@ For disabling the behaviour for certain buffers and/or modes."
 (use-package multiple-cursors
   :bind
   (("C-S-<mouse-1>" . mc/add-cursor-on-click)
-   (:prefix-map mab/mc-prefix-map
+   (:prefix-map b/mc-prefix-map
                :prefix "C-c m"
                ("c" . mc/edit-lines)
                ("n" . mc/mark-next-like-this)
                ("p" . mc/mark-previous-like-this)
                ("a" . mc/mark-all-like-this))))
 
-(use-package forge
-  :after magit
-  :demand)
+(comment
+  ;; TODO
+  (use-package forge
+    :after magit
+    :demand))
 
 (use-package yasnippet
   :defer 0.6
@@ -1560,67 +1489,17 @@ For disabling the behaviour for certain buffers and/or modes."
   (setq yas-verbosity yas-verbosity-cur)
   (yas-global-mode))
 
-(use-package debbugs
-  :straight (debbugs
-             :host github
-             :repo "emacs-straight/debbugs"
-             :files (:defaults "Debbugs.wsdl")))
+(use-package debbugs)
 
 (use-package org-ref
   :init
-  (mab/setq-every '("~/usr/org/references.bib")
+  (b/setq-every '("~/usr/org/references.bib")
     reftex-default-bibliography
     org-ref-default-bibliography)
   (setq
    org-ref-bibliography-notes "~/usr/org/notes.org"
    org-ref-pdf-directory "~/usr/org/bibtex-pdfs/"))
 
-;; ugh, temporary (still better than using the proprietary web app)
-(use-package slack
-  :commands (slack-start)
-  :init
-  (eval-when-compile                    ; silence the byte-compiler
-    (defvar url-http-data nil)
-    (defvar url-http-extra-headers nil)
-    (defvar url-http-method nil)
-    (defvar url-callback-function nil)
-    (defvar url-callback-arguments nil)
-    (defvar oauth--token-data nil))
-  (setq slack-buffer-emojify t
-        slack-prefer-current-team t)
-  :config
-  (slack-register-team
-   :name "nday-students"
-   :default t
-   :token nday-students-token
-   :subscribed-channels '(general)
-   :full-and-display-names t)
-  (with-eval-after-load 'swiper
-    (add-to-list 'swiper-font-lock-exclude 'slack-message-buffer-mode t))
-  (setq lui-time-stamp-format "[%Y-%m-%d %H:%M:%S]"
-        lui-time-stamp-only-when-changed-p t
-        lui-time-stamp-position 'right)
-  :bind
-  (("C-c s s" . slack-start)
-   ("C-c s u" . slack-select-unread-rooms)
-   ("C-c s b" . slack-select-rooms)
-   ("C-c s t" . slack-change-current-team)
-   ("C-c s c" . slack-ws-close)
-   :map slack-mode-map
-   ("M-p"     . slack-buffer-goto-prev-message)
-   ("M-n"     . slack-buffer-goto-next-message)
-   ("C-c e"   . slack-message-edit)
-   ("C-c k"   . slack-message-delete)
-   ("C-c C-k" . slack-channel-leave)
-   ("C-c r a" . slack-message-add-reaction)
-   ("C-c r r" . slack-message-remove-reaction)
-   ("C-c r s" . slack-message-show-reaction-users)
-   ("C-c p l" . slack-room-pins-list)
-   ("C-c p a" . slack-message-pins-add)
-   ("C-c p r" . slack-message-pins-remove)
-   ("@"       . slack-message-embed-mention)
-   ("#"       . slack-message-embed-channel)))
-
 (use-package alert
   :commands (alert)
   :init (setq alert-default-style 'notifications))
@@ -1630,7 +1509,7 @@ For disabling the behaviour for certain buffers and/or modes."
 (use-package emojify
   :hook (erc-mode . emojify-mode))
 
-(use-feature window
+(use-package window
   :bind
   (("s-o"   . other-window)
    ("M-o"   . other-window)
@@ -1639,7 +1518,7 @@ For disabling the behaviour for certain buffers and/or modes."
    ("s-/ 0" . delete-window)
    ("s-q"   . delete-window)))
 
-(use-feature windmove
+(use-package windmove
   :defer 0.6
   :bind
   (("s-h" . windmove-left)
@@ -1659,16 +1538,16 @@ For disabling the behaviour for certain buffers and/or modes."
 
 ;;; Email (with Gnus)
 
-(defvar mab/maildir (expand-file-name "~/mail/"))
+(defvar b/maildir (expand-file-name "~/mail/"))
 (with-eval-after-load 'recentf
-  (add-to-list 'recentf-exclude mab/maildir))
+  (add-to-list 'recentf-exclude b/maildir))
 
 (setq
- mab/gnus-init-file  (no-littering-expand-etc-file-name "gnus")
+ b/gnus-init-file  (b/etc "gnus")
  mail-user-agent   'gnus-user-agent
  read-mail-command 'gnus)
 
-(use-feature gnus
+(use-package gnus
   :bind (("s-m"   . gnus)
          ("s-M"   . gnus-unplugged))
   :init
@@ -1878,7 +1757,7 @@ For disabling the behaviour for certain buffers and/or modes."
      ("nnimap\\+uw:.*"
       (gcc-self . t)))
    gnus-large-newsgroup  50
-   gnus-home-directory   (no-littering-expand-var-file-name "gnus/")
+   gnus-home-directory   (b/var "gnus/")
    gnus-directory        (concat gnus-home-directory "news/")
    message-directory     (concat gnus-home-directory "mail/")
    nndraft-directory     (concat gnus-home-directory "drafts/")
@@ -1887,16 +1766,18 @@ For disabling the behaviour for certain buffers and/or modes."
    gnus-interactive-exit nil
    gnus-gcc-mark-as-read t)
   :config
-  (require 'ebdb)
-  (require 'ebdb-mua)
-  (require 'ebdb-gnus)
+  (comment
+    ;; TODO
+    (require 'ebdb)
+    (require 'ebdb-mua)
+    (require 'ebdb-gnus))
 
   ;; (gnus-registry-initialize)
 
   (with-eval-after-load 'recentf
     (add-to-list 'recentf-exclude gnus-home-directory)))
 
-(use-feature gnus-art
+(use-package gnus-art
   :config
   (setq
    gnus-buttonized-mime-types '("multipart/\\(signed\\|encrypted\\)")
@@ -1924,9 +1805,9 @@ For disabling the behaviour for certain buffers and/or modes."
    :map gnus-article-mode-map
    ("M-L" . org-store-link)))
 
-(use-feature gnus-sum
+(use-package gnus-sum
   :bind (:map gnus-summary-mode-map
-              :prefix-map mab/gnus-summary-prefix-map
+              :prefix-map b/gnus-summary-prefix-map
               :prefix "v"
               ("r" . gnus-summary-reply)
               ("w" . gnus-summary-wide-reply)
@@ -1935,23 +1816,23 @@ For disabling the behaviour for certain buffers and/or modes."
   (bind-keys
    :map gnus-summary-mode-map
    ("M-L" . org-store-link))
-  :hook (gnus-summary-mode . mab/no-mouse-autoselect-window))
+  :hook (gnus-summary-mode . b/no-mouse-autoselect-window))
 
-(use-feature gnus-msg
+(use-package gnus-msg
   :config
-  (defvar mab/signature "Amin Bandali
+  (defvar b/signature "Amin Bandali
 Free Software Activist | GNU Webmaster & Volunteer
 GPG: BE62 7373 8E61 6D6D 1B3A  08E8 A21A 0202 4881 6103
 https://shemshak.org/~amin")
-  (defvar mab/gnu-signature "Amin Bandali
+  (defvar b/gnu-signature "Amin Bandali
 Free Software Activist | GNU Webmaster & Volunteer
 GPG: BE62 7373 8E61 6D6D 1B3A  08E8 A21A 0202 4881 6103
 https://bandalis.org")
-  (defvar mab/uw-signature "Amin Bandali, MMath Student
+  (defvar b/uw-signature "Amin Bandali, MMath Student
 Cheriton School of Computer Science
 University of Waterloo
 https://bandalis.org")
-  (defvar mab/csc-signature "Amin Bandali
+  (defvar b/csc-signature "Amin Bandali
 Termcom, Computer Science Club
 University of Waterloo
 https://bandalis.org")
@@ -1959,64 +1840,64 @@ https://bandalis.org")
         '((".*"
            (address "amin@shemshak.org")
            (body "\nBest,\n")
-           (signature mab/signature)
-           (eval (setq mab/message-cite-say-hi t)))
+           (signature b/signature)
+           (eval (setq b/message-cite-say-hi t)))
           ("nnimap\\+gnu:.*"
            (address "bandali@gnu.org")
-           (signature mab/gnu-signature)
+           (signature b/gnu-signature)
            (eval (set (make-local-variable 'message-user-fqdn) "fencepost.gnu.org")))
           ((header "subject" "ThankCRM")
            (to "webmasters-comment@gnu.org")
            (body "")
-           (eval (setq mab/message-cite-say-hi nil)))
+           (eval (setq b/message-cite-say-hi nil)))
           ("nnimap\\+uw:.*"
            (address "abandali@uwaterloo.ca")
-           (signature mab/uw-signature))
+           (signature b/uw-signature))
           ("nnimap\\+uw:INBOX"
            (gcc "\"nnimap+uw:Sent Items\""))
           ("nnimap\\+csc:.*"
            (address "abandali@csclub.uwaterloo.ca")
-           (signature mab/csc-signature)
+           (signature b/csc-signature)
            (gcc "nnimap+csc:Sent")))))
 
-(use-feature gnus-topic
+(use-package gnus-topic
   :hook (gnus-group-mode . gnus-topic-mode)
   :config (setq gnus-topic-line-format "%i[ %A: %(%{%n%}%) ]%v\n"))
 
-(use-feature gnus-agent
+(use-package gnus-agent
   :config
   (setq gnus-agent-synchronize-flags 'ask)
   :hook (gnus-group-mode . gnus-agent-mode))
 
-(use-feature gnus-group
+(use-package gnus-group
   :config
   (setq gnus-permanently-visible-groups "\\(:INBOX$\\|:gnu$\\)"))
 
 (comment
   ;; problematic with ebdb's popup, *EBDB-Gnus*
-  (use-feature gnus-win
+  (use-package gnus-win
     :config
     (setq gnus-use-full-window nil)))
 
-(use-feature gnus-dired
+(use-package gnus-dired
   :commands gnus-dired-mode
   :init
   (add-hook 'dired-mode-hook 'gnus-dired-mode))
 
-(use-feature mm-decode
+(use-package mm-decode
   :config
   (setq mm-discouraged-alternatives '("text/html" "text/richtext")
         mm-decrypt-option 'known
         mm-verify-option 'known))
 
-(use-feature sendmail
+(use-package sendmail
   :config
   (setq sendmail-program (executable-find "msmtp")
         ;; message-sendmail-extra-arguments '("-v" "-d")
         mail-specify-envelope-from t
         mail-envelope-from 'header))
 
-(use-feature message
+(use-package message
   :config
   ;; redefine for a simplified In-Reply-To header
   ;; (see https://todo.sr.ht/~sircmpwn/lists.sr.ht/67)
@@ -2028,7 +1909,7 @@ https://bandalis.org")
         (when from
           msg-id))))
 
-  (defconst mab/message-cite-style-format "On %Y-%m-%d %l:%M %p, %N wrote:")
+  (defconst b/message-cite-style-format "On %Y-%m-%d %l:%M %p, %N wrote:")
   (defconst message-cite-style-bandali
     '((message-cite-function  'message-cite-original)
       (message-citation-line-function  'message-insert-formatted-citation-line)
@@ -2037,9 +1918,9 @@ https://bandalis.org")
       (message-yank-cited-prefix  ">")
       (message-yank-empty-prefix  ">")
       (message-citation-line-format
-       (if mab/message-cite-say-hi
-           (concat "Hi %F,\n\n" mab/message-cite-style-format)
-         mab/message-cite-style-format)))
+       (if b/message-cite-say-hi
+           (concat "Hi %F,\n\n" b/message-cite-style-format)
+         b/message-cite-style-format)))
     "Citation style based on Mozilla Thunderbird's. Use with message-cite-style.")
   (setq ;; message-cite-style 'message-cite-style-bandali
         message-kill-buffer-on-exit t
@@ -2049,7 +1930,9 @@ https://bandalis.org")
         '(gnus-find-subscribed-addresses)
         message-dont-reply-to-names
         "\\(\\(\\(amin\\|mab\\)@shemshak\\.org\\)\\|\\(amin@bndl\\.org\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(bandali\\|mab\\|aminb?\\)@gnu\\.org\\)\\|\\(a\\(min\\.\\)?bandali@uwaterloo\\.ca\\)\\|\\(abandali@csclub\\.uwaterloo\\.ca\\)\\)")
-  (require 'company-ebdb)
+  (comment
+    ;; TODO
+    (require 'company-ebdb))
   :hook (;; (message-setup . mml-secure-message-sign-pgpmime)
          (message-mode . flyspell-mode)
          (message-mode . (lambda ()
@@ -2063,15 +1946,15 @@ https://bandalis.org")
   ;; (message-header-cc      ((t (:foreground "#333" :weight normal))))
   )
 
-(use-feature mml
+(use-package mml
   :delight " mml")
 
-(use-feature mml-sec
+(use-package mml-sec
   :custom
   (mml-secure-openpgp-encrypt-to-self t)
   (mml-secure-openpgp-sign-with-sender t))
 
-(use-feature footnote
+(use-package footnote
   :after message
   ;; :config
   ;; (setq footnote-start-tag ""
@@ -2079,7 +1962,7 @@ https://bandalis.org")
   ;;       footnote-style     'unicode)
   :bind
   (:map message-mode-map
-        :prefix-map mab/footnote-prefix-map
+        :prefix-map b/footnote-prefix-map
         :prefix "C-c f"
         ("a" . footnote-add-footnote)
         ("b" . footnote-back-to-message)
@@ -2089,51 +1972,56 @@ https://bandalis.org")
         ("r" . footnote-renumber-footnotes)
         ("s" . footnote-set-style)))
 
-(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)))
+(comment
+  ;; TODO
+  (use-package ebdb
+    :straight (:host github :repo "girzel/ebdb")
+    :after gnus
+    :bind (:map gnus-group-mode-map ("e" . ebdb))
+    :config
+    (setq ebdb-sources (b/var "ebdb"))
+    (with-eval-after-load 'swiper
+      (add-to-list 'swiper-font-lock-exclude 'ebdb-mode t)))
 
-(use-feature ebdb-com
-  :after ebdb)
+  (use-package ebdb-com
+    :after ebdb)
 
-;; (use-package ebdb-complete
-;;   :after ebdb
-;;   :config
-;;   (ebdb-complete-enable))
+  ;; (use-package ebdb-complete
+  ;;   :after ebdb
+  ;;   :config
+  ;;   (ebdb-complete-enable))
 
-(use-package company-ebdb
-  :config
-  (defun company-ebdb--post-complete (_) nil))
+  (use-package company-ebdb
+    :config
+    (defun company-ebdb--post-complete (_) nil))
 
-(use-feature ebdb-gnus
-  :after ebdb
-  :custom
-  (ebdb-gnus-window-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-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-package ebdb-mua
+    :after ebdb
+    ;; :custom (ebdb-mua-pop-up nil)
+    )
 
-;; (use-package ebdb-message
-;;   :after ebdb)
+  ;; (use-package ebdb-message
+  ;;   :after ebdb)
 
 
-;; (use-package ebdb-vcard
-;;   :after ebdb)
+  ;; (use-package ebdb-vcard
+  ;;   :after ebdb)
+  )
 
-(use-package message-x)
+(comment
+  ;; TODO
+  (use-package message-x))
 
 (comment
   (use-package message-x
@@ -2159,7 +2047,7 @@ https://bandalis.org")
 
 ;;; IRC (with ERC and ZNC)
 
-(use-feature erc
+(use-package erc
   :bind (("C-c a e b" . erc-switch-to-buffer)
          :map erc-mode-map
          ("M-a" . erc-track-switch-buffer))
@@ -2187,21 +2075,23 @@ https://bandalis.org")
   (add-to-list 'erc-modules 'keep-place)
   (add-to-list 'erc-modules 'notifications)
   (add-to-list 'erc-modules 'spelling)
-  (add-to-list 'erc-modules 'scrolltoplace)
+  (comment
+    ;; TODO
+    (add-to-list 'erc-modules 'scrolltoplace))
   (erc-update-modules))
 
-(use-feature erc-fill
+(use-package erc-fill
   :after erc
   :custom
   (erc-fill-function 'erc-fill-static)
   (erc-fill-static-center 18))
 
-(use-feature erc-pcomplete
+(use-package erc-pcomplete
   :after erc
   :custom
   (erc-pcomplete-nick-postfix ","))
 
-(use-feature erc-track
+(use-package erc-track
   :after erc
   :custom
   (erc-track-enable-keybindings nil)
@@ -2213,11 +2103,13 @@ https://bandalis.org")
 (use-package erc-hl-nicks
   :after erc)
 
-(use-package erc-scrolltoplace
-  :after erc)
+(comment
+  ;; TODO
+  (use-package erc-scrolltoplace
+    :after erc))
 
 (use-package znc
-  :straight (:host nil :repo "https://git.shemshak.org/amin/znc.el")
+  :load-path "lisp/znc.el/"
   :bind (("C-c a e e" . znc-erc)
          ("C-c a e a" . znc-all))
   :config
@@ -2238,6 +2130,6 @@ https://bandalis.org")
 
 (message "Loading %s...done (%.3fs)" user-init-file
          (float-time (time-subtract (current-time)
-                                    mab/before-user-init-time)))
+                                    b/before-user-init-time)))
 
 ;;; init.el ends here
diff --git a/.emacs.d/lisp/znc.el b/.emacs.d/lisp/znc.el
new file mode 160000
+Subproject ee50cc596adab44cf5460ef62be2c6e3d745aa5
diff --git a/.emacs.d/straight/versions/default.el b/.emacs.d/straight/versions/default.el
deleted file mode 100644
index 5749d5a..0000000
--- a/.emacs.d/straight/versions/default.el
+++ /dev/null
@@ -1,108 +0,0 @@
-(("PG" . "aa36785c6e7166da0720e05ba708cdf22687a9d9")
- ("alert" . "ee1326aa8f1a0146ea10dc6f91d0a72584fa8b18")
- ("alloy-mode" . "0d05bdd10c77ec04c3d61eccf67e68c08284951f")
- ("auto-compile" . "f043133f37fe6d707fa03a1ec4ba619da24c2f35")
- ("biblio.el" . "efeeab720cb8e3f95ddb4298d0cc62393cf237e9")
- ("boxquote.el" . "7e47e0e2853bc1215739b2e28f260e9eed93b2c5")
- ("bui.el" . "508577a7225b3d07eaefa9444064410af2518675")
- ("circe" . "6ccd4b494cbae9d28091217654f052eaea321007")
- ("cl-lib" . "e79686c4a26959c0ecba0951a7e335ed28035386")
- ("closql" . "f2f1d7bc76153ec257cb13452075f51feb99f14e")
- ("company-ebdb" . "3b463fe1236ac6445657f3a1df20357a7a2fa8f6")
- ("company-mode" . "ad6ff0eecca99dc5ac8b6a8a6174df7d2ad88ae7")
- ("crux" . "308f17d914e2cd79cbc809de66d02b03ceb82859")
- ("dante" . "8090286a5dd498de281ce1b1c14a47b9913198c8")
- ("dash.el" . "77f3bf40c9c85386a50f2dab3dc950513f6f88bd")
- ("debbugs" . "b904a1615a6a059bec8bf6cf308f7ad9114d33f2")
- ("delight" . "02e73b69708e23053105866a58fe14f75c272dee")
- ("diff-hl" . "374b1d4b34876219218da7a539e7301259b56958")
- ("ebdb" . "2a87f5ed2a53e3a4e91e8c88ba5afc49f5e945df")
- ("edit-indirect" . "de645d8144e8a08f039a9c88185121ec81d957ef")
- ("elisp-refs" . "0a254e6a4dc7fa12857f8334fe6eefa72e49d1c9")
- ("emacs-async" . "bd68cc1ab1ac6af890e250bdaa12ffb1cb9649be")
- ("emacs-doom-themes" . "4be80b29416d58d2130e019b7337c8b87d70b56c")
- ("emacs-emojify" . "a16199dcf9b4688839eba00f1e356d9beac46cfe")
- ("emacs-htmlize" . "8db0aa6aab77475a732b7363f0d57bd3933c18fd")
- ("emacs-request" . "6888892644e42860ab0d4daf82943a0d012442f3")
- ("emacs-slack" . "df605f45f15f9e78c5e622827a5e31475859983b")
- ("emacs-websocket" . "d91a9aef5a3ec5af985e5185c3b237fdd24605e0")
- ("emacs-which-key" . "da2e093e916bf9ae7512c104512b92eca8fb224e")
- ("emacsmirror-mirror" . "b6fb3d92da03998c6b81655038b561d17af0189e")
- ("emacsql" . "a118b6c95af1306f0288a383d274b5dd93efbbda")
- ("emmet-mode" . "1acb821e0142136344ccf40c1e5fb664d7db2e70")
- ("epl" . "78ab7a85c08222cd15582a298a364774e3282ce6")
- ("erc-hl-nicks" . "756c4438a8245ccd3e389bf6c9850ee8453783ec")
- ("erc-scrolltoplace" . "feb0fbf1fd4bdf220ae2d31ea7c066d8e62089f9")
- ("eshell-up" . "9c100bae5c3020e8d9307e4332d3b64e7dc28519")
- ("exec-path-from-shell" . "3cfedb8791397ed50ee66bc0a7cbee5b9d78245c")
- ("expand-region.el" . "1c31447730443d98f90f65dfcb752f347d46ad1b")
- ("f.el" . "8191672377816a1975414cc1f116fd3b94b30bd0")
- ("flycheck" . "1555b185ab2b5f1ec99536a641fff545fd8aa6bf")
- ("flycheck-haskell" . "32ddff87165a7d3a35e7318bee997b5b4bd41278")
- ("forge" . "1b940e5ac3ec98c7bd5e9b2364a3c5b1d61d3ffd")
- ("geiser" . "fbdfbee56a03a1a0396d61fdc8f0b0af87273fc9")
- ("ghub" . "a8191c6a63dfa630af418105b58434266859d21b")
- ("gntp.el" . "767571135e2c0985944017dc59b0be79af222ef5")
- ("gnu-elpa-mirror" . "abc8e638f0e846785c5633a97545015e0ed7fa12")
- ("go-mode.el" . "77c6aae6cb748127c2a533b568332df2eba65f7c")
- ("guix.el" . "11e0dbf6491300d250efb3dc09d634b01e86b35b")
- ("haskell-mode" . "9623545dfb0724fb347959e8a6262680667cde84")
- ("helm" . "fba8b267b7d967a1379863828b71cdb974b1b8c6")
- ("helm-bibtex" . "8978ba5236af767023976c5b793a2b3e29e43c7a")
- ("helpful" . "8ac851e7c0f8345046d053d136befe28fd75dcd9")
- ("hl-todo" . "3010adfe09ee64cf403c2c7806581e5ea6823d05")
- ("hlint-refactor-mode" . "c4307f86aad6d02e32e9b30cb6edc115584c791c")
- ("ht.el" . "5650a8cd190badb49d28d21e72a2f55c9380de7b")
- ("hydra" . "a91dd72529aadd2d3cc14e132a3e0545eb2975a6")
- ("key-chord" . "72443e9ff3c4f1c3ccaced3130236801efde3d83")
- ("lcr" . "c14f40692292d59156c7632dbdd2867c086aa75f")
- ("lean-mode" . "9d6b8471e2044310b4cd7cd3213b1fc8f78ec499")
- ("let-alist" . "faa72a357328add64ce2dfe7e8438549ae71d66a")
- ("log4e" . "c69424e407be0d9d0e54b427d8b18b1ac5a607e2")
- ("loop.el" . "e22807f83a0890dc8a904c51ee0742c34efccc6c")
- ("magit" . "2657293c6dcd32b4e05dc11aa97f66220b2cb8ba")
- ("magit-popup" . "4250c3a606011e3ff2477e3b5bbde2b493f3c85c")
- ("markdown-mode" . "115f77df9755c6a453f3e5d9623ff885d207ea82")
- ("melpa" . "aecfc82727d408eb3120f76ace1ed7207ff5e5f1")
- ("message-x" . "5524de7bbfdd8749c110f48de5afb024d9f83133")
- ("multi-term" . "0804b11e52b960c80f5cd0712ee1e53ae70d83a4")
- ("multiple-cursors.el" . "5ffb19af48bf8a76ddc9f81745be052f050bddef")
- ("mwim.el" . "b4f3edb4c0fb8f8b71cecbf8095c2c25a8ffbf85")
- ("nadvice" . "2dfcf614dc5472fb21e48f93d0ebb4546276377f")
- ("no-littering" . "7480853e0fe7d3ddd89407122ebe8068f96ae579")
- ("oauth2" . "bf4903b5a4a2af0327832bdcb20f3149176e1c1d")
- ("org" . "2d08e9d4be87489045c33792ddbc368eba188e04")
- ("org-ref" . "45152736e332e50f8257248efbb31e069a2c81c5")
- ("packed" . "f350cc446c65b85bcc213265cd6dcadee1568762")
- ("page-break-lines" . "6f19d894bda6a981c10a58df5e23419f4d2ba353")
- ("parsebib" . "9a5f1730b8ef1fb6c29262a8ba79f8136e5548d4")
- ("pass" . "ba6a3f695acb380e1457a29a0d13b22641f72c4f")
- ("password-store" . "c22cdbd4674a25dec71fe42ec1ef0b4829b6c7f3")
- ("password-store-otp.el" . "04998c8578a060ab4a4e8f46f2ee0aafad4ab4d5")
- ("pdf-tools" . "db7de3901ae0e55f6ab8cf9baec257f706c3d16e")
- ("pinentry" . "cd942f755c38a7ac270ce858bb887ebdd59edd26")
- ("pkg-info.el" . "76ba7415480687d05a4353b27fea2ae02b8d9d61")
- ("po-mode" . "1916142f6a817c733d5ec37e3b4fbae3da67e499")
- ("popup-el" . "80829dd46381754639fb764da11c67235fe63282")
- ("projectile" . "71a01f409a319d57eb3832e93e8a412fbc9d7a65")
- ("rich-minority" . "a03e693f6f9232cf75363aaaf1cb041f21675c19")
- ("s.el" . "03410e6a7a2b11e47e1fea3b7d9899c7df26435e")
- ("seq" . "095fb15a3baa082079799dd36b6caccdb062cb90")
- ("shrink-path.el" . "9d06c453d1537df46a4b703a29213cc7f7857aa0")
- ("smart-mode-line" . "999be065b195f2eddb4e1b629f99038d832d44b7")
- ("smex" . "55aaebe3d793c2c990b39a302eb26c184281c42c")
- ("soap-client" . "53a0bf9dd741acfeb799b0652d65f577c088b333")
- ("straight.el" . "323dd77da15a1f01a8860e5b4c246ea32c2a5607")
- ("swiper" . "1a4ebdaff8cf67faa69f412e6fa9ed2743c6bc92")
- ("switch-buffer-functions-el" . "b8d8e01e21ae8c8c84234dddeb3cc8250814f7ba")
- ("tablist" . "8079801527da1f596bc942162026328d7bdf6ad9")
- ("transient" . "01a166fcb8bbd9918ba741e9b5428a4b524eab33")
- ("treepy.el" . "b40e6b09eb9be45da67b8c9e4990a5a0d7a2a09d")
- ("typoel" . "9dad93b6f367f02f52c8d9bf15d446d922cec294")
- ("unkillable-scratch" . "b24c2a760529833f230c14cb02ff6e7ec92288ab")
- ("use-package" . "1d5ffb2e0d1427066ced58febbba68c1328bf001")
- ("web-mode" . "a723d3ecd3606d1c1948871f46fc8c8d7f879fe4")
- ("with-editor" . "45c29f9bfb7f2df93426ce1571e2f4f41ed4e492")
- ("yasnippet" . "d91dd66f2aed9bbaef32813a68b105ea77e83890")
- ("znc" . "ee50cc596adab44cf5460ef62be2c6e3d745aa5b"))
-:pluto
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..098fb79
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule ".emacs.d/lisp/znc.el"]
+	path = .emacs.d/lisp/znc.el
+	url = https://git.shemshak.org/amin/znc.el
diff --git a/.gnupg/gpg-agent.conf b/.gnupg/gpg-agent.conf
index 6b5bd7d..b0ff3ac 100644
--- a/.gnupg/gpg-agent.conf
+++ b/.gnupg/gpg-agent.conf
@@ -4,6 +4,6 @@ max-cache-ttl 43200
 default-cache-ttl-ssh 10800
 max-cache-ttl-ssh 10800
 
-# allow-emacs-pinentry
+pinentry-program /home/bandali/.guix-profile/bin/pinentry-emacs
+allow-emacs-pinentry
 allow-loopback-pinentry
-pinentry-program /usr/bin/pinentry-gnome3