X-Git-Url: https://git.shemshak.org/~bandali/configs/blobdiff_plain/3327384949bc6c578ebb4e5e80b0f7f6f99fc1bd..b1c752b86267b05ef9560ef9481cda446f2ab077:/.emacs.d/init.el?ds=sidebyside

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 60c73b7..fb4c73c 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -138,6 +138,15 @@
      :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/")))
@@ -171,37 +180,26 @@
 ;;; 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-feature custom
-  :no-require t
+  :no-require
   :config
   (setq custom-file (b/etc "custom.el"))
   (when (file-exists-p custom-file)
     (load custom-file))
   ;; while at it, treat themes as safe
-  (setf custom-safe-themes t))
+  (setf custom-safe-themes t)
+  ;; only one custom theme at a time
+  (comment
+    (defadvice load-theme (before clear-previous-themes activate)
+      "Clear existing theme settings instead of layering them"
+      (mapc #'disable-theme custom-enabled-themes))))
 
 ;; load the secrets file if it exists, otherwise show a warning
 (comment
@@ -220,18 +218,86 @@
   (exec-path-from-shell-copy-env "SSH_AGENT_PID")
   (exec-path-from-shell-copy-env "SSH_AUTH_SOCK"))
 
-;; only one custom theme at a time
-(comment
-  (defadvice load-theme (before clear-previous-themes activate)
-    "Clear existing theme settings instead of layering them"
-    (mapc #'disable-theme custom-enabled-themes)))
-
 ;; start up emacs server.  see
 ;; https://www.gnu.org/software/emacs/manual/html_node/emacs/Emacs-Server.html#Emacs-Server
 (use-feature server
   :defer 0.4
   :config (or (server-running-p) (server-mode)))
 
+
+;;; Useful utilities
+
+;; useful libraries
+(require 'cl-lib)
+(require 'subr-x)
+
+(defmacro b/setq-every (value &rest vars)
+  "Set all the variables from VARS to value VALUE."
+  (declare (indent defun) (debug t))
+  `(progn ,@(mapcar (lambda (x) (list 'setq x value)) vars)))
+
+(defun b/start-process (program &rest args)
+  "Same as `start-process', but doesn't bother about name and buffer."
+  (let ((process-name (concat program "_process"))
+        (buffer-name  (generate-new-buffer-name
+                       (concat program "_output"))))
+    (apply #'start-process
+           process-name buffer-name program args)))
+
+(defun b/dired-start-process (program &optional args)
+  "Open current file with a PROGRAM."
+  ;; Shell command looks like this: "program [ARGS]... FILE" (ARGS can
+  ;; be nil, so remove it).
+  (apply #'b/start-process
+         program
+         (remove nil (list args (dired-get-file-for-visit)))))
+
+(defun b/add-elisp-section ()
+  (interactive)
+  (insert "\n")
+  (previous-line)
+  (insert "\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))
+
+
+;;; Defaults
+
+;;;; C-level customizations
+
+(setq
+ ;; minibuffer
+ enable-recursive-minibuffers t
+ resize-mini-windows t
+ ;; more useful frame titles
+ frame-title-format '("" invocation-name " - "
+                      (:eval
+                       (if (buffer-file-name)
+                           (abbreviate-file-name (buffer-file-name))
+                         "%b")))
+ ;; i don't feel like jumping out of my chair every now and again; so
+ ;; don't BEEP! at me, emacs
+ ring-bell-function 'ignore
+ ;; better scrolling
+ ;; scroll-margin 1
+ ;; scroll-conservatively 10000
+ scroll-step 1
+ scroll-conservatively 10
+ scroll-preserve-screen-position 1
+ ;; focus follows mouse
+ mouse-autoselect-window t)
+
+(setq-default
+ ;; always use space for indentation
+ indent-tabs-mode nil
+ tab-width 4
+ ;; cursor shape
+ cursor-type 'bar)
+
 ;; unicode support
 (comment
   (dolist (ft (fontset-list))
@@ -265,175 +331,92 @@
      nil
      'prepend)))
 
-;; gentler font resizing
-(setq text-scale-mode-step 1.05)
+;;;; Elisp-level customizations
 
-;; focus follows mouse
-(setq mouse-autoselect-window t)
-
-(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))
-
-;; better scrolling
-(setq ;; scroll-margin 1
-      ;; scroll-conservatively 10000
-      scroll-step 1
-      scroll-conservatively 10
-      scroll-preserve-screen-position 1)
-
-(use-feature mwheel
-  :defer 0.4
+(use-feature startup
+  :no-require
+  :demand
   :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
-  :defer 0.4
-  :config (pixel-scroll-mode 1))
-
-;; ask for GPG passphrase in minibuffer
-(use-feature epa
+  ;; don't need to see the startup echo area message
+  (advice-add #'display-startup-echo-area-message :override #'ignore)
   :custom
-  ; this will fail if gpg>=2.1 is not available
-  (epa-pinentry-mode 'loopback))
-
-(use-feature epg-config
-  :defer 0.4
+  ;; i want *scratch* as my startup buffer
+  (initial-buffer-choice t)
+  ;; i don't need the default hint
+  (initial-scratch-message nil)
+  ;; use customizable text-mode as major mode for *scratch*
+  (initial-major-mode 'text-mode)
+  ;; inhibit buffer list when more than 2 files are loaded
+  (inhibit-startup-buffer-menu t)
+  ;; don't need to see the startup screen or echo area message
+  (inhibit-startup-screen t)
+  (inhibit-startup-echo-area-message user-login-name))
+
+(use-feature files
+  :no-require
+  :demand
   :custom
-  ((epg-gpg-program (executable-find "gpg"))
-   (epg-pinentry-mode 'loopback)))
+  ;; backups (C-h v make-backup-files RET)
+  (backup-by-copying t)
+  (version-control t)
+  (delete-old-versions t)
 
-(use-feature epg
-  :after epg-config)
+  ;; auto-save
+  (auto-save-file-name-transforms
+   `((".*" ,(b/var "auto-save/") t)))
 
-(use-package pinentry
-  :demand
-  :after (epa epg server)
-  :config
-  (setq pinentry--socket-dir server-socket-dir)
-  (pinentry-start))
+  ;; insert newline at the end of files
+  (require-final-newline t)
 
-;; useful libraries
-(require 'cl-lib)
-(require 'subr-x)
+  ;; open read-only file buffers in view-mode
+  ;; (enables niceties like `q' for quit)
+  (view-read-only t))
 
-
-;;; Useful utilities
-
-(defmacro b/setq-every (value &rest vars)
-  "Set all the variables from VARS to value VALUE."
-  (declare (indent defun) (debug t))
-  `(progn ,@(mapcar (lambda (x) (list 'setq x value)) vars)))
-
-(defun b/start-process (program &rest args)
-  "Same as `start-process', but doesn't bother about name and buffer."
-  (let ((process-name (concat program "_process"))
-        (buffer-name  (generate-new-buffer-name
-                       (concat program "_output"))))
-    (apply #'start-process
-           process-name buffer-name program args)))
-
-(defun b/dired-start-process (program &optional args)
-  "Open current file with a PROGRAM."
-  ;; Shell command looks like this: "program [ARGS]... FILE" (ARGS can
-  ;; be nil, so remove it).
-  (apply #'b/start-process
-         program
-         (remove nil (list args (dired-get-file-for-visit)))))
+;; disable disabled commands
+(setq disabled-command-function nil)
 
-(defun b/add-elisp-section ()
-  (interactive)
-  (insert "\n")
-  (previous-line)
-  (insert "\n\n;;; "))
+;; lazy-person-friendly yes/no prompts
+(defalias 'yes-or-no-p #'y-or-n-p)
 
-
-;;; Defaults
+;; enable automatic reloading of changed buffers and files
+(use-feature autorevert
+  :demand
+  :config
+  (global-auto-revert-mode 1)
+  :custom
+  (auto-revert-verbose nil)
+  (global-auto-revert-non-file-buffers nil))
 
 ;; time and battery in mode-line
 (comment
-  (use-package time
+  (use-feature time
     :init
     (setq display-time-default-load-average nil)
     :config
     (display-time-mode))
 
-  (use-package battery
+  (use-feature battery
     :config
     (display-battery-mode)))
 
-;; smaller fringe
-;; (fringe-mode '(3 . 1))
-(fringe-mode nil)
-
-;; disable disabled commands
-(setq disabled-command-function nil)
-
-;; Save what I copy into clipboard from other applications into Emacs'
-;; kill-ring, which would allow me to still be able to easily access
-;; it in case I kill (cut or copy) something else inside Emacs before
-;; yanking (pasting) what I'd originally intended to.
-(setq save-interprogram-paste-before-kill t)
-
-;; minibuffer
-(setq enable-recursive-minibuffers t
-      resize-mini-windows t)
-
-;; lazy-person-friendly yes/no prompts
-(defalias 'yes-or-no-p #'y-or-n-p)
-
-;; i want *scratch* as my startup buffer
-(setq initial-buffer-choice t)
-
-;; i don't need the default hint
-(setq initial-scratch-message nil)
-
-;; use customizable text-mode as major mode for *scratch*
-(setq initial-major-mode 'text-mode)
-
-;; inhibit buffer list when more than 2 files are loaded
-(setq inhibit-startup-buffer-menu t)
-
-;; don't need to see the startup screen or the echo area message
-(advice-add #'display-startup-echo-area-message :override #'ignore)
-(setq inhibit-startup-screen t
-      inhibit-startup-echo-area-message user-login-name)
-
-;; more useful frame titles
-(setq frame-title-format
-      '("" invocation-name " - "
-        (:eval (if (buffer-file-name)
-                   (abbreviate-file-name (buffer-file-name))
-                 "%b"))))
-
-;; 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)
-
-;; enable automatic reloading of changed buffers and files
-(global-auto-revert-mode 1)
-(setq auto-revert-verbose nil
-      global-auto-revert-non-file-buffers nil)
-
-;; always use space for indentation
-(setq-default
- indent-tabs-mode nil
- require-final-newline t
- tab-width 4)
+(use-feature fringe
+  :demand
+  :config
+  ;; smaller fringe
+  ;; (fringe-mode '(3 . 1))
+  (fringe-mode nil))
 
-;; enable winner-mode (C-h f winner-mode RET)
-(winner-mode 1)
+(use-feature winner
+  :demand
+  :config
+  ;; enable winner-mode (C-h f winner-mode RET)
+  (winner-mode 1))
 
-;; don't display *compilation* buffer on success.  based on
-;; https://stackoverflow.com/a/17788551, with changes to use `cl-letf'
-;; instead of the now obsolete `flet'.
-(with-eval-after-load 'compile
+(use-feature compile
+  :config
+  ;; don't display *compilation* buffer on success.  based on
+  ;; https://stackoverflow.com/a/17788551, with changes to use `cl-letf'
+  ;; instead of the now obsolete `flet'.
   (defun b/compilation-finish-function (buffer outstr)
     (unless (string-match "finished" outstr)
       (switch-to-buffer-other-window buffer))
@@ -452,23 +435,21 @@ For disabling the behaviour for certain buffers and/or modes."
       ad-do-it))
   (ad-activate 'compilation-start))
 
-;; search for non-ASCII characters: i’d like non-ASCII characters such
-;; as ‘’“”«»‹›áⓐ𝒶 to be selected when i search for their ASCII
-;; counterpart.  shoutout to
-;; http://endlessparentheses.com/new-in-emacs-25-1-easily-search-non-ascii-characters.html
-(setq search-default-mode #'char-fold-to-regexp)
-;; uncomment to extend this behaviour to query-replace
-;; (setq replace-char-fold t)
-
-;; cursor shape
-(setq-default cursor-type 'bar)
-
-;; allow scrolling in Isearch
-(setq isearch-allow-scroll t)
-
-;; open read-only file buffers in view-mode
-;; (enables niceties like `q' for quit)
-(setq view-read-only t)
+(use-feature isearch
+  :custom
+  ;; allow scrolling in Isearch
+  (isearch-allow-scroll t)
+  ;; search for non-ASCII characters: i’d like non-ASCII characters such
+  ;; as ‘’“”«»‹›áⓐ𝒶 to be selected when i search for their ASCII
+  ;; counterpart.  shoutout to
+  ;; http://endlessparentheses.com/new-in-emacs-25-1-easily-search-non-ascii-characters.html
+  (search-default-mode #'char-fold-to-regexp))
+
+;; uncomment to extend the above behaviour to query-replace
+(comment
+  (use-feature replace
+    :custom
+    (replace-char-fold t)))
 
 (use-feature vc
   :bind ("C-x v C-=" . vc-ediff))
@@ -478,9 +459,25 @@ For disabling the behaviour for certain buffers and/or modes."
   :custom ((ediff-window-setup-function 'ediff-setup-windows-plain)
            (ediff-split-window-function 'split-window-horizontally)))
 
-;; i don't feel like jumping out of my chair every now and again; so
-;; don't BEEP! at me, emacs
-(setq ring-bell-function 'ignore)
+(use-feature face-remap
+  :custom
+  ;; gentler font resizing
+  (text-scale-mode-step 1.05))
+
+(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-feature pixel-scroll
+  :defer 0.4
+  :config (pixel-scroll-mode 1))
+
+(use-feature epg-config
+  :custom
+  ((epg-gpg-program (executable-find "gpg"))))
 
 
 ;;; General bindings
@@ -516,22 +513,24 @@ For disabling the behaviour for certain buffers and/or modes."
 
 (bind-keys
  ;; for back and forward mouse keys
+ ("<XF86Back>"     . previous-buffer)
  ("<mouse-8>"      . previous-buffer)
  ("<drag-mouse-8>" . previous-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 mab/straight-prefix-map
+ :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" . mab/reload-init)
+ ("r" . b/reload-init)
  ;; M-x ^straight-.*-all$
  ("a c" . straight-check-all)
  ("a f" . straight-fetch-all)
@@ -673,9 +672,6 @@ 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)))))
 
@@ -685,13 +681,10 @@ For disabling the behaviour for certain buffers and/or modes."
   ;; :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
@@ -796,7 +789,6 @@ 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))
 
@@ -992,21 +984,25 @@ This function is intended for use with `ivy-ignore-buffers'."
 
 (use-feature simple
   :delight (auto-fill-function " fill")
-  :config (column-number-mode))
+  :config (column-number-mode)
+  :custom
+  ;; Save what I copy into clipboard from other applications into Emacs'
+  ;; kill-ring, which would allow me to still be able to easily access
+  ;; it in case I kill (cut or copy) something else inside Emacs before
+  ;; yanking (pasting) what I'd originally intended to.
+  (save-interprogram-paste-before-kill t))
 
 ;; save minibuffer history
 (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-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-feature prog-mode
   :config (global-prettify-symbols-mode)
@@ -1086,9 +1082,7 @@ This function is intended for use with `ivy-ignore-buffers'."
 
 (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
@@ -1253,10 +1247,7 @@ 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-feature geiser-guile
   :config
@@ -1320,7 +1311,7 @@ This function is intended for use with `ivy-ignore-buffers'."
   "Go dark."
   (interactive)
   (mapc #'disable-theme custom-enabled-themes)
-  ;; (load-theme 'doom-tomorrow-night t)
+  (load-theme 'doom-tomorrow-night t)
   (sml/apply-theme 'automatic)
   (font-lock-add-keywords
    'org-mode b/org-mode-font-lock-keywords t))
@@ -1375,7 +1366,7 @@ This function is intended for use with `ivy-ignore-buffers'."
 
   ;; prefixes for major modes
   (which-key-add-major-mode-key-based-replacements 'message-mode
-    "C-c f"   "footnote")
+    "C-c f n" "footnote")
   (which-key-add-major-mode-key-based-replacements 'org-mode
     "C-c C-v" "org-babel")
   (which-key-add-major-mode-key-based-replacements 'web-mode
@@ -1410,7 +1401,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 ()
@@ -1435,9 +1425,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
@@ -1597,9 +1585,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
@@ -1612,7 +1598,6 @@ 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)
@@ -1650,9 +1635,6 @@ 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-feature window
@@ -1685,9 +1667,13 @@ This function is intended for use with `ivy-ignore-buffers'."
 (use-package pdf-tools
   :defer 0.5
   :bind (:map pdf-view-mode-map
-              ("<XF86Back>"    . pdf-history-backward)
-              ("<XF86Forward>" . pdf-history-forward)
-              ("M-RET"         . image-previous-line))
+              ("<C-XF86Back>"    . pdf-history-backward)
+              ("<mouse-8>"       . pdf-history-backward)
+              ("<drag-mouse-8>"  . pdf-history-backward)
+              ("<C-XF86Forward>" . pdf-history-forward)
+              ("<mouse-9>"       . pdf-history-forward)
+              ("<drag-mouse-9>"  . pdf-history-forward)
+              ("M-RET"           . image-previous-line))
   :config (pdf-tools-install nil t)
   :custom (pdf-view-resize-factor 1.05))
 
@@ -1987,7 +1973,11 @@ This function is intended for use with `ivy-ignore-buffers'."
   (bind-keys
    :map gnus-summary-mode-map
    ("M-L" . org-store-link))
-  :hook (gnus-summary-mode . b/no-mouse-autoselect-window))
+  :hook (gnus-summary-mode . b/no-mouse-autoselect-window)
+  :custom
+  (gnus-thread-sort-functions '(gnus-thread-sort-by-number
+                                gnus-thread-sort-by-subject
+                                gnus-thread-sort-by-date)))
 
 (use-feature gnus-msg
   :config
@@ -2132,7 +2122,7 @@ https://csclub.uwaterloo.ca/~abandali")
   :bind
   (:map message-mode-map
         :prefix-map b/footnote-prefix-map
-        :prefix "C-c f"
+        :prefix "C-c f n"
         ("a" . footnote-add-footnote)
         ("b" . footnote-back-to-message)
         ("c" . footnote-cycle-style)
@@ -2164,13 +2154,7 @@ https://csclub.uwaterloo.ca/~abandali")
 (use-feature ebdb-gnus
   :after ebdb
   :custom
-  (ebdb-gnus-window-configuration
-   '(article
-     (vertical 1.0
-               (summary 0.25 point)
-               (horizontal 1.0
-                           (article 1.0)
-                           (ebdb-gnus 0.3))))))
+  (ebdb-gnus-window-size 0.3))
 
 (use-feature ebdb-mua
   :after ebdb
@@ -2206,6 +2190,14 @@ https://csclub.uwaterloo.ca/~abandali")
         (gnus-harvest-install 'message-x)
       (gnus-harvest-install))))
 
+(use-feature gnus-article-treat-patch
+  :disabled
+  :demand
+  :load-path "lisp/"
+  :config
+  (setq ft/gnus-article-patch-conditions
+        '("^@@ -[0-9]+,[0-9]+ \\+[0-9]+,[0-9]+ @@")))
+
 
 ;;; IRC (with ERC and ZNC)