switch back to setopt rather than custom

21 files changed, 312 insertions, 322 deletions

diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index cf9bbaf..b36732b 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -21,8 +21,6 @@
 (keymap-global-unset "C-z")
 (keymap-global-unset "C-x C-z")
 (keymap-global-set "C-x C-b" #'ibuffer)
-(keymap-global-set "C-z =" #'text-scale-increase)
-(keymap-global-set "C-z -" #'text-scale-decrease)
 (keymap-global-set "H-SPC" #'pop-to-mark-command)
 
 (setopt warning-minimum-level :error
@@ -50,6 +48,7 @@
         completion-ignore-case t
         read-buffer-completion-ignore-case t)
 (setq-default tab-width 8)
+(add-to-list 'default-frame-alist '(alpha . (92 . 92)))
 (blink-cursor-mode -1)
 (indent-tabs-mode 0)
 (fringe-mode '(0 . 0))
diff --git a/.config/emacs/modules/bd--browse.el b/.config/emacs/modules/bd--browse.el
index e229e5a..ab61fa8 100644
--- a/.config/emacs/modules/bd--browse.el
+++ b/.config/emacs/modules/bd--browse.el
@@ -69,10 +69,10 @@ icecat, or eww."
 
 (use-package shr
   :defer t
-  :custom
-  (shr-use-fonts t)
-  (shr-cookie-policy nil)
-  (shr-max-width 85))
+  :config
+  (setopt shr-use-fonts t
+	  shr-cookie-policy nil
+	  shr-max-width 85))
 
 (use-package elpher
   :bind
@@ -92,25 +92,23 @@ icecat, or eww."
          (elpher-go url))
         (t (funcall original url new-window))))
   (advice-add 'eww :around 'bd/elpher)
-  :custom
-  (elpher-default-url-type "gemini")
-  (elpher-connection-timeout 120)
-  (elpher-gemini-max-fill-width 85)
-  (elpher-use-emacs-bookmark-menu t))
+  (setopt elpher-default-url-type "gemini"
+	  elpher-connection-timeout 120
+	  elpher-gemini-max-fill-width 85
+	  elpher-use-emacs-bookmark-menu t))
 
 (use-package eww
   :hook
   ((eww-after-render . (lambda ()
                          (setq-local fill-column-desired-width 90)
                          (fill-column-mode))))
-  :custom
-  (eww-search-prefix "https://duckduckgo.com/html/?q=")
-  (eww-auto-rename-buffer 'title)
-  (eww-use-browse-url (regexp-opt '("mailto:"
+  :config
+  (setopt eww-search-prefix "https://duckduckgo.com/html/?q="
+	  eww-auto-rename-buffer 'title
+	  eww-use-browse-url (regexp-opt '("mailto:"
                                     "youtube.com"
                                     "youtu.be"))))
 
-
 (use-package apropos
   :bind (("C-h a" . selector-apropos)))
 
diff --git a/.config/emacs/modules/bd--buffers.el b/.config/emacs/modules/bd--buffers.el
index a8e3cbe..986a932 100644
--- a/.config/emacs/modules/bd--buffers.el
+++ b/.config/emacs/modules/bd--buffers.el
@@ -8,30 +8,28 @@
 (use-package autorevert
   :init
   (global-auto-revert-mode)
-  :custom
-  (global-auto-revert-non-file-buffers t)
-  (auto-revert-interval 30))
+  :config
+  (setopt global-auto-revert-non-file-buffers t
+	  auto-revert-interval 30))
 
 (use-package shackle
   :demand t
   :config
   (shackle-mode)
-  :custom
-  (switch-to-buffer-obey-display-actions t)
-  (shackle-rules '(
-                   ;; native
-                   (compilation-mode :select nil :align bottom :size 0.2)
-                   (completion-list-mode :select nil :align bottom :size 0.1)
-                   ("^\\*Async Shell Command\\*.*$" :regexp t :ignore t)
-		   ;; magit
-                   (magit-status-mode :select t :align bottom :size 0.3)
-                   (magit-diff-mode :select nil :align right :size 0.3)
-                   ;; emms
-                   (emms-playlist-mode :select t :align left :size 0.2)
-                   )))
-
+  (setopt switch-to-buffer-obey-display-actions t
+	  shackle-rules
+	  '(
+	    ;; native
+	    (compilation-mode :select nil :align bottom :size 0.2)
+	    (completion-list-mode :select nil :align bottom :size 0.1)
+	    ("^\\*Async Shell Command\\*.*$" :regexp t :ignore t)
+	    ;; magit
+	    (magit-status-mode :select t :align bottom :size 0.3)
+	    (magit-diff-mode :select nil :align right :size 0.3)
+	    ;; emms
+	    (emms-playlist-mode :select t :align left :size 0.2)
+	    )))
 
