emacs: use straight.el for package management again

it seems easier/cleaner to use straight rather than going through all
of guix. not sure; might end up using guix again for it at some point.

also, fork lean-mode and remove runtime requiring of cl, and use the
fork. should submit PR and switch back to upstream once it’s merged.

3 files changed, 283 insertions, 148 deletions

diff --git a/.config/guix/manifest/jirud.scm b/.config/guix/manifest/jirud.scm
index 34094ed..92a67ff 100644
--- a/.config/guix/manifest/jirud.scm
+++ b/.config/guix/manifest/jirud.scm
@@ -2,58 +2,7 @@
   '("audacity"
     "bash-completion"
     "cvs"
-    "emacs"
-    "emacs-alert"
-    "emacs-async"
-    "emacs-biblio-git"
-    "emacs-boxquote"
-    "emacs-company"
-    "emacs-company-ebdb"
-    "emacs-crux"
-    "emacs-dash"
-    "emacs-debbugs"
-    "emacs-delight"
-    "emacs-diff-hl"
-    ;; "emacs-doom-themes"
-    "emacs-ebdb"
-    "emacs-emmet-mode"
-    "emacs-emojify"
-    "emacs-erc-hl-nicks"
-    "emacs-erc-scrolltoplace"
-    "emacs-eshell-up"
-    "emacs-exec-path-from-shell"
-    "emacs-expand-region"
-    "emacs-flycheck"
-    "emacs-geiser"
-    ;; "emacs-gnus-harvest"
-    "emacs-go-mode"
-    "emacs-guix"
-    "emacs-helpful"
-    "emacs-hl-todo"
-    "emacs-ivy"
-    "emacs-magit"
-    "emacs-message-x"
-    "emacs-multi-term"
-    "emacs-multiple-cursors"
-    "emacs-mwim"
-    "emacs-org"
-    "emacs-org-contrib"
-    "emacs-org-ref"
-    "emacs-orgalist"
-    "emacs-page-break-lines"
-    "emacs-pass"
-    "emacs-pdf-tools"
-    "emacs-pinentry"
-    "emacs-projectile"
-    "emacs-shrink-path"
-    "emacs-smart-mode-line"
-    "emacs-smex"
-    "emacs-typo"
-    "emacs-unkillable-scratch"
-    "emacs-use-package"
-    "emacs-web-mode"
-    "emacs-which-key"
-    "emacs-yasnippet"
+    ;; "emacs"
     "font-adobe-source-code-pro"
     ;; "font-gnu-freefont-ttf"
     ;; "font-google-roboto"
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index c723488..60c73b7 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,72 @@
   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 '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
@@ -130,7 +194,7 @@
  nsm-settings-file (b/var "nsm-settings.el"))
 
 ;; 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 +228,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,30 +284,30 @@ 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
+(use-feature epa
   :custom
   ; this will fail if gpg>=2.1 is not available
   (epa-pinentry-mode 'loopback))
 
-(use-package epg-config
+(use-feature epg-config
   :defer 0.4
   :custom
   ((epg-gpg-program (executable-find "gpg"))
    (epg-pinentry-mode 'loopback)))
 
-(use-package epg
+(use-feature epg
   :after epg-config)
 
 (use-package pinentry
@@ -406,10 +470,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)))
@@ -459,10 +523,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
@@ -501,7 +594,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
@@ -517,7 +610,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)))
 
@@ -587,7 +680,7 @@ For disabling the behaviour for certain buffers and/or modes."
   :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\\)?:")
@@ -673,7 +766,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)
@@ -707,7 +800,7 @@ This function is intended for use with `ivy-ignore-buffers'."
   (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
@@ -781,7 +874,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")
@@ -800,10 +893,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)
@@ -852,12 +945,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))
@@ -867,7 +960,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)))
 
@@ -883,51 +976,51 @@ 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
   :config
   (savehist-mode)
   :custom
   (savehist-file (b/var "savehist.el")))
 
 ;; 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")))
 
-(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
@@ -961,11 +1054,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
@@ -991,7 +1084,7 @@ 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
@@ -1000,43 +1093,45 @@ This function is intended for use with `ivy-ignore-buffers'."
 
 ;;; 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
@@ -1061,11 +1156,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))
 
@@ -1163,7 +1258,7 @@ This function is intended for use with `ivy-ignore-buffers'."
   (make-directory (b/var "geiser/") t)
   (setq geiser-repl-history-filename (b/var "geiser/repl-history")))
 
-(use-package geiser-guile
+(use-feature geiser-guile
   :config
   (setq geiser-guile-load-path "~/src/git/guix"))
 
@@ -1180,7 +1275,7 @@ 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)))
@@ -1204,9 +1299,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:]*\\)"
@@ -1535,7 +1628,11 @@ This function is intended for use with `ivy-ignore-buffers'."
 
   (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
@@ -1558,7 +1655,7 @@ This function is intended for use with `ivy-ignore-buffers'."
   (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)
@@ -1568,7 +1665,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)
@@ -1596,10 +1693,10 @@ This function is intended for use with `ivy-ignore-buffers'."
 
 (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
@@ -1625,7 +1722,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)
@@ -1851,7 +1948,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\\)")
@@ -1879,7 +1976,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"
@@ -1892,7 +1989,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
@@ -1934,44 +2031,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)
@@ -2018,15 +2115,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 ""
@@ -2052,7 +2149,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
@@ -2064,7 +2161,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
@@ -2075,7 +2172,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)
   )
