X-Git-Url: https://git.shemshak.org/gitweb.cgi/~bandali/configs/blobdiff_plain/74fd778eb834b25565a6bfd43e587e1f8e2b3c7f..92df6c4f9ba46287c07314eaddc18948c14e806f:/.emacs.d/init.el diff --git a/.emacs.d/init.el b/.emacs.d/init.el index be59294..6567cd5 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -1,4 +1,4 @@ -;;; init.el --- Amin Bandali's Emacs config -*- lexical-binding: t -*- +;;; init.el --- bandali's emacs configuration -*- lexical-binding: t -*- ;; Copyright (C) 2018-2019 Amin Bandali @@ -18,8 +18,9 @@ ;;; Commentary: ;; Emacs configuration of Amin Bandali, computer scientist, functional -;; programmer, and free software advocate. Uses straight.el for -;; purely functional and fully reproducible package management. +;; 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: @@ -37,18 +38,18 @@ ;;; Emacs initialization -(defvar a/before-user-init-time (current-time) +(defvar b/before-user-init-time (current-time) "Value of `current-time' when Emacs begins loading `user-init-file'.") (message "Loading Emacs...done (%.3fs)" - (float-time (time-subtract a/before-user-init-time + (float-time (time-subtract b/before-user-init-time before-init-time))) ;; temporarily increase `gc-cons-threshhold' and `gc-cons-percentage' ;; during startup to reduce garbage collection frequency. clearing ;; `file-name-handler-alist' seems to help reduce startup time too. -(defvar a/gc-cons-threshold gc-cons-threshold) -(defvar a/gc-cons-percentage gc-cons-percentage) -(defvar a/file-name-handler-alist file-name-handler-alist) +(defvar b/gc-cons-threshold gc-cons-threshold) +(defvar b/gc-cons-percentage gc-cons-percentage) +(defvar b/file-name-handler-alist file-name-handler-alist) (setq gc-cons-threshold (* 400 1024 1024) ; 400 MiB gc-cons-percentage 0.6 file-name-handler-alist nil @@ -56,11 +57,11 @@ esup-child-profile-require-level 0) ;; set them back to their defaults once we're done initializing -(defun a/post-init () - (setq gc-cons-threshold a/gc-cons-threshold - gc-cons-percentage a/gc-cons-percentage - file-name-handler-alist a/file-name-handler-alist)) -(add-hook 'after-init-hook #'a/post-init) +(defun b/post-init () + (setq gc-cons-threshold b/gc-cons-threshold + gc-cons-percentage b/gc-cons-percentage + file-name-handler-alist b/file-name-handler-alist)) +(add-hook 'after-init-hook #'b/post-init) ;; increase number of lines kept in *Messages* log (setq message-log-max 20000) @@ -74,7 +75,7 @@ ;;; whoami (setq user-full-name "Amin Bandali" - user-mail-address "amin@bndl.org") + user-mail-address "bandali@gnu.org") ;;; comment macro @@ -86,73 +87,7 @@ nil) -;;; Package management - -;; No package.el (for emacs 26 and before, uncomment the following) -;; Not necessary when using straight.el -;; (C-h v straight-package-neutering-mode RET) - -(when (and - (not (featurep 'straight)) - (version< emacs-version "27")) - (setq package-enable-at-startup nil) - ;; (package-initialize) - ) - -;; for emacs 27 and later, we use early-init.el. see -;; https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=24acb31c04b4048b85311d794e600ecd7ce60d3b - -;; straight.el - -;; Main engine start... - -(setq straight-repository-branch "develop" - straight-check-for-modifications '(check-on-save find-when-checking)) - -(defun 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))) - -;; Solid rocket booster ignition... - -(a/bootstrap-straight) - -;; We have lift off! - -(setq straight-use-package-by-default t) - -(defmacro use-feature (name &rest args) - "Like `use-package', but with `straight-use-package-by-default' disabled." - (declare (indent defun)) - `(use-package ,name - :straight nil - ,@args)) - -(with-eval-after-load 'recentf - (add-to-list 'recentf-exclude - (expand-file-name "~/.emacs.d/straight/build/"))) - -(defun a/reload-init () - "Reload init.el." - (interactive) - (straight-transaction - (straight-mark-transaction-as-init) - (setq a/file-name-handler-alist file-name-handler-alist) - (load user-init-file) - (a/post-init))) - -;; use-package -(straight-use-package 'use-package) +;;; use-package (if nil ; set to t when need to debug init (progn (setq use-package-verbose t @@ -166,46 +101,46 @@ (setq use-package-always-defer t) (require 'bind-key) -;; for browsing the Emacsmirror package database -(comment - (use-package epkg - :commands (epkg-list-packages epkg-describe-package) - :bind - (("C-c p e d" . epkg-describe-package) - ("C-c p e p" . epkg-list-packages)) - :config - (setq epkg-repository "~/.emacs.d/straight/repos/epkgs/") - (eval-when-compile (defvar ivy-initial-inputs-alist)) - (with-eval-after-load 'ivy - (add-to-list - 'ivy-initial-inputs-alist '(epkg-describe-package . "^") t)))) +(use-package delight) ;;; Initial setup ;; keep ~/.emacs.d clean -(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)))) +(defvar b/etc-dir + (expand-file-name + (convert-standard-filename "etc/") user-emacs-directory) + "The directory where packages place their configuration files.") + +(defvar b/var-dir + (expand-file-name + (convert-standard-filename "var/") user-emacs-directory) + "The directory where packages place their persistent data files.") + +(defun b/etc (file) + "Expand filename FILE relative to `b/etc-dir'." + (expand-file-name (convert-standard-filename file) b/etc-dir)) + +(defun b/var (file) + "Expand filename FILE relative to `b/var-dir'." + (expand-file-name (convert-standard-filename file) b/var-dir)) + +(setq auto-save-list-file-prefix (b/var "auto-save/sessions/")) ;; separate custom file (don't want it mixing with init.el) -(use-feature custom +(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)) ;; load the secrets file if it exists, otherwise show a warning -(with-demoted-errors - (load (no-littering-expand-etc-file-name "secrets"))) +(comment + (with-demoted-errors + (load (b/etc "secrets")))) ;; better $PATH (and other environment variable) handling (use-package exec-path-from-shell @@ -227,7 +162,7 @@ ;; start up emacs server. see ;; https://www.gnu.org/software/emacs/manual/html_node/emacs/Emacs-Server.html#Emacs-Server -(use-feature server +(use-package server :defer 0.4 :config (or (server-running-p) (server-mode))) @@ -270,7 +205,7 @@ ;; focus follows mouse (setq mouse-autoselect-window t) -(defun a/no-mouse-autoselect-window () +(defun b/no-mouse-autoselect-window () "Conveniently disable `focus-follows-mouse'. For disabling the behaviour for certain buffers and/or modes." (make-local-variable 'mouse-autoselect-window) @@ -283,19 +218,38 @@ For disabling the behaviour for certain buffers and/or modes." 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)) ;; ask for GPG passphrase in minibuffer -(setq epg-pinentry-mode 'loopback) +(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) @@ -304,12 +258,12 @@ For disabling the behaviour for certain buffers and/or modes." ;;; Useful utilities -(defmacro a/setq-every (value &rest vars) +(defmacro b/setq-every (value &rest vars) "Set all the variables from VARS to value VALUE." (declare (indent defun) (debug t)) `(progn ,@(mapcar (lambda (x) (list 'setq x value)) vars))) -(defun a/start-process (program &rest args) +(defun b/start-process (program &rest args) "Same as `start-process', but doesn't bother about name and buffer." (let ((process-name (concat program "_process")) (buffer-name (generate-new-buffer-name @@ -317,15 +271,15 @@ For disabling the behaviour for certain buffers and/or modes." (apply #'start-process process-name buffer-name program args))) -(defun a/dired-start-process (program &optional args) +(defun b/dired-start-process (program &optional args) "Open current file with a PROGRAM." ;; Shell command looks like this: "program [ARGS]... FILE" (ARGS can ;; be nil, so remove it). - (apply #'a/start-process + (apply #'b/start-process program (remove nil (list args (dired-get-file-for-visit))))) -(defun a/add-elisp-section () +(defun b/add-elisp-section () (interactive) (insert "\n") (previous-line) @@ -392,6 +346,7 @@ For disabling the behaviour for certain buffers and/or modes." ;; 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) @@ -413,12 +368,12 @@ For disabling the behaviour for certain buffers and/or modes." ;; https://stackoverflow.com/a/17788551, with changes to use `cl-letf' ;; instead of the now obsolete `flet'. (with-eval-after-load 'compile - (defun a/compilation-finish-function (buffer outstr) + (defun b/compilation-finish-function (buffer outstr) (unless (string-match "finished" outstr) (switch-to-buffer-other-window buffer)) t) - (setq compilation-finish-functions #'a/compilation-finish-function) + (setq compilation-finish-functions #'b/compilation-finish-function) (require 'cl-macs) @@ -445,10 +400,14 @@ For disabling the behaviour for certain buffers and/or modes." ;; allow scrolling in Isearch (setq isearch-allow-scroll t) -(use-feature vc +;; 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-feature 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))) @@ -464,74 +423,37 @@ For disabling the behaviour for certain buffers and/or modes." ("C-c e i" . emacs-init-time) ("C-c e u" . emacs-uptime) + ("C-c e v" . emacs-version) ("C-c F m" . make-frame-command) ("C-c F d" . delete-frame) ("C-c F D" . server-edit) - ("C-c o" . other-window) - ("C-S-h C" . describe-char) ("C-S-h F" . describe-face) ("C-x k" . kill-this-buffer) ("C-x K" . kill-buffer) - ("s-p" . beginning-of-buffer) - ("s-n" . end-of-buffer) - :map emacs-lisp-mode-map - ("" . a/add-elisp-section)) + ("" . b/add-elisp-section)) (when (display-graphic-p) (unbind-key "C-z" global-map)) (bind-keys - :prefix-map a/straight-prefix-map - :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)) + ;; for back and forward mouse keys + ("" . previous-buffer) + ("" . previous-buffer) + ("" . next-buffer) + ("" . next-buffer) + ("" . kill-this-buffer) + ("" . ivy-switch-buffer)) ;;; Essential packages -(use-package auto-compile - :demand t - :config - (auto-compile-on-load-mode) - (auto-compile-on-save-mode) - (setq auto-compile-display-buffer nil - auto-compile-mode-line-counter t - auto-compile-source-recreate-deletes-dest t - auto-compile-toggle-deletes-nonlib-dest t - auto-compile-update-autoloads t) - (add-hook 'auto-compile-inhibit-compile-hook - 'auto-compile-inhibit-compile-detached-git-head)) - -;; use the org-plus-contrib package to get the whole deal -(straight-use-package 'org-plus-contrib) - -(use-feature org +(use-package org :defer 0.5 :config (setq org-src-tab-acts-natively t @@ -544,6 +466,7 @@ For disabling the behaviour for certain buffers and/or modes." org-catch-invisible-edits 'show-and-error org-log-done 'time) (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 @@ -555,15 +478,18 @@ For disabling the behaviour for certain buffers and/or modes." (org-mode . flyspell-mode)) :custom (org-agenda-files '("~/usr/org/todos/personal.org" + "~/usr/org/todos/habits.org" "~/usr/org/todos/masters.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 @@ -579,7 +505,7 @@ For disabling the behaviour for certain buffers and/or modes." t) (require 'ox-beamer)) -(use-feature ox-extra +(use-package ox-extra :config (ox-extras-activate '(latex-header-blocks ignore-headlines))) @@ -587,13 +513,13 @@ For disabling the behaviour for certain buffers and/or modes." ;; org file. closely inspired by ;; https://github.com/dieggsy/dotfiles/tree/cc10edf7701958eff1cd94d4081da544d882a28c/emacs.d#dotfiles (with-eval-after-load 'org - (defvar a/show-async-tangle-results nil + (defvar b/show-async-tangle-results nil "Keep *emacs* async buffers around for later inspection.") - (defvar a/show-async-tangle-time nil + (defvar b/show-async-tangle-time nil "Show the time spent tangling the file.") - (defun a/async-babel-tangle () + (defun b/async-babel-tangle () "Tangle org file asynchronously." (interactive) (let* ((file-tangle-start-time (current-time)) @@ -605,12 +531,12 @@ For disabling the behaviour for certain buffers and/or modes." `(lambda () (require 'org) (org-babel-tangle-file ,file)) - (unless a/show-async-tangle-results + (unless b/show-async-tangle-results `(lambda (result) (if result (message "Tangled %s%s" ,file-nodir - (if a/show-async-tangle-time + (if b/show-async-tangle-time (format " (%.3fs)" (float-time (time-subtract (current-time) ',file-tangle-start-time))) @@ -619,7 +545,7 @@ For disabling the behaviour for certain buffers and/or modes." (add-to-list 'safe-local-variable-values - '(eval add-hook 'after-save-hook #'a/async-babel-tangle 'append 'local)) + '(eval add-hook 'after-save-hook #'b/async-babel-tangle 'append 'local)) ;; *the* right way to do git (use-package magit @@ -641,17 +567,20 @@ For disabling the behaviour for certain buffers and/or modes." :custom-face (magit-diff-file-heading ((t (:weight normal))))) ;; recently opened files -(use-feature recentf +(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"))) ;; smart M-x enhancement (needed by counsel for history) (use-package smex) (use-package ivy :defer 0.3 + :delight ;; " 🙒" :bind (:map ivy-minibuffer-map ([escape] . keyboard-escape-quit) @@ -679,6 +608,7 @@ For disabling the behaviour for certain buffers and/or modes." (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) @@ -710,42 +640,43 @@ For disabling the behaviour for certain buffers and/or modes." ("C-z" . helm-select-action)) ; List actions :config (helm-mode 1))) -(use-feature eshell +(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) @@ -793,6 +724,7 @@ For disabling the behaviour for certain buffers and/or modes." (mode . scheme-mode) (mode . haskell-mode) (mode . lean-mode) + (mode . go-mode) (mode . alloy-mode))) ("tex" (or @@ -816,16 +748,17 @@ For disabling the behaviour for certain buffers and/or modes." " " filename))) :hook (ibuffer . (lambda () (ibuffer-switch-to-saved-filter-groups "default")))) -(use-feature outline +(use-package outline :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) @@ -833,10 +766,10 @@ For disabling the behaviour for certain buffers and/or modes." ("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) @@ -882,15 +815,15 @@ For disabling the behaviour for certain buffers and/or modes." ("\\" . dired-hide-details-mode) ("z" . (lambda () (interactive) - (a/dired-start-process "zathura")))) + (b/dired-start-process "zathura")))) :hook (dired-mode . dired-hide-details-mode)) -(use-feature help +(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)) @@ -916,39 +849,56 @@ For disabling the behaviour for certain buffers and/or modes." :hook (magit-post-refresh . diff-hl-magit-post-refresh)) ;; display Lisp objects at point in the echo area -(use-feature eldoc +(use-package eldoc :when (version< "25" emacs-version) + :delight " eldoc" :config (global-eldoc-mode)) ;; highlight matching parens -(use-feature paren +(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)) ;; save minibuffer history -(use-feature savehist - :config (savehist-mode)) +(use-package savehist + :config + (savehist-mode) + :custom + (savehist-file (b/var "savehist.el"))) ;; automatically save place in files -(use-feature saveplace +(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) @@ -974,7 +924,11 @@ For disabling the behaviour for certain buffers and/or modes." (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 @@ -983,7 +937,8 @@ For disabling the behaviour for certain buffers and/or modes." ;; ’ 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 @@ -1002,61 +957,75 @@ For disabling the behaviour for certain buffers and/or modes." (advice-add #'ispell-parse-output :filter-args #'endless/replace-quote)) +(use-package abbrev + :delight " abbr" + :hook (text-mode . abbrev-mode) + :custom + (abbrev-file-name (b/var "abbrev.el"))) + ;;; Programming modes -(use-feature lisp-mode +(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 reveal + :delight (reveal-mode " reveal") + :hook (emacs-lisp-mode . reveal-mode)) -(use-package proof-site ; for Coq - :straight proof-general) +(use-package elisp-mode + :delight (emacs-lisp-mode "Elisp" :major)) -(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 +(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 @@ -1069,7 +1038,7 @@ For disabling the behaviour for certain buffers and/or modes." (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)) @@ -1157,7 +1126,7 @@ For disabling the behaviour for certain buffers and/or modes." (use-package geiser) -(use-feature geiser-guile +(use-package geiser-guile :config (setq geiser-guile-load-path "~/src/git/guix")) @@ -1168,56 +1137,68 @@ For disabling the behaviour for certain buffers and/or modes." :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)))) + ;;; Theme -(add-to-list 'custom-theme-load-path "~/.emacs.d/lisp") +(add-to-list 'custom-theme-load-path + (expand-file-name + (convert-standard-filename "lisp") user-emacs-directory)) (load-theme 'tangomod t) (use-package smart-mode-line :commands (sml/apply-theme) :demand :config - (sml/setup)) + (sml/setup) + (smart-mode-line-enable)) -(use-package doom-themes) +(comment + ;; TODO + (use-package doom-themes)) -(defvar a/org-mode-font-lock-keywords +(defvar b/org-mode-font-lock-keywords '(("[ \t]*\\(#\\+\\(BEGIN\\|END\\|begin\\|end\\)_\\(\\S-+\\)\\)[ \t]*\\([^\n:]*\\)" (1 '(:foreground "#5a5b5a" :background "#292b2b") t) ; directive (3 '(:foreground "#81a2be" :background "#292b2b") t) ; kind (4 '(:foreground "#c5c8c6") t)))) ; title -(defun a/lights-on () +(defun b/lights-on () "Enable my favourite light theme." (interactive) (mapc #'disable-theme custom-enabled-themes) (load-theme 'tangomod t) (sml/apply-theme 'automatic) (font-lock-remove-keywords - 'org-mode a/org-mode-font-lock-keywords)) + 'org-mode b/org-mode-font-lock-keywords)) -(defun a/lights-off () +(defun b/lights-off () "Go dark." (interactive) (mapc #'disable-theme custom-enabled-themes) - (load-theme 'doom-tomorrow-night t) + ;; (load-theme 'doom-tomorrow-night t) (sml/apply-theme 'automatic) (font-lock-add-keywords - 'org-mode a/org-mode-font-lock-keywords t)) + 'org-mode b/org-mode-font-lock-keywords t)) (bind-keys - ("s-t d" . a/lights-off) - ("s-t l" . a/lights-on)) + ("s-t d" . b/lights-off) + ("s-t l" . b/lights-on)) ;;; Emacs enhancements & auxiliary packages -(use-feature man +(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 @@ -1253,7 +1234,7 @@ For disabling the behaviour for certain buffers and/or modes." "C-c P 4" "projectile/other-window" "C-c q" "boxquote" "s-g" "magit" - "s-o" "outline" + "s-O" "outline" "s-t" "themes") ;; prefixes for major modes @@ -1284,17 +1265,31 @@ For disabling the behaviour for certain buffers and/or modes." ("C-c j" . crux-top-join-line) ("C-S-j" . crux-top-join-line))) -(use-package mwim - :bind (("C-a" . mwim-beginning-of-code-or-line) - ("C-e" . mwim-end-of-code-or-line) - ("" . mwim-beginning-of-line-or-code) - ("" . mwim-end-of-line-or-code))) +(comment + ;; TODO + (use-package mwim + :bind (("C-a" . mwim-beginning-of-code-or-line) + ("C-e" . mwim-end-of-code-or-line) + ("" . mwim-beginning-of-line-or-code) + ("" . mwim-end-of-line-or-code)))) (use-package projectile + :defer 0.5 :bind-keymap ("C-c P" . projectile-command-map) :config (projectile-mode) + (defun b/projectile-mode-line-fun () + "Report project name and type in the modeline." + (let ((project-name (projectile-project-name)) + (project-type (projectile-project-type))) + (format "%s%s" + projectile-mode-line-prefix + (if project-type + (format ":%s" project-type) + "")))) + (setq projectile-mode-line-function 'b/projectile-mode-line-fun) + (defun my-projectile-invalidate-cache (&rest _args) ;; ignore the args to `magit-checkout' (projectile-invalidate-cache nil)) @@ -1305,7 +1300,9 @@ For disabling the behaviour for certain buffers and/or modes." :after #'my-projectile-invalidate-cache) (advice-add 'magit-branch-and-checkout :after #'my-projectile-invalidate-cache))) - :custom (projectile-completion-system 'ivy)) + :custom + (projectile-completion-system 'ivy) + (projectile-mode-line-prefix " proj")) (use-package helpful :defer 0.6 @@ -1316,41 +1313,45 @@ For disabling the behaviour for certain buffers and/or modes." ("C-S-h k" . helpful-key) ("C-S-h p" . helpful-at-point))) -(use-package unkillable-scratch - :defer 0.6 - :config - (unkillable-scratch 1) - :custom - (unkillable-buffers '("^\\*scratch\\*$" "^\\*Messages\\*$"))) +(comment + ;; TODO + (use-package unkillable-scratch + :defer 0.6 + :config + (unkillable-scratch 1) + :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))) +(comment + ;; TODO + ;; ,---- + ;; | make pretty boxed quotes like this + ;; `---- + (use-package boxquote + :defer 0.6 + :bind + (: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 @@ -1361,9 +1362,10 @@ For disabling the behaviour for certain buffers and/or modes." ;; 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 @@ -1371,21 +1373,23 @@ For disabling the behaviour for certain buffers and/or modes." :config (global-hl-todo-mode)) -(use-package shrink-path - :defer 0.5 - :after eshell - :config - (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 ".*> ") - eshell-prompt-function #'+eshell/prompt)) +(comment + ;; TODO + (use-package shrink-path + :defer 0.5 + :after eshell + :config + (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 ".*> ") + eshell-prompt-function #'+eshell/prompt))) (use-package eshell-up :after eshell @@ -1445,6 +1449,9 @@ For disabling the behaviour for certain buffers and/or modes." (use-package page-break-lines :defer 0.5 + :delight " pgln" + :custom + (page-break-lines-max-width fill-column) :config (global-page-break-lines-mode)) @@ -1454,37 +1461,34 @@ For disabling the behaviour for certain buffers and/or modes." (use-package multiple-cursors :bind (("C-S-" . mc/add-cursor-on-click) - (:prefix-map a/mc-prefix-map + (:prefix-map b/mc-prefix-map :prefix "C-c m" ("c" . mc/edit-lines) ("n" . mc/mark-next-like-this) ("p" . mc/mark-previous-like-this) ("a" . mc/mark-all-like-this)))) -(use-package forge - :after magit - :demand) +(comment + ;; TODO + (use-package forge + :after magit + :demand)) (use-package yasnippet :defer 0.6 :config (defconst yas-verbosity-cur yas-verbosity) (setq yas-verbosity 2) - (add-to-list 'yas-snippet-dirs "~/src/git/guix/etc/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 @@ -1495,56 +1499,145 @@ For disabling the behaviour for certain buffers and/or modes." :commands (alert) :init (setq alert-default-style 'notifications)) -(use-package ivy-xref - :init - (setq xref-show-xrefs-function #'ivy-xref-show-xrefs)) +;; (use-package fill-column-indicator) + +(use-package emojify + :hook (erc-mode . emojify-mode)) + +(use-package window + :bind + (("s-o" . other-window) + ("s-/ ." . split-window-right) + ("s-/ ," . split-window-below) + ("s-/ 0" . delete-window) + ("s-q" . delete-window)) + :custom + (split-width-threshold 150)) + +(use-package windmove + :defer 0.6 + :bind + (("s-h" . windmove-left) + ("s-j" . windmove-down) + ("s-k" . windmove-up) + ("s-l" . windmove-right) + ("s-H" . windmove-swap-states-left) + ("s-J" . windmove-swap-states-down) + ("s-K" . windmove-swap-states-up) + ("s-L" . windmove-swap-states-right))) + +(use-package pass + :commands pass + :bind ("C-c a p" . pass) + :hook (pass-mode . View-exit)) ;;; Email (with Gnus) -(defvar a/maildir (expand-file-name "~/mail/")) +(defvar b/maildir (expand-file-name "~/mail/")) (with-eval-after-load 'recentf - (add-to-list 'recentf-exclude a/maildir)) + (add-to-list 'recentf-exclude b/maildir)) (setq - a/gnus-init-file (no-littering-expand-etc-file-name "gnus") + b/gnus-init-file (b/etc "gnus") mail-user-agent 'gnus-user-agent read-mail-command 'gnus) -(use-feature gnus +(use-package gnus :bind (("s-m" . gnus) ("s-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@shemshak.local")) + (nnimap "gnu" (nnimap-stream plain) (nnimap-address "127.0.0.1") (nnimap-server-port 143) (nnimap-authenticator plain) - (nnimap-user "amin@bndl.local")) + (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 ".*emacs-devel.gnu.org" "l.gnu.emacs.devel") + (list ".*help-gnu-emacs.gnu.org" "l.gnu.emacs.help") + (list ".*info-gnu-emacs.gnu.org" "l.gnu.emacs.info") + (list ".*emacs-orgmode.gnu.org" "l.gnu.emacs.orgmode") + (list ".*emacs-tangents.gnu.org" "l.gnu.emacs.tangents") + (list ".*emacsconf-discuss.gnu.org" "l.gnu.emacsconf.discuss") + (list ".*emacsconf-register.gnu.org" "l.gnu.emacsconf.register") + (list ".*emacsconf-submit.gnu.org" "l.gnu.emacsconf.submit") + (list ".*fencepost-users.gnu.org" "l.gnu.fencepost.users") + (list ".*gnunet-developers.gnu.org" "l.gnu.gnunet.developers") + (list ".*help-gnunet.gnu.org" "l.gnu.gnunet.help") + (list ".*bug-gnuzilla.gnu.org" "l.gnu.gnuzilla.bug") + (list ".*gnuzilla-dev.gnu.org" "l.gnu.gnuzilla.dev") + (list ".*guile-devel.gnu.org" "l.gnu.guile.devel") + (list ".*guile-user.gnu.org" "l.gnu.guile.user") + (list ".*guix-devel.gnu.org" "l.gnu.guix.devel") + (list ".*help-guix.gnu.org" "l.gnu.guix.help") + (list ".*info-guix.gnu.org" "l.gnu.guix.info") + (list ".*savannah-hackers-public.gnu.org" "l.gnu.savannah.hackers.public") + (list ".*savannah-users.gnu.org" "l.gnu.savannah.users") + (list ".*www-commits.gnu.org" "l.gnu.www.commits") + (list ".*www-discuss.gnu.org" "l.gnu.www.discuss") + ;; webmasters + (from "webmasters\\(-comment\\)?@gnu\\.org" "webmasters") + ;; haskell + (list ".*haskell-art.we.lurk.org" "l.haskell.art") + (list ".*haskell-cafe.haskell.org" "l.haskell.cafe") + ;; other + (list ".*atreus.freelists.org" "l.atreus") + (list ".*deepspec.lists.cs.princeton.edu" "l.deepspec") + (list ".*notmuch.notmuchmail.org" "l.notmuch") + (list ".*dev.lists.parabola.nu" "l.parabola.dev") + ;; *@lists.sr.ht + (list ".*~bandali/public-inbox@lists.sr.ht" "l.~bandali.public-inbox") + (list ".*~sircmpwn/free-writers-club@lists.sr.ht" "l.~sircmpwn.free-writers-club") + (list ".*~sircmpwn/sr.ht-admins@lists.sr.ht" "l.~sircmpwn.srht.admins") + (list ".*~sircmpwn/sr.ht-announce@lists.sr.ht" "l.~sircmpwn.srht.announce") + (list ".*~sircmpwn/sr.ht-dev@lists.sr.ht" "l.~sircmpwn.srht.dev") + (list ".*~sircmpwn/sr.ht-discuss@lists.sr.ht" "l.~sircmpwn.srht.discuss") + "INBOX"))) (nnimap "uw" (nnimap-stream plain) (nnimap-address "127.0.0.1") (nnimap-server-port 143) (nnimap-authenticator plain) - (nnimap-user "abandali@uw.local")) + (nnimap-user "abandali@uw.local") + (nnimap-inbox "INBOX") + (nnimap-split-methods 'nnimap-split-fancy) + (nnimap-split-fancy (| + ;; (: gnus-registry-split-fancy-with-parent) + ;; se463-s19 + ("subject" "\\(SE\\s-?463\\|Deliverable\\)" "course.se463-s19") + (from "\\(SE\\s-?463\\|Gema\\|Hemant\\|Davood\\|Camilo\\|Reza\\|Michael\\|Sandy\\)" "course.se463-s19") + ;; catch-all + "INBOX"))) (nnimap "csc" (nnimap-stream plain) (nnimap-address "127.0.0.1") (nnimap-server-port 143) (nnimap-authenticator plain) (nnimap-user "abandali@csc.uw.local"))) - gnus-message-archive-group "nnimap+amin:Sent" + gnus-message-archive-group "nnimap+shemshak:Sent" gnus-parameters - '(("l\\.deepspec" + '(("l\\.atreus" + (to-address . "atreus@freelists.org") + (to-list . "atreus@freelists.org")) + ("l\\.deepspec" (to-address . "deepspec@lists.cs.princeton.edu") (to-list . "deepspec@lists.cs.princeton.edu") (list-identifier . "\\[deepspec\\]")) - ("gnu\\.emacs-devel" - (to-address . "emacs-devel@gnu.org") - (to-list . "emacs-devel@gnu.org")) ("l\\.gnu\\.emacs\\.devel" (to-address . "emacs-devel@gnu.org") (to-list . "emacs-devel@gnu.org")) @@ -1558,9 +1651,18 @@ For disabling the behaviour for certain buffers and/or modes." (to-address . "emacs-orgmode@gnu.org") (to-list . "emacs-orgmode@gnu.org") (list-identifier . "\\[O\\]")) + ("l\\.gnu\\.emacs\\.tangents" + (to-address . "emacs-tangents@gnu.org") + (to-list . "emacs-tangents@gnu.org")) ("l\\.gnu\\.emacsconf\\.discuss" (to-address . "emacsconf-discuss@gnu.org") (to-list . "emacsconf-discuss@gnu.org")) + ("l\\.gnu\\.emacsconf\\.register" + (to-address . "emacsconf-register@gnu.org") + (to-list . "emacsconf-register@gnu.org")) + ("l\\.gnu\\.emacsconf\\.submit" + (to-address . "emacsconf-submit@gnu.org") + (to-list . "emacsconf-submit@gnu.org")) ("l\\.gnu\\.fencepost\\.users" (to-address . "fencepost-users@gnu.org") (to-list . "fencepost-users@gnu.org") @@ -1584,12 +1686,24 @@ For disabling the behaviour for certain buffers and/or modes." ("l\\.gnu\\.guile\\.devel" (to-address . "guile-devel@gnu.org") (to-list . "guile-devel@gnu.org")) + ("l\\.gnu\\.guile\\.user" + (to-address . "guile-user@gnu.org") + (to-list . "guile-user@gnu.org")) ("l\\.gnu\\.guix\\.devel" (to-address . "guix-devel@gnu.org") (to-list . "guix-devel@gnu.org")) + ("l\\.gnu\\.guix\\.help" + (to-address . "help-guix@gnu.org") + (to-list . "help-guix@gnu.org")) ("l\\.gnu\\.guix\\.info" (to-address . "info-guix@gnu.org") (to-list . "info-guix@gnu.org")) + ("l\\.gnu\\.savannah\\.hackers\\.public" + (to-address . "savannah-hackers-public@gnu.org") + (to-list . "savannah-hackers-public@gnu.org")) + ("l\\.gnu\\.savannah\\.users" + (to-address . "savannah-users@gnu.org") + (to-list . "savannah-users@gnu.org")) ("l\\.gnu\\.www\\.commits" (to-address . "www-commits@gnu.org") (to-list . "www-commits@gnu.org")) @@ -1614,6 +1728,9 @@ For disabling the behaviour for certain buffers and/or modes." ("l\\.~bandali\\.public-inbox" (to-address . "~bandali/public-inbox@lists.sr.ht") (to-list . "~bandali/public-inbox@lists.sr.ht")) + ("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")) @@ -1636,7 +1753,7 @@ For disabling the behaviour for certain buffers and/or modes." ("nnimap\\+uw:.*" (gcc-self . t))) gnus-large-newsgroup 50 - gnus-home-directory (no-littering-expand-var-file-name "gnus/") + gnus-home-directory (b/var "gnus/") gnus-directory (concat gnus-home-directory "news/") message-directory (concat gnus-home-directory "mail/") nndraft-directory (concat gnus-home-directory "drafts/") @@ -1645,16 +1762,21 @@ For disabling the behaviour for certain buffers and/or modes." gnus-interactive-exit nil gnus-gcc-mark-as-read t) :config - (require 'ebdb) - (require 'ebdb-mua) - (require 'ebdb-gnus) + (comment + ;; TODO + (require 'ebdb) + (require 'ebdb-mua) + (require 'ebdb-gnus)) + + ;; (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 @@ -1679,9 +1801,9 @@ For disabling the behaviour for certain buffers and/or modes." :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) @@ -1690,78 +1812,88 @@ For disabling the behaviour for certain buffers and/or modes." (bind-keys :map gnus-summary-mode-map ("M-L" . org-store-link)) - :hook (gnus-summary-mode . a/no-mouse-autoselect-window)) + :hook (gnus-summary-mode . b/no-mouse-autoselect-window)) -(use-feature gnus-msg +(use-package gnus-msg :config - (defvar a/gnu-signature "Amin Bandali | GNU Webmaster -https://bandali.eu.org | https://gnu.org -GPG Key: BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103") - (defvar a/uw-signature "Amin Bandali, MMath Student + (defvar b/signature "Amin Bandali +Free Software Activist | GNU Webmaster & Volunteer +GPG: BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103 +https://shemshak.org/~amin") + (defvar b/gnu-signature "Amin Bandali +Free Software Activist | GNU Webmaster & Volunteer +GPG: BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103 +https://bandalis.org") + (defvar b/uw-signature "Amin Bandali, MMath Student Cheriton School of Computer Science University of Waterloo -https://bandali.eu.org") - (defvar a/csc-signature "Amin Bandali | Termcom, CSC -https://csclub.uwaterloo.ca/~abandali/") +https://bandalis.org") + (defvar b/csc-signature "Amin Bandali +Termcom, Computer Science Club +University of Waterloo +https://bandalis.org") (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 a/gnu-signature) + (signature b/gnu-signature) (eval (set (make-local-variable 'message-user-fqdn) "fencepost.gnu.org"))) ((header "subject" "ThankCRM") (to "webmasters-comment@gnu.org") - (body "Added to 2019supporters.html.\n\nMoving to campaigns.\n\n-amin\n") - (eval (setq a/message-cite-say-hi nil))) + (body "") + (eval (setq b/message-cite-say-hi nil))) ("nnimap\\+uw:.*" (address "abandali@uwaterloo.ca") - (signature a/uw-signature)) + (signature b/uw-signature)) ("nnimap\\+uw:INBOX" (gcc "\"nnimap+uw:Sent Items\"")) ("nnimap\\+csc:.*" (address "abandali@csclub.uwaterloo.ca") - (signature a/csc-signature) + (signature b/csc-signature) (gcc "nnimap+csc:Sent"))))) -(use-feature gnus-topic +(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$\\)")) (comment ;; problematic with ebdb's popup, *EBDB-Gnus* - (use-feature gnus-win + (use-package gnus-win :config (setq gnus-use-full-window nil))) -(use-feature gnus-dired +(use-package gnus-dired :commands gnus-dired-mode :init (add-hook 'dired-mode-hook 'gnus-dired-mode)) -(use-feature mm-decode +(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) @@ -1773,7 +1905,7 @@ https://csclub.uwaterloo.ca/~abandali/") (when from msg-id)))) - (defconst a/message-cite-style-format "On %Y-%m-%d %l:%M %p, %N wrote:") + (defconst b/message-cite-style-format "On %Y-%m-%d %l:%M %p, %N wrote:") (defconst message-cite-style-bandali '((message-cite-function 'message-cite-original) (message-citation-line-function 'message-insert-formatted-citation-line) @@ -1782,9 +1914,9 @@ https://csclub.uwaterloo.ca/~abandali/") (message-yank-cited-prefix ">") (message-yank-empty-prefix ">") (message-citation-line-format - (if a/message-cite-say-hi - (concat "Hi %F,\n\n" a/message-cite-style-format) - a/message-cite-style-format))) + (if b/message-cite-say-hi + (concat "Hi %F,\n\n" b/message-cite-style-format) + b/message-cite-style-format))) "Citation style based on Mozilla Thunderbird's. Use with message-cite-style.") (setq ;; message-cite-style 'message-cite-style-bandali message-kill-buffer-on-exit t @@ -1793,8 +1925,10 @@ https://csclub.uwaterloo.ca/~abandali/") message-subscribed-address-functions '(gnus-find-subscribed-addresses) message-dont-reply-to-names - "\\(\\(amin@bndl\\.org\\)\\|\\(.*@\\(aminb\\|amin\\.bndl\\)\\.org\\)\\|\\(\\(bandali\\|aminb?\\|mab\\)@gnu\\.org\\)\\|\\(a\\(min\\.\\)?bandali@uwaterloo\\.ca\\)\\|\\(abandali@csclub\\.uwaterloo\\.ca\\)\\)") - (require 'company-ebdb) + "\\(\\(\\(amin\\|mab\\)@shemshak\\.org\\)\\|\\(amin@bndl\\.org\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(bandali\\|mab\\|aminb?\\)@gnu\\.org\\)\\|\\(a\\(min\\.\\)?bandali@uwaterloo\\.ca\\)\\|\\(abandali@csclub\\.uwaterloo\\.ca\\)\\)") + (comment + ;; TODO + (require 'company-ebdb)) :hook (;; (message-setup . mml-secure-message-sign-pgpmime) (message-mode . flyspell-mode) (message-mode . (lambda () @@ -1808,11 +1942,15 @@ https://csclub.uwaterloo.ca/~abandali/") ;; (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 "" @@ -1820,7 +1958,7 @@ https://csclub.uwaterloo.ca/~abandali/") ;; footnote-style 'unicode) :bind (:map message-mode-map - :prefix-map a/footnote-prefix-map + :prefix-map b/footnote-prefix-map :prefix "C-c f" ("a" . footnote-add-footnote) ("b" . footnote-back-to-message) @@ -1830,51 +1968,56 @@ https://csclub.uwaterloo.ca/~abandali/") ("r" . footnote-renumber-footnotes) ("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")) - (with-eval-after-load 'swiper - (add-to-list 'swiper-font-lock-exclude 'ebdb-mode t))) +(comment + ;; TODO + (use-package ebdb + :straight (:host github :repo "girzel/ebdb") + :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-feature ebdb-com - :after ebdb) + (use-package ebdb-com + :after ebdb) -;; (use-package ebdb-complete -;; :after ebdb -;; :config -;; (ebdb-complete-enable)) + ;; (use-package ebdb-complete + ;; :after ebdb + ;; :config + ;; (ebdb-complete-enable)) -(use-package company-ebdb - :config - (defun company-ebdb--post-complete (_) nil)) + (use-package company-ebdb + :config + (defun company-ebdb--post-complete (_) nil)) -(use-feature ebdb-gnus - :after ebdb - :custom - (ebdb-gnus-window-configuration - '(article - (vertical 1.0 - (summary 0.25 point) - (horizontal 1.0 - (article 1.0) - (ebdb-gnus 0.3)))))) - -(use-feature ebdb-mua - :after ebdb - ;; :custom (ebdb-mua-pop-up nil) - ) + (use-package ebdb-gnus + :after ebdb + :custom + (ebdb-gnus-window-configuration + '(article + (vertical 1.0 + (summary 0.25 point) + (horizontal 1.0 + (article 1.0) + (ebdb-gnus 0.3)))))) + + (use-package ebdb-mua + :after ebdb + ;; :custom (ebdb-mua-pop-up nil) + ) -;; (use-package ebdb-message -;; :after ebdb) + ;; (use-package ebdb-message + ;; :after ebdb) -;; (use-package ebdb-vcard -;; :after ebdb) + ;; (use-package ebdb-vcard + ;; :after ebdb) + ) -(use-package message-x) +(comment + ;; TODO + (use-package message-x)) (comment (use-package message-x @@ -1898,10 +2041,72 @@ https://csclub.uwaterloo.ca/~abandali/") (gnus-harvest-install)))) -;;; IRC +;;; IRC (with ERC and ZNC) + +(use-package erc + :bind (("C-c a e b" . 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 + (with-eval-after-load 'ivy + ;; ignore channel buffer names + (add-to-list 'ivy-ignore-buffers "^#")) + (defun erc-cmd-OPME () + "Request chanserv to op me." + (erc-message "PRIVMSG" + (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) + (comment + ;; TODO + (add-to-list 'erc-modules 'scrolltoplace)) + (erc-update-modules)) + +(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 + :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) + +(comment + ;; TODO + (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 @@ -1910,16 +2115,18 @@ https://csclub.uwaterloo.ca/~abandali/") ((null auth) (error "Couldn't find znca's authinfo")) (t (funcall (plist-get (car auth) :secret))))))) (setq znc-servers - `(("znc.bndl.org" 1337 t + `(("znc.shemshak.org" 1337 t ((freenode "amin/freenode" ,pwd))) - ("znc.bndl.org" 1337 t - ((moznet "amin/moznet" ,pwd))))))) + ("znc.shemshak.org" 1337 t + ((moznet "amin/moznet" ,pwd))) + ("znc.shemshak.org" 1337 t + ((oftc "amin/oftc" ,pwd))))))) ;;; Post initialization (message "Loading %s...done (%.3fs)" user-init-file (float-time (time-subtract (current-time) - a/before-user-init-time))) + b/before-user-init-time))) ;;; init.el ends here