X-Git-Url: https://git.shemshak.org/gitweb.cgi/~bandali/configs/blobdiff_plain/41d290a233ff4f54a839184e74b9c86065a30cf5..2e81c51ad88d5ea21b5f85fdf1ab6cf585e830ef:/.emacs.d/init.el?ds=sidebyside diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 19c4d7a..08af872 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; eval: (view-mode 1) -*- +;;; init.el --- bandali's emacs configuration -*- lexical-binding: t -*- ;; Copyright (C) 2018-2019 Amin Bandali @@ -18,95 +18,76 @@ ;;; Commentary: ;; Emacs configuration of Amin Bandali, computer scientist, functional -;; programmer, and free software advocate. - -;; THIS FILE IS AUTO-GENERATED FROM `init.org'. - -(defvar a/byte-compiled-init nil - "If non-nil, byte-(re)compile init.el on successful tangles.") - -(defvar a/before-user-init-time (current-time) +;; programmer, and free software activist. Used to use straight.el +;; for purely functional and fully reproducible package management. +;; Now I just use Guix. + +;; 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: +;; +;; - https://github.com/dieggsy/dotfiles +;; - https://github.com/dakra/dmacs +;; - http://pages.sachachua.com/.emacs.d/Sacha.html +;; - https://github.com/dakrone/eos +;; - http://doc.rix.si/cce/cce.html +;; - https://github.com/jwiegley/dot-emacs +;; - https://github.com/wasamasa/dotemacs +;; - https://github.com/hlissner/doom-emacs + +;;; Code: + +;;; Emacs initialization + +(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))) -(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) +;; 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 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 ;; sidesteps a bug when profiling with esup esup-child-profile-require-level 0) -(add-hook - 'after-init-hook - (lambda () - (setq gc-cons-threshold a/gc-cons-threshold - gc-cons-percentage a/gc-cons-percentage - file-name-handler-alist a/file-name-handler-alist))) +;; set them back to their defaults once we're done initializing +(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) +;; optionally, uncomment to supress some byte-compiler warnings +;; (see C-h v byte-compile-warnings RET for more info) ;; (setq byte-compile-warnings ;; '(not free-vars unresolved noruntime lexical make-local)) -(setq user-full-name "Amin Bandali" - user-mail-address "amin@bndl.org") - -;; Main engine start... - -(setq straight-repository-branch "develop" - straight-check-for-modifications '(check-on-save find-when-checking)) - -(defun a/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))) + +;;; whoami -;; Solid rocket booster ignition... - -(defun a/build-init () - (a/bootstrap-straight) - (byte-compile-file "init.el")) - -(a/bootstrap-straight) - -;; We have lift off! +(setq user-full-name "Amin Bandali" + user-mail-address "bandali@gnu.org") -(setq straight-use-package-by-default t) + +;;; comment macro -(defmacro use-feature (name &rest args) - "Like `use-package', but with `straight-use-package-by-default' disabled." +;; useful for commenting out multiple sexps at a time +(defmacro comment (&rest _) + "Comment out one or more s-expressions." (declare (indent defun)) - `(use-package ,name - :straight nil - ,@args)) - -(with-eval-after-load 'recentf - (add-to-list 'recentf-exclude - (expand-file-name "~/.emacs.d/straight/build/"))) + nil) -(defun a/reload-init () - "Reload init.el." - (interactive) - (straight-transaction - (straight-mark-transaction-as-init) - (load (if a/byte-compiled-init - (concat (file-name-sans-extension user-init-file) ".elc") - user-init-file)))) - -(straight-use-package 'use-package) + +;;; use-package (if nil ; set to t when need to debug init (progn (setq use-package-verbose t @@ -120,26 +101,50 @@ (setq use-package-always-defer t) (require 'bind-key) -(use-package no-littering - :demand t - :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)))) +(use-package delight) + + +;;; 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)) -(use-feature custom +(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")) + +;; separate custom file (don't want it mixing with init.el) +(use-package 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)) -(with-demoted-errors - (load (no-littering-expand-etc-file-name "secrets"))) +;; load the secrets file if it exists, otherwise show a warning +(comment + (with-demoted-errors + (load (b/etc "secrets")))) +;; better $PATH (and other environment variable) handling (use-package exec-path-from-shell :defer 0.4 :init @@ -151,46 +156,116 @@ (exec-path-from-shell-copy-env "SSH_AGENT_PID") (exec-path-from-shell-copy-env "SSH_AUTH_SOCK")) -(use-feature server +;; only one custom theme at a time +(comment + (defadvice load-theme (before clear-previous-themes activate) + "Clear existing theme settings instead of layering them" + (mapc #'disable-theme custom-enabled-themes))) + +;; start up emacs server. see +;; https://www.gnu.org/software/emacs/manual/html_node/emacs/Emacs-Server.html#Emacs-Server +(use-package server :defer 0.4 :config (or (server-running-p) (server-mode))) +;; unicode support +(comment + (dolist (ft (fontset-list)) + (set-fontset-font + ft + 'unicode + (font-spec :name "Source Code Pro" :size 14)) + (set-fontset-font + ft + 'unicode + (font-spec :name "DejaVu Sans Mono") + nil + 'append) + ;; (set-fontset-font + ;; ft + ;; 'unicode + ;; (font-spec + ;; :name "Symbola monospacified for DejaVu Sans Mono") + ;; nil + ;; 'append) + ;; (set-fontset-font + ;; ft + ;; #x2115 ; ℕ + ;; (font-spec :name "DejaVu Sans Mono") + ;; nil + ;; 'append) + (set-fontset-font + ft + (cons ?Α ?ω) + (font-spec :name "DejaVu Sans Mono" :size 14) + nil + 'prepend))) + +;; gentler font resizing (setq text-scale-mode-step 1.05) +;; 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) (setq mouse-autoselect-window nil)) +;; better scrolling (setq ;; scroll-margin 1 ;; scroll-conservatively 10000 scroll-step 1 scroll-conservatively 10 scroll-preserve-screen-position 1) -(use-feature mwheel +(use-package mwheel :defer 0.4 :config (setq mouse-wheel-scroll-amount '(1 ((shift) . 1)) ; one line at a time mouse-wheel-progressive-speed nil ; don't accelerate scrolling mouse-wheel-follow-mouse t)) ; scroll window under mouse -(use-feature pixel-scroll +(use-package pixel-scroll :defer 0.4 :config (pixel-scroll-mode 1)) -(setq epg-pinentry-mode 'loopback) +;; ask for GPG passphrase in minibuffer +(use-package epa + :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)) + +;; useful libraries (require 'cl-lib) (require 'subr-x) -(defmacro a/setq-every (value &rest vars) + +;;; Useful utilities + +(defmacro b/setq-every (value &rest vars) "Set all the variables from VARS to value VALUE." (declare (indent defun) (debug t)) `(progn ,@(mapcar (lambda (x) (list 'setq x value)) vars))) -(defun 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 @@ -198,66 +273,109 @@ (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 b/add-elisp-section () + (interactive) + (insert "\n") + (previous-line) + (insert "\n \n;;; ")) + + +;;; Defaults + +;; time and battery in mode-line +(comment + (use-package time + :init + (setq display-time-default-load-average nil) + :config + (display-time-mode)) + + (use-package battery + :config + (display-battery-mode))) + +;; smaller fringe ;; (fringe-mode '(3 . 1)) (fringe-mode nil) +;; disable disabled commands (setq disabled-command-function nil) +;; Save what I copy into clipboard from other applications into Emacs' +;; kill-ring, which would allow me to still be able to easily access +;; it in case I kill (cut or copy) something else inside Emacs before +;; yanking (pasting) what I'd originally intended to. (setq save-interprogram-paste-before-kill t) +;; minibuffer (setq enable-recursive-minibuffers t resize-mini-windows t) +;; lazy-person-friendly yes/no prompts (defalias 'yes-or-no-p #'y-or-n-p) +;; i want *scratch* as my startup buffer (setq initial-buffer-choice t) +;; i don't need the default hint (setq initial-scratch-message nil) +;; use customizable text-mode as major mode for *scratch* (setq initial-major-mode 'text-mode) +;; inhibit buffer list when more than 2 files are loaded (setq inhibit-startup-buffer-menu t) +;; don't need to see the startup screen or the echo area message (advice-add #'display-startup-echo-area-message :override #'ignore) (setq inhibit-startup-screen t inhibit-startup-echo-area-message user-login-name) +;; more useful frame titles (setq frame-title-format '("" invocation-name " - " (:eval (if (buffer-file-name) (abbreviate-file-name (buffer-file-name)) "%b")))) +;; backups (C-h v make-backup-files RET) (setq backup-by-copying t + backup-directory-alist (list (cons "." (b/var "backup/"))) version-control t delete-old-versions t) +;; enable automatic reloading of changed buffers and files (global-auto-revert-mode 1) (setq auto-revert-verbose nil global-auto-revert-non-file-buffers nil) +;; always use space for indentation (setq-default indent-tabs-mode nil require-final-newline t tab-width 4) +;; enable winner-mode (C-h f winner-mode RET) (winner-mode 1) +;; don't display *compilation* buffer on success. based on +;; https://stackoverflow.com/a/17788551, with changes to use `cl-letf' +;; instead of the now obsolete `flet'. (with-eval-after-load 'compile - (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) @@ -270,15 +388,39 @@ ad-do-it)) (ad-activate 'compilation-start)) +;; search for non-ASCII characters: i’d like non-ASCII characters such +;; as ‘’“”«»‹›áⓐ𝒶 to be selected when i search for their ASCII +;; counterpart. shoutout to +;; http://endlessparentheses.com/new-in-emacs-25-1-easily-search-non-ascii-characters.html (setq search-default-mode #'char-fold-to-regexp) - ;; uncomment to extend this behaviour to query-replace ;; (setq replace-char-fold t) +;; cursor shape (setq-default cursor-type 'bar) +;; allow scrolling in Isearch (setq isearch-allow-scroll t) +;; open read-only file buffers in view-mode +;; (enables niceties like `q' for quit) +(setq view-read-only t) + +(use-package vc + :bind ("C-x v C-=" . vc-ediff)) + +(use-package 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))) + +;; 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 + (bind-keys ("C-c a i" . ielm) @@ -287,12 +429,11 @@ ("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" . delete-other-frames) - - ("C-c o" . other-window) + ("C-c F D" . server-edit) ("C-S-h C" . describe-char) ("C-S-h F" . describe-face) @@ -300,54 +441,25 @@ ("C-x k" . kill-this-buffer) ("C-x K" . kill-buffer) - ("s-p" . beginning-of-buffer) - ("s-n" . end-of-buffer)) + :map emacs-lisp-mode-map + ("" . b/add-elisp-section)) (when (display-graphic-p) (unbind-key "C-z" global-map)) (bind-keys - :prefix-map a/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) - ;; 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)) - -(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)) - -(straight-use-package 'org-plus-contrib) - -(use-feature org + ;; for back and forward mouse keys + ("" . previous-buffer) + ("" . previous-buffer) + ("" . next-buffer) + ("" . next-buffer) + ("" . kill-this-buffer) + ("" . ivy-switch-buffer)) + + +;;; Essential packages + +(use-package org :defer 0.5 :config (setq org-src-tab-acts-natively t @@ -359,26 +471,34 @@ 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) - ("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")))) '(org-block ((t (:background "#1d1f21")))) '(org-latex-and-related ((t (:foreground "#b294bb"))))) -(use-feature ox-latex +(use-package ox-latex :after ox :config (setq org-latex-listings 'listings @@ -394,28 +514,21 @@ t) (require 'ox-beamer)) -(use-feature ox-extra +(use-package ox-extra :config (ox-extras-activate '(latex-header-blocks ignore-headlines))) +;; asynchronous tangle, using emacs-async to asynchronously tangle an +;; 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.") - (defvar a/async-tangle-post-compile - (when a/byte-compiled-init "make build-init") - "If non-nil, pass to `compile' after successful tangle.") - - ;; TODO: look into why directly byte-compiling init.el causes a - ;; number of problems, including magit-status not loading (busy - ;; waiting). - (defvar a/async-tangle-byte-recompile nil - "If non-nil, byte-recompile the file on successful tangle.") - - (defun a/async-babel-tangle () + (defun b/async-babel-tangle () "Tangle org file asynchronously." (interactive) (let* ((file-tangle-start-time (current-time)) @@ -427,33 +540,29 @@ `(lambda () (require 'org) (org-babel-tangle-file ,file)) - (unless a/show-async-tangle-results + (unless b/show-async-tangle-results `(lambda (result) (if result - (progn - ;; (setq byte-compile-warnings '(not noruntime unresolved)) - (message "Tangled %s%s" - ,file-nodir - (if a/show-async-tangle-time - (format " (%.3fs)" - (float-time (time-subtract (current-time) - ',file-tangle-start-time))) - "")) - (when a/async-tangle-post-compile - (compile a/async-tangle-post-compile)) - (when a/async-tangle-byte-recompile - (byte-recompile-file (concat ,file-noext ".el")))) + (message "Tangled %s%s" + ,file-nodir + (if b/show-async-tangle-time + (format " (%.3fs)" + (float-time (time-subtract (current-time) + ',file-tangle-start-time))) + "")) (message "Tangling %s failed" ,file-nodir)))))))) (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 g" . magit-status) + ("C-x g s" . magit-status) + ("C-x g b" . magit-blame-addition) + ("C-x g l" . magit-log-buffer-file)) :config (magit-add-section-hook 'magit-status-sections-hook 'magit-insert-modules @@ -464,18 +573,29 @@ (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))))) -(use-feature recentf +;; recently opened files +(use-package 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) + (recentf-save-file (b/var "recentf-save.el"))) -(use-package smex) +;; smart M-x enhancement (needed by counsel for history) +(use-package smex + :config + (setq smex-save-file (b/var "smex-save.el"))) (use-package ivy :defer 0.3 + :delight ;; " 🙒" :bind (:map ivy-minibuffer-map ([escape] . keyboard-escape-quit) @@ -488,6 +608,19 @@ 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)))) @@ -503,53 +636,73 @@ (use-package counsel :after ivy + :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) + ("C-c x" . counsel-M-x) :map minibuffer-local-map ("C-r" . counsel-minibuffer-history)) :config (counsel-mode 1) (defalias 'locate #'counsel-locate)) -(use-feature eshell +(comment + (use-package helm + :commands (helm-M-x helm-mini helm-resume) + :bind (("M-x" . helm-M-x) + ("M-y" . helm-show-kill-ring) + ("C-x b" . helm-mini) + ("C-x C-b" . helm-buffers-list) + ("C-x C-f" . helm-find-files) + ("C-h r" . helm-info-emacs) + ("C-s-r" . helm-resume) + :map helm-map + ("" . helm-execute-persistent-action) + ("C-i" . helm-execute-persistent-action) ; Make TAB work in terminals + ("C-z" . helm-select-action)) ; List actions + :config (helm-mode 1))) + +(use-package eshell :defer 0.5 :commands eshell :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-directory-name (b/var "eshell/")) (eshell-hist-ignoredups t) (eshell-input-filter 'eshell-input-filter-initial-space)) -(use-feature ibuffer +(use-package 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) @@ -597,6 +750,7 @@ (mode . scheme-mode) (mode . haskell-mode) (mode . lean-mode) + (mode . go-mode) (mode . alloy-mode))) ("tex" (or @@ -620,16 +774,18 @@ " " filename))) :hook (ibuffer . (lambda () (ibuffer-switch-to-saved-filter-groups "default")))) -(use-feature outline +(use-package outline + :disabled :hook (prog-mode . outline-minor-mode) + :delight (outline-minor-mode " outl") :bind (:map outline-minor-mode-map ("" . 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) @@ -637,10 +793,10 @@ ("h" . outline-hide-subtree) ("s" . outline-show-subtree))) -(use-feature ls-lisp +(use-package ls-lisp :custom (ls-lisp-dirs-first t)) -(use-feature dired +(use-package dired :config (setq dired-listing-switches "-alh" ls-lisp-use-insert-directory-program nil) @@ -668,6 +824,17 @@ (setq ediff-after-quit-hook-internal nil) (set-window-configuration wnd)))) (error "no more than 2 files should be marked")))) + + (require 'dired-x) + (setq dired-guess-shell-alist-user + '(("\\.pdf\\'" "evince" "zathura" "okular") + ("\\.doc\\'" "libreoffice") + ("\\.docx\\'" "libreoffice") + ("\\.ppt\\'" "libreoffice") + ("\\.pptx\\'" "libreoffice") + ("\\.xls\\'" "libreoffice") + ("\\.xlsx\\'" "libreoffice") + ("\\.flac\\'" "mpv"))) :bind (:map dired-mode-map ("b" . dired-up-directory) ("e" . dired-ediff-files) @@ -675,15 +842,15 @@ ("\\" . 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 +(use-package help :config (temp-buffer-resize-mode) (setq help-window-select t)) -(use-feature tramp +(use-package tramp :config (add-to-list 'tramp-default-proxies-alist '(nil "\\`root\\'" "/ssh:%h:")) (add-to-list 'tramp-default-proxies-alist '("localhost" nil nil)) @@ -697,42 +864,68 @@ :bind (:map doc-view-mode-map ("M-RET" . image-previous-line))) + +;;; Editing + +;; highlight uncommitted changes in the left fringe (use-package diff-hl + :defer 0.6 :config (setq diff-hl-draw-borders nil) (global-diff-hl-mode) :hook (magit-post-refresh . diff-hl-magit-post-refresh)) -(use-feature eldoc +;; display Lisp objects at point in the echo area +(use-package eldoc :when (version< "25" emacs-version) + :delight " eldoc" :config (global-eldoc-mode)) -(use-feature paren +;; highlight matching parens +(use-package paren :demand :config (show-paren-mode)) -(use-feature simple +(use-package elec-pair + :demand + :config (electric-pair-mode)) + +(use-package simple + :delight (auto-fill-function " fill") :config (column-number-mode)) -(use-feature savehist - :config (savehist-mode)) +;; save minibuffer history +(use-package savehist + :config + (savehist-mode) + :custom + (savehist-file (b/var "savehist.el"))) -(use-feature saveplace +;; automatically save place in files +(use-package saveplace :when (version< "25" emacs-version) - :config (save-place-mode)) + :config (save-place-mode) + :custom + (save-place-file (b/var "save-place.el"))) -(use-feature prog-mode +(use-package 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-feature text-mode - :hook ((text-mode . indicate-buffer-boundaries-left) - (text-mode . abbrev-mode))) +(use-package text-mode + :hook (text-mode . indicate-buffer-boundaries-left)) + +(use-package conf-mode + :mode "\\.*rc$") + +(use-package sh-mode + :mode "\\.bashrc$") (use-package company :defer 0.6 + :delight " comp" :bind (:map company-active-map ([tab] . company-complete-common-or-cycle) @@ -758,7 +951,11 @@ (setq flycheck-emacs-lisp-load-path 'inherit) ;; Only flycheck when I actually save the buffer - (setq flycheck-check-syntax-automatically '(mode-enabled save))) + (setq flycheck-check-syntax-automatically '(mode-enabled save)) + :custom (flycheck-mode-line-prefix "flyc")) + +(use-package flyspell + :delight " flysp") ;; http://endlessparentheses.com/ispell-and-apostrophes.html (use-package ispell @@ -767,7 +964,8 @@ ;; ’ 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 @@ -786,57 +984,75 @@ (advice-add #'ispell-parse-output :filter-args #'endless/replace-quote)) -(use-feature lisp-mode +(use-package abbrev + :delight " abbr" + :hook (text-mode . abbrev-mode) + :custom + (abbrev-file-name (b/var "abbrev.el"))) + + +;;; Programming modes + +(use-package lisp-mode :config - (add-hook 'emacs-lisp-mode-hook 'outline-minor-mode) - (add-hook 'emacs-lisp-mode-hook 'reveal-mode) (defun indent-spaces-mode () (setq indent-tabs-mode nil)) (add-hook 'lisp-interaction-mode-hook #'indent-spaces-mode)) -(use-package alloy-mode - :straight (:host github :repo "dwwmmn/alloy-mode") - :mode "\\.als\\'" - :config (setq alloy-basic-offset 2)) - -(use-package proof-site ; Proof General - :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 - 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) +(use-package reveal + :delight (reveal-mode " reveal") + :hook (emacs-lisp-mode . reveal-mode)) + +(use-package 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 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 + 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 :config @@ -849,7 +1065,7 @@ (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)) @@ -863,19 +1079,162 @@ (setq emmet-move-cursor-between-quotes t) :hook (web-mode css-mode html-mode sgml-mode)) -(use-package geiser) +(comment + (use-package meghanada + :bind + (:map meghanada-mode-map + (("C-M-o" . meghanada-optimize-import) + ("C-M-t" . meghanada-import-all))) + :hook (java-mode . meghanada-mode))) + +(comment + (use-package treemacs + :config (setq treemacs-never-persist t)) + + (use-package yasnippet + :config + ;; (yas-global-mode) + ) + + (use-package lsp-mode + :init (setq lsp-eldoc-render-all nil + lsp-highlight-symbol-at-point nil) + ) + + (use-package hydra) + + (use-package company-lsp + :after company + :config + (setq company-lsp-cache-candidates t + company-lsp-async t)) + + (use-package lsp-ui + :config + (setq lsp-ui-sideline-update-mode 'point)) + + (use-package lsp-java + :config + (add-hook 'java-mode-hook + (lambda () + (setq-local company-backends (list 'company-lsp)))) + + (add-hook 'java-mode-hook 'lsp-java-enable) + (add-hook 'java-mode-hook 'flycheck-mode) + (add-hook 'java-mode-hook 'company-mode) + (add-hook 'java-mode-hook 'lsp-ui-mode)) + + (use-package dap-mode + :after lsp-mode + :config + (dap-mode t) + (dap-ui-mode t)) + + (use-package dap-java + :after (lsp-java)) + + (use-package lsp-java-treemacs + :after (treemacs))) + +(comment + (use-package eclim + :bind (:map eclim-mode-map ("S-SPC" . company-complete)) + :hook ((java-mode . eclim-mode) + (eclim-mode . (lambda () + (make-local-variable 'company-idle-delay) + (defvar company-idle-delay) + ;; (setq company-idle-delay 0.7) + (setq company-idle-delay nil)))) + :custom + (eclim-auto-save nil) + ;; (eclimd-default-workspace "~/src/eclipse-workspace-exp") + (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-feature geiser-guile +(use-package geiser-guile :config (setq geiser-guile-load-path "~/src/git/guix")) (use-package guix) -(use-feature man +(comment + (use-package auctex + :custom + (font-latex-fontify-sectioning 'color))) + +(use-package go-mode) + +(use-package po-mode + :hook + (po-mode . (lambda () (run-with-timer 0.1 nil 'View-exit)))) + +(use-package tex-mode + :config + (cl-delete-if + (lambda (p) (string-match "^---?" (car p))) + tex--prettify-symbols-alist)) + + +;;; Theme + +(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) + (smart-mode-line-enable)) + +(comment + ;; TODO + (use-package doom-themes)) + +(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 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 b/org-mode-font-lock-keywords)) + +(defun b/lights-off () + "Go dark." + (interactive) + (mapc #'disable-theme custom-enabled-themes) + ;; (load-theme 'doom-tomorrow-night t) + (sml/apply-theme 'automatic) + (font-lock-add-keywords + 'org-mode b/org-mode-font-lock-keywords t)) + +(bind-keys + ("C-c t d" . b/lights-off) + ("C-c t l" . b/lights-on)) + + +;;; Emacs enhancements & auxiliary packages + +(use-package man :config (setq Man-width 80)) (use-package which-key :defer 0.4 + :delight :config (which-key-add-key-based-replacements ;; prefixes for global prefixes and minor modes @@ -894,11 +1253,7 @@ "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" @@ -910,9 +1265,9 @@ "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" + "C-x g" "magit") ;; prefixes for major modes (which-key-add-major-mode-key-based-replacements 'message-mode @@ -931,46 +1286,7 @@ (which-key-add-column-padding 5) (which-key-max-description-length 32)) -(add-to-list 'custom-theme-load-path "~/.emacs.d/lisp") -(load-theme 'tangomod t) - -(use-package smart-mode-line - :commands (sml/apply-theme) - :demand - :config - (sml/setup)) - -(use-package doom-themes) - -(defvar a/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 () - "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)) - -(defun a/lights-off () - "Go dark." - (interactive) - (mapc #'disable-theme custom-enabled-themes) - (load-theme 'doom-tomorrow-night t) - (sml/apply-theme 'automatic) - (font-lock-add-keywords - 'org-mode a/org-mode-font-lock-keywords t)) - -(bind-keys - ("s-t d" . a/lights-off) - ("s-t l" . a/lights-on)) - -(use-package crux ; results in Waiting for git... [2 times] +(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) @@ -988,10 +1304,23 @@ ("" . mwim-end-of-line-or-code))) (use-package projectile + :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 () + "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)) @@ -1002,7 +1331,11 @@ :after #'my-projectile-invalidate-cache) (advice-add 'magit-branch-and-checkout :after #'my-projectile-invalidate-cache))) - :custom (projectile-completion-system 'ivy)) + :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 :defer 0.6 @@ -1020,43 +1353,50 @@ :custom (unkillable-buffers '("^\\*scratch\\*$" "^\\*Messages\\*$"))) +;; ,---- +;; | make pretty boxed quotes like this +;; `---- (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 :disabled t :after message :hook (message-mode . orgalist-mode)) +;; easily type pretty quotes & other typography, like ‘’“”-–—«»‹› (use-package typo :defer 0.5 + :delight " typo" :config (typo-global-mode 1) - :hook (text-mode . typo-mode)) + :hook ((text-mode erc-mode) . typo-mode)) +;; highlight TODOs in buffers (use-package hl-todo :defer 0.5 :config @@ -1084,13 +1424,17 @@ (use-package multi-term :defer 0.6 - :bind (("C-c a s m" . multi-term-dedicated-toggle) + :bind (("C-c a s m m" . multi-term) + ("C-c a s m d" . multi-term-dedicated-toggle) + ("C-c a s m p" . multi-term-prev) + ("C-c a s m n" . multi-term-next) :map term-mode-map - ("C-c C-j" . term-char-mode) - :map term-raw-map - ("C-c C-j" . term-line-mode)) + ("C-c C-j" . term-char-mode)) :config - (setq multi-term-program "/bin/screen" + (setq multi-term-program "screen" + multi-term-program-switches (concat "-c" + (getenv "XDG_CONFIG_HOME") + "/screen/screenrc") ;; TODO: add separate bindings for connecting to existing ;; session vs. always creating a new one multi-term-dedicated-select-after-open-p t @@ -1099,21 +1443,42 @@ term-bind-key-alist '(("C-c C-c" . term-interrupt-subjob) ("C-c C-e" . term-send-esc) + ("C-c C-j" . term-line-mode) ("C-k" . kill-line) - ("C-y" . term-paste) + ;; ("C-y" . term-paste) + ("C-y" . term-send-raw) ("M-f" . term-send-forward-word) ("M-b" . term-send-backward-word) ("M-p" . term-send-up) ("M-n" . term-send-down) + ("M-j" . term-send-raw-meta) + ("M-y" . term-send-raw-meta) + ("M-/" . term-send-raw-meta) + ("M-0" . term-send-raw-meta) + ("M-1" . term-send-raw-meta) + ("M-2" . term-send-raw-meta) + ("M-3" . term-send-raw-meta) + ("M-4" . term-send-raw-meta) + ("M-5" . term-send-raw-meta) + ("M-6" . term-send-raw-meta) + ("M-7" . term-send-raw-meta) + ("M-8" . term-send-raw-meta) + ("M-9" . term-send-raw-meta) ("" . term-send-backward-kill-word) ("" . term-send-backward-kill-word) ("M-d" . term-send-delete-word) ("M-," . term-send-raw) ("M-." . comint-dynamic-complete)) term-unbind-key-alist - '("C-z" "C-x" "C-c" "C-h" "C-y" ""))) + '("C-z" "C-x" "C-c" "C-h" + ;; "C-y" + ""))) (use-package page-break-lines + :defer 0.5 + :delight " pgln" + :custom + (page-break-lines-max-width fill-column) :config (global-page-break-lines-mode)) @@ -1123,203 +1488,322 @@ (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)))) + ("a" . mc/mark-all-like-this))) + :config + (setq mc/list-file (b/var "mc-list.el"))) -(use-package forge - :after magit - :demand) +(comment + ;; TODO + (use-package forge + :after magit + :demand)) (use-package yasnippet :defer 0.6 :config (defconst yas-verbosity-cur yas-verbosity) (setq yas-verbosity 2) - (add-to-list 'yas-snippet-dirs "~/src/git/guix/etc/snippets") + (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) - :hook - (text-mode . yas-minor-mode)) + (yas-global-mode)) -(use-package debbugs - :straight (debbugs - :host github - :repo "emacs-straight/debbugs" - :files (:defaults "Debbugs.wsdl"))) +(use-package debbugs) (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 org-ref-bibliography-notes "~/usr/org/notes.org" org-ref-pdf-directory "~/usr/org/bibtex-pdfs/")) -(use-package slack - :commands (slack-start) - :init - (eval-when-compile ; silence the byte-compiler - (defvar url-http-data nil) - (defvar url-http-extra-headers nil) - (defvar url-http-method nil) - (defvar url-callback-function nil) - (defvar url-callback-arguments nil) - (defvar oauth--token-data nil)) - (setq slack-buffer-emojify t - slack-prefer-current-team t) +(use-package alert + :commands (alert) + :init (setq alert-default-style 'notifications)) + +;; (use-package fill-column-indicator) + +(use-package emojify :config - (slack-register-team - :name "nday-students" - :default t - :token nday-students-token - :subscribed-channels '(general) - :full-and-display-names t) - (add-to-list 'swiper-font-lock-exclude 'slack-message-buffer-mode t) - (setq lui-time-stamp-format "[%Y-%m-%d %H:%M:%S]" - lui-time-stamp-only-when-changed-p t - lui-time-stamp-position 'right) + (make-directory (b/var "emojify/") t) + (setq emojify-emojis-dir (b/var "emojify/")) + :hook (erc-mode . emojify-mode)) + +(use-package window :bind - (("C-c s s" . slack-start) - ("C-c s u" . slack-select-unread-rooms) - ("C-c s b" . slack-select-rooms) - ("C-c s t" . slack-change-current-team) - ("C-c s c" . slack-ws-close) - :map slack-mode-map - ("M-p" . slack-buffer-goto-prev-message) - ("M-n" . slack-buffer-goto-next-message) - ("C-c e" . slack-message-edit) - ("C-c k" . slack-message-delete) - ("C-c C-k" . slack-channel-leave) - ("C-c r a" . slack-message-add-reaction) - ("C-c r r" . slack-message-remove-reaction) - ("C-c r s" . slack-message-show-reaction-users) - ("C-c p l" . slack-room-pins-list) - ("C-c p a" . slack-message-pins-add) - ("C-c p r" . slack-message-pins-remove) - ("@" . slack-message-embed-mention) - ("#" . slack-message-embed-channel))) + (("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-package alert - :commands (alert) - :init - (setq alert-default-style 'notifier)) +(use-package 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 + ("M-RET" . image-previous-line)) + :config (pdf-tools-install nil t)) + +(use-package biblio) -(defvar a/maildir (expand-file-name "~/mail/")) +(use-package reftex + :hook (latex-mode . reftex-mode)) + +(use-package 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))))) + + +;;; Email (with Gnus) + +(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)) +(use-package 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-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.org")) - (nnimap "uwaterloo" + (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 "uw" (nnimap-stream plain) (nnimap-address "127.0.0.1") (nnimap-server-port 143) (nnimap-authenticator plain) - (nnimap-user "abandali@uwaterloo.ca")) - (nnimap "csclub" + (nnimap-user "abandali@uw.local") + (nnimap-inbox "INBOX") + (nnimap-split-methods 'nnimap-split-fancy) + (nnimap-split-fancy (| + ;; (: 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" (nnimap-stream plain) (nnimap-address "127.0.0.1") (nnimap-server-port 143) (nnimap-authenticator plain) - (nnimap-user "abandali@csclub.uw"))) - gnus-message-archive-group "nnimap+amin:Sent" + (nnimap-user "abandali@csc.uw.local"))) + gnus-message-archive-group "nnimap+shemshak:Sent" gnus-parameters - '(("gnu\\.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")) - ("gnu\\.emacs-devel" + (to-list . "deepspec@lists.cs.princeton.edu") + (list-identifier . "\\[deepspec\\]")) + ("l\\.emacs-devel" (to-address . "emacs-devel@gnu.org") (to-list . "emacs-devel@gnu.org")) - ("gnu\\.emacs-orgmode" + ("l\\.help-gnu-emacs" + (to-address . "help-gnu-emacs@gnu.org") + (to-list . "help-gnu-emacs@gnu.org")) + ("l\\.info-gnu-emacs" + (to-address . "info-gnu-emacs@gnu.org") + (to-list . "info-gnu-emacs@gnu.org")) + ("l\\.emacs-orgmode" (to-address . "emacs-orgmode@gnu.org") - (to-list . "emacs-orgmode@gnu.org")) - ("gnu\\.emacsconf-discuss" + (to-list . "emacs-orgmode@gnu.org") + (list-identifier . "\\[O\\]")) + ("l\\.emacs-tangents" + (to-address . "emacs-tangents@gnu.org") + (to-list . "emacs-tangents@gnu.org")) + ("l\\.emacsconf-discuss" (to-address . "emacsconf-discuss@gnu.org") (to-list . "emacsconf-discuss@gnu.org")) - ("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")) - ("gnu\\.gnunet-developers" + (to-list . "fencepost-users@gnu.org") + (list-identifier . "\\[Fencepost-users\\]")) + ("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")) - ("gnu\\.guile-devel" + (to-list . "gnunet-developers@gnu.org") + (list-identifier . "\\[GNUnet-developers\\]")) + ("l\\.help-gnunet" + (to-address . "help-gnunet@gnu.org") + (to-list . "help-gnunet@gnu.org") + (list-identifier . "\\[Help-gnunet\\]")) + ("l\\.bug-gnuzilla" + (to-address . "bug-gnuzilla@gnu.org") + (to-list . "bug-gnuzilla@gnu.org") + (list-identifier . "\\[Bug-gnuzilla\\]")) + ("l\\.gnuzilla-dev" + (to-address . "gnuzilla-dev@gnu.org") + (to-list . "gnuzilla-dev@gnu.org") + (list-identifier . "\\[Gnuzilla-dev\\]")) + ("l\\.guile-devel" (to-address . "guile-devel@gnu.org") (to-list . "guile-devel@gnu.org")) - ("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")) - ("gnu\\.haskell-art" - (to-address . "haskell-art@we.lurk.org") - (to-list . "haskell-art@we.lurk.org")) - ("gnu\\.haskell-cafe" - (to-address . "haskell-cafe@haskell.org") - (to-list . "haskell-cafe@haskell.org")) - ("gnu\\.help-gnu-emacs" - (to-address . "help-gnu-emacs@gnu.org") - (to-list . "help-gnu-emacs@gnu.org")) - ("gnu\\.info-gnu-emacs" - (to-address . "info-gnu-emacs@gnu.org") - (to-list . "info-gnu-emacs@gnu.org")) - ("gnu\\.info-guix" + ("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")) - ("gnu\\.notmuch" - (to-address . "notmuch@notmuchmail.org") - (to-list . "notmuch@notmuchmail.org")) - ("gnu\\.parabola-dev" - (to-address . "dev@lists.parabola.nu") - (to-list . "dev@lists.parabola.nu")) - ("gnu\\.webmasters" - (to-address . "webmasters@gnu.org") - (to-list . "webmasters@gnu.org")) - ("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")) - ("gnu\\.www-discuss" + ("l\\.www-discuss" (to-address . "www-discuss@gnu.org") (to-list . "www-discuss@gnu.org")) - ("gnu\\.~bandali\\.public-inbox" + ("l\\.haskell-art" + (to-address . "haskell-art@we.lurk.org") + (to-list . "haskell-art@we.lurk.org") + (list-identifier . "\\[haskell-art\\]")) + ("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" + (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")) - ("gnu\\.~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")) - ("gnu\\.~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")) - ("gnu\\.~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")) - ("gnu\\.~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" + (to-address . "webmasters@gnu.org") + (to-list . "webmasters@gnu.org")) ("gnu.*" (gcc-self . t)) ("gnu\\." - (subscribed . t))) + (subscribed . t)) + ("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/") @@ -1332,12 +1816,21 @@ (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-feature gnus-art +(use-package 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 @@ -1362,9 +1855,9 @@ :map gnus-article-mode-map ("M-L" . org-store-link))) -(use-feature gnus-sum +(use-package 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) @@ -1373,54 +1866,88 @@ (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 +(use-package 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 +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 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))) - ("gnu.*" + (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"))) ((header "subject" "ThankCRM") (to "webmasters-comment@gnu.org") - (body "Added to 2019supporters.html.\n\nMoving to campaigns.\n\n-amin\n") - (eval (setq a/message-cite-say-hi nil))) - ("nnimap\\+uwaterloo:.*" + (body "") + (eval (setq b/message-cite-say-hi nil))) + ("nnimap\\+uw:.*" (address "abandali@uwaterloo.ca") - (gcc "\"nnimap+uwaterloo:Sent Items\"")) - ("nnimap\\+csclub:.*" + (signature b/uw-signature)) + ("nnimap\\+uw:INBOX" + (gcc "\"nnimap+uw:Sent Items\"")) + ("nnimap\\+csc:.*" (address "abandali@csclub.uwaterloo.ca") - (gcc "nnimap+csclub:Sent"))))) + (signature b/csc-signature) + (gcc "nnimap+csc:Sent"))))) -(use-feature gnus-topic +(use-package gnus-topic :hook (gnus-group-mode . gnus-topic-mode) :config (setq gnus-topic-line-format "%i[ %A: %(%{%n%}%) ]%v\n")) -(use-feature gnus-agent +(use-package gnus-agent :config (setq gnus-agent-synchronize-flags 'ask) :hook (gnus-group-mode . gnus-agent-mode)) -(use-feature gnus-group +(use-package gnus-group :config (setq gnus-permanently-visible-groups "\\(:INBOX$\\|:gnu$\\)")) -(use-feature mm-decode +(comment + ;; problematic with ebdb's popup, *EBDB-Gnus* + (use-package gnus-win + :config + (setq gnus-use-full-window nil))) + +(use-package gnus-dired + :commands gnus-dired-mode + :init + (add-hook 'dired-mode-hook 'gnus-dired-mode)) + +(use-package 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 +(use-package 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)) -(use-feature message +(use-package message :config ;; redefine for a simplified In-Reply-To header ;; (see https://todo.sr.ht/~sircmpwn/lists.sr.ht/67) @@ -1432,7 +1959,7 @@ (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) @@ -1441,9 +1968,9 @@ (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 @@ -1452,7 +1979,7 @@ 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) @@ -1467,11 +1994,15 @@ ;; (message-header-cc ((t (:foreground "#333" :weight normal)))) ) -(with-eval-after-load 'mml-sec - (setq mml-secure-openpgp-encrypt-to-self t - mml-secure-openpgp-sign-with-sender t)) +(use-package mml + :delight " mml") + +(use-package mml-sec + :custom + (mml-secure-openpgp-encrypt-to-self t) + (mml-secure-openpgp-sign-with-sender t)) -(use-feature footnote +(use-package footnote :after message ;; :config ;; (setq footnote-start-tag "" @@ -1479,7 +2010,7 @@ ;; 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) @@ -1490,15 +2021,14 @@ ("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))) -(use-feature ebdb-com +(use-package ebdb-com :after ebdb) ;; (use-package ebdb-complete @@ -1510,7 +2040,7 @@ :config (defun company-ebdb--post-complete (_) nil)) -(use-feature ebdb-gnus +(use-package ebdb-gnus :after ebdb :custom (ebdb-gnus-window-configuration @@ -1521,7 +2051,7 @@ (article 1.0) (ebdb-gnus 0.3)))))) -(use-feature ebdb-mua +(use-package ebdb-mua :after ebdb ;; :custom (ebdb-mua-pop-up nil) ) @@ -1529,14 +2059,167 @@ ;; (use-package ebdb-message ;; :after ebdb) - ;; (use-package ebdb-vcard ;; :after ebdb) (use-package message-x) +(comment + (use-package message-x + :custom + (message-x-completion-alist + (quote + (("\\([rR]esent-\\|[rR]eply-\\)?[tT]o:\\|[bB]?[cC][cC]:" . gnus-harvest-find-address) + ((if + (boundp + (quote message-newgroups-header-regexp)) + message-newgroups-header-regexp message-newsgroups-header-regexp) + . message-expand-group)))))) + +(comment + (use-package gnus-harvest + :commands gnus-harvest-install + :demand t + :config + (if (featurep 'message-x) + (gnus-harvest-install 'message-x) + (gnus-harvest-install)))) + + +;;; IRC (with ERC and ZNC) + +(use-package 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-package erc-fill + :after erc + :custom + (erc-fill-column 77) + (erc-fill-function 'erc-fill-static) + (erc-fill-static-center 18)) + +(use-package erc-pcomplete + :after erc + :custom + (erc-pcomplete-nick-postfix ",")) + +(use-package 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") + :load-path "lisp/znc.el/" :bind (("C-c a e e" . znc-erc) ("C-c a e a" . znc-all)) :config @@ -1545,13 +2228,18 @@ ((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