emacs: use custom function for killing current buffer

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

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index deb88ba..e36e204 100644 (file)
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -1,6 +1,6 @@
-;;; init.el --- bandali's emacs configuration -*- lexical-binding: t -*-
+;;; init.el --- mab's emacs configuration -*- lexical-binding: t -*-

 
 

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

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


@@ -17,9 +17,11 @@
 
 ;;; Commentary:
 
 
 ;;; 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.
+;; Emacs configuration of Amin Bandali, computer scientist, free
+;; software activist, GNU maintainer & webmaster.  Packages are
+;; installed from GNU Guix, for purely functional and fully
+;; reproducible package management.  Before switching to GNU Guix,
+;; I used straight.el for package management, and before that, Borg.

 
 ;; Over the years, I've taken inspiration from configurations of many
 ;; great people.  Some that I can remember off the top of my head are:
 
 ;; Over the years, I've taken inspiration from configurations of many
 ;; great people.  Some that I can remember off the top of my head are:


@@ -80,7 +82,7 @@
 ;;; whoami
 
 (setq user-full-name "Amin Bandali"
 ;;; whoami
 
 (setq user-full-name "Amin Bandali"

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

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


@@ -94,80 +96,16 @@
 \f
 ;;; Package management
 
 \f
 ;;; Package management
 

-;; No package.el  (for emacs 26 and before, uncomment the following)
-;; Not necessary when using straight.el
-;;   (C-h v straight-package-neutering-mode RET)
-
-(when (and
-       (not (featurep 'straight))
-       (version< emacs-version "27"))
+;; No package.el  (for emacs 26 and before)
+(when (version< emacs-version "27")

   (setq package-enable-at-startup nil)
   ;; (package-initialize)
   )
   (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
 
 ;; 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 b/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...
-
-(b/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 1))
-  `(use-package ,name
-     :straight nil
-     ,@args))
-
-(with-eval-after-load 'use-package-core
-  (let ((upflk (car use-package-font-lock-keywords)))
-    (font-lock-add-keywords
-     'emacs-lisp-mode
-     `((,(replace-regexp-in-string
-          "use-package" "use-feature"
-          (car upflk))
-        ,@(cdr upflk))))))
-
-(with-eval-after-load 'recentf
-  (add-to-list 'recentf-exclude
-               (expand-file-name "~/.emacs.d/straight/build/")))
-
-(defun b/reload-init ()
-  "Reload `user-init-file'."
-  (interactive)
-  (setq b/before-user-init-time   (current-time)
-        b/file-name-handler-alist file-name-handler-alist)
-  (load user-init-file nil 'nomessage)
-  (b/post-init))

 
 ;; use-package
 
 ;; use-package

-(straight-use-package 'use-package)
-

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


@@ -181,11 +119,12 @@
 (setq use-package-always-defer t)
 (require 'bind-key)
 
 (setq use-package-always-defer t)
 (require 'bind-key)
 

-(use-package delight)
-

 \f
 ;;; Initial setup
 
 \f
 ;;; Initial setup
 

+(defvar b/exwm-p (string= (system-name) "jirud")
+  "Whether or not we will be using `exwm'.")
+

 ;; keep ~/.emacs.d clean
 (use-package no-littering
   :demand
 ;; keep ~/.emacs.d clean
 (use-package no-littering
   :demand


@@ -194,7 +133,7 @@
   (defalias 'b/var 'no-littering-expand-var-file-name))
 
 ;; separate custom file (don't want it mixing with init.el)
   (defalias 'b/var 'no-littering-expand-var-file-name))
 
 ;; separate custom file (don't want it mixing with init.el)

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

   :no-require
   :config
   (setq custom-file (b/etc "custom.el"))
   :no-require
   :config
   (setq custom-file (b/etc "custom.el"))


@@ -227,7 +166,7 @@
 
 ;; start up emacs server.  see
 ;; https://www.gnu.org/software/emacs/manual/html_node/emacs/Emacs-Server.html#Emacs-Server
 
 ;; start up emacs server.  see
 ;; https://www.gnu.org/software/emacs/manual/html_node/emacs/Emacs-Server.html#Emacs-Server

-(use-feature server
+(use-package server

   :defer 0.4
   :config (or (server-running-p) (server-mode)))
 
   :defer 0.4
   :config (or (server-running-p) (server-mode)))
 


@@ -265,12 +204,34 @@
   (previous-line)
   (insert "\n\f\n;;; "))
 
   (previous-line)
   (insert "\n\f\n;;; "))
 

+;; (defvar b/fill-column 47
+;;   "My custom `fill-column'.")
+
+(defconst b/asterism "* * *")
+
+(defun b/insert-asterism ()
+  "Insert a centred asterism."
+  (interactive)
+  (insert
+   (concat
+    "\n\n"
+    (make-string (floor (/ (- fill-column (length b/asterism)) 2))
+                 ?\s)
+    b/asterism
+    "\n\n")))
+

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

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

 \f
 ;;; Defaults
 
 \f
 ;;; Defaults
 


@@ -340,7 +301,7 @@ For disabling the behaviour for certain buffers and/or modes."
 
 ;;;; Elisp-level customizations
 
 
 ;;;; Elisp-level customizations
 

-(use-feature startup
+(use-package startup

   :no-require
   :demand
   :config
   :no-require
   :demand
   :config


@@ -359,7 +320,7 @@ For disabling the behaviour for certain buffers and/or modes."
   (inhibit-startup-screen t)
   (inhibit-startup-echo-area-message user-login-name))
 
   (inhibit-startup-screen t)
   (inhibit-startup-echo-area-message user-login-name))
 

-(use-feature files
+(use-package files

   :no-require
   :demand
   :custom
   :no-require
   :demand
   :custom


@@ -386,7 +347,7 @@ For disabling the behaviour for certain buffers and/or modes."
 (defalias 'yes-or-no-p #'y-or-n-p)
 
 ;; enable automatic reloading of changed buffers and files
 (defalias 'yes-or-no-p #'y-or-n-p)
 
 ;; enable automatic reloading of changed buffers and files

-(use-feature autorevert
+(use-package autorevert

   :demand
   :config
   (global-auto-revert-mode 1)
   :demand
   :config
   (global-auto-revert-mode 1)


@@ -395,31 +356,39 @@ For disabling the behaviour for certain buffers and/or modes."
   (global-auto-revert-non-file-buffers nil))
 
 ;; time and battery in mode-line
   (global-auto-revert-non-file-buffers nil))
 
 ;; time and battery in mode-line

-(comment
-  (use-feature time
-    :init
-    (setq display-time-default-load-average nil)
-    :config
-    (display-time-mode))
+(use-package time
+  :if b/exwm-p
+  :demand
+  :config
+  (display-time-mode)
+  :custom
+  (display-time-default-load-average nil)
+  (display-time-format "%a %b %-e, %-l:%M%P")
+  (display-time-mail-icon '(image :type xpm :file "gnus/gnus-pointer.xpm" :ascent center))
+  (display-time-use-mail-icon t))

 
 

-  (use-feature battery
-    :config
-    (display-battery-mode)))
+(use-package battery
+  :if b/exwm-p
+  :demand
+  :config
+  (display-battery-mode)
+  :custom
+  (battery-mode-line-format " %p%% %t"))

 
 

-(use-feature fringe
+(use-package fringe

   :demand
   :config
   ;; smaller fringe
   ;; (fringe-mode '(3 . 1))
   (fringe-mode nil))
 
   :demand
   :config
   ;; smaller fringe
   ;; (fringe-mode '(3 . 1))
   (fringe-mode nil))
 

-(use-feature winner
+(use-package winner

   :demand
   :config
   ;; enable winner-mode (C-h f winner-mode RET)
   (winner-mode 1))
 
   :demand
   :config
   ;; enable winner-mode (C-h f winner-mode RET)
   (winner-mode 1))
 

-(use-feature compile
+(use-package compile

   :config
   ;; don't display *compilation* buffer on success.  based on
   ;; https://stackoverflow.com/a/17788551, with changes to use `cl-letf'
   :config
   ;; don't display *compilation* buffer on success.  based on
   ;; https://stackoverflow.com/a/17788551, with changes to use `cl-letf'


@@ -442,7 +411,7 @@ For disabling the behaviour for certain buffers and/or modes."
       ad-do-it))
   (ad-activate 'compilation-start))
 
       ad-do-it))
   (ad-activate 'compilation-start))
 

-(use-feature isearch
+(use-package isearch

   :custom
   ;; allow scrolling in Isearch
   (isearch-allow-scroll t)
   :custom
   ;; allow scrolling in Isearch
   (isearch-allow-scroll t)


@@ -454,37 +423,64 @@ For disabling the behaviour for certain buffers and/or modes."
 
 ;; uncomment to extend the above behaviour to query-replace
 (comment
 
 ;; uncomment to extend the above behaviour to query-replace
 (comment

-  (use-feature replace
+  (use-package replace

     :custom
     (replace-char-fold t)))
 
     :custom
     (replace-char-fold t)))
 

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

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

-(use-feature ediff
+(use-package vc-git
+  :after vc
+  :custom
+  (vc-git-print-log-follow t))
+
+(use-package ediff

   :config (add-hook 'ediff-after-quit-hook-internal 'winner-undo)
   :custom ((ediff-window-setup-function 'ediff-setup-windows-plain)
            (ediff-split-window-function 'split-window-horizontally)))
 
   :config (add-hook 'ediff-after-quit-hook-internal 'winner-undo)
   :custom ((ediff-window-setup-function 'ediff-setup-windows-plain)
            (ediff-split-window-function 'split-window-horizontally)))
 

-(use-feature face-remap
+(use-package face-remap

   :custom
   ;; gentler font resizing
   (text-scale-mode-step 1.05))
 
   :custom
   ;; gentler font resizing
   (text-scale-mode-step 1.05))
 

-(use-feature mwheel
+(use-package mwheel

   :defer 0.4
   :config
   (setq mouse-wheel-scroll-amount '(1 ((shift) . 1)) ; one line at a time
         mouse-wheel-progressive-speed nil            ; don't accelerate scrolling
         mouse-wheel-follow-mouse t))                 ; scroll window under mouse
 
   :defer 0.4
   :config
   (setq mouse-wheel-scroll-amount '(1 ((shift) . 1)) ; one line at a time
         mouse-wheel-progressive-speed nil            ; don't accelerate scrolling
         mouse-wheel-follow-mouse t))                 ; scroll window under mouse
 

-(use-feature pixel-scroll
+(use-package pixel-scroll

   :defer 0.4
   :config (pixel-scroll-mode 1))
 
   :defer 0.4
   :config (pixel-scroll-mode 1))
 

-(use-feature epg-config
+(use-package epg-config
+  :config
+  ;; ask for GPG passphrase in minibuffer
+  ;; this will fail if gpg>=2.1 is not available
+  (if (version< "27" emacs-version)
+      (setq epg-pinentry-mode 'loopback)
+    (setq epa-pinentry-mode 'loopback))
+  :custom
+  (epg-gpg-program (executable-find "gpg")))
+
+(use-package epg
+  :after epg-config)
+
+(use-package pinentry
+  :demand
+  :after (epa epg server)
+  :config
+  ;; workaround for systemd-based distros:
+  ;; (setq pinentry--socket-dir server-socket-dir)
+  (pinentry-start))
+
+(use-package auth-source

   :custom
   :custom

-  ((epg-gpg-program (executable-find "gpg"))))
+  (auth-sources '("~/.authinfo.gpg"))
+  (authinfo-hidden (regexp-opt '("password" "client-secret" "token"))))

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


@@ -507,7 +503,7 @@ For disabling the behaviour for certain buffers and/or modes."
  ("C-S-h C" . describe-char)
  ("C-S-h F" . describe-face)
 
  ("C-S-h C" . describe-char)
  ("C-S-h F" . describe-face)
 

- ("C-x k"   . kill-this-buffer)
+ ("C-x k"   . b/kill-current-buffer)

  ("C-x K"   . kill-buffer)
  ("C-x s"   . save-buffer)
  ("C-x S"   . save-some-buffers)
  ("C-x K"   . kill-buffer)
  ("C-x s"   . save-buffer)
  ("C-x S"   . save-some-buffers)


@@ -522,216 +518,232 @@ For disabling the behaviour for certain buffers and/or modes."
  ;; for back and forward mouse keys
  ("<XF86Back>"     . previous-buffer)
  ("<mouse-8>"      . previous-buffer)
  ;; for back and forward mouse keys
  ("<XF86Back>"     . previous-buffer)
  ("<mouse-8>"      . previous-buffer)

- ("<drag-mouse-8>" . previous-buffer)
+ ;; ("<drag-mouse-8>" . previous-buffer)

  ("<XF86Forward>"  . next-buffer)
  ("<mouse-9>"      . next-buffer)
  ("<XF86Forward>"  . next-buffer)
  ("<mouse-9>"      . next-buffer)

- ("<drag-mouse-9>" . next-buffer)
- ("<drag-mouse-2>" . kill-this-buffer)
- ("<drag-mouse-3>" . ivy-switch-buffer))
-
-(bind-keys
- :prefix-map b/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" . b/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))
+ ;; ("<drag-mouse-9>" . next-buffer)
+ ;; ("<drag-mouse-2>" . kill-this-buffer)
+ ;; ("<drag-mouse-3>" . switch-to-buffer)
+ )

 
 \f
 ;;; Essential packages
 
 (use-package exwm
 
 \f
 ;;; Essential packages
 
 (use-package exwm

-  :disabled
+  :if b/exwm-p

   :demand
   :config
   :demand
   :config

-  (require 'exwm-config)
-
-  ;; Set the initial workspace number.
-  (setq exwm-workspace-number 4)
-
-  ;; Make class name the buffer name, truncating beyond 50 characters
-  (defun exwm-rename-buffer ()
+  ;; make class name the buffer name, truncating beyond 60 characters
+  (defun b/exwm-rename-buffer ()

     (interactive)
     (exwm-workspace-rename-buffer
      (concat exwm-class-name ":"
     (interactive)
     (exwm-workspace-rename-buffer
      (concat exwm-class-name ":"

-             (if (<= (length exwm-title) 50) exwm-title
-               (concat (substring exwm-title 0 49) "...")))))
-  (add-hook 'exwm-update-class-hook 'exwm-rename-buffer)
-  (add-hook 'exwm-update-title-hook 'exwm-rename-buffer)
-
-  ;; 's-R': Reset
-  (exwm-input-set-key (kbd "s-R") #'exwm-reset)
-  ;; 's-\': Switch workspace
-  (exwm-input-set-key (kbd "s-\\") #'exwm-workspace-switch)
-  ;; 's-N': Switch to certain workspace
-  (dotimes (i 10)
-    (exwm-input-set-key
-     (kbd (format "s-%d" i))
-     (lambda ()
-       (interactive)
-       (exwm-workspace-switch-create i))))
-  ;; 's-SPC': Launch application
-  ;; (exwm-input-set-key
-  ;;  (kbd "s-SPC")
-  ;;  (lambda (command)
-  ;;    (interactive (list (read-shell-command "➜ ")))
-  ;;    (start-process-shell-command command nil command)))
-
-  (exwm-input-set-key (kbd "M-s-SPC") #'counsel-linux-app)
-
-  ;; Shorten 'C-c C-q' to 'C-q'
-  (define-key exwm-mode-map [?\C-q] #'exwm-input-send-next-key)
-
-  ;; Line-editing shortcuts
-  (setq exwm-input-simulation-keys
-       '(;; movement
-          ([?\C-b] . [left])
-          ([?\M-b] . [C-left])
-          ([?\C-f] . [right])
-          ([?\M-f] . [C-right])
-          ([?\C-p] . [up])
-          ([?\C-n] . [down])
-          ([?\C-a] . [home])
-          ([?\C-e] . [end])
-          ([?\M-v] . [prior])
-          ([?\C-v] . [next])
-          ([?\C-d] . [delete])
-          ([?\C-k] . [S-end delete])
-          ;; cut/copy/paste
-          ;; ([?\C-w] . [?\C-x])
-          ([?\M-w] . [?\C-c])
-          ([?\C-y] . [?\C-v])
-          ;; search
-          ([?\C-s] . [?\C-f])))
-
+             (if (<= (length exwm-title) 60) exwm-title
+               (concat (substring exwm-title 0 59) "...")))))

   ;; Enable EXWM
   (exwm-enable)
   ;; Enable EXWM
   (exwm-enable)

+  :hook ((exwm-update-class . b/exwm-rename-buffer)
+         (exwm-update-title . b/exwm-rename-buffer)))

 
 

-  (add-hook 'exwm-init-hook #'exwm-config--fix/ido-buffer-window-other-frame)
+(use-package exwm-config
+  :demand
+  :after exwm
+  :hook (exwm-init . exwm-config--fix/ido-buffer-window-other-frame))

 
 

-  (require 'exwm-systemtray)
-  (exwm-systemtray-enable)
+(use-package exwm-input
+  :demand
+  :after exwm
+  :config
+  (defun b/exwm-ws-prev-index ()
+    "Return the index for the previous EXWM workspace, wrapping
+around if needed."
+    (if (= exwm-workspace-current-index 0)
+        (1- exwm-workspace-number)
+      (1- exwm-workspace-current-index)))
+
+  (defun b/exwm-ws-next-index ()
+    "Return the index for the next EXWM workspace, wrapping
+around if needed."
+    (if (= exwm-workspace-current-index
+           (1- exwm-workspace-number))
+        0
+      (1+ exwm-workspace-current-index)))
+
+  ;; shorten 'C-c C-q' to 'C-q'
+  (define-key exwm-mode-map [?\C-q] #'exwm-input-send-next-key)

 
 

-  (require 'exwm-randr)
+  (setq exwm-workspace-number 4
+        exwm-input-global-keys
+        `(([?\s-R] . exwm-reset)
+          ([?\s-\\] . exwm-workspace-switch)
+          ([?\s-\s] . dmenu)
+          ([?\S-\s-\s] . (lambda (command)
+                              (interactive
+                               (list (read-shell-command "➜ ")))
+                              (start-process-shell-command
+                               command nil command)))
+          ([s-return] . (lambda ()
+                          (interactive)
+                          (start-process "" nil "urxvt")))
+          ([?\C-\s-\s] . counsel-linux-app)
+          ([?\M-\s-\s] . (lambda ()
+                           (interactive)
+                           (start-process-shell-command
+                            "rofi-pass" nil "rofi-pass")))
+          ([?\s-h] . windmove-left)
+          ([?\s-j] . windmove-down)
+          ([?\s-k] . windmove-up)
+          ([?\s-l] . windmove-right)
+          ([?\s-H] . windmove-swap-states-left)
+          ([?\s-J] . windmove-swap-states-down)
+          ([?\s-K] . windmove-swap-states-up)
+          ([?\s-L] . windmove-swap-states-right)
+          ([?\M-\s-h] . shrink-window-horizontally)
+          ([?\M-\s-l] . enlarge-window-horizontally)
+          ([?\M-\s-k] . shrink-window)
+          ([?\M-\s-j] . enlarge-window)
+          ([?\s-\[] . (lambda ()
+                        (interactive)
+                        (exwm-workspace-switch-create
+                         (b/exwm-ws-prev-index))))
+          ([?\s-\]] . (lambda ()
+                        (interactive)
+                        (exwm-workspace-switch-create
+                         (b/exwm-ws-next-index))))
+          ([?\s-{] . (lambda ()
+                       (interactive)
+                       (exwm-workspace-move-window
+                        (b/exwm-ws-prev-index))))
+          ([?\s-}] . (lambda ()
+                       (interactive)
+                       (exwm-workspace-move-window
+                        (b/exwm-ws-next-index))))
+          ,@(mapcar (lambda (i)
+                      `(,(kbd (format "s-%d" i)) .
+                        (lambda ()
+                          (interactive)
+                          (exwm-workspace-switch-create ,i))))
+                    (number-sequence 0 (1- exwm-workspace-number)))
+          ([?\s-t] . exwm-floating-toggle-floating)
+          ([?\s-f] . exwm-layout-toggle-fullscreen)
+          ([?\s-W] . (lambda ()
+                       (interactive)
+                       (kill-buffer (current-buffer))))
+          ([?\s-Q] . (lambda ()
+                       (interactive)
+                       (exwm-manage--kill-client)))
+          ([?\s-\'] . (lambda ()
+                        (interactive)
+                        (start-process-shell-command
+                         "rofi-light" nil "rofi-light")))
+          ([XF86AudioMute] .
+           (lambda ()
+             (interactive)
+             (start-process "" nil "pamixer" "--toggle-mute")))
+          ([XF86AudioLowerVolume] .
+           (lambda ()
+             (interactive)
+             (start-process
+              "" nil "pamixer" "--allow-boost" "--decrease" "5")))
+          ([XF86AudioRaiseVolume] .
+           (lambda ()
+             (interactive)
+             (start-process
+              "" nil "pamixer" "--allow-boost" "--increase" "5")))
+          ([XF86AudioPlay] .
+           (lambda ()
+             (interactive)
+             (start-process "" nil "mpc" "toggle")))
+          ([XF86AudioPrev] .
+           (lambda ()
+             (interactive)
+             (start-process "" nil "mpc" "prev")))
+          ([XF86AudioNext] .
+           (lambda ()
+             (interactive)
+             (start-process "" nil "mpc" "next")))
+          ([XF86ScreenSaver] .
+           (lambda ()
+                    (interactive)
+                    (start-process "" nil "dm-tool" "lock")))
+          ([\s-XF86Back] . previous-buffer)
+          ([\s-XF86Forward] . next-buffer)))
+
+  ;; Line-editing shortcuts
+  (setq exwm-input-simulation-keys
+    '(;; movement
+      ([?\C-b] . [left])
+      ([?\M-b] . [C-left])
+      ([?\C-f] . [right])
+      ([?\M-f] . [C-right])
+      ([?\C-p] . [up])
+      ([?\C-n] . [down])
+      ([?\C-a] . [home])
+      ([?\C-e] . [end])
+      ([?\M-v] . [prior])
+      ([?\C-v] . [next])
+      ([?\C-d] . [delete])
+      ([?\C-k] . [S-end ?\C-x])
+      ([?\M-<] . C-home)
+      ([?\M->] . C-end)
+      ;; cut/copy/paste
+      ([?\C-w] . [?\C-x])
+      ([?\M-w] . [?\C-c])
+      ([?\C-y] . [?\C-v])
+      ([?\M-d] . [C-S-right ?\C-x])
+      ([?\M-\d] . [C-S-left ?\C-x])
+      ;; window
+      ([?\s-w] . [?\C-w])
+      ([?\s-q] . [?\C-q])
+      ;; misc
+      ([?\C-s] . [?\C-f])
+      ([?\s-s] . [?\C-s])
+      ([?\C-g] . [escape]))))
+
+(use-package exwm-manage
+  :demand
+  :after exwm
+  :hook
+  (exwm-manage-finish . (lambda ()
+                          (when exwm-class-name
+                            (cond
+                             ((string= exwm-class-name "Abrowser")
+                              (exwm-input-set-local-simulation-keys
+                               `(,@exwm-input-simulation-keys
+                                 ([?\C-\S-d] . [?\C-d]))))
+                             ((string= exwm-class-name "URxvt")
+                              (exwm-input-set-local-simulation-keys
+                               '(([?\C-c ?\C-c] . [?\C-c])
+                                 ([?\C-c ?\C-u] . [?\C-u]))))
+                             ((string= exwm-class-name "Zathura")
+                              (exwm-input-set-local-simulation-keys
+                               '(([?\C-p] . [C-up])
+                                 ([?\C-n] . [C-down])))))))))
+
+(use-package exwm-randr
+  :demand
+  :after exwm
+  :config

   (exwm-randr-enable)
   (exwm-randr-enable)

+  :custom
+  (exwm-randr-workspace-monitor-plist '(1 "VGA-1")))

 
 

-  ;; (exwm-input-set-key
-  ;;  (kbd "s-<return>")
-  ;;  (lambda ()
-  ;;    (interactive)
-  ;;    (start-process "urxvt" nil "urxvt")))
-
-  ;; (exwm-input-set-key
-  ;;  (kbd "s-SPC")  ;; rofi doesn't properly launch programs when started from emacs
-  ;;  (lambda ()
-  ;;    (interactive)
-  ;;    (start-process-shell-command "rofi-run" nil "rofi -show run -display-run '> ' -display-window ' 🗔 '")))
-
-  ;; (exwm-input-set-key
-  ;;  (kbd "s-/")
-  ;;  (lambda ()
-  ;;    (interactive)
-  ;;    (start-process-shell-command "rofi-win" nil "rofi -show window  -display-run '> ' -display-window ' 🗔 '")))
-
-  ;; (exwm-input-set-key
-  ;;  (kbd "M-SPC")
-  ;;  (lambda ()
-  ;;    (interactive)
-  ;;    (start-process "rofi-pass" nil "rofi-pass")))
-
-  ;; (exwm-input-set-key
-  ;;  (kbd "<XF86AudioMute>")
-  ;;  (lambda ()
-  ;;    (interactive)
-  ;;    (start-process-shell-command "pamixer" nil "pamixer --toggle-mute")))
-
-  ;; (exwm-input-set-key
-  ;;  (kbd "<XF86AudioLowerVolume>")
-  ;;  (lambda ()
-  ;;    (interactive)
-  ;;    (start-process-shell-command "pamixer" nil "pamixer --allow-boost --decrease 5")))
-
-  ;; (exwm-input-set-key
-  ;;  (kbd "<XF86AudioRaiseVolume>")
-  ;;  (lambda ()
-  ;;    (interactive)
-  ;;    (start-process-shell-command "pamixer" nil "pamixer --allow-boost --increase 5")))
-
-  ;; (exwm-input-set-key
-  ;;  (kbd "<XF86AudioPlay>")
-  ;;  (lambda ()
-  ;;    (interactive)
-  ;;    (start-process-shell-command "mpc" nil "mpc toggle")))
-
-  ;; (exwm-input-set-key
-  ;;  (kbd "<XF86AudioPrev>")
-  ;;  (lambda ()
-  ;;    (interactive)
-  ;;    (start-process-shell-command "mpc" nil "mpc prev")))
-
-  ;; (exwm-input-set-key
-  ;;  (kbd "<XF86AudioNext>")
-  ;;  (lambda ()
-  ;;    (interactive)
-  ;;    (start-process-shell-command "mpc" nil "mpv next")))
-
-  (defun b/exwm-pasystray ()
-    "A command used to start pasystray."
-    (interactive)
-    (if (executable-find "pasystray")
-       (progn
-          (message "EXWM: starting pasystray ...")
-          (start-process-shell-command "pasystray" nil "pasystray --notify=all"))
-      (message "EXWM: pasystray is not installed, abort!")))
-
-  (add-hook 'exwm-init-hook #'b/exwm-pasystray)
-
-  (exwm-input-set-key
-   (kbd "s-t")
-   (lambda ()
-     (interactive)
-     (exwm-floating-toggle-floating)))
-
-  (exwm-input-set-key
-   (kbd "s-f")
-   (lambda ()
-     (interactive)
-     (exwm-layout-toggle-fullscreen)))
-
-  (exwm-input-set-key
-   (kbd "s-w")
-   (lambda ()
-     (interactive)
-     (kill-buffer (current-buffer))))
-
-  (exwm-input-set-key
-   (kbd "s-q")
-   (lambda ()
-     (interactive)
-     (exwm-manage--kill-client))))
+(use-package exwm-systemtray
+  :demand
+  :after exwm
+  :config
+  (exwm-systemtray-enable))
+
+(use-package exwm-workspace)
+
+(use-package exwm-edit
+  :demand
+  :after exwm)

 
 ;; use the org-plus-contrib package to get the whole deal
 (use-package org-plus-contrib)
 
 
 ;; use the org-plus-contrib package to get the whole deal
 (use-package org-plus-contrib)
 

-(use-feature org
+(use-package org

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


@@ -770,7 +782,7 @@ For disabling the behaviour for certain buffers and/or modes."
   '(org-block ((t (:background "#1d1f21"))))
   '(org-latex-and-related ((t (:foreground "#b294bb")))))
 
   '(org-block ((t (:background "#1d1f21"))))
   '(org-latex-and-related ((t (:foreground "#b294bb")))))
 

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

   :after ox
   :config
   (setq org-latex-listings 'listings
   :after ox
   :config
   (setq org-latex-listings 'listings


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

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

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


@@ -849,23 +861,87 @@ For disabling the behaviour for certain buffers and/or modes."
   (nconc magit-section-initial-visibility-alist
          '(([unpulled status] . show)
            ([unpushed status] . show)))
   (nconc magit-section-initial-visibility-alist
          '(([unpulled status] . show)
            ([unpushed status] . show)))

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

   :custom-face (magit-diff-file-heading ((t (:weight normal)))))
 
 ;; recently opened files
   :custom-face (magit-diff-file-heading ((t (:weight normal)))))
 
 ;; recently opened files

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

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

+  :config
+  (recentf-mode)

   :custom
   (recentf-max-saved-items 2000))
 
 ;; smart M-x enhancement (needed by counsel for history)
   :custom
   (recentf-max-saved-items 2000))
 
 ;; smart M-x enhancement (needed by counsel for history)

-(use-package smex)
+;; (use-package smex)
+
+(bind-keys
+ ("C-c f ." . find-file)
+ ("C-c f l" . find-library)
+ ("C-c f r" . recentf-open-files)
+ ("C-c x"   . execute-extended-command))
+
+(comment
+  (use-package ido
+    :demand
+    :bind
+    (:map ido-common-completion-map
+          ([escape] . minibuffer-keyboard-quit)
+          ("DEL"    . b/ido-backspace))
+    :config
+    (require 'delsel)
+    (defun b/ido-backspace ()
+      "Forward to `backward-delete-char'.  On error (read-only), quit."
+      (interactive)
+      (condition-case nil
+          (backward-delete-char 1)
+        (error
+         (minibuffer-keyboard-quit))))
+    (ido-mode 1)
+    (ido-everywhere 1)
+    :custom
+    (ido-enable-flex-matching t)
+    ;; (ido-enable-regexp t)
+    ;; (ido-enable-prefix t)
+    (ido-max-window-height 10)
+    (ido-use-virtual-buffers t))
+
+  (use-package ido-vertical-mode
+    :defer 0.3
+    :config
+    (ido-vertical-mode 1)
+    :custom
+    (ido-vertical-define-keys 'C-n-C-p-up-and-down)
+    (ido-vertical-show-count t))
+
+  (use-package ido-completing-read+
+    :defer 0.3
+    :after ido
+    :config
+    (ido-ubiquitous-mode 1))
+
+  (use-package crm-custom
+    :defer 0.3
+    :config
+    (crm-custom-mode 1))
+
+  (use-package icomplete
+    :defer 0.3
+    :config
+    (icomplete-mode 1)))
+
+(use-package amx
+  :defer 0.3
+  :config
+  (amx-mode))

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

-  :delight ;; " 🙒"

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


@@ -874,7 +950,7 @@ For disabling the behaviour for certain buffers and/or modes."
    ("DEL"    . ivy-backward-delete-char))
   :config
   (setq ivy-wrap t
    ("DEL"    . ivy-backward-delete-char))
   :config
   (setq ivy-wrap t

-        ivy-height 14
+        ;; ivy-height 14

         ivy-use-virtual-buffers t
         ivy-virtual-abbreviate 'abbreviate
         ivy-count-format "%d/%d ")
         ivy-use-virtual-buffers t
         ivy-virtual-abbreviate 'abbreviate
         ivy-count-format "%d/%d ")


@@ -892,28 +968,25 @@ This function is intended for use with `ivy-ignore-buffers'."
   (add-to-list 'ivy-ignore-buffers 'b/ivy-ignore-buffer-p)
 
   (ivy-mode 1)
   (add-to-list 'ivy-ignore-buffers 'b/ivy-ignore-buffer-p)
 
   (ivy-mode 1)

-  ;; :custom-face
-  ;; (ivy-minibuffer-match-face-2 ((t (:background "#e99ce8" :weight semi-bold))))
-  ;; (ivy-minibuffer-match-face-3 ((t (:background "#bbbbff" :weight semi-bold))))
-  ;; (ivy-minibuffer-match-face-4 ((t (:background "#ffbbff" :weight semi-bold))))
-)
+  :custom-face
+  (ivy-minibuffer-match-face-1 ((t (:background "#eeeeee"))))
+  (ivy-minibuffer-match-face-2 ((t (:background "#e7e7e7" :weight bold))))
+  (ivy-minibuffer-match-face-3 ((t (:background "light goldenrod" :weight semi-bold))))
+  (ivy-minibuffer-match-face-4 ((t (:background "misty rose" :weight semi-bold))))
+  (ivy-current-match ((((class color) (background light))
+                       :background "#d7d7d7" :foreground "black")
+                      (((class color) (background dark))
+                       :background "#65a7e2" :foreground "black"))))

 
 (use-package swiper
 
 (use-package swiper

+  :demand

   :after ivy
   :after ivy

-  :bind (("C-s"   . swiper-isearch)
-         ("C-r"   . swiper)
-         ("C-S-s" . isearch-forward)))
+  :bind (("C-S-s" . swiper-isearch)))

 
 (use-package counsel
 
 (use-package counsel

+  :demand

   :after ivy
   :after ivy

-  :delight
-  :bind (([remap execute-extended-command] . counsel-M-x)
-         ([remap find-file]                . counsel-find-file)
-         ("C-c b b"                        . ivy-switch-buffer)
-         ("C-c f ."                        . counsel-find-file)
-         ("C-c f l"                        . counsel-find-library)
-         ("C-c f r"                        . counsel-recentf)
-         ("C-c x"                          . counsel-M-x)
+  :bind (("C-c f r" . counsel-recentf)

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


@@ -936,7 +1009,7 @@ This function is intended for use with `ivy-ignore-buffers'."
            ("C-z"   . helm-select-action))            ; List actions
     :config (helm-mode 1)))
 
            ("C-z"   . helm-select-action))            ; List actions
     :config (helm-mode 1)))
 

-(use-feature eshell
+(use-package eshell

   :defer 0.5
   :commands eshell
   :bind ("C-c a s e" . eshell)
   :defer 0.5
   :commands eshell
   :bind ("C-c a s e" . eshell)


@@ -962,14 +1035,16 @@ This function is intended for use with `ivy-ignore-buffers'."
                ("C-d"   . b/eshell-quit-or-delete-char)
                ("C-S-l" . b/eshell-clear)
                ("M-r"   . counsel-esh-history)
                ("C-d"   . b/eshell-quit-or-delete-char)
                ("C-S-l" . b/eshell-clear)
                ("M-r"   . counsel-esh-history)

-               ([tab]   . company-complete)))
+               ;; ([tab]   . company-complete)
+               :map eshell-hist-mode-map
+               ("M-r" . counsel-esh-history)))

 
   :hook (eshell-mode . b/eshell-setup)
   :custom
   (eshell-hist-ignoredups t)
   (eshell-input-filter 'eshell-input-filter-initial-space))
 
 
   :hook (eshell-mode . b/eshell-setup)
   :custom
   (eshell-hist-ignoredups t)
   (eshell-input-filter 'eshell-input-filter-initial-space))
 

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

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


@@ -1019,7 +1094,7 @@ This function is intended for use with `ivy-ignore-buffers'."
         (mode . scheme-mode)
         (mode . haskell-mode)
         (mode . lean-mode)
         (mode . scheme-mode)
         (mode . haskell-mode)
         (mode . lean-mode)

-        (mode . go-mode)
+        ;; (mode . go-mode)

         (mode . alloy-mode)))
       ("tex"
        (or
         (mode . alloy-mode)))
       ("tex"
        (or


@@ -1029,10 +1104,11 @@ This function is intended for use with `ivy-ignore-buffers'."
        (or
         (name . "^\\*scratch\\*$")
         (name . "^\\*Messages\\*$")))
        (or
         (name . "^\\*scratch\\*$")
         (name . "^\\*Messages\\*$")))

+      ("exwm" (mode . exwm-mode))

       ("erc" (mode . erc-mode)))))
   (ibuffer-formats
    '((mark modified read-only locked " "
       ("erc" (mode . erc-mode)))))
   (ibuffer-formats
    '((mark modified read-only locked " "

-           (name 18 18 :left :elide)
+           (name 72 72 :left :elide)

            " "
            (size-h 9 -1 :right)
            " "
            " "
            (size-h 9 -1 :right)
            " "


@@ -1043,10 +1119,9 @@ This function is intended for use with `ivy-ignore-buffers'."
            " " filename)))
   :hook (ibuffer . (lambda () (ibuffer-switch-to-saved-filter-groups "default"))))
 
            " " filename)))
   :hook (ibuffer . (lambda () (ibuffer-switch-to-saved-filter-groups "default"))))
 

-(use-feature outline
+(use-package outline

   :disabled
   :hook (prog-mode . outline-minor-mode)
   :disabled
   :hook (prog-mode . outline-minor-mode)

-  :delight (outline-minor-mode " outl")

   :bind
   (:map
    outline-minor-mode-map
   :bind
   (:map
    outline-minor-mode-map


@@ -1062,12 +1137,13 @@ This function is intended for use with `ivy-ignore-buffers'."
    ("h"   . outline-hide-subtree)
    ("s"   . outline-show-subtree)))
 
    ("h"   . outline-hide-subtree)
    ("s"   . outline-show-subtree)))
 

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

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

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

   :config
   :config

-  (setq dired-listing-switches "-alh"
+  (setq dired-dwim-target t
+        dired-listing-switches "-alh"

         ls-lisp-use-insert-directory-program nil)
 
   ;; easily diff 2 marked files
         ls-lisp-use-insert-directory-program nil)
 
   ;; easily diff 2 marked files


@@ -1114,12 +1190,12 @@ This function is intended for use with `ivy-ignore-buffers'."
                         (b/dired-start-process "zathura"))))
   :hook (dired-mode . dired-hide-details-mode))
 
                         (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))
 
   :config
   (temp-buffer-resize-mode)
   (setq help-window-select t))
 

-(use-feature tramp
+(use-package tramp

   :config
   (add-to-list 'tramp-default-proxies-alist '(nil "\\`root\\'" "/ssh:%h:"))
   (add-to-list 'tramp-default-proxies-alist '("localhost" nil nil))
   :config
   (add-to-list 'tramp-default-proxies-alist '(nil "\\`root\\'" "/ssh:%h:"))
   (add-to-list 'tramp-default-proxies-alist '("localhost" nil nil))


@@ -1129,7 +1205,7 @@ This function is intended for use with `ivy-ignore-buffers'."
 (use-package dash
   :config (dash-enable-font-lock))
 
 (use-package dash
   :config (dash-enable-font-lock))
 

-(use-feature doc-view
+(use-package doc-view

   :bind (:map doc-view-mode-map
               ("M-RET" . image-previous-line)))
 
   :bind (:map doc-view-mode-map
               ("M-RET" . image-previous-line)))
 


@@ -1145,22 +1221,20 @@ This function is intended for use with `ivy-ignore-buffers'."
   :hook (magit-post-refresh . diff-hl-magit-post-refresh))
 
 ;; display Lisp objects at point in the echo area
   :hook (magit-post-refresh . diff-hl-magit-post-refresh))
 
 ;; display Lisp objects at point in the echo area

-(use-feature eldoc
+(use-package eldoc

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

-  :delight " eldoc"

   :config (global-eldoc-mode))
 
 ;; highlight matching parens
   :config (global-eldoc-mode))
 
 ;; highlight matching parens

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

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

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

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

-(use-feature simple
-  :delight (auto-fill-function " fill")
+(use-package simple

   :config (column-number-mode)
   :custom
   ;; Save what I copy into clipboard from other applications into Emacs'
   :config (column-number-mode)
   :custom
   ;; Save what I copy into clipboard from other applications into Emacs'


@@ -1170,47 +1244,50 @@ This function is intended for use with `ivy-ignore-buffers'."
   (save-interprogram-paste-before-kill t))
 
 ;; save minibuffer history
   (save-interprogram-paste-before-kill t))
 
 ;; save minibuffer history

-(use-feature savehist
+(use-package savehist

   :demand
   :config
   (savehist-mode)
   (add-to-list 'savehist-additional-variables 'kill-ring))
 
 ;; automatically save place in files
   :demand
   :config
   (savehist-mode)
   (add-to-list 'savehist-additional-variables 'kill-ring))
 
 ;; automatically save place in files

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

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

-(use-feature prog-mode
+(use-package prog-mode

   :config (global-prettify-symbols-mode)
   (defun indicate-buffer-boundaries-left ()
     (setq indicate-buffer-boundaries 'left))
   (add-hook 'prog-mode-hook #'indicate-buffer-boundaries-left))
 
   :config (global-prettify-symbols-mode)
   (defun indicate-buffer-boundaries-left ()
     (setq indicate-buffer-boundaries 'left))
   (add-hook 'prog-mode-hook #'indicate-buffer-boundaries-left))
 

-(use-feature text-mode
-  :hook (text-mode . indicate-buffer-boundaries-left))
+(use-package text-mode
+  :bind (:map text-mode-map ("C-*" . b/insert-asterism))
+  :hook ((text-mode . indicate-buffer-boundaries-left)
+         (text-mode . flyspell-mode)))

 
 

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

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

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

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

-  :defer 0.6
-  :delight " comp"

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

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

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

-  :config
-  (global-company-mode t))
+  ;; :config
+  ;; (global-company-mode t)
+  )

 
 (use-package flycheck
   :defer 0.6
 
 (use-package flycheck
   :defer 0.6


@@ -1227,11 +1304,10 @@ This function is intended for use with `ivy-ignore-buffers'."
   (setq flycheck-check-syntax-automatically '(mode-enabled save))
   :custom (flycheck-mode-line-prefix "flyc"))
 
   (setq flycheck-check-syntax-automatically '(mode-enabled save))
   :custom (flycheck-mode-line-prefix "flyc"))
 

-(use-feature flyspell
-  :delight " flysp")
+(use-package flyspell)

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

-(use-feature ispell
+(use-package ispell

   :defer 0.6
   :config
   ;; ’ can be part of a word
   :defer 0.6
   :config
   ;; ’ can be part of a word


@@ -1257,36 +1333,45 @@ This function is intended for use with `ivy-ignore-buffers'."
   (advice-add #'ispell-parse-output :filter-args
               #'endless/replace-quote))
 
   (advice-add #'ispell-parse-output :filter-args
               #'endless/replace-quote))
 

-(use-feature abbrev
-  :delight " abbr"
+(use-package abbrev

   :hook (text-mode . abbrev-mode))
 
 \f
 ;;; Programming modes
 
   :hook (text-mode . abbrev-mode))
 
 \f
 ;;; Programming modes
 

-(use-feature lisp-mode
+(use-package lisp-mode

   :config
   (defun indent-spaces-mode ()
     (setq indent-tabs-mode nil))
   (add-hook 'lisp-interaction-mode-hook #'indent-spaces-mode))
 
   :config
   (defun indent-spaces-mode ()
     (setq indent-tabs-mode nil))
   (add-hook 'lisp-interaction-mode-hook #'indent-spaces-mode))
 

-(use-feature reveal
-  :delight (reveal-mode " reveal")
+(use-package reveal

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

-(use-feature elisp-mode
-  :delight (emacs-lisp-mode "Elisp" :major))
-
+(use-package elisp-mode)

 
 

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

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

-  :straight (:host github :repo "leanprover/lean-mode"
-                   :fork (:repo "notbandali/lean-mode" :branch "remove-cl"))

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


@@ -1327,11 +1412,11 @@ This function is intended for use with `ivy-ignore-buffers'."
   ;; alternative: hs-lint https://github.com/ndmitchell/hlint/blob/20e116a043f2073c57b17b24ae6364b5e433ba7e/data/hs-lint.el
   )
 
   ;; alternative: hs-lint https://github.com/ndmitchell/hlint/blob/20e116a043f2073c57b17b24ae6364b5e433ba7e/data/hs-lint.el
   )
 

-(use-feature sgml-mode
+(use-package sgml-mode

   :config
   (setq sgml-basic-offset 2))
 
   :config
   (setq sgml-basic-offset 2))
 

-(use-feature css-mode
+(use-package css-mode

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


@@ -1341,7 +1426,9 @@ This function is intended for use with `ivy-ignore-buffers'."
   (b/setq-every 2
     web-mode-code-indent-offset
     web-mode-css-indent-offset
   (b/setq-every 2
     web-mode-code-indent-offset
     web-mode-css-indent-offset

-    web-mode-markup-indent-offset))
+    web-mode-markup-indent-offset)
+  :custom
+  (web-mode-enable-auto-indentation nil))

 
 (use-package emmet-mode
   :after (:any web-mode css-mode sgml-mode)
 
 (use-package emmet-mode
   :after (:any web-mode css-mode sgml-mode)


@@ -1389,8 +1476,8 @@ This function is intended for use with `ivy-ignore-buffers'."
   (use-package lsp-java
     :config
     (add-hook 'java-mode-hook
   (use-package lsp-java
     :config
     (add-hook 'java-mode-hook

-                 (lambda ()
-                   (setq-local company-backends (list 'company-lsp))))
+              (lambda ()
+                (setq-local company-backends (list 'company-lsp))))

 
     (add-hook 'java-mode-hook 'lsp-java-enable)
     (add-hook 'java-mode-hook 'flycheck-mode)
 
     (add-hook 'java-mode-hook 'lsp-java-enable)
     (add-hook 'java-mode-hook 'flycheck-mode)


@@ -1426,7 +1513,7 @@ This function is intended for use with `ivy-ignore-buffers'."
 
 (use-package geiser)
 
 
 (use-package geiser)
 

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

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


@@ -1437,13 +1524,14 @@ This function is intended for use with `ivy-ignore-buffers'."
     :custom
     (font-latex-fontify-sectioning 'color)))
 
     :custom
     (font-latex-fontify-sectioning 'color)))
 

-(use-package go-mode)
+(use-package go-mode
+  :disabled)

 
 (use-package po-mode
   :hook
   (po-mode . (lambda () (run-with-timer 0.1 nil 'View-exit))))
 
 
 (use-package po-mode
   :hook
   (po-mode . (lambda () (run-with-timer 0.1 nil 'View-exit))))
 

-(use-feature tex-mode
+(use-package tex-mode

   :config
   (cl-delete-if
    (lambda (p) (string-match "^---?" (car p)))
   :config
   (cl-delete-if
    (lambda (p) (string-match "^---?" (car p)))


@@ -1451,6 +1539,10 @@ This function is intended for use with `ivy-ignore-buffers'."
   :hook ((tex-mode . auto-fill-mode)
          (tex-mode . flyspell-mode)))
 
   :hook ((tex-mode . auto-fill-mode)
          (tex-mode . flyspell-mode)))
 

+;; (use-package george-mode
+;;   :straight (:host nil :repo "https://git.shemshak.org/amin/george-mode")
+;;   :mode "\\.grg\\'")
+

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


@@ -1463,6 +1555,7 @@ This function is intended for use with `ivy-ignore-buffers'."
   :commands (sml/apply-theme)
   :demand
   :config
   :commands (sml/apply-theme)
   :demand
   :config

+  (setq sml/theme 'tangomod)

   (sml/setup)
   (smart-mode-line-enable))
 
   (sml/setup)
   (smart-mode-line-enable))
 


@@ -1475,29 +1568,63 @@ This function is intended for use with `ivy-ignore-buffers'."
 
 (use-package doom-themes)
 
 
 (use-package doom-themes)
 

+(use-package solarized-theme
+  :disabled
+  :config
+  (load-theme 'solarized-light t))
+
+(use-package moody
+  :disabled
+  :demand
+  :config
+  (setq x-underline-at-descent-line t)
+  (let ((line (face-attribute 'mode-line :underline)))
+    (set-face-attribute 'mode-line          nil :overline   line)
+    (set-face-attribute 'mode-line-inactive nil :overline   line)
+    (set-face-attribute 'mode-line-inactive nil :underline  line)
+    (set-face-attribute 'mode-line          nil :box        nil)
+    (set-face-attribute 'mode-line-inactive nil :box        nil)
+    (set-face-attribute 'mode-line-inactive nil :background "#e1e1e1")) ; d3d7cf
+  (moody-replace-mode-line-buffer-identification)
+  (moody-replace-vc-mode))
+
+(use-package mini-modeline
+  :disabled
+  :demand
+  :config (mini-modeline-mode))
+

 (defvar b/org-mode-font-lock-keywords
   '(("[ \t]*\\(#\\+\\(BEGIN\\|END\\|begin\\|end\\)_\\(\\S-+\\)\\)[ \t]*\\([^\n:]*\\)"
       (1 '(:foreground "#5a5b5a" :background "#292b2b") t) ; directive
       (3 '(:foreground "#81a2be" :background "#292b2b") t) ; kind
 (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
+      (4 '(:foreground "#c5c8c6") t)))                     ; title
+  "For use with the `doom-tomorrow-night' theme.")

 
 (defun b/lights-on ()
   "Enable my favourite light theme."
   (interactive)
   (mapc #'disable-theme custom-enabled-themes)
   (load-theme 'tangomod t)
 
 (defun b/lights-on ()
   "Enable my favourite light theme."
   (interactive)
   (mapc #'disable-theme custom-enabled-themes)
   (load-theme 'tangomod t)

-  (sml/apply-theme 'automatic)
+  (sml/apply-theme 'tangomod)

   (font-lock-remove-keywords
   (font-lock-remove-keywords

-   'org-mode b/org-mode-font-lock-keywords))
+   'org-mode b/org-mode-font-lock-keywords)
+  (when (featurep 'erc-hl-nicks)
+    (erc-hl-nicks-reset-face-table))
+  (when (featurep 'exwm-systemtray)
+    (exwm-systemtray--refresh)))

 
 (defun b/lights-off ()
   "Go dark."
   (interactive)
   (mapc #'disable-theme custom-enabled-themes)
 
 (defun b/lights-off ()
   "Go dark."
   (interactive)
   (mapc #'disable-theme custom-enabled-themes)

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

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

-   'org-mode b/org-mode-font-lock-keywords t))
+   'org-mode b/org-mode-font-lock-keywords t)
+  (when (featurep 'erc-hl-nicks)
+    (erc-hl-nicks-reset-face-table))
+  (when (featurep 'exwm-systemtray)
+    (exwm-systemtray--refresh)))

 
 (bind-keys
  ("C-c t d" . b/lights-off)
 
 (bind-keys
  ("C-c t d" . b/lights-off)


@@ -1511,21 +1638,23 @@ This function is intended for use with `ivy-ignore-buffers'."
 
 (use-package which-key
   :defer 0.4
 
 (use-package which-key
   :defer 0.4

-  :delight

   :config
   (which-key-add-key-based-replacements
     ;; prefixes for global prefixes and minor modes
     "C-c @"   "outline"
     "C-c !"   "flycheck"
   :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 RET" "coding system"

     "C-x 8"   "unicode"
     "C-x 8"   "unicode"

+    "C-x @"   "event modifiers"

     "C-x a"   "abbrev/expand"
     "C-x r"   "rectangle/register/bookmark"
     "C-x a"   "abbrev/expand"
     "C-x r"   "rectangle/register/bookmark"

+    "C-x t"   "tabs"

     "C-x v"   "version control"
     "C-x v"   "version control"

+    "C-x X"   "edebug"
+    "C-x C-a" "edebug"
+    "C-x C-k" "kmacro"

     ;; prefixes for my personal bindings
     ;; prefixes for my personal bindings

+    "C-c &"   "yasnippet"

     "C-c a"   "applications"
     "C-c a e" "erc"
     "C-c a o" "org"
     "C-c a"   "applications"
     "C-c a e" "erc"
     "C-c a o" "org"


@@ -1538,10 +1667,10 @@ This function is intended for use with `ivy-ignore-buffers'."
     "C-c g"   "magit"
     "C-S-h"   "help(ful)"
     "C-c m"   "multiple-cursors"
     "C-c g"   "magit"
     "C-S-h"   "help(ful)"
     "C-c m"   "multiple-cursors"

-    "C-c P"   "projectile"
-    "C-c P s" "projectile/search"
-    "C-c P x" "projectile/execute"
-    "C-c P 4" "projectile/other-window"
+    "C-c p"   "projectile"
+    "C-c p s" "projectile/search"
+    "C-c p x" "projectile/execute"
+    "C-c p 4" "projectile/other-window"

     "C-c q"   "boxquote"
     "C-c t"   "themes"
     ;; "s-O"     "outline"
     "C-c q"   "boxquote"
     "C-c t"   "themes"
     ;; "s-O"     "outline"


@@ -1567,7 +1696,7 @@ This function is intended for use with `ivy-ignore-buffers'."
 (use-package crux            ; results in Waiting for git... [2 times]
   :defer 0.4
   :bind (("C-c d"   . crux-duplicate-current-line-or-region)
 (use-package crux            ; results in Waiting for git... [2 times]
   :defer 0.4
   :bind (("C-c d"   . crux-duplicate-current-line-or-region)

-         ("C-c D"   . crux-duplicate-and-comment-current-line-or-region)
+         ("C-c M-d" . crux-duplicate-and-comment-current-line-or-region)

          ("C-c f C" . crux-copy-file-preserve-attributes)
          ("C-c f D" . crux-delete-file-and-buffer)
          ("C-c f R" . crux-rename-file-and-buffer)
          ("C-c 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)


@@ -1582,7 +1711,7 @@ This function is intended for use with `ivy-ignore-buffers'."
 
 (use-package projectile
   :defer 0.5
 
 (use-package projectile
   :defer 0.5

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

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


@@ -1657,19 +1786,24 @@ This function is intended for use with `ivy-ignore-buffers'."
                ("M-w" . boxquote-kill-ring-save)))
 
 (use-package orgalist
                ("M-w" . boxquote-kill-ring-save)))
 
 (use-package orgalist

-  ;; http://lists.gnu.org/archive/html/emacs-orgmode/2019-04/msg00007.html
-  :disabled t
+  ;; breaks auto-fill-mode, showing this error:
+  ;; orgalist--boundaries: Lisp nesting exceeds ‘max-lisp-eval-depth’
+  :disabled

   :after message
   :hook (message-mode . orgalist-mode))
 
 ;; easily type pretty quotes & other typography, like ‘’“”-–—«»‹›
 (use-package typo
   :defer 0.5
   :after message
   :hook (message-mode . orgalist-mode))
 
 ;; easily type pretty quotes & other typography, like ‘’“”-–—«»‹›
 (use-package typo
   :defer 0.5

-  :delight " typo"

   :config
   :config

-  (typo-global-mode 1)
-  :hook (((text-mode erc-mode) . typo-mode)
-         (tex-mode             . (lambda ()(typo-mode -1)))))
+  :hook (((text-mode erc-mode web-mode) . typo-mode)
+         ((tex-mode git-commit-mode)    . (lambda ()(typo-mode -1)))))
+
+(use-package electric
+  :disabled
+  :demand
+  :config
+  (electric-quote-mode))

 
 ;; highlight TODOs in buffers
 (use-package hl-todo
 
 ;; highlight TODOs in buffers
 (use-package hl-todo


@@ -1681,16 +1815,17 @@ This function is intended for use with `ivy-ignore-buffers'."
   :defer 0.5
   :after eshell
   :config
   :defer 0.5
   :after eshell
   :config

-  (defvar user-@-host (concat (user-login-name) "@" (system-name) " "))
+  (defvar user-@-host (concat (user-login-name) "@" (system-name) ":"))

   (defun +eshell/prompt ()
   (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 ".*> ")
+    (concat (propertize user-@-host 'face 'default)
+            (propertize (abbreviate-file-name default-directory)
+                        'face 'font-lock-comment-face)
+            (propertize "\n" 'face 'default)
+            (if (= (user-uid) 0)
+                (propertize "#" 'face 'red)
+              (propertize "$" 'face 'default))
+            (propertize " " 'face 'default)))
+  (setq eshell-prompt-regexp "\\(.*\n\\)*[$#] "

         eshell-prompt-function #'+eshell/prompt))
 
 (use-package eshell-up
         eshell-prompt-function #'+eshell/prompt))
 
 (use-package eshell-up


@@ -1752,7 +1887,6 @@ This function is intended for use with `ivy-ignore-buffers'."
 
 (use-package page-break-lines
   :defer 0.5
 
 (use-package page-break-lines
   :defer 0.5

-  :delight " pgln"

   :custom
   (page-break-lines-max-width fill-column)
   :config
   :custom
   (page-break-lines-max-width fill-column)
   :config


@@ -1771,11 +1905,10 @@ This function is intended for use with `ivy-ignore-buffers'."
                ("p" . mc/mark-previous-like-this)
                ("a" . mc/mark-all-like-this))))
 
                ("p" . mc/mark-previous-like-this)
                ("a" . mc/mark-all-like-this))))
 

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

 
 (use-package yasnippet
   :defer 0.6
 
 (use-package yasnippet
   :defer 0.6


@@ -1798,10 +1931,24 @@ This function is intended for use with `ivy-ignore-buffers'."
   (yas-global-mode))
 
 (use-package debbugs
   (yas-global-mode))
 
 (use-package debbugs

-  :straight (debbugs
-             :host github
-             :repo "emacs-straight/debbugs"
-             :files (:defaults "Debbugs.wsdl")))
+  :bind
+  (("C-c D d" . debbugs-gnu)
+   ("C-c D b" . debbugs-gnu-bugs)
+   ("C-c D e" .
+    (lambda ()
+      (interactive)
+      (setq debbugs-gnu-current-suppress t)
+      (debbugs-gnu debbugs-gnu-default-severities '("emacs"))))
+   ("C-c D g" .
+    (lambda ()
+      (interactive)
+      (setq debbugs-gnu-current-suppress t)
+      (debbugs-gnu debbugs-gnu-default-severities '("gnuzilla"))))
+   ("C-c D G" .
+    (lambda ()
+      (interactive)
+      (setq debbugs-gnu-current-suppress t)
+      (debbugs-gnu debbugs-gnu-default-severities '("guix"))))))

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


@@ -1819,19 +1966,29 @@ This function is intended for use with `ivy-ignore-buffers'."
 ;; (use-package fill-column-indicator)
 
 (use-package emojify
 ;; (use-package fill-column-indicator)
 
 (use-package emojify

+  :disabled

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

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

   :bind
   :bind

-  (("C-c w <right>" . split-window-right)
-   ("C-c w <down>"  . split-window-below)
-   ("C-c w s l"     . split-window-right)
-   ("C-c w s j"     . split-window-below)
-   ("C-c w q"       . quit-window))
+  (("C-c w e"   . (lambda ()
+                    (interactive)
+                    (split-window-right)
+                    (other-window 1)
+                    (erc-switch-to-buffer)))
+   ("C-c w s l" . (lambda ()
+                    (interactive)
+                    (split-window-right)
+                    (other-window 1)))
+   ("C-c w s j" . (lambda ()
+                    (interactive)
+                    (split-window-below)
+                    (other-window 1)))
+   ("C-c w q"   . quit-window))

   :custom
   (split-width-threshold 150))
 
   :custom
   (split-width-threshold 150))
 

-(use-feature windmove
+(use-package windmove

   :defer 0.6
   :bind
   (("C-c w h" . windmove-left)
   :defer 0.6
   :bind
   (("C-c w h" . windmove-left)


@@ -1857,16 +2014,27 @@ This function is intended for use with `ivy-ignore-buffers'."
               ("<C-XF86Forward>" . pdf-history-forward)
               ("<mouse-9>"       . pdf-history-forward)
               ("<drag-mouse-9>"  . pdf-history-forward)
               ("<C-XF86Forward>" . pdf-history-forward)
               ("<mouse-9>"       . pdf-history-forward)
               ("<drag-mouse-9>"  . pdf-history-forward)

-              ("M-RET"           . image-previous-line))
+              ("M-RET"           . image-previous-line)
+              ("C-s"             . isearch-forward)
+              ("s s"             . isearch-forward))

   :config (pdf-tools-install nil t)
   :custom (pdf-view-resize-factor 1.05))
 
   :config (pdf-tools-install nil t)
   :custom (pdf-view-resize-factor 1.05))
 

+(use-package org-pdftools
+  :disabled
+  :straight (:host github :repo "fuxialexander/org-pdftools")
+  :demand
+  :after org
+  :config
+  (with-eval-after-load 'org
+    (require 'org-pdftools)))
+

 (use-package biblio)
 
 (use-package biblio)
 

-(use-feature reftex
+(use-package reftex

   :hook (latex-mode . reftex-mode))
 
   :hook (latex-mode . reftex-mode))
 

-(use-feature reftex-cite
+(use-package reftex-cite

   :after reftex
   :disabled                             ; enable to disable
                                         ; reftex-cite's default choice
   :after reftex
   :disabled                             ; enable to disable
                                         ; reftex-cite's default choice


@@ -1880,6 +2048,61 @@ This function is intended for use with `ivy-ignore-buffers'."
           (goto-char (cdr macro)))
         (reftex-this-word)))))
 
           (goto-char (cdr macro)))
         (reftex-this-word)))))
 

+(use-package minions
+  :demand
+  :config (minions-mode))
+
+(use-package dmenu
+  :custom
+  (dmenu-prompt-string "run: ")
+  (dmenu-save-file (b/var "dmenu-items")))
+
+(use-package eosd
+  ;; TODO: fix build by properly building the eosd-pixbuf.c module
+  ;; e.g. see https://github.com/raxod502/straight.el/issues/386
+  :disabled
+  :straight (:host github :repo "clarete/eosd")
+  :demand
+  :after exwm
+  :config
+  (eosd-start))
+
+(use-package nnreddit
+  :disabled
+  :demand
+  :after gnus
+  :custom
+  (nnreddit-python-command "python3"))
+
+(use-package hyperbole
+  :disabled
+  :straight (hyperbole
+             :host github :repo "rswgnu/hyperbole"
+             :files ("*.el" ("kotl" "kotl/*.el")
+                     "DEMO" "man/*.info" "man/*.texi")))
+
+;; (use-package oddmuse-curl
+;;   :straight (:host github :repo "kensanata/oddmuse-curl")
+;;   :config
+;;   (setq
+;;    oddmuse-wikis
+;;    (append
+;;     '(("EmacsConf" "https://emacsconf.org" utf-8 "question" nil)
+;;       ("EmacsConf 2019" "https://emacsconf.org/2019" utf-8 "question" nil))
+;;     oddmuse-wikis))
+;;   :custom
+;;   (oddmuse-username "bandali"))
+
+(use-package debpaste
+  :custom
+  (debpaste-paste-is-hidden t))
+
+(use-package scpaste
+  :disabled
+  :config
+  (setq scpaste-http-destination "https://p.bndl.org"
+        scpaste-scp-destination "nix:/var/www/p.bndl.org"))
+

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


@@ -1892,7 +2115,7 @@ This function is intended for use with `ivy-ignore-buffers'."
  mail-user-agent   'gnus-user-agent
  read-mail-command '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)
          ("C-c a m" . gnus)
   :bind (("s-m"     . gnus)
          ("s-M"     . gnus-unplugged)
          ("C-c a m" . gnus)


@@ -1902,41 +2125,45 @@ This function is intended for use with `ivy-ignore-buffers'."
    gnus-select-method '(nnnil "")
    gnus-secondary-select-methods
    '((nnimap "shemshak"
    gnus-select-method '(nnnil "")
    gnus-secondary-select-methods
    '((nnimap "shemshak"

-            (nnimap-stream plain)
-            (nnimap-address "127.0.0.1")
-            (nnimap-server-port 143)
-            (nnimap-authenticator plain)
-            (nnimap-user "amin@shemshak.local"))
+             (nnimap-stream plain)
+             (nnimap-address "127.0.0.1")
+             (nnimap-server-port 143)
+             (nnimap-authenticator plain)
+             (nnimap-user "amin@shemshak.local"))

      (nnimap "gnu"
      (nnimap "gnu"

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

      (nnimap "uw"
              (nnimap-stream plain)
              (nnimap-address "127.0.0.1")
      (nnimap "uw"
              (nnimap-stream plain)
              (nnimap-address "127.0.0.1")


@@ -1958,7 +2185,7 @@ This function is intended for use with `ivy-ignore-buffers'."
              (nnimap-server-port 143)
              (nnimap-authenticator plain)
              (nnimap-user "abandali@csc.uw.local")))
              (nnimap-server-port 143)
              (nnimap-authenticator plain)
              (nnimap-user "abandali@csc.uw.local")))

-   gnus-message-archive-group "nnimap+shemshak:Sent"
+   gnus-message-archive-group "nnimap+gnu:INBOX"

    gnus-parameters
    '(("l\\.atreus"
       (to-address . "atreus@freelists.org")
    gnus-parameters
    '(("l\\.atreus"
       (to-address . "atreus@freelists.org")


@@ -1983,6 +2210,9 @@ This function is intended for use with `ivy-ignore-buffers'."
      ("l\\.emacs-tangents"
       (to-address . "emacs-tangents@gnu.org")
       (to-list    . "emacs-tangents@gnu.org"))
      ("l\\.emacs-tangents"
       (to-address . "emacs-tangents@gnu.org")
       (to-list    . "emacs-tangents@gnu.org"))

+     ("l\\.emacsconf-committee"
+      (to-address . "emacsconf-committee@gnu.org")
+      (to-list    . "emacsconf-committee@gnu.org"))

      ("l\\.emacsconf-discuss"
       (to-address . "emacsconf-discuss@gnu.org")
       (to-list    . "emacsconf-discuss@gnu.org"))
      ("l\\.emacsconf-discuss"
       (to-address . "emacsconf-discuss@gnu.org")
       (to-list    . "emacsconf-discuss@gnu.org"))


@@ -2089,7 +2319,7 @@ This function is intended for use with `ivy-ignore-buffers'."
       (to-list    . "webmasters@gnu.org"))
      ("gnu.*"
       (gcc-self . t))
       (to-list    . "webmasters@gnu.org"))
      ("gnu.*"
       (gcc-self . t))

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

       (subscribed . t))
      ("nnimap\\+uw:.*"
       (gcc-self . t)))
       (subscribed . t))
      ("nnimap\\+uw:.*"
       (gcc-self . t)))


@@ -2103,32 +2333,50 @@ This function is intended for use with `ivy-ignore-buffers'."
    gnus-interactive-exit nil
    gnus-gcc-mark-as-read t)
   :config
    gnus-interactive-exit nil
    gnus-gcc-mark-as-read t)
   :config

-  (require 'ebdb)
-  (require 'ebdb-mua)
-  (require 'ebdb-gnus)
-

   (when (version< emacs-version "27")
   (when (version< emacs-version "27")

-    (add-to-list
-     'nnmail-split-abbrev-alist
-     '(list . "list-id\\|list-post\\|x-mailing-list\\|x-beenthere\\|x-loop")
-     t))
+    (with-eval-after-load 'nnmail
+      (add-to-list
+       'nnmail-split-abbrev-alist
+       '(list . "list-id\\|list-post\\|x-mailing-list\\|x-beenthere\\|x-loop")
+       t)))

 
   ;; (gnus-registry-initialize)
 
   (with-eval-after-load 'recentf
     (add-to-list 'recentf-exclude gnus-home-directory)))
 
 
   ;; (gnus-registry-initialize)
 
   (with-eval-after-load 'recentf
     (add-to-list 'recentf-exclude gnus-home-directory)))
 

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

   :config
   (setq
    gnus-buttonized-mime-types '("multipart/\\(signed\\|encrypted\\)")
   :config
   (setq
    gnus-buttonized-mime-types '("multipart/\\(signed\\|encrypted\\)")

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

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


@@ -2146,7 +2394,7 @@ This function is intended for use with `ivy-ignore-buffers'."
    :map gnus-article-mode-map
    ("M-L" . org-store-link)))
 
    :map gnus-article-mode-map
    ("M-L" . org-store-link)))
 

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

   :bind (:map gnus-summary-mode-map
               :prefix-map b/gnus-summary-prefix-map
               :prefix "v"
   :bind (:map gnus-summary-mode-map
               :prefix-map b/gnus-summary-prefix-map
               :prefix "v"


@@ -2163,16 +2411,10 @@ This function is intended for use with `ivy-ignore-buffers'."
                                 gnus-thread-sort-by-subject
                                 gnus-thread-sort-by-date)))
 
                                 gnus-thread-sort-by-subject
                                 gnus-thread-sort-by-date)))
 

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

   :config
   :config

-  (defvar b/signature "Amin Bandali
-Free Software Activist | GNU Webmaster & Volunteer
-GPG: BE62 7373 8E61 6D6D 1B3A  08E8 A21A 0202 4881 6103
+  (defvar b/shemshak-signature "Amin Bandali

 https://shemshak.org/~amin")
 https://shemshak.org/~amin")

-  (defvar b/gnu-signature "Amin Bandali
-Free Software Activist | GNU Webmaster & Volunteer
-GPG: BE62 7373 8E61 6D6D 1B3A  08E8 A21A 0202 4881 6103
-https://bandali.eu.org")

   (defvar b/uw-signature "Amin Bandali, MMath Student
 Cheriton School of Computer Science
 University of Waterloo
   (defvar b/uw-signature "Amin Bandali, MMath Student
 Cheriton School of Computer Science
 University of Waterloo


@@ -2181,73 +2423,89 @@ https://bandali.eu.org")
 Systems Committee
 Computer Science Club, University of Waterloo
 https://csclub.uwaterloo.ca/~abandali")
 Systems Committee
 Computer Science Club, University of Waterloo
 https://csclub.uwaterloo.ca/~abandali")

-  (setq gnus-posting-styles
+  (setq gnus-message-replysign t
+        gnus-posting-styles

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

-           (address "amin@shemshak.org")
-           (body "\nBest,\n")
-           (signature b/signature)
-           (eval (setq b/message-cite-say-hi t)))
+           (address "mab@gnu.org"))
+          ("nnimap\\+gnu:l\\..*"
+           (signature nil))

           ("nnimap\\+gnu:.*"
           ("nnimap\\+gnu:.*"

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

           ((header "subject" "ThankCRM")
            (to "webmasters-comment@gnu.org")
            (body "")
            (eval (setq b/message-cite-say-hi nil)))
           ((header "subject" "ThankCRM")
            (to "webmasters-comment@gnu.org")
            (body "")
            (eval (setq b/message-cite-say-hi nil)))

+          ("nnimap\\+shemshak:.*"
+           (address "amin@shemshak.org")
+           (body "\nBest,\n")
+           (signature b/shemshak-signature)
+           (gcc "nnimap+shemshak:Sent")
+           (eval (setq b/message-cite-say-hi t)))

           ("nnimap\\+uw:.*"
           ("nnimap\\+uw:.*"

-           (address "abandali@uwaterloo.ca")
+           (address "bandali@uwaterloo.ca")
+           (body "\nBest,\n")

            (signature b/uw-signature))
           ("nnimap\\+uw:INBOX"
            (gcc "\"nnimap+uw:Sent Items\""))
           ("nnimap\\+csc:.*"
            (signature b/uw-signature))
           ("nnimap\\+uw:INBOX"
            (gcc "\"nnimap+uw:Sent Items\""))
           ("nnimap\\+csc:.*"

-           (address "abandali@csclub.uwaterloo.ca")
+           (address "bandali@csclub.uwaterloo.ca")

            (signature b/csc-signature)
            (signature b/csc-signature)

-           (gcc "nnimap+csc:Sent")))))
+           (gcc "nnimap+csc:Sent"))))
+  :hook (gnus-message-setup . (lambda ()
+                                (unless (mml-secure-is-encrypted-p)
+                                  (mml-secure-message-sign)))))

 
 

-(use-feature gnus-topic
+(use-package gnus-topic

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

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

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

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

   :config
   (setq gnus-permanently-visible-groups "\\(:INBOX$\\|:gnu$\\)"))
 
 (comment
   ;; problematic with ebdb's popup, *EBDB-Gnus*
   :config
   (setq gnus-permanently-visible-groups "\\(:INBOX$\\|:gnu$\\)"))
 
 (comment
   ;; problematic with ebdb's popup, *EBDB-Gnus*

-  (use-feature gnus-win
+  (use-package gnus-win

     :config
     (setq gnus-use-full-window nil)))
 
     :config
     (setq gnus-use-full-window nil)))
 

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

   :commands gnus-dired-mode
   :init
   (add-hook 'dired-mode-hook 'gnus-dired-mode))
 
   :commands gnus-dired-mode
   :init
   (add-hook 'dired-mode-hook 'gnus-dired-mode))
 

-(use-feature mm-decode
+(comment
+  (use-package gnus-utils
+    :custom
+    (gnus-completing-read-function 'gnus-ido-completing-read)))
+
+(use-package mm-decode

   :config
   (setq mm-discouraged-alternatives '("text/html" "text/richtext")
         mm-decrypt-option 'known
         mm-verify-option 'known))
 
   :config
   (setq mm-discouraged-alternatives '("text/html" "text/richtext")
         mm-decrypt-option 'known
         mm-verify-option 'known))
 

-(use-feature mm-uu
+(use-package mm-uu
+  :config
+  (set-face-attribute 'mm-uu-extract nil :extend t)

   :custom
   (mm-uu-diff-groups-regexp
    "\\(gmane\\|gnu\\|l\\)\\..*\\(diff\\|commit\\|cvs\\|bug\\|dev\\)"))
 
   :custom
   (mm-uu-diff-groups-regexp
    "\\(gmane\\|gnu\\|l\\)\\..*\\(diff\\|commit\\|cvs\\|bug\\|dev\\)"))
 

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

   :config
   (setq sendmail-program (executable-find "msmtp")
         ;; message-sendmail-extra-arguments '("-v" "-d")
         mail-specify-envelope-from t
         mail-envelope-from 'header))
 
   :config
   (setq sendmail-program (executable-find "msmtp")
         ;; message-sendmail-extra-arguments '("-v" "-d")
         mail-specify-envelope-from t
         mail-envelope-from 'header))
 

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

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


@@ -2255,7 +2513,7 @@ https://csclub.uwaterloo.ca/~abandali")
     "Return the In-Reply-To header for this message."
     (when message-reply-headers
       (let ((from (mail-header-from message-reply-headers))
     "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)))
+            (msg-id (mail-header-id message-reply-headers)))

         (when from
           msg-id))))
 
         (when from
           msg-id))))
 


@@ -2279,13 +2537,13 @@ https://csclub.uwaterloo.ca/~abandali")
         message-subscribed-address-functions
         '(gnus-find-subscribed-addresses)
         message-dont-reply-to-names
         message-subscribed-address-functions
         '(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)
+        "\\(\\(\\(amin\\|mab\\)@shemshak\\.org\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(mab\\|bandali\\|aminb?\\)@gnu\\.org\\)\\|\\(a?bandali@\\(csclub\\.\\)?uwaterloo\\.ca\\)\\)")
+  ;; (require 'company-ebdb)

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

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

                            (make-local-variable 'company-idle-delay)
                            (setq company-idle-delay 0.2))))
   ;; :custom-face
                            (make-local-variable 'company-idle-delay)
                            (setq company-idle-delay 0.2))))
   ;; :custom-face


@@ -2295,15 +2553,14 @@ https://csclub.uwaterloo.ca/~abandali")
   :custom
   (message-elide-ellipsis "[...]\n"))
 
   :custom
   (message-elide-ellipsis "[...]\n"))
 

-(use-feature mml
-  :delight " mml")
+(use-package mml)

 
 

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

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

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

   :after message
   ;; :config
   ;; (setq footnote-start-tag ""
   :after message
   ;; :config
   ;; (setq footnote-start-tag ""


@@ -2321,7 +2578,19 @@ https://csclub.uwaterloo.ca/~abandali")
         ("r" . footnote-renumber-footnotes)
         ("s" . footnote-set-style)))
 
         ("r" . footnote-renumber-footnotes)
         ("s" . footnote-set-style)))
 

+(use-package bbdb
+  :disabled
+  :demand
+  :after gnus
+  :bind (:map gnus-group-mode-map ("e" . bbdb))
+  :config
+  (bbdb-initialize 'gnus 'message)
+  :custom
+  (bbdb-complete-mail-allow-cycling t)
+  (bbdb-user-mail-address-re message-dont-reply-to-names))
+

 (use-package ebdb
 (use-package ebdb

+  :demand

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


@@ -2329,27 +2598,32 @@ https://csclub.uwaterloo.ca/~abandali")
   (with-eval-after-load 'swiper
     (add-to-list 'swiper-font-lock-exclude 'ebdb-mode t)))
 
   (with-eval-after-load 'swiper
     (add-to-list 'swiper-font-lock-exclude 'ebdb-mode t)))
 

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

   :after ebdb)
 
   :after ebdb)
 

-;; (use-package ebdb-complete
-;;   :after ebdb
-;;   :config
-;;   (ebdb-complete-enable))
-
-(use-package company-ebdb
+(use-package ebdb-complete
+  :after ebdb

   :config
   :config

-  (defun company-ebdb--post-complete (_) nil))
+  ;; (setq ebdb-complete-mail 'capf)
+  (ebdb-complete-enable))
+
+(use-package ebdb-message
+  :demand
+  :after ebdb)

 
 

-(use-feature ebdb-gnus
+;; (use-package company-ebdb
+;;   :config
+;;   (defun company-ebdb--post-complete (_) nil))
+
+(use-package ebdb-gnus

   :after ebdb
   :custom
   (ebdb-gnus-window-size 0.3))
 
   :after ebdb
   :custom
   (ebdb-gnus-window-size 0.3))
 

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

   :after ebdb
   :after ebdb

-  ;; :custom (ebdb-mua-pop-up nil)
-  )
+  :custom (ebdb-mua-pop-up t))

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


@@ -2380,7 +2654,7 @@ https://csclub.uwaterloo.ca/~abandali")
         (gnus-harvest-install 'message-x)
       (gnus-harvest-install))))
 
         (gnus-harvest-install 'message-x)
       (gnus-harvest-install))))
 

-(use-feature gnus-article-treat-patch
+(use-package gnus-article-treat-patch

   :disabled
   :demand
   :load-path "lisp/"
   :disabled
   :demand
   :load-path "lisp/"


@@ -2393,8 +2667,8 @@ https://csclub.uwaterloo.ca/~abandali")
 \f
 ;;; IRC (with ERC and ZNC)
 
 \f
 ;;; IRC (with ERC and ZNC)
 

-(use-feature erc
-  :bind (("C-c b e" . erc-switch-to-buffer)
+(use-package erc
+  :bind (("C-c b b" . erc-switch-to-buffer)

          :map erc-mode-map
          ("M-a" . erc-track-switch-buffer))
   :custom
          :map erc-mode-map
          ("M-a" . erc-track-switch-buffer))
   :custom


@@ -2417,96 +2691,24 @@ https://csclub.uwaterloo.ca/~abandali")
     (erc-cmd-DEOP (format "%s" (erc-current-nick))))
   (add-to-list 'erc-modules 'keep-place)
   (add-to-list 'erc-modules 'notifications)
     (erc-cmd-DEOP (format "%s" (erc-current-nick))))
   (add-to-list 'erc-modules 'keep-place)
   (add-to-list 'erc-modules 'notifications)

+  (add-to-list 'erc-modules 'smiley)

   (add-to-list 'erc-modules 'spelling)
   (add-to-list 'erc-modules 'scrolltoplace)
   (add-to-list 'erc-modules 'spelling)
   (add-to-list 'erc-modules 'scrolltoplace)

-  (erc-update-modules)
-
-  (when (and (version<= "24.4" emacs-version)
-             (version<         emacs-version "27"))
-    ;; fix erc-lurker bug
-    ;; patch submitted: https://bugs.gnu.org/36843#10
-    ;; TODO: remove when patch is merged and emacs 27 is released
-    (defvar erc-message-parsed)
-    (defun erc-display-message (parsed type buffer msg &rest args)
-      "Display MSG in BUFFER.
-
-ARGS, PARSED, and TYPE are used to format MSG sensibly.
-
-See also `erc-format-message' and `erc-display-line'."
-      (let ((string (if (symbolp msg)
-                        (apply #'erc-format-message msg args)
-                      msg))
-            (erc-message-parsed parsed))
-        (setq string
-              (cond
-               ((null type)
-                string)
-               ((listp type)
-                (mapc (lambda (type)
-                        (setq string
-                              (erc-display-message-highlight type string)))
-                      type)
-                string)
-               ((symbolp type)
-                (erc-display-message-highlight type string))))
-
-        (if (not (erc-response-p parsed))
-            (erc-display-line string buffer)
-          (unless (erc-hide-current-message-p parsed)
-            (erc-put-text-property 0 (length string) 'erc-parsed parsed string)
-            (erc-put-text-property 0 (length string) 'rear-sticky t string)
-            (when (erc-response.tags parsed)
-              (erc-put-text-property 0 (length string) 'tags (erc-response.tags parsed)
-                                     string))
-            (erc-display-line string buffer)))))
-
-    (defun erc-lurker-update-status (_message)
-      "Update `erc-lurker-state' if necessary.
-
-This function is called from `erc-insert-pre-hook'.  If the
-current message is a PRIVMSG, update `erc-lurker-state' to
-reflect the fact that its sender has issued a PRIVMSG at the
-current time.  Otherwise, take no action.
-
-This function depends on the fact that `erc-display-message'
-lexically binds `erc-message-parsed', which is used to check if
-the current message is a PRIVMSG and to determine its sender.
-See also `erc-lurker-trim-nicks' and `erc-lurker-ignore-chars'.
-
-In order to limit memory consumption, this function also calls
-`erc-lurker-cleanup' once every `erc-lurker-cleanup-interval'
-updates of `erc-lurker-state'."
-      (when (and (boundp 'erc-message-parsed)
-                 (erc-response-p erc-message-parsed))
-        (let* ((command (erc-response.command erc-message-parsed))
-               (sender
-                (erc-lurker-maybe-trim
-                 (car (erc-parse-user (erc-response.sender erc-message-parsed)))))
-               (server
-                (erc-canonicalize-server-name erc-server-announced-name)))
-          (when (equal command "PRIVMSG")
-            (when (>= (cl-incf erc-lurker-cleanup-count)
-                      erc-lurker-cleanup-interval)
-              (setq erc-lurker-cleanup-count 0)
-              (erc-lurker-cleanup))
-            (unless (gethash server erc-lurker-state)
-              (puthash server (make-hash-table :test 'equal) erc-lurker-state))
-            (puthash sender (current-time)
-                     (gethash server erc-lurker-state))))))))
-
-(use-feature erc-fill
+  (erc-update-modules))
+
+(use-package erc-fill

   :after erc
   :custom
   (erc-fill-column 77)
   (erc-fill-function 'erc-fill-static)
   (erc-fill-static-center 18))
 
   :after erc
   :custom
   (erc-fill-column 77)
   (erc-fill-function 'erc-fill-static)
   (erc-fill-static-center 18))
 

-(use-feature erc-pcomplete
+(use-package erc-pcomplete

   :after erc
   :custom
   :after erc
   :custom

-  (erc-pcomplete-nick-postfix ","))
+  (erc-pcomplete-nick-postfix ", "))

 
 

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

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


@@ -2514,6 +2716,7 @@ updates of `erc-lurker-state'."
   (erc-track-enable-keybindings nil)
   (erc-track-exclude-types '("JOIN" "MODE" "NICK" "PART" "QUIT"
                              "324" "329" "332" "333" "353" "477"))
   (erc-track-enable-keybindings nil)
   (erc-track-exclude-types '("JOIN" "MODE" "NICK" "PART" "QUIT"
                              "324" "329" "332" "333" "353" "477"))

+  (erc-track-position-in-mode-line t)

   (erc-track-priority-faces-only 'all)
   (erc-track-shorten-function nil))
 
   (erc-track-priority-faces-only 'all)
   (erc-track-shorten-function nil))
 


@@ -2523,22 +2726,22 @@ updates of `erc-lurker-state'."
 (use-package erc-scrolltoplace
   :after erc)
 
 (use-package erc-scrolltoplace
   :after erc)
 

-(use-package znc
-  :straight (:host nil :repo "https://git.shemshak.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.shemshak.org" 1337 t
-             ((freenode "amin/freenode" ,pwd)))
-            ("znc.shemshak.org" 1337 t
-             ((moznet "amin/moznet" ,pwd)))
-            ("znc.shemshak.org" 1337 t
-             ((oftc "amin/oftc" ,pwd)))))))
+;; (use-package znc
+;;   :straight (:host nil :repo "https://git.shemshak.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.shemshak.org" 1337 t
+;;              ((freenode "amin/freenode" ,pwd)))
+;;             ("znc.shemshak.org" 1337 t
+;;              ((moznet "amin/moznet" ,pwd)))
+;;             ("znc.shemshak.org" 1337 t
+;;              ((oftc "amin/oftc" ,pwd)))))))

 
 \f
 ;;; Post initialization
 
 \f
 ;;; Post initialization