X-Git-Url: https://git.shemshak.org/~bandali/configs/blobdiff_plain/f0d99991ba0e5016dbdda13e01ee34c2bfddaf3e..1060413bf79aaa20273c785976cf9c2b2b34fac2:/.emacs.d/init.el?ds=inline diff --git a/.emacs.d/init.el b/.emacs.d/init.el index b0a340d..d08c84a 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -1,4 +1,4 @@ -;;; init.el --- Amin Bandali's Emacs config -*- lexical-binding: t -*- +;;; init.el --- bandali's emacs configuration -*- lexical-binding: t -*- ;; Copyright (C) 2018-2019 Amin Bandali @@ -18,7 +18,7 @@ ;;; Commentary: ;; Emacs configuration of Amin Bandali, computer scientist, functional -;; programmer, and free software advocate. Uses straight.el for +;; 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 @@ -37,18 +37,18 @@ ;;; Emacs initialization -(defvar a/before-user-init-time (current-time) +(defvar b/before-user-init-time (current-time) "Value of `current-time' when Emacs begins loading `user-init-file'.") (message "Loading Emacs...done (%.3fs)" - (float-time (time-subtract a/before-user-init-time + (float-time (time-subtract b/before-user-init-time before-init-time))) ;; temporarily increase `gc-cons-threshhold' and `gc-cons-percentage' ;; during startup to reduce garbage collection frequency. clearing ;; `file-name-handler-alist' seems to help reduce startup time too. -(defvar a/gc-cons-threshold gc-cons-threshold) -(defvar a/gc-cons-percentage gc-cons-percentage) -(defvar a/file-name-handler-alist file-name-handler-alist) +(defvar b/gc-cons-threshold gc-cons-threshold) +(defvar b/gc-cons-percentage gc-cons-percentage) +(defvar b/file-name-handler-alist file-name-handler-alist) (setq gc-cons-threshold (* 400 1024 1024) ; 400 MiB gc-cons-percentage 0.6 file-name-handler-alist nil @@ -56,11 +56,11 @@ esup-child-profile-require-level 0) ;; set them back to their defaults once we're done initializing -(defun a/post-init () - (setq gc-cons-threshold a/gc-cons-threshold - gc-cons-percentage a/gc-cons-percentage - file-name-handler-alist a/file-name-handler-alist)) -(add-hook 'after-init-hook #'a/post-init) +(defun b/post-init () + (setq gc-cons-threshold b/gc-cons-threshold + gc-cons-percentage b/gc-cons-percentage + file-name-handler-alist b/file-name-handler-alist)) +(add-hook 'after-init-hook #'b/post-init) ;; increase number of lines kept in *Messages* log (setq message-log-max 20000) @@ -74,7 +74,7 @@ ;;; whoami (setq user-full-name "Amin Bandali" - user-mail-address "amin@bndl.org") + user-mail-address "bandali@gnu.org") ;;; comment macro @@ -109,7 +109,7 @@ (setq straight-repository-branch "develop" straight-check-for-modifications '(check-on-save find-when-checking)) -(defun a/bootstrap-straight () +(defun b/bootstrap-straight () (defvar bootstrap-version) (let ((bootstrap-file (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory)) @@ -125,7 +125,7 @@ ;; Solid rocket booster ignition... -(a/bootstrap-straight) +(b/bootstrap-straight) ;; We have lift off! @@ -133,24 +133,34 @@ (defmacro use-feature (name &rest args) "Like `use-package', but with `straight-use-package-by-default' disabled." - (declare (indent defun)) + (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 a/reload-init () +(defun b/reload-init () "Reload init.el." (interactive) - (setq a/file-name-handler-alist file-name-handler-alist) + (setq b/file-name-handler-alist file-name-handler-alist) (load user-init-file nil 'nomessage) - (a/post-init)) + (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 @@ -166,46 +176,30 @@ (use-package delight) -;; for browsing the Emacsmirror package database -(comment - (use-package epkg - :commands (epkg-list-packages epkg-describe-package) - :bind - (("C-c p e d" . epkg-describe-package) - ("C-c p e p" . epkg-list-packages)) - :config - (setq epkg-repository "~/.emacs.d/straight/repos/epkgs/") - (eval-when-compile (defvar ivy-initial-inputs-alist)) - (with-eval-after-load 'ivy - (add-to-list - 'ivy-initial-inputs-alist '(epkg-describe-package . "^") t)))) - ;;; Initial setup ;; keep ~/.emacs.d clean (use-package no-littering - :demand t + :demand :config - (savehist-mode 1) - (add-to-list 'savehist-additional-variables 'kill-ring) - (save-place-mode 1) - (setq auto-save-file-name-transforms - `((".*" ,(no-littering-expand-var-file-name "auto-save/") t)))) + (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 :config - (setq custom-file (no-littering-expand-etc-file-name "custom.el")) + (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)) ;; load the secrets file if it exists, otherwise show a warning -(with-demoted-errors - (load (no-littering-expand-etc-file-name "secrets"))) +(comment + (with-demoted-errors + (load (b/etc "secrets")))) ;; better $PATH (and other environment variable) handling (use-package exec-path-from-shell @@ -270,7 +264,7 @@ ;; focus follows mouse (setq mouse-autoselect-window t) -(defun a/no-mouse-autoselect-window () +(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) @@ -294,8 +288,9 @@ For disabling the behaviour for certain buffers and/or modes." :defer 0.4 :config (pixel-scroll-mode 1)) -;; ask for GPG passphrase in minibuffer -(setq epg-pinentry-mode 'loopback) +(use-feature epg-config + :custom + ((epg-gpg-program (executable-find "gpg")))) ;; useful libraries (require 'cl-lib) @@ -304,12 +299,12 @@ For disabling the behaviour for certain buffers and/or modes." ;;; Useful utilities -(defmacro a/setq-every (value &rest vars) +(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 a/start-process (program &rest args) +(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 @@ -317,15 +312,15 @@ For disabling the behaviour for certain buffers and/or modes." (apply #'start-process process-name buffer-name program args))) -(defun a/dired-start-process (program &optional 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 #'a/start-process + (apply #'b/start-process program (remove nil (list args (dired-get-file-for-visit))))) -(defun a/add-elisp-section () +(defun b/add-elisp-section () (interactive) (insert "\n") (previous-line) @@ -413,12 +408,12 @@ For disabling the behaviour for certain buffers and/or modes." ;; https://stackoverflow.com/a/17788551, with changes to use `cl-letf' ;; instead of the now obsolete `flet'. (with-eval-after-load 'compile - (defun a/compilation-finish-function (buffer outstr) + (defun b/compilation-finish-function (buffer outstr) (unless (string-match "finished" outstr) (switch-to-buffer-other-window buffer)) t) - (setq compilation-finish-functions #'a/compilation-finish-function) + (setq compilation-finish-functions #'b/compilation-finish-function) (require 'cl-macs) @@ -445,6 +440,10 @@ For disabling the behaviour for certain buffers and/or modes." ;; 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 vc :bind ("C-x v C-=" . vc-ediff)) @@ -453,6 +452,10 @@ 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) + ;;; General bindings @@ -460,41 +463,49 @@ For disabling the behaviour for certain buffers and/or modes." ("C-c a i" . ielm) ("C-c e b" . eval-buffer) + ("C-c e e" . eval-last-sexp) ("C-c e r" . eval-region) ("C-c e i" . emacs-init-time) ("C-c e u" . emacs-uptime) + ("C-c e v" . emacs-version) ("C-c F m" . make-frame-command) ("C-c F d" . delete-frame) ("C-c F D" . server-edit) - ("C-c o" . other-window) - ("C-S-h C" . describe-char) ("C-S-h F" . describe-face) ("C-x k" . kill-this-buffer) ("C-x K" . kill-buffer) - - ("s-p" . beginning-of-buffer) - ("s-n" . end-of-buffer) + ("C-x s" . save-buffer) + ("C-x S" . save-some-buffers) :map emacs-lisp-mode-map - ("" . a/add-elisp-section)) + ("" . b/add-elisp-section)) (when (display-graphic-p) (unbind-key "C-z" global-map)) (bind-keys - :prefix-map a/straight-prefix-map + ;; for back and forward mouse keys + ("" . previous-buffer) + ("" . previous-buffer) + ("" . next-buffer) + ("" . next-buffer) + ("" . kill-this-buffer) + ("" . 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" . a/reload-init) + ("r" . mab/reload-init) ;; M-x ^straight-.*-all$ ("a c" . straight-check-all) ("a f" . straight-fetch-all) @@ -515,21 +526,8 @@ For disabling the behaviour for certain buffers and/or modes." ;;; Essential packages -(use-package auto-compile - :demand t - :config - (auto-compile-on-load-mode) - (auto-compile-on-save-mode) - (setq auto-compile-display-buffer nil - auto-compile-mode-line-counter t - auto-compile-source-recreate-deletes-dest t - auto-compile-toggle-deletes-nonlib-dest t - auto-compile-update-autoloads t) - (add-hook 'auto-compile-inhibit-compile-hook - 'auto-compile-inhibit-compile-detached-git-head)) - ;; use the org-plus-contrib package to get the whole deal -(straight-use-package 'org-plus-contrib) +(use-package org-plus-contrib) (use-feature org :defer 0.5 @@ -543,20 +541,27 @@ For disabling the behaviour for certain buffers and/or modes." 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)) :custom + (org-pretty-entities t) (org-agenda-files '("~/usr/org/todos/personal.org" - "~/usr/org/todos/masters.org")) + "~/usr/org/todos/habits.org" + "~/src/git/masters-thesis/todo.org")) (org-agenda-start-on-weekday 0) + (org-agenda-time-leading-zero t) + (org-habit-graph-column 44) (org-latex-packages-alist '(("" "listings") ("" "color"))) :custom-face '(org-block-begin-line ((t (:foreground "#5a5b5a" :background "#1d1f21")))) @@ -587,13 +592,13 @@ For disabling the behaviour for certain buffers and/or modes." ;; org file. closely inspired by ;; https://github.com/dieggsy/dotfiles/tree/cc10edf7701958eff1cd94d4081da544d882a28c/emacs.d#dotfiles (with-eval-after-load 'org - (defvar a/show-async-tangle-results nil + (defvar b/show-async-tangle-results nil "Keep *emacs* async buffers around for later inspection.") - (defvar a/show-async-tangle-time nil + (defvar b/show-async-tangle-time nil "Show the time spent tangling the file.") - (defun a/async-babel-tangle () + (defun b/async-babel-tangle () "Tangle org file asynchronously." (interactive) (let* ((file-tangle-start-time (current-time)) @@ -605,12 +610,12 @@ For disabling the behaviour for certain buffers and/or modes." `(lambda () (require 'org) (org-babel-tangle-file ,file)) - (unless a/show-async-tangle-results + (unless b/show-async-tangle-results `(lambda (result) (if result (message "Tangled %s%s" ,file-nodir - (if a/show-async-tangle-time + (if b/show-async-tangle-time (format " (%.3fs)" (float-time (time-subtract (current-time) ',file-tangle-start-time))) @@ -619,19 +624,24 @@ For disabling the behaviour for certain buffers and/or modes." (add-to-list 'safe-local-variable-values - '(eval add-hook 'after-save-hook #'a/async-babel-tangle 'append 'local)) + '(eval add-hook 'after-save-hook #'b/async-babel-tangle 'append 'local)) ;; *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 @@ -643,9 +653,10 @@ For disabling the behaviour for certain buffers and/or modes." ;; recently opened files (use-feature recentf :defer 0.2 - :config - (add-to-list 'recentf-exclude "^/\\(?:ssh\\|su\\|sudo\\)?:") - (setq recentf-max-saved-items 40)) + ;; :config + ;; (add-to-list 'recentf-exclude "^/\\(?:ssh\\|su\\|sudo\\)?:") + :custom + (recentf-max-saved-items 2000)) ;; smart M-x enhancement (needed by counsel for history) (use-package smex) @@ -665,6 +676,19 @@ For disabling the behaviour for certain buffers and/or modes." 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)))) @@ -683,12 +707,11 @@ For disabling the behaviour for certain buffers and/or modes." :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 @@ -704,7 +727,6 @@ For disabling the behaviour for certain buffers and/or modes." ("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 ("" . helm-execute-persistent-action) @@ -718,36 +740,36 @@ For disabling the behaviour for certain buffers and/or modes." :bind ("C-c a s e" . eshell) :config (eval-when-compile (defvar eshell-prompt-regexp)) - (defun a/eshell-quit-or-delete-char (arg) + (defun b/eshell-quit-or-delete-char (arg) (interactive "p") (if (and (eolp) (looking-back eshell-prompt-regexp nil)) (eshell-life-is-too-much) (delete-char arg))) - (defun a/eshell-clear () + (defun b/eshell-clear () (interactive) (let ((inhibit-read-only t)) (erase-buffer)) (eshell-send-input)) - (defun a/eshell-setup () + (defun b/eshell-setup () (make-local-variable 'company-idle-delay) (defvar company-idle-delay) (setq company-idle-delay nil) (bind-keys :map eshell-mode-map - ("C-d" . a/eshell-quit-or-delete-char) - ("C-S-l" . a/eshell-clear) + ("C-d" . b/eshell-quit-or-delete-char) + ("C-S-l" . b/eshell-clear) ("M-r" . counsel-esh-history) ([tab] . company-complete))) - :hook (eshell-mode . a/eshell-setup) + :hook (eshell-mode . b/eshell-setup) :custom (eshell-hist-ignoredups t) (eshell-input-filter 'eshell-input-filter-initial-space)) (use-feature ibuffer :bind - (("C-x C-b" . ibuffer-other-window) + (("C-x C-b" . ibuffer) :map ibuffer-mode-map ("P" . ibuffer-backward-filter-group) ("N" . ibuffer-forward-filter-group) @@ -820,6 +842,7 @@ For disabling the behaviour for certain buffers and/or modes." :hook (ibuffer . (lambda () (ibuffer-switch-to-saved-filter-groups "default")))) (use-feature outline + :disabled :hook (prog-mode . outline-minor-mode) :delight (outline-minor-mode " outl") :bind @@ -828,8 +851,8 @@ For disabling the behaviour for certain buffers and/or modes." ("" . outline-toggle-children) ("M-p" . outline-previous-visible-heading) ("M-n" . outline-next-visible-heading) - :prefix-map a/outline-prefix-map - :prefix "s-o" + :prefix-map b/outline-prefix-map + :prefix "s-O" ("TAB" . outline-toggle-children) ("a" . outline-hide-body) ("H" . outline-hide-body) @@ -886,7 +909,7 @@ For disabling the behaviour for certain buffers and/or modes." ("\\" . dired-hide-details-mode) ("z" . (lambda () (interactive) - (a/dired-start-process "zathura")))) + (b/dired-start-process "zathura")))) :hook (dired-mode . dired-hide-details-mode)) (use-feature help @@ -904,7 +927,7 @@ For disabling the behaviour for certain buffers and/or modes." (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))) @@ -940,7 +963,10 @@ For disabling the behaviour for certain buffers and/or modes." ;; save minibuffer history (use-feature savehist - :config (savehist-mode)) + :demand + :config + (savehist-mode) + (add-to-list 'savehist-additional-variables 'kill-ring)) ;; automatically save place in files (use-feature saveplace @@ -964,7 +990,7 @@ For disabling the behaviour for certain buffers and/or modes." (use-package company :defer 0.6 - :delight " company" + :delight " comp" :bind (:map company-active-map ([tab] . company-complete-common-or-cycle) @@ -997,13 +1023,14 @@ For disabling the behaviour for certain buffers and/or modes." :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 (setq ispell-local-dictionary-alist `((nil "[[:alpha:]]" "[^[:alpha:]]" - "['\x2019]" nil ("-B") nil utf-8))) + "['\x2019]" nil ("-B") nil utf-8)) + ispell-program-name (executable-find "hunspell")) ;; don't send ’ to the subprocess (defun endless/replace-apostrophe (args) (cons (replace-regexp-in-string @@ -1042,16 +1069,16 @@ For disabling the behaviour for certain buffers and/or modes." (use-feature elisp-mode :delight (emacs-lisp-mode "Elisp" :major)) + (use-package alloy-mode :straight (:host github :repo "dwwmmn/alloy-mode") :mode "\\.als\\'" :config (setq alloy-basic-offset 2)) -(use-package proof-site ; for Coq - :straight proof-general) - (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)) @@ -1064,41 +1091,46 @@ For disabling the behaviour for certain buffers and/or modes." lean-input-user-translations '(("/" "/"))) (lean-input-setup)) -(use-package haskell-mode - :config - (setq haskell-indentation-layout-offset 4 - haskell-indentation-left-offset 4 - flycheck-checker 'haskell-hlint - flycheck-disabled-checkers '(haskell-stack-ghc haskell-ghc))) - -(use-package dante - :after haskell-mode - :commands dante-mode - :hook (haskell-mode . dante-mode)) - -(use-package hlint-refactor - :after haskell-mode - :bind (:map hlint-refactor-mode-map - ("C-c l b" . hlint-refactor-refactor-buffer) - ("C-c l r" . hlint-refactor-refactor-at-point)) - :hook (haskell-mode . hlint-refactor-mode)) - -(use-package flycheck-haskell - :after haskell-mode) -;; alternative: hs-lint https://github.com/ndmitchell/hlint/blob/20e116a043f2073c57b17b24ae6364b5e433ba7e/data/hs-lint.el - -(use-package sgml-mode +(comment + (use-package proof-site ; for Coq + :straight proof-general) + + (use-package haskell-mode + :config + (setq haskell-indentation-layout-offset 4 + haskell-indentation-left-offset 4 + flycheck-checker 'haskell-hlint + flycheck-disabled-checkers '(haskell-stack-ghc haskell-ghc))) + + (use-package dante + :after haskell-mode + :commands dante-mode + :hook (haskell-mode . dante-mode)) + + (use-package hlint-refactor + :after haskell-mode + :bind (:map hlint-refactor-mode-map + ("C-c l b" . hlint-refactor-refactor-buffer) + ("C-c l r" . hlint-refactor-refactor-at-point)) + :hook (haskell-mode . hlint-refactor-mode)) + + (use-package flycheck-haskell + :after haskell-mode) + ;; alternative: hs-lint https://github.com/ndmitchell/hlint/blob/20e116a043f2073c57b17b24ae6364b5e433ba7e/data/hs-lint.el + ) + +(use-feature sgml-mode :config (setq sgml-basic-offset 2)) -(use-package css-mode +(use-feature css-mode :config (setq css-indent-offset 2)) (use-package web-mode :mode "\\.html\\'" :config - (a/setq-every 2 + (b/setq-every 2 web-mode-code-indent-offset web-mode-css-indent-offset web-mode-markup-indent-offset)) @@ -1199,52 +1231,68 @@ For disabling the behaviour for certain buffers and/or modes." (use-package go-mode) +(use-package po-mode + :hook + (po-mode . (lambda () (run-with-timer 0.1 nil 'View-exit)))) + +(use-feature tex-mode + :config + (cl-delete-if + (lambda (p) (string-match "^---?" (car p))) + tex--prettify-symbols-alist) + :hook ((tex-mode . auto-fill-mode) + (tex-mode . flyspell-mode) + (tex-mode . (lambda () (electric-indent-local-mode -1))))) + ;;; Theme -(add-to-list 'custom-theme-load-path "~/.emacs.d/lisp") +(add-to-list 'custom-theme-load-path + (expand-file-name + (convert-standard-filename "lisp") user-emacs-directory)) (load-theme 'tangomod t) (use-package smart-mode-line :commands (sml/apply-theme) :demand :config - (sml/setup)) + (sml/setup) + (smart-mode-line-enable)) (use-package doom-themes) -(defvar a/org-mode-font-lock-keywords +(defvar b/org-mode-font-lock-keywords '(("[ \t]*\\(#\\+\\(BEGIN\\|END\\|begin\\|end\\)_\\(\\S-+\\)\\)[ \t]*\\([^\n:]*\\)" (1 '(:foreground "#5a5b5a" :background "#292b2b") t) ; directive (3 '(:foreground "#81a2be" :background "#292b2b") t) ; kind (4 '(:foreground "#c5c8c6") t)))) ; title -(defun a/lights-on () +(defun b/lights-on () "Enable my favourite light theme." (interactive) (mapc #'disable-theme custom-enabled-themes) (load-theme 'tangomod t) (sml/apply-theme 'automatic) (font-lock-remove-keywords - 'org-mode a/org-mode-font-lock-keywords)) + 'org-mode b/org-mode-font-lock-keywords)) -(defun a/lights-off () +(defun b/lights-off () "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 a/org-mode-font-lock-keywords t)) + 'org-mode b/org-mode-font-lock-keywords t)) (bind-keys - ("s-t d" . a/lights-off) - ("s-t l" . a/lights-on)) + ("C-c t d" . b/lights-off) + ("C-c t l" . b/lights-on)) ;;; Emacs enhancements & auxiliary packages -(use-feature man +(use-package man :config (setq Man-width 80)) (use-package which-key @@ -1268,15 +1316,12 @@ For disabling the behaviour for certain buffers and/or modes." "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" @@ -1284,9 +1329,9 @@ For disabling the behaviour for certain buffers and/or modes." "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 @@ -1307,8 +1352,7 @@ For disabling the behaviour for certain buffers and/or modes." (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) @@ -1323,10 +1367,22 @@ For disabling the behaviour for certain buffers and/or modes." ("" . mwim-end-of-line-or-code))) (use-package projectile + :defer 0.5 :bind-keymap ("C-c P" . projectile-command-map) :config (projectile-mode) + (defun b/projectile-mode-line-fun () + "Report project name and type in the modeline." + (let ((project-name (projectile-project-name)) + (project-type (projectile-project-type))) + (format "%s%s" + projectile-mode-line-prefix + (if project-type + (format ":%s" project-type) + "")))) + (setq projectile-mode-line-function 'b/projectile-mode-line-fun) + (defun my-projectile-invalidate-cache (&rest _args) ;; ignore the args to `magit-checkout' (projectile-invalidate-cache nil)) @@ -1363,28 +1419,28 @@ For disabling the behaviour for certain buffers and/or modes." (use-package boxquote :defer 0.6 :bind - (:prefix-map a/boxquote-prefix-map - :prefix "C-c q" - ("b" . boxquote-buffer) - ("B" . boxquote-insert-buffer) - ("d" . boxquote-defun) - ("F" . boxquote-insert-file) - ("hf" . boxquote-describe-function) - ("hk" . boxquote-describe-key) - ("hv" . boxquote-describe-variable) - ("hw" . boxquote-where-is) - ("k" . boxquote-kill) - ("p" . boxquote-paragraph) - ("q" . boxquote-boxquote) - ("r" . boxquote-region) - ("s" . boxquote-shell-command) - ("t" . boxquote-text) - ("T" . boxquote-title) - ("u" . boxquote-unbox) - ("U" . boxquote-unbox-region) - ("y" . boxquote-yank) - ("M-q" . boxquote-fill-paragraph) - ("M-w" . boxquote-kill-ring-save))) + (:prefix-map b/boxquote-prefix-map + :prefix "C-c q" + ("b" . boxquote-buffer) + ("B" . boxquote-insert-buffer) + ("d" . boxquote-defun) + ("F" . boxquote-insert-file) + ("hf" . boxquote-describe-function) + ("hk" . boxquote-describe-key) + ("hv" . boxquote-describe-variable) + ("hw" . boxquote-where-is) + ("k" . boxquote-kill) + ("p" . boxquote-paragraph) + ("q" . boxquote-boxquote) + ("r" . boxquote-region) + ("s" . boxquote-shell-command) + ("t" . boxquote-text) + ("T" . boxquote-title) + ("u" . boxquote-unbox) + ("U" . boxquote-unbox-region) + ("y" . boxquote-yank) + ("M-q" . boxquote-fill-paragraph) + ("M-w" . boxquote-kill-ring-save))) (use-package orgalist ;; http://lists.gnu.org/archive/html/emacs-orgmode/2019-04/msg00007.html @@ -1398,7 +1454,8 @@ For disabling the behaviour for certain buffers and/or modes." :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 @@ -1492,16 +1549,18 @@ For disabling the behaviour for certain buffers and/or modes." (use-package multiple-cursors :bind (("C-S-" . mc/add-cursor-on-click) - (:prefix-map a/mc-prefix-map + (:prefix-map b/mc-prefix-map :prefix "C-c m" ("c" . mc/edit-lines) ("n" . mc/mark-next-like-this) ("p" . mc/mark-previous-like-this) ("a" . mc/mark-all-like-this)))) -(use-package forge - :after magit - :demand) +(comment + ;; TODO + (use-package forge + :after magit + :demand)) (use-package yasnippet :defer 0.6 @@ -1511,6 +1570,16 @@ For disabling the behaviour for certain buffers and/or modes." (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 @@ -1521,7 +1590,7 @@ For disabling the behaviour for certain buffers and/or modes." (use-package org-ref :init - (a/setq-every '("~/usr/org/references.bib") + (b/setq-every '("~/usr/org/references.bib") reftex-default-bibliography org-ref-default-bibliography) (setq @@ -1532,37 +1601,97 @@ For disabling the behaviour for certain buffers and/or modes." :commands (alert) :init (setq alert-default-style 'notifications)) -(use-package ivy-xref - :init - (setq xref-show-xrefs-function #'ivy-xref-show-xrefs)) - ;; (use-package fill-column-indicator) +(use-package emojify + :hook (erc-mode . emojify-mode)) + +(use-feature window + :bind + (("C-c w " . split-window-right) + ("C-c w " . 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-feature windmove + :defer 0.6 + :bind + (("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 + :bind ("C-c a p" . pass) + :hook (pass-mode . View-exit)) + +(use-package pdf-tools + :defer 0.5 + :bind (:map pdf-view-mode-map + ("" . pdf-history-backward) + ("" . 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)))) + ;;; Email (with Gnus) -(defvar a/maildir (expand-file-name "~/mail/")) +(defvar b/maildir (expand-file-name "~/mail/")) (with-eval-after-load 'recentf - (add-to-list 'recentf-exclude a/maildir)) + (add-to-list 'recentf-exclude b/maildir)) (setq - a/gnus-init-file (no-littering-expand-etc-file-name "gnus") + b/gnus-init-file (b/etc "gnus") mail-user-agent 'gnus-user-agent read-mail-command 'gnus) (use-feature gnus - :bind (("s-m" . gnus) - ("s-M" . gnus-unplugged)) + :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-secondary-select-methods - '((nnimap "amin" + '((nnimap "shemshak" (nnimap-stream plain) (nnimap-address "127.0.0.1") (nnimap-server-port 143) (nnimap-authenticator plain) - (nnimap-user "amin@bndl.local")) + (nnimap-user "amin@shemshak.local")) (nnimap "gnu" (nnimap-stream plain) (nnimap-address "127.0.0.1") @@ -1572,40 +1701,26 @@ For disabling the behaviour for certain buffers and/or modes." (nnimap-inbox "INBOX") (nnimap-split-methods 'nnimap-split-fancy) (nnimap-split-fancy (| - (: gnus-registry-split-fancy-with-parent) + ;; (: 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 ".*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 ".*guix-devel.gnu.org" "l.gnu.guix.devel") - (list ".*info-guix.gnu.org" "l.gnu.guix.info") - (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/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) @@ -1616,10 +1731,10 @@ For disabling the behaviour for certain buffers and/or modes." (nnimap-inbox "INBOX") (nnimap-split-methods 'nnimap-split-fancy) (nnimap-split-fancy (| - (: gnus-registry-split-fancy-with-parent) - ;; se463-s19 - ("subject" "SE\\s-?463" "course.se463-s19") - (from "\\(SE\\s-?463\\|Gema\\)" "course.se463-s19") + ;; (: gnus-registry-split-fancy-with-parent) + ;; se212-f19 + ("subject" "SE\\s-?212" "course.se212-f19") + (from "SE\\s-?212" "course.se212-f19") ;; catch-all "INBOX"))) (nnimap "csc" @@ -1628,94 +1743,130 @@ For disabling the behaviour for certain buffers and/or modes." (nnimap-server-port 143) (nnimap-authenticator plain) (nnimap-user "abandali@csc.uw.local"))) - gnus-message-archive-group "nnimap+amin:Sent" + gnus-message-archive-group "nnimap+shemshak:Sent" gnus-parameters - '(("l\\.deepspec" + '(("l\\.atreus" + (to-address . "atreus@freelists.org") + (to-list . "atreus@freelists.org")) + ("l\\.deepspec" (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\\.fencepost\\.users" + ("l\\.emacsconf-register" + (to-address . "emacsconf-register@gnu.org") + (to-list . "emacsconf-register@gnu.org")) + ("l\\.emacsconf-submit" + (to-address . "emacsconf-submit@gnu.org") + (to-list . "emacsconf-submit@gnu.org")) + ("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\\.guix\\.devel" + ("l\\.guile-user" + (to-address . "guile-user@gnu.org") + (to-list . "guile-user@gnu.org")) + ("l\\.guix-devel" (to-address . "guix-devel@gnu.org") (to-list . "guix-devel@gnu.org")) - ("l\\.gnu\\.guix\\.info" + ("l\\.help-guix" + (to-address . "help-guix@gnu.org") + (to-list . "help-guix@gnu.org")) + ("l\\.info-guix" (to-address . "info-guix@gnu.org") (to-list . "info-guix@gnu.org")) - ("l\\.gnu\\.www\\.commits" + ("l\\.savannah-hackers-public" + (to-address . "savannah-hackers-public@gnu.org") + (to-list . "savannah-hackers-public@gnu.org")) + ("l\\.savannah-users" + (to-address . "savannah-users@gnu.org") + (to-list . "savannah-users@gnu.org")) + ("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\\.~bandali\\.public-inbox" (to-address . "~bandali/public-inbox@lists.sr.ht") (to-list . "~bandali/public-inbox@lists.sr.ht")) - ("l\\.~sircmpwn\\.srht\\.admins" + ("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" (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" @@ -1728,7 +1879,7 @@ For disabling the behaviour for certain buffers and/or modes." ("nnimap\\+uw:.*" (gcc-self . t))) gnus-large-newsgroup 50 - gnus-home-directory (no-littering-expand-var-file-name "gnus/") + gnus-home-directory (b/var "gnus/") gnus-directory (concat gnus-home-directory "news/") message-directory (concat gnus-home-directory "mail/") nndraft-directory (concat gnus-home-directory "drafts/") @@ -1741,7 +1892,13 @@ For disabling the behaviour for certain buffers and/or modes." (require 'ebdb-mua) (require 'ebdb-gnus) - (gnus-registry-initialize) + (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))) @@ -1749,6 +1906,7 @@ For disabling the behaviour for certain buffers and/or modes." (use-feature gnus-art :config (setq + gnus-buttonized-mime-types '("multipart/\\(signed\\|encrypted\\)") gnus-visible-headers (concat gnus-visible-headers "\\|^List-Id:\\|^X-RT-Originator:\\|^User-Agent:") gnus-sorted-header-list @@ -1775,7 +1933,7 @@ For disabling the behaviour for certain buffers and/or modes." (use-feature gnus-sum :bind (:map gnus-summary-mode-map - :prefix-map a/gnus-summary-prefix-map + :prefix-map b/gnus-summary-prefix-map :prefix "v" ("r" . gnus-summary-reply) ("w" . gnus-summary-wide-reply) @@ -1784,40 +1942,48 @@ For disabling the behaviour for certain buffers and/or modes." (bind-keys :map gnus-summary-mode-map ("M-L" . org-store-link)) - :hook (gnus-summary-mode . a/no-mouse-autoselect-window)) + :hook (gnus-summary-mode . b/no-mouse-autoselect-window)) (use-feature gnus-msg :config - (defvar a/gnu-signature "Amin Bandali | GNU Webmaster -https://bandali.eu.org | https://gnu.org -GPG Key: BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103") - (defvar a/uw-signature "Amin Bandali, MMath Student + (defvar b/signature "Amin Bandali +Free Software Activist | GNU Webmaster & Volunteer +GPG: BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103 +https://shemshak.org/~amin") + (defvar b/gnu-signature "Amin Bandali +Free Software Activist | GNU Webmaster & Volunteer +GPG: BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103 +https://bandali.eu.org") + (defvar b/uw-signature "Amin Bandali, MMath Student Cheriton School of Computer Science University of Waterloo https://bandali.eu.org") - (defvar a/csc-signature "Amin Bandali | Termcom, CSC -https://csclub.uwaterloo.ca/~abandali/") + (defvar b/csc-signature "Amin Bandali +Systems Committee +Computer Science Club, University of Waterloo +https://csclub.uwaterloo.ca/~abandali") (setq gnus-posting-styles '((".*" - (address "amin@bndl.org") + (address "amin@shemshak.org") (body "\nBest,\n") - (eval (setq a/message-cite-say-hi t))) + (signature b/signature) + (eval (setq b/message-cite-say-hi t))) ("nnimap\\+gnu:.*" (address "bandali@gnu.org") - (signature a/gnu-signature) + (signature b/gnu-signature) (eval (set (make-local-variable 'message-user-fqdn) "fencepost.gnu.org"))) ((header "subject" "ThankCRM") (to "webmasters-comment@gnu.org") - (body "Added to 2019supporters.html.\n\nMoving to campaigns.\n") - (eval (setq a/message-cite-say-hi nil))) + (body "") + (eval (setq b/message-cite-say-hi nil))) ("nnimap\\+uw:.*" (address "abandali@uwaterloo.ca") - (signature a/uw-signature)) + (signature b/uw-signature)) ("nnimap\\+uw:INBOX" (gcc "\"nnimap+uw:Sent Items\"")) ("nnimap\\+csc:.*" (address "abandali@csclub.uwaterloo.ca") - (signature a/csc-signature) + (signature b/csc-signature) (gcc "nnimap+csc:Sent"))))) (use-feature gnus-topic @@ -1846,11 +2012,13 @@ https://csclub.uwaterloo.ca/~abandali/") (use-feature mm-decode :config - (setq mm-discouraged-alternatives '("text/html" "text/richtext"))) + (setq mm-discouraged-alternatives '("text/html" "text/richtext") + mm-decrypt-option 'known + mm-verify-option 'known)) (use-feature sendmail :config - (setq sendmail-program "/usr/bin/msmtp" + (setq sendmail-program (executable-find "msmtp") ;; message-sendmail-extra-arguments '("-v" "-d") mail-specify-envelope-from t mail-envelope-from 'header)) @@ -1867,7 +2035,7 @@ https://csclub.uwaterloo.ca/~abandali/") (when from msg-id)))) - (defconst a/message-cite-style-format "On %Y-%m-%d %l:%M %p, %N wrote:") + (defconst b/message-cite-style-format "On %Y-%m-%d %l:%M %p, %N wrote:") (defconst message-cite-style-bandali '((message-cite-function 'message-cite-original) (message-citation-line-function 'message-insert-formatted-citation-line) @@ -1876,9 +2044,9 @@ https://csclub.uwaterloo.ca/~abandali/") (message-yank-cited-prefix ">") (message-yank-empty-prefix ">") (message-citation-line-format - (if a/message-cite-say-hi - (concat "Hi %F,\n\n" a/message-cite-style-format) - a/message-cite-style-format))) + (if b/message-cite-say-hi + (concat "Hi %F,\n\n" b/message-cite-style-format) + b/message-cite-style-format))) "Citation style based on Mozilla Thunderbird's. Use with message-cite-style.") (setq ;; message-cite-style 'message-cite-style-bandali message-kill-buffer-on-exit t @@ -1887,7 +2055,7 @@ https://csclub.uwaterloo.ca/~abandali/") message-subscribed-address-functions '(gnus-find-subscribed-addresses) message-dont-reply-to-names - "\\(\\(amin@bndl\\.org\\)\\|\\(.*@\\(aminb\\|amin\\.bndl\\)\\.org\\)\\|\\(\\(bandali\\|aminb?\\|mab\\)@gnu\\.org\\)\\|\\(a\\(min\\.\\)?bandali@uwaterloo\\.ca\\)\\|\\(abandali@csclub\\.uwaterloo\\.ca\\)\\)") + "\\(\\(\\(amin\\|mab\\)@shemshak\\.org\\)\\|\\(amin@bndl\\.org\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(bandali\\|mab\\|aminb?\\)@gnu\\.org\\)\\|\\(a\\(min\\.\\)?bandali@uwaterloo\\.ca\\)\\|\\(abandali@csclub\\.uwaterloo\\.ca\\)\\)") (require 'company-ebdb) :hook (;; (message-setup . mml-secure-message-sign-pgpmime) (message-mode . flyspell-mode) @@ -1918,7 +2086,7 @@ https://csclub.uwaterloo.ca/~abandali/") ;; footnote-style 'unicode) :bind (:map message-mode-map - :prefix-map a/footnote-prefix-map + :prefix-map b/footnote-prefix-map :prefix "C-c f" ("a" . footnote-add-footnote) ("b" . footnote-back-to-message) @@ -1929,11 +2097,10 @@ https://csclub.uwaterloo.ca/~abandali/") ("s" . footnote-set-style))) (use-package ebdb - :straight (:host github :repo "girzel/ebdb") :after gnus :bind (:map gnus-group-mode-map ("e" . ebdb)) :config - (setq ebdb-sources (no-littering-expand-var-file-name "ebdb")) + (setq ebdb-sources (b/var "ebdb")) (with-eval-after-load 'swiper (add-to-list 'swiper-font-lock-exclude 'ebdb-mode t))) @@ -1968,7 +2135,6 @@ https://csclub.uwaterloo.ca/~abandali/") ;; (use-package ebdb-message ;; :after ebdb) - ;; (use-package ebdb-vcard ;; :after ebdb) @@ -1996,10 +2162,140 @@ https://csclub.uwaterloo.ca/~abandali/") (gnus-harvest-install)))) -;;; IRC +;;; IRC (with ERC and ZNC) + +(use-feature erc + :bind (("C-c b e" . erc-switch-to-buffer) + :map erc-mode-map + ("M-a" . erc-track-switch-buffer)) + :custom + (erc-join-buffer 'bury) + (erc-lurker-hide-list '("JOIN" "PART" "QUIT")) + (erc-nick "bandali") + (erc-prompt "erc>") + (erc-rename-buffers t) + (erc-server-reconnect-attempts 5) + (erc-server-reconnect-timeout 3) + :config + (defun erc-cmd-OPME () + "Request chanserv to op me." + (erc-message "PRIVMSG" + (format "chanserv op %s %s" + (erc-default-target) + (erc-current-nick)) nil)) + (defun erc-cmd-DEOPME () + "Deop myself from current channel." + (erc-cmd-DEOP (format "%s" (erc-current-nick)))) + (add-to-list 'erc-modules 'keep-place) + (add-to-list 'erc-modules 'notifications) + (add-to-list 'erc-modules 'spelling) + (add-to-list 'erc-modules 'scrolltoplace) + (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-feature erc-pcomplete + :after erc + :custom + (erc-pcomplete-nick-postfix ",")) + +(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" + "324" "329" "332" "333" "353" "477")) + (erc-track-priority-faces-only 'all) + (erc-track-shorten-function nil)) + +(use-package erc-hl-nicks + :after erc) + +(use-package erc-scrolltoplace + :after erc) (use-package znc - :straight (:host nil :repo "https://git.bndl.org/amin/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 @@ -2008,16 +2304,18 @@ https://csclub.uwaterloo.ca/~abandali/") ((null auth) (error "Couldn't find znca's authinfo")) (t (funcall (plist-get (car auth) :secret))))))) (setq znc-servers - `(("znc.bndl.org" 1337 t + `(("znc.shemshak.org" 1337 t ((freenode "amin/freenode" ,pwd))) - ("znc.bndl.org" 1337 t - ((moznet "amin/moznet" ,pwd))))))) + ("znc.shemshak.org" 1337 t + ((moznet "amin/moznet" ,pwd))) + ("znc.shemshak.org" 1337 t + ((oftc "amin/oftc" ,pwd))))))) ;;; Post initialization (message "Loading %s...done (%.3fs)" user-init-file (float-time (time-subtract (current-time) - a/before-user-init-time))) + b/before-user-init-time))) ;;; init.el ends here