X-Git-Url: https://git.shemshak.org/~bandali/configs/blobdiff_plain/d7b88f06c1a9623caf5d01774c4f2b12e460fe58..568f899369d2b24f9f43675937cf44c1c58a3e91:/.emacs.d/init.el?ds=inline diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 93dd563..5e3ce80 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -184,6 +184,9 @@ ;;; Initial setup +(defvar b/exwm-p (string= (system-name) "jirud") + "Whether or not we will be using `exwm'.") + ;; keep ~/.emacs.d clean (use-package no-littering :demand @@ -263,6 +266,10 @@ (previous-line) (insert "\n \n;;; ")) +(defun b/insert-asterism () + (interactive) + (insert "\n\n * * *\n\n")) + (defun b/no-mouse-autoselect-window () "Conveniently disable `focus-follows-mouse'. For disabling the behaviour for certain buffers and/or modes." @@ -394,6 +401,7 @@ For disabling the behaviour for certain buffers and/or modes." ;; time and battery in mode-line (use-feature time + :if b/exwm-p :demand :config (display-time-mode) @@ -402,6 +410,7 @@ For disabling the behaviour for certain buffers and/or modes." (display-time-format "%a %b %-e, %-l:%M%P")) (use-feature battery + :if b/exwm-p :demand :config (display-battery-mode) @@ -463,6 +472,11 @@ For disabling the behaviour for certain buffers and/or modes." (use-feature vc :bind ("C-x v C-=" . vc-ediff)) +(use-feature vc-git + :after vc + :custom + (vc-git-print-log-follow t)) + (use-feature ediff :config (add-hook 'ediff-after-quit-hook-internal 'winner-undo) :custom ((ediff-window-setup-function 'ediff-setup-windows-plain) @@ -488,6 +502,11 @@ For disabling the behaviour for certain buffers and/or modes." :custom ((epg-gpg-program (executable-find "gpg")))) +(use-feature auth-source + :custom + (auth-sources '("~/.authinfo.gpg")) + (authinfo-hidden (regexp-opt '("password" "client-secret" "token")))) + ;;; General bindings @@ -524,12 +543,13 @@ For disabling the behaviour for certain buffers and/or modes." ;; for back and forward mouse keys ("" . previous-buffer) ("" . previous-buffer) - ("" . previous-buffer) + ;; ("" . previous-buffer) ("" . next-buffer) ("" . next-buffer) - ("" . next-buffer) - ("" . kill-this-buffer) - ("" . ivy-switch-buffer)) + ;; ("" . next-buffer) + ;; ("" . kill-this-buffer) + ;; ("" . switch-to-buffer) + ) (bind-keys :prefix-map b/straight-prefix-map @@ -561,6 +581,7 @@ For disabling the behaviour for certain buffers and/or modes." ;;; Essential packages (use-package exwm + :if b/exwm-p :demand :config ;; make class name the buffer name, truncating beyond 60 characters @@ -582,7 +603,7 @@ For disabling the behaviour for certain buffers and/or modes." (use-feature exwm-input :demand - :after exwm-workspace + :after exwm :config (defun b/exwm-ws-prev-index () "Return the index for the previous EXWM workspace, wrapping @@ -602,14 +623,16 @@ around if needed." ;; shorten 'C-c C-q' to 'C-q' (define-key exwm-mode-map [?\C-q] #'exwm-input-send-next-key) - (setq exwm-input-global-keys + (setq exwm-workspace-number 4 + exwm-input-global-keys `(([?\s-R] . exwm-reset) ([?\s-\\] . exwm-workspace-switch) - ([?\s-\s] . (lambda (command) - (interactive - (list (read-shell-command "➜ "))) - (start-process-shell-command - command nil command))) + ([?\s-\s] . dmenu) + ([?\S-\s-\s] . (lambda (command) + (interactive + (list (read-shell-command "➜ "))) + (start-process-shell-command + command nil command))) ([s-return] . (lambda () (interactive) (start-process "" nil "urxvt"))) @@ -654,10 +677,10 @@ around if needed." (number-sequence 0 (1- exwm-workspace-number))) ([?\s-t] . exwm-floating-toggle-floating) ([?\s-f] . exwm-layout-toggle-fullscreen) - ([?\s-w] . (lambda () + ([?\s-W] . (lambda () (interactive) (kill-buffer (current-buffer)))) - ([?\s-q] . (lambda () + ([?\s-Q] . (lambda () (interactive) (exwm-manage--kill-client))) ([?\s-\'] . (lambda () @@ -693,7 +716,9 @@ around if needed." ([XF86ScreenSaver] . (lambda () (interactive) - (start-process "" nil "dm-tool" "lock"))))) + (start-process "" nil "dm-tool" "lock"))) + ([\s-XF86Back] . previous-buffer) + ([\s-XF86Forward] . next-buffer))) ;; Line-editing shortcuts (setq exwm-input-simulation-keys @@ -718,9 +743,12 @@ around if needed." ([?\C-y] . [?\C-v]) ([?\M-d] . [C-S-right ?\C-x]) ([?\M-\d] . [C-S-left ?\C-x]) - ;; search + ;; window + ([?\s-w] . [?\C-w]) + ([?\s-q] . [?\C-q]) + ;; misc ([?\C-s] . [?\C-f]) - ;; escape + ([?\s-s] . [?\C-s]) ([?\C-g] . [escape])))) (use-feature exwm-manage @@ -733,9 +761,7 @@ around if needed." ((string= exwm-class-name "Abrowser") (exwm-input-set-local-simulation-keys `(,@exwm-input-simulation-keys - ([?\C-\S-d] . [?\C-d]) - ([?\C-q] . [?\C-w]) - ([?\s-q] . [?\C-q])))) + ([?\C-\S-d] . [?\C-d])))) ((string= exwm-class-name "URxvt") (exwm-input-set-local-simulation-keys '(([?\C-c ?\C-c] . [?\C-c]) @@ -749,7 +775,9 @@ around if needed." :demand :after exwm :config - (exwm-randr-enable)) + (exwm-randr-enable) + :custom + (exwm-randr-workspace-monitor-plist '(1 "VGA-1"))) (use-feature exwm-systemtray :demand @@ -757,11 +785,7 @@ around if needed." :config (exwm-systemtray-enable)) -(use-feature exwm-workspace - :demand - :after exwm - :custom - (exwm-workspace-number 4)) +(use-feature exwm-workspace) (use-package exwm-edit :demand @@ -891,6 +915,7 @@ around if needed." :custom (magit-diff-refine-hunk t) (magit-display-buffer-function #'magit-display-buffer-fullframe-status-v1) + ;; (magit-completing-read-function 'magit-ido-completing-read) :custom-face (magit-diff-file-heading ((t (:weight normal))))) ;; recently opened files @@ -898,11 +923,73 @@ around if needed." :defer 0.2 ;; :config ;; (add-to-list 'recentf-exclude "^/\\(?:ssh\\|su\\|sudo\\)?:") + :config + (recentf-mode) :custom (recentf-max-saved-items 2000)) ;; smart M-x enhancement (needed by counsel for history) -(use-package smex) +;; (use-package smex) + +(bind-keys + ("C-c f ." . find-file) + ("C-c f l" . find-library) + ("C-c f r" . recentf-open-files) + ("C-c x" . execute-extended-command)) + +(comment + (use-feature ido + :demand + :bind + (:map ido-common-completion-map + ([escape] . minibuffer-keyboard-quit) + ("DEL" . b/ido-backspace)) + :config + (require 'delsel) + (defun b/ido-backspace () + "Forward to `backward-delete-char'. On error (read-only), quit." + (interactive) + (condition-case nil + (backward-delete-char 1) + (error + (minibuffer-keyboard-quit)))) + (ido-mode 1) + (ido-everywhere 1) + :custom + (ido-enable-flex-matching t) + ;; (ido-enable-regexp t) + ;; (ido-enable-prefix t) + (ido-max-window-height 10) + (ido-use-virtual-buffers t)) + + (use-package ido-vertical-mode + :defer 0.3 + :config + (ido-vertical-mode 1) + :custom + (ido-vertical-define-keys 'C-n-C-p-up-and-down) + (ido-vertical-show-count t)) + + (use-package ido-completing-read+ + :defer 0.3 + :after ido + :config + (ido-ubiquitous-mode 1)) + + (use-package crm-custom + :defer 0.3 + :config + (crm-custom-mode 1)) + + (use-feature icomplete + :defer 0.3 + :config + (icomplete-mode 1))) + +(use-package amx + :defer 0.3 + :config + (amx-mode)) (use-package ivy :defer 0.3 @@ -914,7 +1001,7 @@ around if needed." ("DEL" . ivy-backward-delete-char)) :config (setq ivy-wrap t - ivy-height 14 + ;; ivy-height 14 ivy-use-virtual-buffers t ivy-virtual-abbreviate 'abbreviate ivy-count-format "%d/%d ") @@ -932,27 +1019,25 @@ This function is intended for use with `ivy-ignore-buffers'." (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)))) - ;; (ivy-minibuffer-match-face-3 ((t (:background "#bbbbff" :weight semi-bold)))) - ;; (ivy-minibuffer-match-face-4 ((t (:background "#ffbbff" :weight semi-bold)))) -) + :custom-face + (ivy-minibuffer-match-face-1 ((t (:background "#eeeeee")))) + (ivy-minibuffer-match-face-2 ((t (:background "#e7e7e7" :weight bold)))) + (ivy-minibuffer-match-face-3 ((t (:background "light goldenrod" :weight semi-bold)))) + (ivy-minibuffer-match-face-4 ((t (:background "misty rose" :weight semi-bold)))) + (ivy-current-match ((((class color) (background light)) + :background "#d7d7d7" :foreground "black") + (((class color) (background dark)) + :background "#65a7e2" :foreground "black")))) (use-package swiper + :demand :after ivy - :bind (("C-s" . swiper-isearch) - ("C-r" . swiper) - ("C-S-s" . isearch-forward))) + :bind (("C-S-s" . swiper-isearch))) (use-package counsel + :demand :after ivy - :bind (([remap execute-extended-command] . counsel-M-x) - ([remap find-file] . counsel-find-file) - ("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) - ("C-c x" . counsel-M-x) + :bind (("C-c f r" . counsel-recentf) :map minibuffer-local-map ("C-r" . counsel-minibuffer-history)) :config @@ -1001,7 +1086,9 @@ This function is intended for use with `ivy-ignore-buffers'." ("C-d" . b/eshell-quit-or-delete-char) ("C-S-l" . b/eshell-clear) ("M-r" . counsel-esh-history) - ([tab] . company-complete))) + ;; ([tab] . company-complete) + :map eshell-hist-mode-map + ("M-r" . counsel-esh-history))) :hook (eshell-mode . b/eshell-setup) :custom @@ -1106,7 +1193,8 @@ This function is intended for use with `ivy-ignore-buffers'." (use-feature dired :config - (setq dired-listing-switches "-alh" + (setq dired-dwim-target t + dired-listing-switches "-alh" ls-lisp-use-insert-directory-program nil) ;; easily diff 2 marked files @@ -1225,6 +1313,7 @@ This function is intended for use with `ivy-ignore-buffers'." (add-hook 'prog-mode-hook #'indicate-buffer-boundaries-left)) (use-feature text-mode + :bind (:map text-mode-map ("C-*" . b/insert-asterism)) :hook (text-mode . indicate-buffer-boundaries-left)) (use-feature conf-mode @@ -1234,19 +1323,21 @@ This function is intended for use with `ivy-ignore-buffers'." :mode "\\.bashrc$") (use-package company - :defer 0.6 :bind (:map company-active-map ([tab] . company-complete-common-or-cycle) - ([escape] . company-abort)) + ([escape] . company-abort) + ("C-p" . company-select-previous-or-abort) + ("C-n" . company-select-next-or-abort)) :custom (company-minimum-prefix-length 1) (company-selection-wrap-around t) (company-dabbrev-char-regexp "\\sw\\|\\s_\\|[-_]") (company-dabbrev-downcase nil) (company-dabbrev-ignore-case nil) - :config - (global-company-mode t)) + ;; :config + ;; (global-company-mode t) + ) (use-package flycheck :defer 0.6 @@ -1312,12 +1403,11 @@ This function is intended for use with `ivy-ignore-buffers'." (use-package alloy-mode :straight (:host github :repo "dwwmmn/alloy-mode") :mode "\\.als\\'" - :config (setq alloy-basic-offset 2)) + :config (setq alloy-basic-offset 2) + :hook (alloy-mode . (lambda () (setq-local indent-tabs-mode nil)))) (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)) @@ -1482,6 +1572,10 @@ This function is intended for use with `ivy-ignore-buffers'." :hook ((tex-mode . auto-fill-mode) (tex-mode . flyspell-mode))) +(use-package george-mode + :straight (:host nil :repo "https://git.shemshak.org/amin/george-mode") + :mode "\\.grg\\'") + ;;; Theme @@ -1491,10 +1585,10 @@ This function is intended for use with `ivy-ignore-buffers'." (load-theme 'tangomod t) (use-package smart-mode-line - :disabled :commands (sml/apply-theme) :demand :config + (setq sml/theme 'tangomod) (sml/setup) (smart-mode-line-enable)) @@ -1505,54 +1599,65 @@ This function is intended for use with `ivy-ignore-buffers'." :custom (doom-modeline-buffer-file-name-style 'relative-to-project)) -(use-package doom-themes - :disabled) +(use-package doom-themes) (use-package solarized-theme + :disabled + :config + (load-theme 'solarized-light t)) + +(use-package moody + :disabled :demand :config - (load-theme 'solarized-light t) + (setq x-underline-at-descent-line t) (let ((line (face-attribute 'mode-line :underline))) (set-face-attribute 'mode-line nil :overline line) (set-face-attribute 'mode-line-inactive nil :overline line) (set-face-attribute 'mode-line-inactive nil :underline line) (set-face-attribute 'mode-line nil :box nil) (set-face-attribute 'mode-line-inactive nil :box nil) - (set-face-attribute 'mode-line-inactive nil :background "#f9f2d9"))) - -(use-package moody - :demand - :config - (setq x-underline-at-descent-line t) + (set-face-attribute 'mode-line-inactive nil :background "#e1e1e1")) ; d3d7cf (moody-replace-mode-line-buffer-identification) (moody-replace-vc-mode)) +(use-package mini-modeline + :disabled + :demand + :config (mini-modeline-mode)) + (defvar b/org-mode-font-lock-keywords - "For use with the `doom-tomorrow-night' theme." '(("[ \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 + (4 '(:foreground "#c5c8c6") t))) ; title + "For use with the `doom-tomorrow-night' theme.") (defun b/lights-on () "Enable my favourite light theme." (interactive) (mapc #'disable-theme custom-enabled-themes) - (load-theme 'solarized-light t) - ;; (sml/apply-theme 'automatic) - ;; (font-lock-remove-keywords - ;; 'org-mode b/org-mode-font-lock-keywords) - (run-with-timer 0.01 nil 'exwm-systemtray--refresh)) + (load-theme 'tangomod t) + (sml/apply-theme 'tangomod) + (font-lock-remove-keywords + 'org-mode b/org-mode-font-lock-keywords) + (when (featurep 'erc-hl-nicks) + (erc-hl-nicks-reset-face-table)) + (when (featurep 'exwm-systemtray) + (exwm-systemtray--refresh))) (defun b/lights-off () "Go dark." (interactive) (mapc #'disable-theme custom-enabled-themes) - (load-theme 'solarized-dark t) - ;; (sml/apply-theme 'automatic) - ;; (font-lock-add-keywords - ;; 'org-mode b/org-mode-font-lock-keywords t) - (run-with-timer 0.01 nil 'exwm-systemtray--refresh)) + (load-theme 'doom-one t) + (sml/apply-theme 'automatic) + (font-lock-add-keywords + 'org-mode b/org-mode-font-lock-keywords t) + (when (featurep 'erc-hl-nicks) + (erc-hl-nicks-reset-face-table)) + (when (featurep 'exwm-systemtray) + (exwm-systemtray--refresh))) (bind-keys ("C-c t d" . b/lights-off) @@ -1575,11 +1680,18 @@ This function is intended for use with `ivy-ignore-buffers'." "C-c 8 -" "typo/dashes" "C-c 8 <" "typo/left-brackets" "C-c 8 >" "typo/right-brackets" + "C-x RET" "coding system" "C-x 8" "unicode" + "C-x @" "event modifiers" "C-x a" "abbrev/expand" "C-x r" "rectangle/register/bookmark" + "C-x t" "tabs" "C-x v" "version control" + "C-x X" "edebug" + "C-x C-a" "edebug" + "C-x C-k" "kmacro" ;; prefixes for my personal bindings + "C-c &" "yasnippet" "C-c a" "applications" "C-c a e" "erc" "C-c a o" "org" @@ -1596,6 +1708,10 @@ This function is intended for use with `ivy-ignore-buffers'." "C-c P s" "projectile/search" "C-c P x" "projectile/execute" "C-c P 4" "projectile/other-window" + "C-c p" "package management" + "C-c ps" "straight" + "C-c psa" "all" + "C-c psp" "package" "C-c q" "boxquote" "C-c t" "themes" ;; "s-O" "outline" @@ -1721,8 +1837,8 @@ This function is intended for use with `ivy-ignore-buffers'." :defer 0.5 :config (typo-global-mode 1) - :hook (((text-mode erc-mode) . typo-mode) - (tex-mode . (lambda ()(typo-mode -1))))) + :hook (((text-mode erc-mode web-mode) . typo-mode) + (tex-mode . (lambda ()(typo-mode -1))))) ;; highlight TODOs in buffers (use-package hl-todo @@ -1734,16 +1850,17 @@ This function is intended for use with `ivy-ignore-buffers'." :defer 0.5 :after eshell :config - (defvar user-@-host (concat (user-login-name) "@" (system-name) " ")) + (defvar user-@-host (concat (user-login-name) "@" (system-name) ":")) (defun +eshell/prompt () - (let ((base/dir (shrink-path-prompt default-directory))) - (concat (propertize user-@-host 'face 'default) - (propertize (car base/dir) - 'face 'font-lock-comment-face) - (propertize (cdr base/dir) - 'face 'font-lock-constant-face) - (propertize "> " 'face 'default)))) - (setq eshell-prompt-regexp (concat user-@-host ".*> ") + (concat (propertize user-@-host 'face 'default) + (propertize (abbreviate-file-name default-directory) + 'face 'font-lock-comment-face) + (propertize "\n" 'face 'default) + (if (= (user-uid) 0) + (propertize "#" 'face 'red) + (propertize "$" 'face 'default)) + (propertize " " 'face 'default))) + (setq eshell-prompt-regexp "\\(.*\n\\)*[$#] " eshell-prompt-function #'+eshell/prompt)) (use-package eshell-up @@ -1869,15 +1986,25 @@ This function is intended for use with `ivy-ignore-buffers'." ;; (use-package fill-column-indicator) (use-package emojify + :disabled :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)) + (("C-c w e" . (lambda () + (interactive) + (split-window-right) + (other-window 1) + (erc-switch-to-buffer))) + ("C-c w s l" . (lambda () + (interactive) + (split-window-right) + (other-window 1))) + ("C-c w s j" . (lambda () + (interactive) + (split-window-below) + (other-window 1))) + ("C-c w q" . quit-window)) :custom (split-width-threshold 150)) @@ -1907,10 +2034,20 @@ This function is intended for use with `ivy-ignore-buffers'." ("" . pdf-history-forward) ("" . pdf-history-forward) ("" . pdf-history-forward) - ("M-RET" . image-previous-line)) + ("M-RET" . image-previous-line) + ("C-s" . isearch-forward) + ("s s" . isearch-forward)) :config (pdf-tools-install nil t) :custom (pdf-view-resize-factor 1.05)) +(use-package org-pdftools + :straight (:host github :repo "fuxialexander/org-pdftools") + :demand + :after org + :config + (with-eval-after-load 'org + (require 'org-pdftools))) + (use-package biblio) (use-feature reftex @@ -1935,9 +2072,7 @@ This function is intended for use with `ivy-ignore-buffers'." :config (minions-mode)) (use-package dmenu - :disabled :custom - (dmenu-history-size 0) (dmenu-prompt-string "run: ") (dmenu-save-file (b/var "dmenu-items"))) @@ -1951,6 +2086,36 @@ This function is intended for use with `ivy-ignore-buffers'." :config (eosd-start)) +(use-package nnreddit + :disabled + :demand + :after gnus + :custom + (nnreddit-python-command "python3")) + +(use-package hyperbole + :disabled + :straight (hyperbole + :host github :repo "rswgnu/hyperbole" + :files ("*.el" ("kotl" "kotl/*.el") + "DEMO" "man/*.info" "man/*.texi"))) + +(use-package oddmuse-curl + :straight (:host github :repo "kensanata/oddmuse-curl") + :config + (setq + oddmuse-wikis + (append + '(("EmacsConf" "https://emacsconf.org" utf-8 "question" nil) + ("EmacsConf 2019" "https://emacsconf.org/2019" utf-8 "question" nil)) + oddmuse-wikis)) + :custom + (oddmuse-username "bandali")) + +(use-package debpaste + :custom + (debpaste-paste-is-hidden t)) + ;;; Email (with Gnus) @@ -1973,41 +2138,43 @@ This function is intended for use with `ivy-ignore-buffers'." gnus-select-method '(nnnil "") gnus-secondary-select-methods '((nnimap "shemshak" - (nnimap-stream plain) - (nnimap-address "127.0.0.1") - (nnimap-server-port 143) - (nnimap-authenticator plain) - (nnimap-user "amin@shemshak.local")) + (nnimap-stream plain) + (nnimap-address "127.0.0.1") + (nnimap-server-port 143) + (nnimap-authenticator plain) + (nnimap-user "amin@shemshak.local")) (nnimap "gnu" - (nnimap-stream plain) - (nnimap-address "127.0.0.1") - (nnimap-server-port 143) - (nnimap-authenticator plain) - (nnimap-user "bandali@gnu.local") - (nnimap-inbox "INBOX") - (nnimap-split-methods 'nnimap-split-fancy) - (nnimap-split-fancy (| - ;; (: gnus-registry-split-fancy-with-parent) - ;; (: gnus-group-split-fancy "INBOX" t "INBOX") - ;; gnu - (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") - ;; other - (list ".*atreus.freelists.org" "l.atreus") - (list ".*deepspec.lists.cs.princeton.edu" "l.deepspec") - ;; (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-stream plain) + (nnimap-address "127.0.0.1") + (nnimap-server-port 143) + (nnimap-authenticator plain) + (nnimap-user "bandali@gnu.local") + (nnimap-inbox "INBOX") + (nnimap-split-methods 'nnimap-split-fancy) + (nnimap-split-fancy (| + ;; (: gnus-registry-split-fancy-with-parent) + ;; (: gnus-group-split-fancy "INBOX" t "INBOX") + ;; gnu + (list ".*<\\(.*\\)\\.\\(non\\)?gnu\\.org>.*" "l.\\1") + ;; gnus + (list ".*<\\(.*\\)\\.gnus\\.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") + ;; other + (list ".*atreus.freelists.org" "l.atreus") + (list ".*deepspec.lists.cs.princeton.edu" "l.deepspec") + ;; (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-address "127.0.0.1") @@ -2029,7 +2196,7 @@ This function is intended for use with `ivy-ignore-buffers'." (nnimap-server-port 143) (nnimap-authenticator plain) (nnimap-user "abandali@csc.uw.local"))) - gnus-message-archive-group "nnimap+shemshak:Sent" + gnus-message-archive-group "nnimap+gnu:INBOX" gnus-parameters '(("l\\.atreus" (to-address . "atreus@freelists.org") @@ -2054,6 +2221,9 @@ This function is intended for use with `ivy-ignore-buffers'." ("l\\.emacs-tangents" (to-address . "emacs-tangents@gnu.org") (to-list . "emacs-tangents@gnu.org")) + ("l\\.emacsconf-committee" + (to-address . "emacsconf-committee@gnu.org") + (to-list . "emacsconf-committee@gnu.org")) ("l\\.emacsconf-discuss" (to-address . "emacsconf-discuss@gnu.org") (to-list . "emacsconf-discuss@gnu.org")) @@ -2189,13 +2359,34 @@ This function is intended for use with `ivy-ignore-buffers'." :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 - '("^From:" "^Subject:" "^Summary:" "^Keywords:" - "^Followup-To:" "^To:" "^Cc:" "X-RT-Originator" - "^Newsgroups:" "List-Id:" "^Organization:" - "^User-Agent:" "^Date:") + gnus-sorted-header-list '("^From:" + "^X-RT-Originator" + "^Newsgroups:" + "^Subject:" + "^Date:" + "^Envelope-To:" + "^Followup-To:" + "^Reply-To:" + "^Organization:" + "^Summary:" + "^Abstract:" + "^Keywords:" + "^To:" + "^[BGF]?Cc:" + "^Posted-To:" + "^Mail-Copies-To:" + "^Mail-Followup-To:" + "^Apparently-To:" + "^Resent-From:" + "^User-Agent:" + "^X-detected-operating-system:" + "^Message-ID:" + ;; "^References:" + "^List-Id:" + "^Gnus-Warning:") + gnus-visible-headers (mapconcat 'identity + gnus-sorted-header-list + "\\|") ;; local-lapsed article dates ;; from https://www.emacswiki.org/emacs/GnusFormatting#toc11 gnus-article-date-headers '(user-defined) @@ -2232,14 +2423,12 @@ This function is intended for use with `ivy-ignore-buffers'." (use-feature gnus-msg :config - (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 +Free Software Activist | GNU Maintainer & Webmaster GPG: BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103 https://bandali.eu.org") + (defvar b/shemshak-signature "Amin Bandali +https://shemshak.org/~amin") (defvar b/uw-signature "Amin Bandali, MMath Student Cheriton School of Computer Science University of Waterloo @@ -2248,29 +2437,35 @@ https://bandali.eu.org") Systems Committee Computer Science Club, University of Waterloo https://csclub.uwaterloo.ca/~abandali") - (setq gnus-posting-styles + (setq gnus-message-replysign t + gnus-posting-styles '((".*" - (address "amin@shemshak.org") - (body "\nBest,\n") - (signature b/signature) - (eval (setq b/message-cite-say-hi t))) - ("nnimap\\+gnu:.*" (address "bandali@gnu.org") - (signature b/gnu-signature) - (eval (set (make-local-variable 'message-user-fqdn) "fencepost.gnu.org"))) + (signature b/gnu-signature)) + ("nnimap\\+gnu:l\\..*" + (signature nil)) ((header "subject" "ThankCRM") (to "webmasters-comment@gnu.org") (body "") (eval (setq b/message-cite-say-hi nil))) + ("nnimap\\+shemshak:.*" + (address "amin@shemshak.org") + (body "\nBest,\n") + (signature b/shemshak-signature) + (gcc "nnimap+shemshak:Sent") + (eval (setq b/message-cite-say-hi t))) ("nnimap\\+uw:.*" - (address "abandali@uwaterloo.ca") + (address "bandali@uwaterloo.ca") + (body "\nBest,\n") (signature b/uw-signature)) ("nnimap\\+uw:INBOX" (gcc "\"nnimap+uw:Sent Items\"")) ("nnimap\\+csc:.*" - (address "abandali@csclub.uwaterloo.ca") + (address "bandali@csclub.uwaterloo.ca") (signature b/csc-signature) - (gcc "nnimap+csc:Sent"))))) + (gcc "nnimap+csc:Sent")))) + ;; :hook (gnus-message-setup . mml-secure-message-sign) + ) (use-feature gnus-topic :hook (gnus-group-mode . gnus-topic-mode) @@ -2296,6 +2491,11 @@ https://csclub.uwaterloo.ca/~abandali") :init (add-hook 'dired-mode-hook 'gnus-dired-mode)) +(comment + (use-feature gnus-utils + :custom + (gnus-completing-read-function 'gnus-ido-completing-read))) + (use-feature mm-decode :config (setq mm-discouraged-alternatives '("text/html" "text/richtext") @@ -2315,6 +2515,7 @@ https://csclub.uwaterloo.ca/~abandali") mail-envelope-from 'header)) (use-feature message + :bind (:map message-mode-map ("" . b/insert-asterism)) :config ;; redefine for a simplified In-Reply-To header ;; (see https://todo.sr.ht/~sircmpwn/lists.sr.ht/67) @@ -2346,8 +2547,8 @@ https://csclub.uwaterloo.ca/~abandali") message-subscribed-address-functions '(gnus-find-subscribed-addresses) message-dont-reply-to-names - "\\(\\(\\(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) + "\\(\\(\\(amin\\|mab\\)@shemshak\\.org\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(bandali\\|mab\\|aminb?\\)@gnu\\.org\\)\\|\\(a?bandali@\\(csclub\\.\\)?uwaterloo\\.ca\\)\\)") + ;; (require 'company-ebdb) :hook (;; (message-setup . mml-secure-message-sign-pgpmime) (message-mode . flyspell-mode) (message-mode . (lambda () @@ -2387,43 +2588,59 @@ https://csclub.uwaterloo.ca/~abandali") ("r" . footnote-renumber-footnotes) ("s" . footnote-set-style))) -(use-package ebdb +(use-package bbdb :demand :after gnus - :bind (:map gnus-group-mode-map ("e" . ebdb)) + :bind (:map gnus-group-mode-map ("e" . bbdb)) :config - (setq ebdb-sources (b/var "ebdb")) - (with-eval-after-load 'swiper - (add-to-list 'swiper-font-lock-exclude 'ebdb-mode t))) + (bbdb-initialize 'gnus 'message) + :custom + (bbdb-complete-mail-allow-cycling t) + (bbdb-user-mail-address-re message-dont-reply-to-names)) -(use-feature ebdb-com - :after ebdb) +(comment + (use-package ebdb + :demand + :after gnus + :bind (:map gnus-group-mode-map ("e" . ebdb)) + :config + (setq ebdb-sources (b/var "ebdb")) + (with-eval-after-load 'swiper + (add-to-list 'swiper-font-lock-exclude 'ebdb-mode t))) -;; (use-package ebdb-complete -;; :after ebdb -;; :config -;; (ebdb-complete-enable)) + (use-feature ebdb-com + :after ebdb) -(use-package company-ebdb - :config - (defun company-ebdb--post-complete (_) nil)) + (use-feature ebdb-complete + :after ebdb + :config + ;; (setq ebdb-complete-mail 'capf) + (ebdb-complete-enable)) -(use-feature ebdb-gnus - :demand - :after ebdb - :custom - (ebdb-gnus-window-size 0.3)) + (use-feature ebdb-message + :demand + :after ebdb) -(use-feature ebdb-mua - :demand - :after ebdb - :custom (ebdb-mua-pop-up nil)) + ;; (use-package company-ebdb + ;; :config + ;; (defun company-ebdb--post-complete (_) nil)) -;; (use-package ebdb-message -;; :after ebdb) + (use-feature ebdb-gnus + :after ebdb + :custom + (ebdb-gnus-window-size 0.3)) -;; (use-package ebdb-vcard -;; :after ebdb) + (use-feature ebdb-mua + :demand + :after ebdb + :custom (ebdb-mua-pop-up t)) + + ;; (use-package ebdb-message + ;; :after ebdb) + + ;; (use-package ebdb-vcard + ;; :after ebdb) + ) (use-package message-x) @@ -2462,7 +2679,7 @@ https://csclub.uwaterloo.ca/~abandali") ;;; IRC (with ERC and ZNC) (use-feature erc - :bind (("C-c b e" . erc-switch-to-buffer) + :bind (("C-c b b" . erc-switch-to-buffer) :map erc-mode-map ("M-a" . erc-track-switch-buffer)) :custom @@ -2499,7 +2716,7 @@ https://csclub.uwaterloo.ca/~abandali") (use-feature erc-pcomplete :after erc :custom - (erc-pcomplete-nick-postfix ",")) + (erc-pcomplete-nick-postfix ", ")) (use-feature erc-track :after erc