X-Git-Url: https://git.shemshak.org/~bandali/configs/blobdiff_plain/3b3615f5761d8949046d65906d3f324eec9b18e8..1060413bf79aaa20273c785976cf9c2b2b34fac2:/.emacs.d/init.el

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 4002d9a..d08c84a 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -18,9 +18,8 @@
 ;;; Commentary:
 
 ;; Emacs configuration of Amin Bandali, computer scientist, functional
-;; programmer, and free software activist.  Used to use straight.el
-;; for purely functional and fully reproducible package management.
-;; Now I just use Guix.
+;; programmer, and free software activist.  Uses straight.el for
+;; purely functional and fully reproducible package management.
 
 ;; 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:
@@ -87,7 +86,81 @@
   nil)
 
 
-;;; use-package
+;;; Package management
+
+;; No package.el  (for emacs 26 and before, uncomment the following)
+;; Not necessary when using straight.el
+;;   (C-h v straight-package-neutering-mode RET)
+
+(when (and
+       (not (featurep 'straight))
+       (version< emacs-version "27"))
+  (setq package-enable-at-startup nil)
+  ;; (package-initialize)
+  )
+
+;; for emacs 27 and later, we use early-init.el.  see
+;; https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=24acb31c04b4048b85311d794e600ecd7ce60d3b
+
+;; straight.el
+
+;; Main engine start...
+
+(setq straight-repository-branch "develop"
+      straight-check-for-modifications '(check-on-save find-when-checking))
+
+(defun 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 init.el."
+  (interactive)
+  (setq b/file-name-handler-alist file-name-handler-alist)
+  (load user-init-file nil 'nomessage)
+  (b/post-init))
+
+;; use-package
+(straight-use-package 'use-package)
+
 (if nil                             ; set to t when need to debug init
     (progn
       (setq use-package-verbose t
@@ -107,30 +180,14 @@
 ;;; Initial setup
 
 ;; keep ~/.emacs.d clean
-(defvar b/etc-dir
-  (expand-file-name
-   (convert-standard-filename "etc/") user-emacs-directory)
-  "The directory where packages place their configuration files.")
-
-(defvar b/var-dir
-  (expand-file-name
-   (convert-standard-filename "var/") user-emacs-directory)
-  "The directory where packages place their persistent data files.")
-
-(defun b/etc (file)
-  "Expand filename FILE relative to `b/etc-dir'."
-  (expand-file-name (convert-standard-filename file) b/etc-dir))
-
-(defun b/var (file)
-  "Expand filename FILE relative to `b/var-dir'."
-  (expand-file-name (convert-standard-filename file) b/var-dir))
-
-(setq
- auto-save-list-file-prefix (b/var "auto-save/sessions/")
- nsm-settings-file (b/var "nsm-settings.el"))
+(use-package no-littering
+  :demand
+  :config
+  (defalias 'b/etc 'no-littering-expand-etc-file-name)
+  (defalias 'b/var 'no-littering-expand-var-file-name))
 
 ;; separate custom file (don't want it mixing with init.el)
-(use-package custom
+(use-feature custom
   :no-require t
   :config
   (setq custom-file (b/etc "custom.el"))
@@ -164,7 +221,7 @@
 
 ;; start up emacs server.  see
 ;; https://www.gnu.org/software/emacs/manual/html_node/emacs/Emacs-Server.html#Emacs-Server
-(use-package server
+(use-feature server
   :defer 0.4
   :config (or (server-running-p) (server-mode)))
 
@@ -220,38 +277,20 @@ For disabling the behaviour for certain buffers and/or modes."
       scroll-conservatively 10
       scroll-preserve-screen-position 1)
 
-(use-package mwheel
+(use-feature mwheel
   :defer 0.4
   :config
   (setq mouse-wheel-scroll-amount '(1 ((shift) . 1)) ; one line at a time
         mouse-wheel-progressive-speed nil            ; don't accelerate scrolling
         mouse-wheel-follow-mouse t))                 ; scroll window under mouse
 
-(use-package pixel-scroll
+(use-feature pixel-scroll
   :defer 0.4
   :config (pixel-scroll-mode 1))
 
-;; ask for GPG passphrase in minibuffer
-(use-package epa
-  :custom
-  ; this will fail if gpg>=2.1 is not available
-  (epa-pinentry-mode 'loopback))
-
-(use-package epg-config
-  :defer 0.4
+(use-feature epg-config
   :custom
-  ((epg-gpg-program (executable-find "gpg"))
-   (epg-pinentry-mode 'loopback)))
-
-(use-package epg
-  :after epg-config)
-
-(use-package pinentry
-  :demand
-  :after (epa epg server)
-  :config
-  (setq pinentry--socket-dir server-socket-dir)
-  (pinentry-start))
+  ((epg-gpg-program (executable-find "gpg"))))
 
 ;; useful libraries
 (require 'cl-lib)
@@ -348,7 +387,6 @@ For disabling the behaviour for certain buffers and/or modes."
 
 ;; backups (C-h v make-backup-files RET)
 (setq backup-by-copying t
-      backup-directory-alist (list (cons "." (b/var "backup/")))
       version-control t
       delete-old-versions t)
 
@@ -406,10 +444,10 @@ For disabling the behaviour for certain buffers and/or modes."
 ;; (enables niceties like `q' for quit)
 (setq view-read-only t)
 
-(use-package vc
+(use-feature vc
   :bind ("C-x v C-=" . vc-ediff))
 
-(use-package ediff
+(use-feature 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)))
@@ -425,6 +463,7 @@ For disabling the behaviour for certain buffers and/or modes."
  ("C-c a i" . ielm)
 
  ("C-c e b" . eval-buffer)
+ ("C-c e e" . eval-last-sexp)
  ("C-c e r" . eval-region)
 
  ("C-c e i" . emacs-init-time)
@@ -440,6 +479,8 @@ For disabling the behaviour for certain buffers and/or modes."
 
  ("C-x k"   . kill-this-buffer)
  ("C-x K"   . kill-buffer)
+ ("C-x s"   . save-buffer)
+ ("C-x S"   . save-some-buffers)
 
  :map emacs-lisp-mode-map
  ("<C-return>" . b/add-elisp-section))
@@ -456,10 +497,39 @@ For disabling the behaviour for certain buffers and/or modes."
  ("<drag-mouse-2>" . kill-this-buffer)
  ("<drag-mouse-3>" . ivy-switch-buffer))
 
+(bind-keys
+ :prefix-map mab/straight-prefix-map
+ :prefix "C-c p s"
+ ("u" . straight-use-package)
+ ("f" . straight-freeze-versions)
+ ("t" . straight-thaw-versions)
+ ("P" . straight-prune-build)
+ ("g" . straight-get-recipe)
+ ("r" . mab/reload-init)
+ ;; M-x ^straight-.*-all$
+ ("a c" . straight-check-all)
+ ("a f" . straight-fetch-all)
+ ("a m" . straight-merge-all)
+ ("a n" . straight-normalize-all)
+ ("a F" . straight-pull-all)
+ ("a P" . straight-push-all)
+ ("a r" . straight-rebuild-all)
+ ;; M-x ^straight-.*-package$
+ ("p c" . straight-check-package)
+ ("p f" . straight-fetch-package)
+ ("p m" . straight-merge-package)
+ ("p n" . straight-normalize-package)
+ ("p F" . straight-pull-package)
+ ("p P" . straight-push-package)
+ ("p r" . straight-rebuild-package))
+
 
 ;;; Essential packages
 
-(use-package org
+;; use the org-plus-contrib package to get the whole deal
+(use-package org-plus-contrib)
+
+(use-feature org
   :defer 0.5
   :config
   (setq org-src-tab-acts-natively t
@@ -498,7 +568,7 @@ For disabling the behaviour for certain buffers and/or modes."
   '(org-block ((t (:background "#1d1f21"))))
   '(org-latex-and-related ((t (:foreground "#b294bb")))))
 
-(use-package ox-latex
+(use-feature ox-latex
   :after ox
   :config
   (setq org-latex-listings 'listings
@@ -514,7 +584,7 @@ For disabling the behaviour for certain buffers and/or modes."
                t)
   (require 'ox-beamer))
 
-(use-package ox-extra
+(use-feature ox-extra
   :config
   (ox-extras-activate '(latex-header-blocks ignore-headlines)))
 
@@ -559,8 +629,8 @@ For disabling the behaviour for certain buffers and/or modes."
 ;; *the* right way to do git
 (use-package magit
   :defer 0.5
-  :bind (("C-c g g" . magit-status)
-         ("C-c g s" . magit-status)
+  :bind (("C-x g"   . magit-status)
+         ("C-c g g" . magit-status)
          ("C-c g b" . magit-blame-addition)
          ("C-c g l" . magit-log-buffer-file))
   :config
@@ -577,25 +647,19 @@ For disabling the behaviour for certain buffers and/or modes."
   (nconc magit-section-initial-visibility-alist
          '(([unpulled status] . show)
            ([unpushed status] . show)))
-  (setq transient-history-file (b/var "transient/history.el")
-        transient-levels-file  (b/etc "transient/levels.el")
-        transient-values-file  (b/etc "transient/values.el"))
   :custom (magit-display-buffer-function #'magit-display-buffer-fullframe-status-v1)
   :custom-face (magit-diff-file-heading ((t (:weight normal)))))
 
 ;; recently opened files
-(use-package recentf
+(use-feature recentf
   :defer 0.2
   ;; :config
   ;; (add-to-list 'recentf-exclude "^/\\(?:ssh\\|su\\|sudo\\)?:")
   :custom
-  (recentf-max-saved-items 2000)
-  (recentf-save-file (b/var "recentf-save.el")))
+  (recentf-max-saved-items 2000))
 
 ;; smart M-x enhancement (needed by counsel for history)
-(use-package smex
-  :config
-  (setq smex-save-file (b/var "smex-save.el")))
+(use-package smex)
 
 (use-package ivy
   :defer 0.3
@@ -670,7 +734,7 @@ This function is intended for use with `ivy-ignore-buffers'."
            ("C-z"   . helm-select-action))            ; List actions
     :config (helm-mode 1)))
 
-(use-package eshell
+(use-feature eshell
   :defer 0.5
   :commands eshell
   :bind ("C-c a s e" . eshell)
@@ -700,11 +764,10 @@ This function is intended for use with `ivy-ignore-buffers'."
 
   :hook (eshell-mode . b/eshell-setup)
   :custom
-  (eshell-directory-name (b/var "eshell/"))
   (eshell-hist-ignoredups t)
   (eshell-input-filter 'eshell-input-filter-initial-space))
 
-(use-package ibuffer
+(use-feature ibuffer
   :bind
   (("C-x C-b" . ibuffer)
    :map ibuffer-mode-map
@@ -778,7 +841,7 @@ This function is intended for use with `ivy-ignore-buffers'."
            " " filename)))
   :hook (ibuffer . (lambda () (ibuffer-switch-to-saved-filter-groups "default"))))
 
-(use-package outline
+(use-feature outline
   :disabled
   :hook (prog-mode . outline-minor-mode)
   :delight (outline-minor-mode " outl")
@@ -797,10 +860,10 @@ This function is intended for use with `ivy-ignore-buffers'."
    ("h"   . outline-hide-subtree)
    ("s"   . outline-show-subtree)))
 
-(use-package ls-lisp
+(use-feature ls-lisp
   :custom (ls-lisp-dirs-first t))
 
-(use-package dired
+(use-feature dired
   :config
   (setq dired-listing-switches "-alh"
         ls-lisp-use-insert-directory-program nil)
@@ -849,12 +912,12 @@ This function is intended for use with `ivy-ignore-buffers'."
                         (b/dired-start-process "zathura"))))
   :hook (dired-mode . dired-hide-details-mode))
 
-(use-package help
+(use-feature help
   :config
   (temp-buffer-resize-mode)
   (setq help-window-select t))
 
-(use-package tramp
+(use-feature tramp
   :config
   (add-to-list 'tramp-default-proxies-alist '(nil "\\`root\\'" "/ssh:%h:"))
   (add-to-list 'tramp-default-proxies-alist '("localhost" nil nil))
@@ -864,7 +927,7 @@ This function is intended for use with `ivy-ignore-buffers'."
 (use-package dash
   :config (dash-enable-font-lock))
 
-(use-package doc-view
+(use-feature doc-view
   :bind (:map doc-view-mode-map
               ("M-RET" . image-previous-line)))
 
@@ -880,51 +943,49 @@ 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
-(use-package eldoc
+(use-feature eldoc
   :when (version< "25" emacs-version)
   :delight " eldoc"
   :config (global-eldoc-mode))
 
 ;; highlight matching parens
-(use-package paren
+(use-feature paren
   :demand
   :config (show-paren-mode))
 
-(use-package elec-pair
+(use-feature elec-pair
   :demand
   :config (electric-pair-mode))
 
-(use-package simple
+(use-feature simple
   :delight (auto-fill-function " fill")
   :config (column-number-mode))
 
 ;; save minibuffer history
-(use-package savehist
+(use-feature savehist
+  :demand
   :config
   (savehist-mode)
-  :custom
-  (savehist-file (b/var "savehist.el")))
+  (add-to-list 'savehist-additional-variables 'kill-ring))
 
 ;; automatically save place in files
-(use-package saveplace
+(use-feature saveplace
   :when (version< "25" emacs-version)
-  :config (save-place-mode)
-  :custom
-  (save-place-file (b/var "save-place.el")))
+  :config (save-place-mode))
 
-(use-package prog-mode
+(use-feature prog-mode
   :config (global-prettify-symbols-mode)
   (defun indicate-buffer-boundaries-left ()
     (setq indicate-buffer-boundaries 'left))
   (add-hook 'prog-mode-hook #'indicate-buffer-boundaries-left))
 
-(use-package text-mode
+(use-feature text-mode
   :hook (text-mode . indicate-buffer-boundaries-left))
 
-(use-package conf-mode
+(use-feature conf-mode
   :mode "\\.*rc$")
 
-(use-package sh-mode
+(use-feature sh-mode
   :mode "\\.bashrc$")
 
 (use-package company
@@ -958,11 +1019,11 @@ This function is intended for use with `ivy-ignore-buffers'."
   (setq flycheck-check-syntax-automatically '(mode-enabled save))
   :custom (flycheck-mode-line-prefix "flyc"))
 
-(use-package flyspell
+(use-feature flyspell
   :delight " flysp")
 
 ;; http://endlessparentheses.com/ispell-and-apostrophes.html
-(use-package ispell
+(use-feature ispell
   :defer 0.6
   :config
   ;; ’ can be part of a word
@@ -988,52 +1049,52 @@ This function is intended for use with `ivy-ignore-buffers'."
   (advice-add #'ispell-parse-output :filter-args
               #'endless/replace-quote))
 
-(use-package abbrev
+(use-feature abbrev
   :delight " abbr"
-  :hook (text-mode . abbrev-mode)
-  :custom
-  (abbrev-file-name (b/var "abbrev.el")))
+  :hook (text-mode . abbrev-mode))
 
 
 ;;; Programming modes
 
-(use-package lisp-mode
+(use-feature lisp-mode
   :config
   (defun indent-spaces-mode ()
     (setq indent-tabs-mode nil))
   (add-hook 'lisp-interaction-mode-hook #'indent-spaces-mode))
 
-(use-package reveal
+(use-feature reveal
   :delight (reveal-mode " reveal")
   :hook (emacs-lisp-mode . reveal-mode))
 
-(use-package elisp-mode
+(use-feature elisp-mode
   :delight (emacs-lisp-mode "Elisp" :major))
 
-(comment
-  ;; TODO
-  (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\\'"
+  :config (setq alloy-basic-offset 2))
+
+(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))
+  :config
+  (require 'lean-input)
+  (setq default-input-method "Lean"
+        lean-input-tweak-all '(lean-input-compose
+                               (lean-input-prepend "/")
+                               (lean-input-nonempty))
+        lean-input-user-translations '(("/" "/")))
+  (lean-input-setup))
+
+(comment
   (use-package proof-site                 ; for Coq
     :straight proof-general)
 
-  (eval-when-compile (defvar lean-mode-map))
-  (use-package lean-mode
-    :defer 0.4
-    :bind (:map lean-mode-map
-                ("S-SPC" . company-complete))
-    :config
-    (require 'lean-input)
-    (setq default-input-method "Lean"
-          lean-input-tweak-all '(lean-input-compose
-                                 (lean-input-prepend "/")
-                                 (lean-input-nonempty))
-          lean-input-user-translations '(("/" "/")))
-    (lean-input-setup))
-
   (use-package haskell-mode
     :config
     (setq haskell-indentation-layout-offset 4
@@ -1058,11 +1119,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
   )
 
-(use-package sgml-mode
+(use-feature sgml-mode
   :config
   (setq sgml-basic-offset 2))
 
-(use-package css-mode
+(use-feature css-mode
   :config
   (setq css-indent-offset 2))
 
@@ -1155,12 +1216,9 @@ This function is intended for use with `ivy-ignore-buffers'."
     (eclim-executable "~/.p2/pool/plugins/org.eclim_2.8.0/bin/eclim")
     (eclim-eclipse-dirs '("~/usr/eclipse/dsl-2018-09/eclipse"))))
 
-(use-package geiser
-  :config
-  (make-directory (b/var "geiser/") t)
-  (setq geiser-repl-history-filename (b/var "geiser/repl-history")))
+(use-package geiser)
 
-(use-package geiser-guile
+(use-feature geiser-guile
   :config
   (setq geiser-guile-load-path "~/src/git/guix"))
 
@@ -1177,11 +1235,14 @@ This function is intended for use with `ivy-ignore-buffers'."
   :hook
   (po-mode . (lambda () (run-with-timer 0.1 nil 'View-exit))))
 
-(use-package tex-mode
+(use-feature tex-mode
   :config
   (cl-delete-if
    (lambda (p) (string-match "^---?" (car p)))
-   tex--prettify-symbols-alist))
+   tex--prettify-symbols-alist)
+  :hook ((tex-mode . auto-fill-mode)
+         (tex-mode . flyspell-mode)
+         (tex-mode . (lambda () (electric-indent-local-mode -1)))))
 
 
 ;;; Theme
@@ -1198,9 +1259,7 @@ This function is intended for use with `ivy-ignore-buffers'."
   (sml/setup)
   (smart-mode-line-enable))
 
-(comment
-  ;; TODO
-  (use-package doom-themes))
+(use-package doom-themes)
 
 (defvar b/org-mode-font-lock-keywords
   '(("[ \t]*\\(#\\+\\(BEGIN\\|END\\|begin\\|end\\)_\\(\\S-+\\)\\)[ \t]*\\([^\n:]*\\)"
@@ -1293,8 +1352,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 b k" . crux-kill-other-buffers)
-         ("C-c d"   . crux-duplicate-current-line-or-region)
+  :bind (("C-c d"   . crux-duplicate-current-line-or-region)
          ("C-c D"   . crux-duplicate-and-comment-current-line-or-region)
          ("C-c f c" . crux-copy-file-preserve-attributes)
          ("C-c f d" . crux-delete-file-and-buffer)
@@ -1312,7 +1370,6 @@ This function is intended for use with `ivy-ignore-buffers'."
   :defer 0.5
   :bind-keymap ("C-c P" . projectile-command-map)
   :config
-  (make-directory (b/var "projectile/") t)
   (projectile-mode)
 
   (defun b/projectile-mode-line-fun ()
@@ -1337,9 +1394,7 @@ This function is intended for use with `ivy-ignore-buffers'."
        (advice-add 'magit-branch-and-checkout
                    :after #'my-projectile-invalidate-cache)))
   :custom
-  (projectile-cache-file (b/var "projectile/cache.el"))
   (projectile-completion-system 'ivy)
-  (projectile-known-projects-file (b/var "projectile/known-projects.el"))
   (projectile-mode-line-prefix " proj"))
 
 (use-package helpful
@@ -1499,9 +1554,7 @@ This function is intended for use with `ivy-ignore-buffers'."
                ("c" . mc/edit-lines)
                ("n" . mc/mark-next-like-this)
                ("p" . mc/mark-previous-like-this)
-               ("a" . mc/mark-all-like-this)))
-  :config
-  (setq mc/list-file (b/var "mc-list.el")))
+               ("a" . mc/mark-all-like-this))))
 
 (comment
   ;; TODO
@@ -1514,14 +1567,26 @@ This function is intended for use with `ivy-ignore-buffers'."
   :config
   (defconst yas-verbosity-cur yas-verbosity)
   (setq yas-verbosity 2)
-  (setq yas-snippet-dirs (list (b/etc "yasnippet/snippets/")))
   (add-to-list 'yas-snippet-dirs "~/src/git/guix/etc/snippets" t)
   (yas-reload-all)
   (setq yas-verbosity yas-verbosity-cur)
-  (define-key yas-minor-mode-map (kbd "SPC") yas-maybe-expand)
+
+  (defun b/yas--maybe-expand-key-filter (cmd)
+    (when (and (yas--maybe-expand-key-filter cmd)
+               (not (bound-and-true-p git-commit-mode)))
+      cmd))
+  (defconst b/yas-maybe-expand
+    '(menu-item "" yas-expand :filter b/yas--maybe-expand-key-filter))
+  (define-key yas-minor-mode-map
+    (kbd "SPC") b/yas-maybe-expand)
+
   (yas-global-mode))
 
-(use-package debbugs)
+(use-package debbugs
+  :straight (debbugs
+             :host github
+             :repo "emacs-straight/debbugs"
+             :files (:defaults "Debbugs.wsdl")))
 
 (use-package org-ref
   :init
@@ -1539,12 +1604,9 @@ This function is intended for use with `ivy-ignore-buffers'."
 ;; (use-package fill-column-indicator)
 
 (use-package emojify
-  :config
-  (make-directory (b/var "emojify/") t)
-  (setq emojify-emojis-dir (b/var "emojify/"))
   :hook (erc-mode . emojify-mode))
 
-(use-package window
+(use-feature window
   :bind
   (("C-c w <right>" . split-window-right)
    ("C-c w <down>"  . split-window-below)
@@ -1554,7 +1616,7 @@ This function is intended for use with `ivy-ignore-buffers'."
   :custom
   (split-width-threshold 150))
 
-(use-package windmove
+(use-feature windmove
   :defer 0.6
   :bind
   (("C-c w h" . windmove-left)
@@ -1574,15 +1636,18 @@ This function is intended for use with `ivy-ignore-buffers'."
 (use-package pdf-tools
   :defer 0.5
   :bind (:map pdf-view-mode-map
-              ("M-RET" . image-previous-line))
-  :config (pdf-tools-install nil t))
+              ("<XF86Back>"    . pdf-history-backward)
+              ("<XF86Forward>" . pdf-history-forward)
+              ("M-RET"         . image-previous-line))
+  :config (pdf-tools-install nil t)
+  :custom (pdf-view-resize-factor 1.05))
 
 (use-package biblio)
 
-(use-package reftex
+(use-feature reftex
   :hook (latex-mode . reftex-mode))
 
-(use-package reftex-cite
+(use-feature reftex-cite
   :after reftex
   :disabled                             ; enable to disable
                                         ; reftex-cite's default choice
@@ -1596,6 +1661,10 @@ This function is intended for use with `ivy-ignore-buffers'."
           (goto-char (cdr macro)))
         (reftex-this-word)))))
 
+(use-feature files
+  :custom (auto-save-file-name-transforms
+           `((".*" ,(b/var "auto-save/") t))))
+
 
 ;;; Email (with Gnus)
 
@@ -1608,7 +1677,7 @@ This function is intended for use with `ivy-ignore-buffers'."
  mail-user-agent   'gnus-user-agent
  read-mail-command 'gnus)
 
-(use-package gnus
+(use-feature gnus
   :bind (("s-m"     . gnus)
          ("s-M"     . gnus-unplugged)
          ("C-c a m" . gnus)
@@ -1834,7 +1903,7 @@ This function is intended for use with `ivy-ignore-buffers'."
   (with-eval-after-load 'recentf
     (add-to-list 'recentf-exclude gnus-home-directory)))
 
-(use-package gnus-art
+(use-feature gnus-art
   :config
   (setq
    gnus-buttonized-mime-types '("multipart/\\(signed\\|encrypted\\)")
@@ -1862,7 +1931,7 @@ This function is intended for use with `ivy-ignore-buffers'."
    :map gnus-article-mode-map
    ("M-L" . org-store-link)))
 
-(use-package gnus-sum
+(use-feature gnus-sum
   :bind (:map gnus-summary-mode-map
               :prefix-map b/gnus-summary-prefix-map
               :prefix "v"
@@ -1875,7 +1944,7 @@ This function is intended for use with `ivy-ignore-buffers'."
    ("M-L" . org-store-link))
   :hook (gnus-summary-mode . b/no-mouse-autoselect-window))
 
-(use-package gnus-msg
+(use-feature gnus-msg
   :config
   (defvar b/signature "Amin Bandali
 Free Software Activist | GNU Webmaster & Volunteer
@@ -1917,44 +1986,44 @@ https://csclub.uwaterloo.ca/~abandali")
            (signature b/csc-signature)
            (gcc "nnimap+csc:Sent")))))
 
-(use-package gnus-topic
+(use-feature gnus-topic
   :hook (gnus-group-mode . gnus-topic-mode)
   :config (setq gnus-topic-line-format "%i[ %A: %(%{%n%}%) ]%v\n"))
 
-(use-package gnus-agent
+(use-feature gnus-agent
   :config
   (setq gnus-agent-synchronize-flags 'ask)
   :hook (gnus-group-mode . gnus-agent-mode))
 
-(use-package gnus-group
+(use-feature gnus-group
   :config
   (setq gnus-permanently-visible-groups "\\(:INBOX$\\|:gnu$\\)"))
 
 (comment
   ;; problematic with ebdb's popup, *EBDB-Gnus*
-  (use-package gnus-win
+  (use-feature gnus-win
     :config
     (setq gnus-use-full-window nil)))
 
-(use-package gnus-dired
+(use-feature gnus-dired
   :commands gnus-dired-mode
   :init
   (add-hook 'dired-mode-hook 'gnus-dired-mode))
 
-(use-package mm-decode
+(use-feature mm-decode
   :config
   (setq mm-discouraged-alternatives '("text/html" "text/richtext")
         mm-decrypt-option 'known
         mm-verify-option 'known))
 
-(use-package sendmail
+(use-feature sendmail
   :config
   (setq sendmail-program (executable-find "msmtp")
         ;; message-sendmail-extra-arguments '("-v" "-d")
         mail-specify-envelope-from t
         mail-envelope-from 'header))
 
-(use-package message
+(use-feature message
   :config
   ;; redefine for a simplified In-Reply-To header
   ;; (see https://todo.sr.ht/~sircmpwn/lists.sr.ht/67)
@@ -2001,15 +2070,15 @@ https://csclub.uwaterloo.ca/~abandali")
   ;; (message-header-cc      ((t (:foreground "#333" :weight normal))))
   )
 
-(use-package mml
+(use-feature mml
   :delight " mml")
 
-(use-package mml-sec
+(use-feature mml-sec
   :custom
   (mml-secure-openpgp-encrypt-to-self t)
   (mml-secure-openpgp-sign-with-sender t))
 
-(use-package footnote
+(use-feature footnote
   :after message
   ;; :config
   ;; (setq footnote-start-tag ""
@@ -2035,7 +2104,7 @@ https://csclub.uwaterloo.ca/~abandali")
   (with-eval-after-load 'swiper
     (add-to-list 'swiper-font-lock-exclude 'ebdb-mode t)))
 
-(use-package ebdb-com
+(use-feature ebdb-com
   :after ebdb)
 
 ;; (use-package ebdb-complete
@@ -2047,7 +2116,7 @@ https://csclub.uwaterloo.ca/~abandali")
   :config
   (defun company-ebdb--post-complete (_) nil))
 
-(use-package ebdb-gnus
+(use-feature ebdb-gnus
   :after ebdb
   :custom
   (ebdb-gnus-window-configuration
@@ -2058,7 +2127,7 @@ https://csclub.uwaterloo.ca/~abandali")
                            (article 1.0)
                            (ebdb-gnus 0.3))))))
 
-(use-package ebdb-mua
+(use-feature ebdb-mua
   :after ebdb
   ;; :custom (ebdb-mua-pop-up nil)
   )
@@ -2095,7 +2164,7 @@ https://csclub.uwaterloo.ca/~abandali")
 
 ;;; IRC (with ERC and ZNC)
 
-(use-package erc
+(use-feature erc
   :bind (("C-c b e" . erc-switch-to-buffer)
          :map erc-mode-map
          ("M-a" . erc-track-switch-buffer))
@@ -2196,19 +2265,19 @@ updates of `erc-lurker-state'."
             (puthash sender (current-time)
                      (gethash server erc-lurker-state))))))))
 
-(use-package erc-fill
+(use-feature erc-fill
   :after erc
   :custom
   (erc-fill-column 77)
   (erc-fill-function 'erc-fill-static)
   (erc-fill-static-center 18))
 
-(use-package erc-pcomplete
+(use-feature erc-pcomplete
   :after erc
   :custom
   (erc-pcomplete-nick-postfix ","))
 
-(use-package erc-track
+(use-feature erc-track
   :after erc
   :bind (("C-c a e t d" . erc-track-disable)
          ("C-c a e t e" . erc-track-enable))
@@ -2226,7 +2295,7 @@ updates of `erc-lurker-state'."
   :after erc)
 
 (use-package znc
-  :load-path "lisp/znc.el/"
+  :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