@@ -2112,7 +2209,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))
@@ -2213,19 +2310,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))
@@ -2243,7 +2340,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
diff --git a/.emacs.d/straight/versions/default.el b/.emacs.d/straight/versions/default.el
new file mode 100644
index 0000000..353c04a
--- /dev/null
+++ b/.emacs.d/straight/versions/default.el
@@ -0,0 +1,89 @@
+(("alert" . "95a735e6947b0d09dbf9b9a944a21e5f5c1e6ee1")
+ ("alloy-mode" . "0d05bdd10c77ec04c3d61eccf67e68c08284951f")
+ ("auth-password-store" . "847a1f54ed48856b4dfaaa184583ef2c84173edf")
+ ("biblio.el" . "efeeab720cb8e3f95ddb4298d0cc62393cf237e9")
+ ("boxquote.el" . "7e47e0e2853bc1215739b2e28f260e9eed93b2c5")
+ ("bui.el" . "508577a7225b3d07eaefa9444064410af2518675")
+ ("cl-lib" . "e79686c4a26959c0ecba0951a7e335ed28035386")
+ ("company-ebdb" . "3b463fe1236ac6445657f3a1df20357a7a2fa8f6")
+ ("company-mode" . "1120b56bd1154a17e4c0b950cbdba4c85be28e2a")
+ ("crux" . "308f17d914e2cd79cbc809de66d02b03ceb82859")
+ ("dash.el" . "11907f4592ff1813536366d54245d3ecf6b99198")
+ ("debbugs" . "137b78bf1b0456590dac00a6813be6148df2d80f")
+ ("delight" . "02e73b69708e23053105866a58fe14f75c272dee")
+ ("diff-hl" . "374b1d4b34876219218da7a539e7301259b56958")
+ ("ebdb" . "61bb4d89f9413611e3563be90a26baefec6a15b0")
+ ("edit-indirect" . "de645d8144e8a08f039a9c88185121ec81d957ef")
+ ("elisp-refs" . "0a254e6a4dc7fa12857f8334fe6eefa72e49d1c9")
+ ("emacs-async" . "bd68cc1ab1ac6af890e250bdaa12ffb1cb9649be")
+ ("emacs-doom-themes" . "470dd52ec4761a0b2c1f2c0309233e1fba04e598")
+ ("emacs-emojify" . "782ac307f37239e90c56810323db4263a6469219")
+ ("emacs-htmlize" . "8db0aa6aab77475a732b7363f0d57bd3933c18fd")
+ ("emacs-which-key" . "42a25055163141165aa0269dbca69735e704825c")
+ ("emacsmirror-mirror" . "0e4c16db8e463b8c256292f7874bfb022963cc6f")
+ ("emmet-mode" . "1acb821e0142136344ccf40c1e5fb664d7db2e70")
+ ("epl" . "78ab7a85c08222cd15582a298a364774e3282ce6")
+ ("erc-hl-nicks" . "756c4438a8245ccd3e389bf6c9850ee8453783ec")
+ ("erc-scrolltoplace" . "feb0fbf1fd4bdf220ae2d31ea7c066d8e62089f9")
+ ("eshell-up" . "9c100bae5c3020e8d9307e4332d3b64e7dc28519")
+ ("exec-path-from-shell" . "3cfedb8791397ed50ee66bc0a7cbee5b9d78245c")
+ ("expand-region.el" . "1c31447730443d98f90f65dfcb752f347d46ad1b")
+ ("f.el" . "8191672377816a1975414cc1f116fd3b94b30bd0")
+ ("flycheck" . "ea176a4f6bfebd70b71a8a5e2988b49e1a58fe52")
+ ("geiser" . "d7bcfde6303b420ca76d9364c6e8f2c6827112e6")
+ ("gntp.el" . "767571135e2c0985944017dc59b0be79af222ef5")
+ ("gnu-elpa-mirror" . "01001b660cd3677228e25a6f544d579b56845c37")
+ ("go-mode.el" . "a13b8146bfde207513327d95e5e85cefadf99832")
+ ("guix.el" . "11e0dbf6491300d250efb3dc09d634b01e86b35b")
+ ("helm" . "c00b5826c1d5797debe92ed235d50b068a348c14")
+ ("helm-bibtex" . "7e87161463c9c5ade3ed0e65aa3cde48c51b57de")
+ ("helpful" . "e9e958a5643619d0e32b9934bf4e9195c57cb71f")
+ ("hl-todo" . "be57dbc5a4667e4a60b8249b53fa176db1019c8e")
+ ("ht.el" . "a5a046e7c26fbcda0b757a64b30ca3e5b1cc6d69")
+ ("hydra" . "435c55e9f75a8cf3ae6a4ba0c7725e3dc4e5963f")
+ ("key-chord" . "72443e9ff3c4f1c3ccaced3130236801efde3d83")
+ ("lean-mode" . "62383ed5c61a0fb91657724cb613afda6c85c9c1")
+ ("let-alist" . "57561d7d9267da48e8b7ab1f3bd45c9d05951289")
+ ("log4e" . "c69424e407be0d9d0e54b427d8b18b1ac5a607e2")
+ ("loop.el" . "e22807f83a0890dc8a904c51ee0742c34efccc6c")
+ ("magit" . "bcd161d8ad3fcd80cbf69e7720c1d75a79415021")
+ ("magit-popup" . "4250c3a606011e3ff2477e3b5bbde2b493f3c85c")
+ ("melpa" . "5b21ac3eaacfff27ca4def04f6cf7b4888b7fcf4")
+ ("message-x" . "5524de7bbfdd8749c110f48de5afb024d9f83133")
+ ("multi-term" . "0804b11e52b960c80f5cd0712ee1e53ae70d83a4")
+ ("multiple-cursors.el" . "b9b851a7670f4348f3a08b11ef12ed99676c8b84")
+ ("mwim.el" . "b4f3edb4c0fb8f8b71cecbf8095c2c25a8ffbf85")
+ ("nadvice" . "2dfcf614dc5472fb21e48f93d0ebb4546276377f")
+ ("org" . "df30a056b2a0a18a349cf02eb761c347608ac930")
+ ("org-ref" . "9ab74270c1543e4743ca0436de567d8205403b43")
+ ("page-break-lines" . "2e1d274e11071bb8daea4d6f4c0369c84466de7a")
+ ("parsebib" . "9a5f1730b8ef1fb6c29262a8ba79f8136e5548d4")
+ ("pass" . "35e3f86e96878520e690513cdbc1b2753b173e72")
+ ("password-store" . "b87e91f984f45615b6459ff3829baa9130b8ef75")
+ ("password-store-otp.el" . "04998c8578a060ab4a4e8f46f2ee0aafad4ab4d5")
+ ("pdf-tools" . "db7de3901ae0e55f6ab8cf9baec257f706c3d16e")
+ ("pinentry" . "cd942f755c38a7ac270ce858bb887ebdd59edd26")
+ ("pkg-info" . "76ba7415480687d05a4353b27fea2ae02b8d9d61")
+ ("po-mode" . "1916142f6a817c733d5ec37e3b4fbae3da67e499")
+ ("popup-el" . "80829dd46381754639fb764da11c67235fe63282")
+ ("projectile" . "71a01f409a319d57eb3832e93e8a412fbc9d7a65")
+ ("rich-minority" . "a03e693f6f9232cf75363aaaf1cb041f21675c19")
+ ("s.el" . "03410e6a7a2b11e47e1fea3b7d9899c7df26435e")
+ ("seq" . "095fb15a3baa082079799dd36b6caccdb062cb90")
+ ("shrink-path.el" . "c14882c8599aec79a6e8ef2d06454254bb3e1e41")
+ ("smart-mode-line" . "999be065b195f2eddb4e1b629f99038d832d44b7")
+ ("smex" . "55aaebe3d793c2c990b39a302eb26c184281c42c")
+ ("soap-client" . "0c531f8bf9cd84cd12fbb434ad02344f75deef6f")
+ ("straight.el" . "3794237a251c759262fb0b1a2579344aba4caf9a")
+ ("swiper" . "79333e9edfee38ec3b367c33711a68bdf7783259")
+ ("switch-buffer-functions-el" . "b8d8e01e21ae8c8c84234dddeb3cc8250814f7ba")
+ ("tablist" . "8079801527da1f596bc942162026328d7bdf6ad9")
+ ("transient" . "9fb3f797f10fd069c2bffa7a3ead746aa53d1a25")
+ ("typoel" . "9dad93b6f367f02f52c8d9bf15d446d922cec294")
+ ("unkillable-scratch" . "b24c2a760529833f230c14cb02ff6e7ec92288ab")
+ ("use-package" . "1d5ffb2e0d1427066ced58febbba68c1328bf001")
+ ("web-mode" . "a723d3ecd3606d1c1948871f46fc8c8d7f879fe4")
+ ("with-editor" . "45c29f9bfb7f2df93426ce1571e2f4f41ed4e492")
+ ("yasnippet" . "d91dd66f2aed9bbaef32813a68b105ea77e83890")
+ ("znc" . "ee50cc596adab44cf5460ef62be2c6e3d745aa5b"))
+:alpha