;;; 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:
nil)
\f
-;;; 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
;;; 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"))
;; 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)))
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 epg-config
:custom
- ; this will fail if gpg>=2.1 is not available
- (epa-pinentry-mode 'loopback))
-
-(use-package epg-config
- :defer 0.4
- :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)
;; 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)
;; (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)))
("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)
("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))
("<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))
+
\f
;;; 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
org-startup-folded 'content
org-catch-invisible-edits 'show-and-error
org-log-done 'time)
+ (when (version< org-version "9.3")
+ (setq org-email-link-description-format
+ org-link-email-description-format))
(add-to-list 'org-structure-template-alist '("L" . "src emacs-lisp") t)
(add-to-list 'org-modules 'org-habit)
:bind
(("C-c a o a" . org-agenda)
:map org-mode-map
("M-L" . org-insert-last-stored-link)
- ("M-O" . org-toggle-link-display)
- ("s-T" . org-todo))
+ ("M-O" . org-toggle-link-display))
:hook ((org-mode . org-indent-mode)
(org-mode . auto-fill-mode)
(org-mode . flyspell-mode))
'(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
t)
(require 'ox-beamer))
-(use-package ox-extra
+(use-feature ox-extra
:config
(ox-extras-activate '(latex-header-blocks ignore-headlines)))
;; *the* right way to do git
(use-package magit
:defer 0.5
- :bind (("C-x g" . magit-status)
- ("s-g s" . magit-status)
- ("s-g l" . magit-log-buffer-file))
+ :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
(magit-add-section-hook 'magit-status-sections-hook
'magit-insert-modules
'magit-insert-stashes
'append)
+ ;; (magit-add-section-hook 'magit-status-sections-hook
+ ;; 'magit-insert-ignored-files
+ ;; 'magit-insert-untracked-files
+ ;; 'append)
(setq magit-repository-directories '(("~/" . 0)
("~/src/git/" . 1)))
(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
ivy-use-virtual-buffers t
ivy-virtual-abbreviate 'abbreviate
ivy-count-format "%d/%d ")
+
+ (defvar b/ivy-ignore-buffer-modes '(magit-mode erc-mode dired-mode))
+ (defun b/ivy-ignore-buffer-p (str)
+ "Return non-nil if str names a buffer with a major mode
+derived from one of `b/ivy-ignore-buffer-modes'.
+
+This function is intended for use with `ivy-ignore-buffers'."
+ (let* ((buf (get-buffer str))
+ (mode (and buf (buffer-local-value 'major-mode buf))))
+ (and mode
+ (apply #'provided-mode-derived-p mode b/ivy-ignore-buffer-modes))))
+ (add-to-list 'ivy-ignore-buffers 'b/ivy-ignore-buffer-p)
+
(ivy-mode 1)
;; :custom-face
;; (ivy-minibuffer-match-face-2 ((t (:background "#e99ce8" :weight semi-bold))))
:delight
:bind (([remap execute-extended-command] . counsel-M-x)
([remap find-file] . counsel-find-file)
- ("C-c x" . counsel-M-x)
+ ("C-c b b" . ivy-switch-buffer)
("C-c f ." . counsel-find-file)
("C-c f l" . counsel-find-library)
("C-c f r" . counsel-recentf)
- ("s-." . counsel-find-file)
- ("s-r" . ivy-switch-buffer)
+ ("C-c x" . counsel-M-x)
:map minibuffer-local-map
("C-r" . counsel-minibuffer-history))
:config
("C-x C-b" . helm-buffers-list)
("C-x C-f" . helm-find-files)
("C-h r" . helm-info-emacs)
- ("s-r" . helm-recentf)
("C-s-r" . helm-resume)
:map helm-map
("<tab>" . helm-execute-persistent-action)
("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)
: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
" " 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")
:bind
("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)
(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))
(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)))
: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
(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
(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))
\f
;;; 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
;; 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))
(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"))
: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)))))
\f
;;; Theme
(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:]*\\)"
'org-mode b/org-mode-font-lock-keywords t))
(bind-keys
- ("s-t d" . b/lights-off)
- ("s-t l" . b/lights-on))
+ ("C-c t d" . b/lights-off)
+ ("C-c t l" . b/lights-on))
\f
;;; Emacs enhancements & auxiliary packages
"C-c a e" "erc"
"C-c a o" "org"
"C-c a s" "shells"
- "C-c p" "package-management"
- ;; "C-c p e" "package-management/epkg"
- "C-c p s" "straight.el"
- "C-c psa" "all"
- "C-c psp" "package"
+ "C-c b" "buffers"
"C-c c" "compile-and-comments"
"C-c e" "eval"
"C-c f" "files"
"C-c F" "frames"
+ "C-c g" "magit"
"C-S-h" "help(ful)"
"C-c m" "multiple-cursors"
"C-c P" "projectile"
"C-c P x" "projectile/execute"
"C-c P 4" "projectile/other-window"
"C-c q" "boxquote"
- "s-g" "magit"
- "s-O" "outline"
- "s-t" "themes")
+ "C-c t" "themes"
+ ;; "s-O" "outline"
+ )
;; prefixes for major modes
(which-key-add-major-mode-key-based-replacements 'message-mode
(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)
: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 ()
(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
:delight " typo"
:config
(typo-global-mode 1)
- :hook ((text-mode erc-mode) . typo-mode))
+ :hook (((text-mode erc-mode) . typo-mode)
+ (tex-mode . (lambda ()(typo-mode -1)))))
;; highlight TODOs in buffers
(use-package hl-todo
("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
: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)
+
+ (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
;; (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
- (("s-o" . other-window)
- ("s-/ ." . split-window-right)
- ("s-/ ," . split-window-below)
- ("s-/ 0" . delete-window)
- ("s-q" . delete-window))
+ (("C-c w <right>" . split-window-right)
+ ("C-c w <down>" . split-window-below)
+ ("C-c w s l" . split-window-right)
+ ("C-c w s j" . split-window-below)
+ ("C-c w q" . quit-window))
:custom
(split-width-threshold 150))
-(use-package windmove
+(use-feature windmove
:defer 0.6
:bind
- (("s-h" . windmove-left)
- ("s-j" . windmove-down)
- ("s-k" . windmove-up)
- ("s-l" . windmove-right)
- ("s-H" . windmove-swap-states-left)
- ("s-J" . windmove-swap-states-down)
- ("s-K" . windmove-swap-states-up)
- ("s-L" . windmove-swap-states-right)))
+ (("C-c w h" . windmove-left)
+ ("C-c w j" . windmove-down)
+ ("C-c w k" . windmove-up)
+ ("C-c w l" . windmove-right)
+ ("C-c w H" . windmove-swap-states-left)
+ ("C-c w J" . windmove-swap-states-down)
+ ("C-c w K" . windmove-swap-states-up)
+ ("C-c w L" . windmove-swap-states-right)))
(use-package pass
:commands pass
(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-feature reftex
+ :hook (latex-mode . reftex-mode))
+
+(use-feature reftex-cite
+ :after reftex
+ :disabled ; enable to disable
+ ; reftex-cite's default choice
+ ; of previous word
+ :config
+ (defun reftex-get-bibkey-default ()
+ "If the cursor is in a citation macro, return the word before the macro."
+ (let* ((macro (reftex-what-macro 1)))
+ (save-excursion
+ (when (and macro (string-match "cite" (car macro)))
+ (goto-char (cdr macro)))
+ (reftex-this-word)))))
+
+(use-feature files
+ :custom (auto-save-file-name-transforms
+ `((".*" ,(b/var "auto-save/") t))))
+
\f
;;; Email (with Gnus)
mail-user-agent 'gnus-user-agent
read-mail-command 'gnus)
-(use-package gnus
- :bind (("s-m" . gnus)
- ("s-M" . gnus-unplugged))
+(use-feature gnus
+ :bind (("s-m" . gnus)
+ ("s-M" . gnus-unplugged)
+ ("C-c a m" . gnus)
+ ("C-c a M" . gnus-unplugged))
:init
(setq
gnus-select-method '(nnnil "")
;; (: gnus-registry-split-fancy-with-parent)
;; (: gnus-group-split-fancy "INBOX" t "INBOX")
;; gnu
- (list ".*emacs-devel.gnu.org" "l.gnu.emacs.devel")
- (list ".*help-gnu-emacs.gnu.org" "l.gnu.emacs.help")
- (list ".*info-gnu-emacs.gnu.org" "l.gnu.emacs.info")
- (list ".*emacs-orgmode.gnu.org" "l.gnu.emacs.orgmode")
- (list ".*emacs-tangents.gnu.org" "l.gnu.emacs.tangents")
- (list ".*emacsconf-discuss.gnu.org" "l.gnu.emacsconf.discuss")
- (list ".*emacsconf-register.gnu.org" "l.gnu.emacsconf.register")
- (list ".*emacsconf-submit.gnu.org" "l.gnu.emacsconf.submit")
- (list ".*fencepost-users.gnu.org" "l.gnu.fencepost.users")
- (list ".*gnunet-developers.gnu.org" "l.gnu.gnunet.developers")
- (list ".*help-gnunet.gnu.org" "l.gnu.gnunet.help")
- (list ".*bug-gnuzilla.gnu.org" "l.gnu.gnuzilla.bug")
- (list ".*gnuzilla-dev.gnu.org" "l.gnu.gnuzilla.dev")
- (list ".*guile-devel.gnu.org" "l.gnu.guile.devel")
- (list ".*guile-user.gnu.org" "l.gnu.guile.user")
- (list ".*guix-devel.gnu.org" "l.gnu.guix.devel")
- (list ".*help-guix.gnu.org" "l.gnu.guix.help")
- (list ".*info-guix.gnu.org" "l.gnu.guix.info")
- (list ".*savannah-hackers-public.gnu.org" "l.gnu.savannah.hackers.public")
- (list ".*savannah-users.gnu.org" "l.gnu.savannah.users")
- (list ".*www-commits.gnu.org" "l.gnu.www.commits")
- (list ".*www-discuss.gnu.org" "l.gnu.www.discuss")
+ (list ".*<\\(.*\\)\\.\\(non\\)?gnu\\.org>.*" "l.\\1")
+ ;; *@lists.sr.ht, omitting one dot if present
+ ;; add more \\.?\\([^.@]*\\) if needed
+ (list ".*<~\\(.*\\)/\\([^.@]*\\)\\.?\\([^.@]*\\)@lists.sr.ht>.*" "l.~\\1.\\2\\3")
;; webmasters
(from "webmasters\\(-comment\\)?@gnu\\.org" "webmasters")
- ;; haskell
- (list ".*haskell-art.we.lurk.org" "l.haskell.art")
- (list ".*haskell-cafe.haskell.org" "l.haskell.cafe")
;; other
(list ".*atreus.freelists.org" "l.atreus")
(list ".*deepspec.lists.cs.princeton.edu" "l.deepspec")
- (list ".*notmuch.notmuchmail.org" "l.notmuch")
- (list ".*dev.lists.parabola.nu" "l.parabola.dev")
- ;; *@lists.sr.ht
- (list ".*~bandali/public-inbox@lists.sr.ht" "l.~bandali.public-inbox")
- (list ".*~sircmpwn/free-writers-club@lists.sr.ht" "l.~sircmpwn.free-writers-club")
- (list ".*~sircmpwn/sr.ht-admins@lists.sr.ht" "l.~sircmpwn.srht.admins")
- (list ".*~sircmpwn/sr.ht-announce@lists.sr.ht" "l.~sircmpwn.srht.announce")
- (list ".*~sircmpwn/sr.ht-dev@lists.sr.ht" "l.~sircmpwn.srht.dev")
- (list ".*~sircmpwn/sr.ht-discuss@lists.sr.ht" "l.~sircmpwn.srht.discuss")
+ ;; (list ".*haskell-art.we.lurk.org" "l.haskell.art") ;d
+ (list ".*haskell-cafe.haskell.org" "l.haskell-cafe")
+ ;; (list ".*notmuch.notmuchmail.org" "l.notmuch") ;u
+ ;; (list ".*dev.lists.parabola.nu" "l.parabola-dev") ;u
+ ;; ----------------------------------
+ ;; legend: (u)nsubscribed | (d)ead
+ ;; ----------------------------------
+ ;; otherwise, leave mail in INBOX
"INBOX")))
(nnimap "uw"
(nnimap-stream plain)
(nnimap-split-methods 'nnimap-split-fancy)
(nnimap-split-fancy (|
;; (: gnus-registry-split-fancy-with-parent)
- ;; se463-s19
- ("subject" "\\(SE\\s-?463\\|Deliverable\\)" "course.se463-s19")
- (from "\\(SE\\s-?463\\|Gema\\|Hemant\\|Davood\\|Camilo\\|Reza\\|Michael\\|Sandy\\)" "course.se463-s19")
+ ;; se212-f19
+ ("subject" "SE\\s-?212" "course.se212-f19")
+ (from "SE\\s-?212" "course.se212-f19")
;; catch-all
"INBOX")))
(nnimap "csc"
(to-address . "deepspec@lists.cs.princeton.edu")
(to-list . "deepspec@lists.cs.princeton.edu")
(list-identifier . "\\[deepspec\\]"))
- ("l\\.gnu\\.emacs\\.devel"
+ ("l\\.emacs-devel"
(to-address . "emacs-devel@gnu.org")
(to-list . "emacs-devel@gnu.org"))
- ("l\\.gnu\\.emacs\\.help"
+ ("l\\.help-gnu-emacs"
(to-address . "help-gnu-emacs@gnu.org")
(to-list . "help-gnu-emacs@gnu.org"))
- ("l\\.gnu\\.emacs\\.info"
+ ("l\\.info-gnu-emacs"
(to-address . "info-gnu-emacs@gnu.org")
(to-list . "info-gnu-emacs@gnu.org"))
- ("l\\.gnu\\.emacs\\.orgmode"
+ ("l\\.emacs-orgmode"
(to-address . "emacs-orgmode@gnu.org")
(to-list . "emacs-orgmode@gnu.org")
(list-identifier . "\\[O\\]"))
- ("l\\.gnu\\.emacs\\.tangents"
+ ("l\\.emacs-tangents"
(to-address . "emacs-tangents@gnu.org")
(to-list . "emacs-tangents@gnu.org"))
- ("l\\.gnu\\.emacsconf\\.discuss"
+ ("l\\.emacsconf-discuss"
(to-address . "emacsconf-discuss@gnu.org")
(to-list . "emacsconf-discuss@gnu.org"))
- ("l\\.gnu\\.emacsconf\\.register"
+ ("l\\.emacsconf-register"
(to-address . "emacsconf-register@gnu.org")
(to-list . "emacsconf-register@gnu.org"))
- ("l\\.gnu\\.emacsconf\\.submit"
+ ("l\\.emacsconf-submit"
(to-address . "emacsconf-submit@gnu.org")
(to-list . "emacsconf-submit@gnu.org"))
- ("l\\.gnu\\.fencepost\\.users"
+ ("l\\.fencepost-users"
(to-address . "fencepost-users@gnu.org")
(to-list . "fencepost-users@gnu.org")
(list-identifier . "\\[Fencepost-users\\]"))
- ("l\\.gnu\\.gnunet\\.developers"
+ ("l\\.gnewsense-art"
+ (to-address . "gnewsense-art@nongnu.org")
+ (to-list . "gnewsense-art@nongnu.org")
+ (list-identifier . "\\[gNewSense-art\\]"))
+ ("l\\.gnewsense-dev"
+ (to-address . "gnewsense-dev@nongnu.org")
+ (to-list . "gnewsense-dev@nongnu.org")
+ (list-identifier . "\\[Gnewsense-dev\\]"))
+ ("l\\.gnewsense-users"
+ (to-address . "gnewsense-users@nongnu.org")
+ (to-list . "gnewsense-users@nongnu.org")
+ (list-identifier . "\\[gNewSense-users\\]"))
+ ("l\\.gnunet-developers"
(to-address . "gnunet-developers@gnu.org")
(to-list . "gnunet-developers@gnu.org")
(list-identifier . "\\[GNUnet-developers\\]"))
- ("l\\.gnu\\.gnunet\\.help"
+ ("l\\.help-gnunet"
(to-address . "help-gnunet@gnu.org")
(to-list . "help-gnunet@gnu.org")
(list-identifier . "\\[Help-gnunet\\]"))
- ("l\\.gnu\\.gnuzilla\\.bug"
+ ("l\\.bug-gnuzilla"
(to-address . "bug-gnuzilla@gnu.org")
(to-list . "bug-gnuzilla@gnu.org")
(list-identifier . "\\[Bug-gnuzilla\\]"))
- ("l\\.gnu\\.gnuzilla\\.dev"
+ ("l\\.gnuzilla-dev"
(to-address . "gnuzilla-dev@gnu.org")
(to-list . "gnuzilla-dev@gnu.org")
(list-identifier . "\\[Gnuzilla-dev\\]"))
- ("l\\.gnu\\.guile\\.devel"
+ ("l\\.guile-devel"
(to-address . "guile-devel@gnu.org")
(to-list . "guile-devel@gnu.org"))
- ("l\\.gnu\\.guile\\.user"
+ ("l\\.guile-user"
(to-address . "guile-user@gnu.org")
(to-list . "guile-user@gnu.org"))
- ("l\\.gnu\\.guix\\.devel"
+ ("l\\.guix-devel"
(to-address . "guix-devel@gnu.org")
(to-list . "guix-devel@gnu.org"))
- ("l\\.gnu\\.guix\\.help"
+ ("l\\.help-guix"
(to-address . "help-guix@gnu.org")
(to-list . "help-guix@gnu.org"))
- ("l\\.gnu\\.guix\\.info"
+ ("l\\.info-guix"
(to-address . "info-guix@gnu.org")
(to-list . "info-guix@gnu.org"))
- ("l\\.gnu\\.savannah\\.hackers\\.public"
+ ("l\\.savannah-hackers-public"
(to-address . "savannah-hackers-public@gnu.org")
(to-list . "savannah-hackers-public@gnu.org"))
- ("l\\.gnu\\.savannah\\.users"
+ ("l\\.savannah-users"
(to-address . "savannah-users@gnu.org")
(to-list . "savannah-users@gnu.org"))
- ("l\\.gnu\\.www\\.commits"
+ ("l\\.www-commits"
(to-address . "www-commits@gnu.org")
(to-list . "www-commits@gnu.org"))
- ("l\\.gnu\\.www\\.discuss"
+ ("l\\.www-discuss"
(to-address . "www-discuss@gnu.org")
(to-list . "www-discuss@gnu.org"))
- ("l\\.haskell\\.art"
+ ("l\\.haskell-art"
(to-address . "haskell-art@we.lurk.org")
(to-list . "haskell-art@we.lurk.org")
(list-identifier . "\\[haskell-art\\]"))
- ("l\\.haskell\\.cafe"
+ ("l\\.haskell-cafe"
(to-address . "haskell-cafe@haskell.org")
(to-list . "haskell-cafe@haskell.org")
(list-identifier . "\\[Haskell-cafe\\]"))
("l\\.notmuch"
(to-address . "notmuch@notmuchmail.org")
(to-list . "notmuch@notmuchmail.org"))
- ("l\\.parabola\\.dev"
+ ("l\\.parabola-dev"
(to-address . "dev@lists.parabola.nu")
(to-list . "dev@lists.parabola.nu")
(list-identifier . "\\[Dev\\]"))
("l\\.~sircmpwn\\.free-writers-club"
(to-address . "~sircmpwn/free-writers-club@lists.sr.ht")
(to-list . "~sircmpwn/free-writers-club@lists.sr.ht"))
- ("l\\.~sircmpwn\\.srht\\.admins"
+ ("l\\.~sircmpwn\\.srht-admins"
(to-address . "~sircmpwn/sr.ht-admins@lists.sr.ht")
(to-list . "~sircmpwn/sr.ht-admins@lists.sr.ht"))
- ("l\\.~sircmpwn\\.srht\\.announce"
+ ("l\\.~sircmpwn\\.srht-announce"
(to-address . "~sircmpwn/sr.ht-announce@lists.sr.ht")
(to-list . "~sircmpwn/sr.ht-announce@lists.sr.ht"))
- ("l\\.~sircmpwn\\.srht\\.dev"
+ ("l\\.~sircmpwn\\.srht-dev"
(to-address . "~sircmpwn/sr.ht-dev@lists.sr.ht")
(to-list . "~sircmpwn/sr.ht-dev@lists.sr.ht"))
- ("l\\.~sircmpwn\\.srht\\.discuss"
+ ("l\\.~sircmpwn\\.srht-discuss"
(to-address . "~sircmpwn/sr.ht-discuss@lists.sr.ht")
(to-list . "~sircmpwn/sr.ht-discuss@lists.sr.ht"))
("webmasters"
(require 'ebdb-mua)
(require 'ebdb-gnus)
+ (when (version< emacs-version "27")
+ (add-to-list
+ 'nnmail-split-abbrev-alist
+ '(list . "list-id\\|list-post\\|x-mailing-list\\|x-beenthere\\|x-loop")
+ t))
+
;; (gnus-registry-initialize)
(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\\)")
: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"
("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
(defvar b/gnu-signature "Amin Bandali
Free Software Activist | GNU Webmaster & Volunteer
GPG: BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103
-https://bandalis.org")
+https://bandali.eu.org")
(defvar b/uw-signature "Amin Bandali, MMath Student
Cheriton School of Computer Science
University of Waterloo
-https://bandalis.org")
+https://bandali.eu.org")
(defvar b/csc-signature "Amin Bandali
-Termcom, Computer Science Club
-University of Waterloo
-https://bandalis.org")
+Systems Committee
+Computer Science Club, University of Waterloo
+https://csclub.uwaterloo.ca/~abandali")
(setq gnus-posting-styles
'((".*"
(address "amin@shemshak.org")
(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)
;; (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 ""
(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
:config
(defun company-ebdb--post-complete (_) nil))
-(use-package ebdb-gnus
+(use-feature ebdb-gnus
:after ebdb
:custom
(ebdb-gnus-window-configuration
(article 1.0)
(ebdb-gnus 0.3))))))
-(use-package ebdb-mua
+(use-feature ebdb-mua
:after ebdb
;; :custom (ebdb-mua-pop-up nil)
)
\f
;;; IRC (with ERC and ZNC)
-(use-package erc
- :bind (("C-c a e b" . erc-switch-to-buffer)
+(use-feature erc
+ :bind (("C-c b e" . erc-switch-to-buffer)
:map erc-mode-map
("M-a" . erc-track-switch-buffer))
:custom
(erc-server-reconnect-attempts 5)
(erc-server-reconnect-timeout 3)
:config
- (with-eval-after-load 'ivy
- ;; ignore channel buffer names
- (add-to-list 'ivy-ignore-buffers "^#"))
(defun erc-cmd-OPME ()
"Request chanserv to op me."
(erc-message "PRIVMSG"
(add-to-list 'erc-modules 'notifications)
(add-to-list 'erc-modules 'spelling)
(add-to-list 'erc-modules 'scrolltoplace)
- (erc-update-modules))
-
-(use-package erc-fill
+ (erc-update-modules)
+
+ (when (and (version<= "24.4" emacs-version)
+ (version< emacs-version "27"))
+ ;; fix erc-lurker bug
+ ;; patch submitted: https://bugs.gnu.org/36843#10
+ ;; TODO: remove when patch is merged and emacs 27 is released
+ (defvar erc-message-parsed)
+ (defun erc-display-message (parsed type buffer msg &rest args)
+ "Display MSG in BUFFER.
+
+ARGS, PARSED, and TYPE are used to format MSG sensibly.
+
+See also `erc-format-message' and `erc-display-line'."
+ (let ((string (if (symbolp msg)
+ (apply #'erc-format-message msg args)
+ msg))
+ (erc-message-parsed parsed))
+ (setq string
+ (cond
+ ((null type)
+ string)
+ ((listp type)
+ (mapc (lambda (type)
+ (setq string
+ (erc-display-message-highlight type string)))
+ type)
+ string)
+ ((symbolp type)
+ (erc-display-message-highlight type string))))
+
+ (if (not (erc-response-p parsed))
+ (erc-display-line string buffer)
+ (unless (erc-hide-current-message-p parsed)
+ (erc-put-text-property 0 (length string) 'erc-parsed parsed string)
+ (erc-put-text-property 0 (length string) 'rear-sticky t string)
+ (when (erc-response.tags parsed)
+ (erc-put-text-property 0 (length string) 'tags (erc-response.tags parsed)
+ string))
+ (erc-display-line string buffer)))))
+
+ (defun erc-lurker-update-status (_message)
+ "Update `erc-lurker-state' if necessary.
+
+This function is called from `erc-insert-pre-hook'. If the
+current message is a PRIVMSG, update `erc-lurker-state' to
+reflect the fact that its sender has issued a PRIVMSG at the
+current time. Otherwise, take no action.
+
+This function depends on the fact that `erc-display-message'
+lexically binds `erc-message-parsed', which is used to check if
+the current message is a PRIVMSG and to determine its sender.
+See also `erc-lurker-trim-nicks' and `erc-lurker-ignore-chars'.
+
+In order to limit memory consumption, this function also calls
+`erc-lurker-cleanup' once every `erc-lurker-cleanup-interval'
+updates of `erc-lurker-state'."
+ (when (and (boundp 'erc-message-parsed)
+ (erc-response-p erc-message-parsed))
+ (let* ((command (erc-response.command erc-message-parsed))
+ (sender
+ (erc-lurker-maybe-trim
+ (car (erc-parse-user (erc-response.sender erc-message-parsed)))))
+ (server
+ (erc-canonicalize-server-name erc-server-announced-name)))
+ (when (equal command "PRIVMSG")
+ (when (>= (cl-incf erc-lurker-cleanup-count)
+ erc-lurker-cleanup-interval)
+ (setq erc-lurker-cleanup-count 0)
+ (erc-lurker-cleanup))
+ (unless (gethash server erc-lurker-state)
+ (puthash server (make-hash-table :test 'equal) erc-lurker-state))
+ (puthash sender (current-time)
+ (gethash server erc-lurker-state))))))))
+
+(use-feature erc-fill
: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))
:custom
(erc-track-enable-keybindings nil)
(erc-track-exclude-types '("JOIN" "MODE" "NICK" "PART" "QUIT"
: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
projects / ~bandali / configs / blobdiff