-(add-to-list 'default-frame-alist '(alpha . (92 . 92)))
 
 (defun bd/layout--do-with-haste (f)
   (let* ((args (transient-args 'bd/layout-dispatcher))
diff --git a/.config/emacs/modules/bd--devel.el b/.config/emacs/modules/bd--devel.el
index 6008904..fda79a9 100644
--- a/.config/emacs/modules/bd--devel.el
+++ b/.config/emacs/modules/bd--devel.el
@@ -37,8 +37,8 @@
                buffer-file-name)))))
 
 (use-package autoformat
-  :custom
-  (autoformat-mode 1))
+  :config
+  (setopt autoformat-mode 1))
 
 (use-package hl-line
   :hook
@@ -48,11 +48,10 @@
 (use-package compile
   :demand t
   :hook ((compilation-filter . ansi-color-compilation-filter))
-  :custom
-  (compilation-always-kill t)
-  (compilation-scroll-output 'first-error)
-  (compilation-ask-about-save nil)
   :config
+  (setopt compilation-always-kill t
+	  compilation-scroll-output 'first-error
+	  compilation-ask-about-save nil)
   (defun bd/compile-dwim (f)
     (let ((default-directory (bd/get-directory-dwim)))
       (call-interactively f)))
@@ -67,8 +66,8 @@
                         (bd/compile-dwim #'compile))))
 
 (use-package man
-  :custom
-  (Man-notify-method 'pushy))
+  :config
+  (setopt Man-notify-method 'pushy))
 
 (use-package eldoc
   :init
@@ -82,14 +81,15 @@
 	 ("C-c f p" . #'flymake-goto-prev-error)
 	 ("C-c f b" . #'flymake-show-buffer-diagnostics)
 	 ("C-c f p" . #'flymake-show-project-diagnostics))
-  :custom
-  ;; (flymake-suppress-zero-counters t)
-  (flymake-no-changes-timeout nil)
-  (flymake-start-on-flymake-mode t)
-  (flymake-start-on-save-buffer t)
-  (flymake-proc-compilation-prevents-syntax-check t)
-  (flymake-wrap-around nil)
-  (flymake-show-diagnostics-at-end-of-line nil))
+  :config
+  (setopt flymake-no-changes-timeout nil
+	  flymake-start-on-flymake-mode t
+	  flymake-start-on-save-buffer t
+	  flymake-proc-compilation-prevents-syntax-check t
+	  flymake-wrap-around nil
+	  flymake-show-diagnostics-at-end-of-line nil))
+
+(use-package geiser-guile)
 
 (use-package yasnippet
   :hook ((text-mode
@@ -100,12 +100,12 @@
   :hook css-mode)
 
 (use-package paren
-  :custom
-  (show-paren-delay 0)
-  (show-paren-highlight-openparen t)
-  (show-paren-context-when-offscreen t)
-  (show-paren-when-point-in-periphery t)
-  (show-paren-when-point-inside-paren t))
+  :config
+  (setopt show-paren-delay 0
+	  show-paren-highlight-openparen t
+	  show-paren-context-when-offscreen t
+	  show-paren-when-point-in-periphery t
+	  show-paren-when-point-inside-paren t))
 
 (use-package rainbow-delimiters
   :hook prog-mode)
diff --git a/.config/emacs/modules/bd--dictionary.el b/.config/emacs/modules/bd--dictionary.el
index 5c161b7..f6e67fb 100644
--- a/.config/emacs/modules/bd--dictionary.el
+++ b/.config/emacs/modules/bd--dictionary.el
@@ -6,9 +6,9 @@
 (use-package dictionary
   :defer t
   :bind (("C-c i" . dictionary-lookup-definition))
-  :custom
-  (dictionary-server "localhost")
-  (dictionary-use-single-buffer t))
+  :config
+  (setopt dictionary-server "localhost"
+	  dictionary-use-single-buffer t))
 
 
 (provide 'bd--dictionary)
diff --git a/.config/emacs/modules/bd--emms.el b/.config/emacs/modules/bd--emms.el
index 1770c16..5efe6c6 100644
--- a/.config/emacs/modules/bd--emms.el
+++ b/.config/emacs/modules/bd--emms.el
@@ -4,7 +4,6 @@
 
 
 (use-package emms
-  :demand t
   :config
   (require 'emms-setup)
   (require 'emms-player-mpv)
@@ -49,13 +48,12 @@ playback."
           title)
          (t
           (emms-track-simple-description track))))))
-  :custom
-  (emms-source-file-default-directory (expand-file-name "~/ik/playlists/"))
-  (emms-info-report-each-num-tracks 2000)
-  (emms-playlist-buffer-name "*Playlist*")
-  (emms-mode-line-icon-enabled-p nil)
-  (emms-mode-line-format " [%s] ")
-  (emms-repeat-playlist t))
+  (setopt emms-source-file-default-directory (expand-file-name "~/ik/playlists/")
+	  emms-info-report-each-num-tracks 2000
+	  emms-playlist-buffer-name "*Playlist*"
+	  emms-mode-line-icon-enabled-p nil
+	  emms-mode-line-format " [%s] "
+	  emms-repeat-playlist t))
 
 
 (provide 'bd--emms)
diff --git a/.config/emacs/modules/bd--exwm-windowing.el b/.config/emacs/modules/bd--exwm-windowing.el
index 2825b1a..e5084bb 100644
--- a/.config/emacs/modules/bd--exwm-windowing.el
+++ b/.config/emacs/modules/bd--exwm-windowing.el
@@ -16,64 +16,65 @@ that buffer."
   (define-key exwm-mode-map [?\C-q] 'exwm-input-send-next-key)
   (exwm-enable)
   (server-start)
-  :custom
-  (exwm-input-prefix-keys
-   `(?\C-x
-     ?\C-u
-     ?\C-g
-     ?\C-h
-     ?\C-z
-     ?\C-`
-     ?\M-x
-     ?\M-`
-     ?\M-&
-     ?\M-:
-     ,@(mapcar (lambda (i)
-                 (kbd (concat "s-" (number-to-string i))))
-               (number-sequence 0 9))))
-  (exwm-input-global-keys
-   '(([?\s-n] . other-window)
-     ([?\s-p] . (lambda ()
-                  (interactive)
-                  (other-window -1)))
-     ([?\s-L] . bd/lock)
-     ([f2] . bd/toggle-mute)
-     ([f5] . bd/decrement-volume)
-     ([f6] . bd/increment-volume)
-     ([f7] . bd/decrement-brightness)
-     ([f8] . bd/increment-brightness)
-     ([f9] . emms-previous)
-     ([f10] . emms-next)
-     ([print] . bd/shoot-part)
-     ([S-print] . bd/shoot-full)
-     ([?\s-O] . bd/visit-bookmark)
-     ([?\s-P] . bd/password)
-     ([?\s-r] . exwm-reset)
-     ([?\s-d] . toggle-window-dedicated)
-     ([?\s-q] . kill-current-buffer)
-     ([?\s-x] . (lambda (command)
-                  (interactive (list (read-shell-command "s-x ")))
-                  (start-process-shell-command command nil command)))))
-  (exwm-input-simulation-keys
-   '(([?\C-b] . [left])
-     ([?\C-f] . [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])
-     ([?\M-w] . [C-c])
-     ([?\C-y] . [C-v])
-     ([?\C-s] . [C-g])
-     ([?\C-r] . [C-S-g])
-     ([?\M-d] . [C-delete])
-     ([?\M-b] . [C-left])
-     ([?\M-f] . [C-right])
-     ([?\H-b] . [M-left])
-     ([?\H-f] . [M-right]))))
+  (setopt exwm-input-prefix-keys
+	  `(?\C-x
+	    ?\C-u
+	    ?\C-g
+	    ?\C-h
+	    ?\C-z
+	    ?\C-`
+	    ?\M-x
+	    ?\M-`
+	    ?\M-&
+	    ?\M-:
+	    ,@(mapcar (lambda (i)
+			(kbd (concat "s-" (number-to-string i))))
+		      (number-sequence 0 9)))
+
+	  exwm-input-global-keys
+	  '(([?\s-n] . other-window)
+	    ([?\s-p] . (lambda ()
+			 (interactive)
+			 (other-window -1)))
+	    ([?\s-L] . bd/lock)
+	    ([f2] . bd/toggle-mute)
+	    ([f5] . bd/decrement-volume)
+	    ([f6] . bd/increment-volume)
+	    ([f7] . bd/decrement-brightness)
+	    ([f8] . bd/increment-brightness)
+	    ([f9] . emms-previous)
+	    ([f10] . emms-next)
+	    ([print] . bd/shoot-part)
+	    ([S-print] . bd/shoot-full)
+	    ([?\s-O] . bd/visit-bookmark)
+	    ([?\s-P] . bd/password)
+	    ([?\s-r] . exwm-reset)
+	    ([?\s-d] . toggle-window-dedicated)
+	    ([?\s-q] . kill-current-buffer)
+	    ([?\s-x] . (lambda (command)
+			 (interactive (list (read-shell-command "s-x ")))
+			 (start-process-shell-command command nil command))))
+
+	  exwm-input-simulation-keys
+	  '(([?\C-b] . [left])
+	    ([?\C-f] . [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])
+	    ([?\M-w] . [C-c])
+	    ([?\C-y] . [C-v])
+	    ([?\C-s] . [C-g])
+	    ([?\C-r] . [C-S-g])
+	    ([?\M-d] . [C-delete])
+	    ([?\M-b] . [C-left])
+	    ([?\M-f] . [C-right])
+	    ([?\H-b] . [M-left])
+	    ([?\H-f] . [M-right]))))
 
 (setopt tab-bar-select-tab-modifiers '(super))
 
diff --git a/.config/emacs/modules/bd--files.el b/.config/emacs/modules/bd--files.el
index 6608734..c242487 100644
--- a/.config/emacs/modules/bd--files.el
+++ b/.config/emacs/modules/bd--files.el
@@ -6,10 +6,10 @@
 (use-package recentf
   :init
   (recentf-mode 1)
-  :custom
-  (recentf-max-saved-items 3500)
-  (recentf-keep '(recentf-keep-default-predicate remote-file-p))
-  (recentf-auto-cleanup 300))
+  :config
+  (setopt recentf-max-saved-items 3500
+	  recentf-keep '(recentf-keep-default-predicate remote-file-p)
+	  recentf-auto-cleanup 300))
 
 (defun bd/zathura (file)
   "Open FILE with zathura."
@@ -55,15 +55,15 @@
 (use-package dired
   :bind
   (("C-c d" . dired-jump))
-  :custom
-  (dired-listing-switches "-alhLG --time-style=long-iso --group-directories-first")
-  (dired-recursive-copies 'always)
-  (dired-recursive-deletes 'always)
-  (dired-auto-revert-buffer t)
-  (dired-dwim-target t)
-  (dired-guess-shell-alist-user
-   `((,(regexp-opt '(".pdf")) "pdftotext -nopgbrk -enc UTF-8 -eol unix -layout")
-     (,(regexp-opt '(".html")) "icecat &"))))
+  :config
+  (setopt dired-listing-switches "-alhLG --time-style=long-iso --group-directories-first"
+	  dired-recursive-copies 'always
+	  dired-recursive-deletes 'always
+	  dired-auto-revert-buffer t
+	  dired-dwim-target t
+	  dired-guess-shell-alist-user
+	  `((,(regexp-opt '(".pdf")) "pdftotext -nopgbrk -enc UTF-8 -eol unix -layout")
+	    (,(regexp-opt '(".html")) "icecat &"))))
 
 (use-package transmission
   :defer t
diff --git a/.config/emacs/modules/bd--gpg.el b/.config/emacs/modules/bd--gpg.el
index fd883cf..3f912b3 100644
--- a/.config/emacs/modules/bd--gpg.el
+++ b/.config/emacs/modules/bd--gpg.el
@@ -62,9 +62,8 @@ for a bug I've encountered."
     (interactive)
     (pinentry-stop)
     (pinentry-start))
-  :custom
-  (enable-recursive-minibuffers t)
-  (pinentry-popup-prompt-window nil))
+  (setopt enable-recursive-minibuffers t
+	  pinentry-popup-prompt-window nil))
 
 
 (provide 'bd--gpg)
diff --git a/.config/emacs/modules/bd--image.el b/.config/emacs/modules/bd--image.el
index 48ab024..1d5876c 100644
--- a/.config/emacs/modules/bd--image.el
+++ b/.config/emacs/modules/bd--image.el
@@ -5,7 +5,7 @@
 
 
 (use-package image-mode
-  :custom
+  :config
   (defun toggle-mode-line ()
     "If the mode line is displayed, toggle it off.
 If the mode line is off, set it to the default value."
diff --git a/.config/emacs/modules/bd--irc.el b/.config/emacs/modules/bd--irc.el
index dd9d1d3..9368144 100644
--- a/.config/emacs/modules/bd--irc.el
+++ b/.config/emacs/modules/bd--irc.el
@@ -11,18 +11,18 @@
 		   (setq-local fill-column-desired-width 80)
 		   (fill-column-mode)
 		   (rcirc-omit-mode))))
-  :custom
-  (rcirc-fill-column 80)
-  (rcirc-omit-threshold 10)
-  (rcirc-reconnect-delay 60)
-  (rcirc-omit-responses '("JOIN" "PART" "QUIT" "NICK" "AWAY"))
-  (rcirc-track-minor-mode 1)
-  (rcirc-server-alist
-   '(("operationnull.com"
-      :nick "Gondul"
-      :user-name "Gondul"
-      :port 6697
-      :encryption tls))))
+  :config
+  (setopt rcirc-fill-column 80
+	  rcirc-omit-threshold 10
+	  rcirc-reconnect-delay 60
+	  rcirc-omit-responses '("JOIN" "PART" "QUIT" "NICK" "AWAY")
+	  rcirc-track-minor-mode 1
+	  rcirc-server-alist
+	  '(("operationnull.com"
+	     :nick "Gondul"
+	     :user-name "Gondul"
+	     :port 6697
+	     :encryption tls))))
 
 
 (provide 'bd--irc)
diff --git a/.config/emacs/modules/bd--minibuffer.el b/.config/emacs/modules/bd--minibuffer.el
index 5acd186..205ead0 100644
--- a/.config/emacs/modules/bd--minibuffer.el
+++ b/.config/emacs/modules/bd--minibuffer.el
@@ -7,15 +7,14 @@
 
 
 (use-package icomplete
-  :custom
-  (completing-read-function #'completing-read-default)
-  (read-file-name-function #'read-file-name-default)
-  (completion-styles '(basic
-                       substring
-                       initials
-                       flex))
-  (completions-max-height '30)
   :config
+  (setopt completing-read-function #'completing-read-default
+	  read-file-name-function #'read-file-name-default
+	  completion-styles '(basic
+			      substring
+			      initials
+			      flex)
+	  completions-max-height '30)
   (icomplete-vertical-mode))
 
 (use-package selector
diff --git a/.config/emacs/modules/bd--notes.el b/.config/emacs/modules/bd--notes.el
index 31aa5c8..0bfdc4a 100644
--- a/.config/emacs/modules/bd--notes.el
+++ b/.config/emacs/modules/bd--notes.el
@@ -55,14 +55,17 @@ then pastes the active region."
     "Format front matter KEYWORDS for skribe file type.
 KEYWORDS is a list of strings."
     (string-join keywords "\" \""))
-  :custom
-  (denote-file-type 'org)
-  (denote-known-keywords '("ss" "writing" "reading" "art" "csu" "umass" "cs" "guix" "emacs" "programs" "mem"))
-  (denote-directory (expand-file-name "~/dc/"))
-  (denote-prompts '(title file-type keywords))
-  (denote-dired-directories (list denote-directory))
-  (denote-journal-extras-directory (expand-file-name "~/dc/log"))
-  (denote-journal-extras-title-format 'day-date-month-year))
+  :config
+  (setopt denote-file-type 'org
+	  denote-known-keywords
+	  '("ss" "writing" "reading" "art"
+	    "csu" "umass" "cs" "guix"
+	    "emacs" "programs" "mem")
+	  denote-directory (expand-file-name "~/dc/")
+	  denote-prompts '(title file-type keywords)
+	  denote-dired-directories (list denote-directory)
+	  denote-journal-extras-directory (expand-file-name "~/dc/log")
+	  denote-journal-extras-title-format 'day-date-month-year))
 
 
 (provide 'bd--notes)
diff --git a/.config/emacs/modules/bd--org.el b/.config/emacs/modules/bd--org.el
index 9215a06..7e7c2c2 100644
--- a/.config/emacs/modules/bd--org.el
+++ b/.config/emacs/modules/bd--org.el
@@ -11,13 +11,12 @@
 	       (org-toggle-inline-images)
 	       (fill-column-mode)
 	       (org-latex-preview '(16)))))
-  :custom
-  (org-ellipsis " ▾")
-  (org-babel-python-command "python3")
-  (org-confirm-babel-evaluate nil)
-  (org-hide-emphasis-markers t)
-  (org-startup-folded 'show3levels)
   :config
+  (setopt org-ellipsis " ▾"
+	  org-babel-python-command "python3"
+	  org-confirm-babel-evaluate nil
+	  org-hide-emphasis-markers t
+	  org-startup-folded 'show3levels)
   (plist-put org-format-latex-options :scale 1.2)
   (push '("\\.pdf\\'" . "zathura %s") org-file-apps)
   (add-hook 'org-babel-after-execute-hook #'org-redisplay-inline-images)
@@ -33,15 +32,14 @@
 (use-package ox
   :config
   (add-to-list 'org-latex-packages-alist '("" "listings"))
-  :custom
-  (org-latex-toc-command "\\tableofcontents \\clearpage")
-  (org-latex-src-block-backend 'listings)
-  (org-latex-image-default-width ".6\\linewidth")
-  (org-export-with-toc nil)
-  (org-export-preserve-breaks t)
-  (org-latex-classes
-   '(("article"
-      "\\PassOptionsToPackage{svgnames}{xcolor}
+  (setopt org-latex-toc-command "\\tableofcontents \\clearpage"
+	  org-latex-src-block-backend 'listings
+	  org-latex-image-default-width ".6\\linewidth"
+	  org-export-with-toc nil
+	  org-export-preserve-breaks t
+	  org-latex-classes
+	  '(("article"
+	     "\\PassOptionsToPackage{svgnames}{xcolor}
 \\documentclass[11pt]{article}
 \\usepackage{listings}
 \\lstset{frame=single,aboveskip=1em,
@@ -74,21 +72,21 @@
   citecolor=DarkRed,colorlinks=true}
 [PACKAGES]
 [EXTRA]"
-      ("\\section{%s}" . "\\section*{%s}")
-      ("\\subsection{%s}" . "\\subsection*{%s}")
-      ("\\subsubsection{%s}" . "\\subsubsection*{%s}")
-      ("\\paragraph{%s}" . "\\paragraph*{%s}")
-      ("\\subparagraph{%s}" . "\\subparagraph*{%s}"))
-     ("report" "\\documentclass[11pt]{report}"
-      ("\\part{%s}" . "\\part*{%s}") ("\\chapter{%s}" . "\\chapter*{%s}")
-      ("\\section{%s}" . "\\section*{%s}")
-      ("\\subsection{%s}" . "\\subsection*{%s}")
-      ("\\subsubsection{%s}" . "\\subsubsection*{%s}"))
-     ("book" "\\documentclass[11pt]{book}" ("\\part{%s}" . "\\part*{%s}")
-      ("\\chapter{%s}" . "\\chapter*{%s}")
-      ("\\section{%s}" . "\\section*{%s}")
-      ("\\subsection{%s}" . "\\subsection*{%s}")
-      ("\\subsubsection{%s}" . "\\subsubsection*{%s}")))))
+	     ("\\section{%s}" . "\\section*{%s}")
+	     ("\\subsection{%s}" . "\\subsection*{%s}")
+	     ("\\subsubsection{%s}" . "\\subsubsection*{%s}")
+	     ("\\paragraph{%s}" . "\\paragraph*{%s}")
+	     ("\\subparagraph{%s}" . "\\subparagraph*{%s}"))
+	    ("report" "\\documentclass[11pt]{report}"
+	     ("\\part{%s}" . "\\part*{%s}") ("\\chapter{%s}" . "\\chapter*{%s}")
+	     ("\\section{%s}" . "\\section*{%s}")
+	     ("\\subsection{%s}" . "\\subsection*{%s}")
+	     ("\\subsubsection{%s}" . "\\subsubsection*{%s}"))
+	    ("book" "\\documentclass[11pt]{book}" ("\\part{%s}" . "\\part*{%s}")
+	     ("\\chapter{%s}" . "\\chapter*{%s}")
+	     ("\\section{%s}" . "\\section*{%s}")
+	     ("\\subsection{%s}" . "\\subsection*{%s}")
+	     ("\\subsubsection{%s}" . "\\subsubsection*{%s}")))))
 
 (use-package org-agenda
   :bind
diff --git a/.config/emacs/modules/bd--project.el b/.config/emacs/modules/bd--project.el
index f5b1c09..243e3cd 100644
--- a/.config/emacs/modules/bd--project.el
+++ b/.config/emacs/modules/bd--project.el
@@ -5,13 +5,13 @@
 
 (use-package project
   :defer t
-  :custom
-  (project-switch-commands
-   '((project-find-file "Find file")
-     (project-find-regexp "Find regexp")
-     (project-find-dir "Find directory")
-     (magit-project-status "Magit")
-     (project-shell "Shell"))))
+  :config
+  (setopt project-switch-commands
+	  '((project-find-file "Find file")
+	    (project-find-regexp "Find regexp")
+	    (project-find-dir "Find directory")
+	    (magit-project-status "Magit")
+	    (project-shell "Shell"))))
 
 
 (provide 'bd--project)
diff --git a/.config/emacs/modules/bd--rss.el b/.config/emacs/modules/bd--rss.el
index cd943ed..ca45065 100644
--- a/.config/emacs/modules/bd--rss.el
+++ b/.config/emacs/modules/bd--rss.el
@@ -5,20 +5,20 @@
 
 (use-package newst-reader
   :bind (("C-z C-n" . newsticker-show-news))
-  :custom
-  (newsticker-url-list-defaults nil)
-  ;; one day
-  (newsticker-retrieval-interval (* 60 60 24))
-  (newsticker-automatically-mark-items-as-old nil)
-  (newsticker-url-list '(("James Enge Mastodon" "https://mastodon.sdf.org/@jamesenge.rss" nil nil nil)
-                         ("operationnull blog" "https://operationnull.com/atom.xml" nil nil nil)
-                         ("Parabola GNU/Linux-libre" "https://www.parabola.nu/feeds/news/" nil nil nil)
-                         ("suckless.org news" "https://suckless.org/atom.xml" nil nil nil)
-			 ("Protesilaos Stravrou" "https://vid.puffyan.us/feed/channel/UC0uTPqBCFIpZxlz_Lv1tk_g" nil nil nil)))
-  (newsticker-groups '("Feeds"
-                       ("READING" "James Enge Mastodon")
-                       ("TECH" "Parabola GNU/Linux-libre" "suckless.org news" "operationnull blog")
-                       ("VIDEO" "Protesilaos Stravrou"))))
+  :config
+  (setopt newsticker-url-list-defaults nil
+	  newsticker-retrieval-interval (* 60 60 24)
+	  newsticker-automatically-mark-items-as-old nil
+
+	  newsticker-url-list '(("James Enge Mastodon" "https://mastodon.sdf.org/@jamesenge.rss" nil nil nil)
+				("operationnull blog" "https://operationnull.com/atom.xml" nil nil nil)
+				("Parabola GNU/Linux-libre" "https://www.parabola.nu/feeds/news/" nil nil nil)
+				("suckless.org news" "https://suckless.org/atom.xml" nil nil nil)
+				("Protesilaos Stravrou" "https://vid.puffyan.us/feed/channel/UC0uTPqBCFIpZxlz_Lv1tk_g" nil nil nil))
+	  newsticker-groups '("Feeds"
+			      ("READING" "James Enge Mastodon")
+			      ("TECH" "Parabola GNU/Linux-libre" "suckless.org news" "operationnull blog")
+			      ("VIDEO" "Protesilaos Stravrou"))))
 
 
 (provide 'bd--rss)
diff --git a/.config/emacs/modules/bd--shells.el b/.config/emacs/modules/bd--shells.el
index e401115..dbf6b67 100644
--- a/.config/emacs/modules/bd--shells.el
+++ b/.config/emacs/modules/bd--shells.el
@@ -12,15 +12,15 @@
   (add-to-list 'eshell-modules-list 'eshell-smart))
 
 (use-package esh-mode
-  :custom
-  (eshell-scroll-to-bottom-on-input 'this))
+  :config
+  (setopt eshell-scroll-to-bottom-on-input 'this))
 
 (use-package em-banner
-  :custom
-  (eshell-banner-message (concat "\n" (propertize " " 'display (create-image (expand-file-name "images/raven.png" user-emacs-directory) 'png nil :scale 0.8 :align-to "center")) "\n")))
+  :config
+  (setopt eshell-banner-message (concat "\n" (propertize " " 'display (create-image (expand-file-name "images/raven.png" user-emacs-directory) 'png nil :scale 0.8 :align-to "center")) "\n")))
 
 (use-package em-term
-  :custom
+  :config
   (add-to-list 'eshell-visual-commands "nethack"))
 
 (use-package em-prompt
@@ -33,9 +33,8 @@
      (system-name)
      (format " %s" (bd/get-prompt-path))
      " >\n"))
-  :custom
-  (eshell-prompt-function 'bd/eshell-prompt)
-  (eshell-prompt-regexp (rx bol (eval (system-name)) (one-or-more anything) " >\n")))
+  (setopt eshell-prompt-function 'bd/eshell-prompt
+	  eshell-prompt-regexp (rx bol (eval (system-name)) (one-or-more anything) " >\n")))
 
 (use-package eshell
   :bind
@@ -58,19 +57,18 @@ clear the scrollback contents. Outputs banner message."
   (defun eshell/open (file)
     (interactive)
     (find-file file))
-  :custom
-  (eshell-buffer-maximum-lines 7500))
+  (setopt eshell-buffer-maximum-lines 7500))
 
 
 (use-package shell
   :bind
   (:map shell-mode-map
 	("C-c C-k" . #'comint-clear-buffer))
-  :custom
-  (shell-command-prompt-show-cwd t)
-  (shell-highlight-undef-enable t)
-  (shell-kill-buffer-on-exit t)
-  (comint-prompt-read-only t))
+  :config
+  (setopt shell-command-prompt-show-cwd t
+	  shell-highlight-undef-enable t
+	  shell-kill-buffer-on-exit t
+	  comint-prompt-read-only t))
 
 
 (use-package proced
diff --git a/.config/emacs/modules/bd--tabs.el b/.config/emacs/modules/bd--tabs.el
index 67ec1d7..264d85b 100644
--- a/.config/emacs/modules/bd--tabs.el
+++ b/.config/emacs/modules/bd--tabs.el
@@ -6,15 +6,15 @@
 (use-package time
   :init
   (display-time)
-  :custom
-  (display-time-format " [%m/%d %H:%M] ")
-  (display-time-default-load-average nil))
+  :config
+  (setopt display-time-format " [%m/%d %H:%M] "
+	  display-time-default-load-average nil))
 
 (use-package battery
   :init
   (display-battery-mode)
-  :custom
-  (battery-update-interval 90))
+  :config
+  (setopt battery-update-interval 90))
 
 (use-package tab-bar
   :bind (("H-f" . tab-bar-history-forward)
@@ -31,22 +31,21 @@
   (tab-bar-select-tab 1)
   (tab-bar-mode)
   (tab-bar-history-mode)
-  :custom
-  (tab-bar-tab-name-function #'bd/tab-bar-name-function)
-  (tab-bar-show t)
-
-  (tab-bar-select-restore-windows nil)
-
-  ;; remove useless gui elements
-  (tab-bar-format
-   '(tab-bar-format-tabs
-     tab-bar-format-align-right
-     tab-bar-format-global))
-  (tab-bar-close-button-show nil)
-  (tab-bar-auto-width-max nil)
-
-  ;; add useless text elements
-  (tab-bar-tab-hints nil))
+  (setopt tab-bar-tab-name-function #'bd/tab-bar-name-function
+	  tab-bar-show t
+
+	  tab-bar-select-restore-windows nil
+
+	  ;; remove useless gui elements
+	  tab-bar-format
+	  '(tab-bar-format-tabs
+	    tab-bar-format-align-right
+	    tab-bar-format-global)
+	  tab-bar-close-button-show nil
+	  tab-bar-auto-width-max nil
+
+	  ;; add useless text elements
+	  tab-bar-tab-hints nil))
 
 
 (provide 'bd--tabs)
diff --git a/.config/emacs/modules/bd--themes.el b/.config/emacs/modules/bd--themes.el
index ec95108..ddcfcf2 100644
--- a/.config/emacs/modules/bd--themes.el
+++ b/.config/emacs/modules/bd--themes.el
@@ -44,31 +44,31 @@ and some other minor face changes."
        `(mode-line-inactive ((,c :overline ,bg-button-inactive)))
        `(eshell-prompt ((,c :foreground ,fg-main :background ,bg-dim :height 1.1 :extend t))))))
   (add-hook 'modus-themes-post-load-hook #'bd/modus-set-faces)
-  :custom
-  (modus-themes-to-toggle '(modus-operandi-tinted modus-vivendi-tinted))
-  (modus-themes-mixed-fonts t)
-  (modus-themes-italic-constructs t)
-  (modus-themes-bold-constructs t)
-  (modus-themes-variable-pitch-ui nil)
-  (modus-themes-headings
-   '((0 variable-pitch bold 1.5)
-     (1 variable-pitch bold 1.4)
-     (2 variable-pitch regular 1.3)
-     (3 variable-pitch regular 1.1)
-     (t variable-pitch regular 1.0)))
+  
+  (setopt modus-themes-to-toggle '(modus-operandi-tinted modus-vivendi-tinted)
+	  modus-themes-mixed-fonts t
+	  modus-themes-italic-constructs t
+	  modus-themes-bold-constructs t
+	  modus-themes-variable-pitch-ui nil
+	  modus-themes-headings
+	  '((0 variable-pitch bold 1.5)
+	    (1 variable-pitch bold 1.4)
+	    (2 variable-pitch regular 1.3)
+	    (3 variable-pitch regular 1.1)
+	    (t variable-pitch regular 1.0))
 
-  (modus-themes-common-palette-overrides
-   '((bg-mode-line-active bg-main)
-     (bg-mode-line-inactive bg-main)
-     (border-mode-line-active bg-main)
-     (border-mode-line-inactive bg-main)
-     (bg-line-number-active bg-dim)
-     (bg-line-number-inactive bg-dim)
-     (fg-heading-1 fg-term-blue-bright)
-     (fg-heading-2 fg-term-magenta-bright)
-     (bg-tab-bar bg-main)
-     (bg-tab-current bg-main)
-     (bg-tab-other bg-button-inactive))))
+	  modus-themes-common-palette-overrides
+	  '((bg-mode-line-active bg-main)
+	    (bg-mode-line-inactive bg-main)
+	    (border-mode-line-active bg-main)
+	    (border-mode-line-inactive bg-main)
+	    (bg-line-number-active bg-dim)
+	    (bg-line-number-inactive bg-dim)
+	    (fg-heading-1 fg-term-blue-bright)
+	    (fg-heading-2 fg-term-magenta-bright)
+	    (bg-tab-bar bg-main)
+	    (bg-tab-current bg-main)
+	    (bg-tab-other bg-button-inactive))))
 
 (load-theme 'modus-vivendi-tinted :no-confirm)
 (run-hooks 'modus-themes-post-load-hook)
diff --git a/.config/emacs/modules/bd--utility.el b/.config/emacs/modules/bd--utility.el
index bff3eeb..cdc2c7e 100644
--- a/.config/emacs/modules/bd--utility.el
+++ b/.config/emacs/modules/bd--utility.el
@@ -81,49 +81,49 @@ ARG can be one of the following:
 (defun bd/get-directory-dwim ()
   "Returns the directory you always wanted."
   (or (when (project-current)
-	(project-root (project-current)))	    ;; git
-      (locate-dominating-file "." "Makefile")	    ;; make
+	(project-root (project-current)))         ;; git
+      (locate-dominating-file "." "Makefile")     ;; make
       (locate-dominating-file "." "manifest.scm") ;; guix
       default-directory))
 
-  (defun bd/buffer-exwm-p (buf)
-    "Return non-nil if BUF is an `exwm-mode' buffer."
-    (member
-     (buffer-local-value 'major-mode (get-buffer buf))
-     '(exwm-mode)))
-
-  (defun bd/buffer-scratch-p (buf)
-    "Return non-nil if BUF is a scratch buffer."
-    (buffer-local-value 'scratch-buffer (get-buffer buf)))
-
-  (defun bd/buffer-text-p (buf)
-    "Return non-nil if BUF derives from `text-mode'."
-    (provided-mode-derived-p (buffer-local-value 'major-mode (get-buffer buf)) 'text-mode))
-
-  (defun bd/buffer-prog-p (buf)
-    "Return non-nil if BUF derives from `prog-mode'."
-    (provided-mode-derived-p (buffer-local-value 'major-mode (get-buffer buf)) 'prog-mode))
-
-  (defun bd/buffer-dired-p (buf)
-    "Return non-nil if BUF is a `dired-mode' buffer."
-    (member
-     (buffer-local-value 'major-mode (get-buffer buf))
-     '(dired-mode)))
-
-  (defun bd/buffer-irc-p (buf)
-    "Return non-nil if BUF is an `irc-mode' buffer."
-    (member
-     (buffer-local-value 'major-mode (get-buffer buf))
-     '(rcirc-mode erc-mode)))
-
-  (defun bd/buffer-ordinary-p (buf)
-    "Return non-nil if BUF does not fit into known categories."
-    (not (or (bd/buffer-exwm-p buf)
-             (bd/buffer-text-p buf)
-             (bd/buffer-prog-p buf)
-	     (bd/buffer-scratch-p buf)
-             (bd/buffer-dired-p buf)
-             (bd/buffer-irc-p buf))))
+(defun bd/buffer-exwm-p (buf)
+  "Return non-nil if BUF is an `exwm-mode' buffer."
+  (member
+   (buffer-local-value 'major-mode (get-buffer buf))
+   '(exwm-mode)))
+
+(defun bd/buffer-scratch-p (buf)
+  "Return non-nil if BUF is a scratch buffer."
+  (buffer-local-value 'scratch-buffer (get-buffer buf)))
+
+(defun bd/buffer-text-p (buf)
+  "Return non-nil if BUF derives from `text-mode'."
+  (provided-mode-derived-p (buffer-local-value 'major-mode (get-buffer buf)) 'text-mode))
+
+(defun bd/buffer-prog-p (buf)
+  "Return non-nil if BUF derives from `prog-mode'."
+  (provided-mode-derived-p (buffer-local-value 'major-mode (get-buffer buf)) 'prog-mode))
+
+(defun bd/buffer-dired-p (buf)
+  "Return non-nil if BUF is a `dired-mode' buffer."
+  (member
+   (buffer-local-value 'major-mode (get-buffer buf))
+   '(dired-mode)))
+
+(defun bd/buffer-irc-p (buf)
+  "Return non-nil if BUF is an `irc-mode' buffer."
+  (member
+   (buffer-local-value 'major-mode (get-buffer buf))
+   '(rcirc-mode erc-mode)))
+
+(defun bd/buffer-ordinary-p (buf)
+  "Return non-nil if BUF does not fit into known categories."
+  (not (or (bd/buffer-exwm-p buf)
+           (bd/buffer-text-p buf)
+           (bd/buffer-prog-p buf)
+	   (bd/buffer-scratch-p buf)
+           (bd/buffer-dired-p buf)
+           (bd/buffer-irc-p buf))))
 
 
 (provide 'bd--utility)
diff --git a/.config/guix/modules/emacs.scm b/.config/guix/modules/emacs.scm
index 7a626b9..0755b0c 100644
--- a/.config/guix/modules/emacs.scm
+++ b/.config/guix/modules/emacs.scm
@@ -28,8 +28,8 @@
   (list
    emacs-dash
    emacs-denote
-   emacs-emms
    emacs-elpher
+   emacs-emms
    emacs-exwm
    emacs-f
    emacs-guix