X-Git-Url: https://git.shemshak.org/~bandali/configs/blobdiff_plain/40eddfea3a057a34d4f2c2d905bcde90dbe56fe2..440013b1eceaae3e25b250e06b031bf73296cbfc:/.emacs.d/init.el diff --git a/.emacs.d/init.el b/.emacs.d/init.el index ae707ad..f2d78f8 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -1,4 +1,4 @@ -;;; init.el --- Amin Bandali's Emacs config -*- lexical-binding: t -*- +;;; init.el --- bandali's emacs configuration -*- lexical-binding: t -*- ;; Copyright (C) 2018-2019 Amin Bandali @@ -18,7 +18,7 @@ ;;; Commentary: ;; Emacs configuration of Amin Bandali, computer scientist, functional -;; programmer, and free software advocate. Uses straight.el for +;; programmer, and free software activist. Uses straight.el for ;; purely functional and fully reproducible package management. ;; Over the years, I've taken inspiration from configurations of many @@ -37,18 +37,22 @@ ;;; 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 - before-init-time))) +(defvar b/emacs-initialized nil + "Whether Emacs has been initialized.") + +(when (not (bound-and-true-p b/emacs-initialized)) + (message "Loading Emacs...done (%.3fs)" + (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 +60,13 @@ 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 () + "My post-initialize function, run after loading `user-init-file'." + (setq b/emacs-initialized t + 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 +80,7 @@ ;;; whoami (setq user-full-name "Amin Bandali" - user-mail-address "amin@bndl.org") + user-mail-address "bandali@gnu.org") ;;; comment macro @@ -109,7 +115,7 @@ (setq straight-repository-branch "develop" straight-check-for-modifications '(check-on-save find-when-checking)) -(defun a/bootstrap-straight () +(defun b/bootstrap-straight () (defvar bootstrap-version) (let ((bootstrap-file (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory)) @@ -125,7 +131,7 @@ ;; Solid rocket booster ignition... -(a/bootstrap-straight) +(b/bootstrap-straight) ;; We have lift off! @@ -133,24 +139,35 @@ (defmacro use-feature (name &rest args) "Like `use-package', but with `straight-use-package-by-default' disabled." - (declare (indent defun)) + (declare (indent 1)) `(use-package ,name :straight nil ,@args)) +(with-eval-after-load 'use-package-core + (let ((upflk (car use-package-font-lock-keywords))) + (font-lock-add-keywords + 'emacs-lisp-mode + `((,(replace-regexp-in-string + "use-package" "use-feature" + (car upflk)) + ,@(cdr upflk)))))) + (with-eval-after-load 'recentf (add-to-list 'recentf-exclude (expand-file-name "~/.emacs.d/straight/build/"))) -(defun a/reload-init () - "Reload init.el." +(defun b/reload-init () + "Reload `user-init-file'." (interactive) - (setq a/file-name-handler-alist file-name-handler-alist) + (setq b/before-user-init-time (current-time) + b/file-name-handler-alist file-name-handler-alist) (load user-init-file nil 'nomessage) - (a/post-init)) + (b/post-init)) ;; use-package (straight-use-package 'use-package) + (if nil ; set to t when need to debug init (progn (setq use-package-verbose t @@ -164,48 +181,38 @@ (setq use-package-always-defer t) (require 'bind-key) -(use-package delight) - -;; for browsing the Emacsmirror package database -(comment - (use-package epkg - :commands (epkg-list-packages epkg-describe-package) - :bind - (("C-c p e d" . epkg-describe-package) - ("C-c p e p" . epkg-list-packages)) - :config - (setq epkg-repository "~/.emacs.d/straight/repos/epkgs/") - (eval-when-compile (defvar ivy-initial-inputs-alist)) - (with-eval-after-load 'ivy - (add-to-list - 'ivy-initial-inputs-alist '(epkg-describe-package . "^") t)))) - ;;; Initial setup +(defvar b/exwm-p (string= (system-name) "jirud") + "Whether or not we will be using `exwm'.") + ;; keep ~/.emacs.d clean (use-package no-littering - :demand t + :demand :config - (savehist-mode 1) - (add-to-list 'savehist-additional-variables 'kill-ring) - (save-place-mode 1) - (setq auto-save-file-name-transforms - `((".*" ,(no-littering-expand-var-file-name "auto-save/") t)))) + (defalias 'b/etc 'no-littering-expand-etc-file-name) + (defalias 'b/var 'no-littering-expand-var-file-name)) ;; separate custom file (don't want it mixing with init.el) (use-feature custom - :no-require t + :no-require :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)) + (setf custom-safe-themes t) + ;; 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)))) ;; 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 @@ -219,18 +226,102 @@ (exec-path-from-shell-copy-env "SSH_AGENT_PID") (exec-path-from-shell-copy-env "SSH_AUTH_SOCK")) -;; 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-feature server :defer 0.4 :config (or (server-running-p) (server-mode))) + +;;; Useful utilities + +;; useful libraries +(require 'cl-lib) +(require 'subr-x) + +(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 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 + (concat program "_output")))) + (apply #'start-process + process-name buffer-name program 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 #'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;;; ")) + +(defvar b/fill-column 47 + "My custom `fill-column'.") + +(defconst b/asterism "* * *") + +(defun b/insert-asterism () + "Insert a centred asterism." + (interactive) + (insert + (concat + "\n\n" + (make-string (floor (/ (- b/fill-column (length b/asterism)) 2)) + ?\s) + b/asterism + "\n\n"))) + +(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)) + + +;;; Defaults + +;;;; C-level customizations + +(setq + ;; minibuffer + enable-recursive-minibuffers t + resize-mini-windows t + ;; more useful frame titles + frame-title-format '("" invocation-name " - " + (:eval + (if (buffer-file-name) + (abbreviate-file-name (buffer-file-name)) + "%b"))) + ;; i don't feel like jumping out of my chair every now and again; so + ;; don't BEEP! at me, emacs + ring-bell-function 'ignore + ;; better scrolling + ;; scroll-margin 1 + ;; scroll-conservatively 10000 + scroll-step 1 + scroll-conservatively 10 + scroll-preserve-screen-position 1 + ;; focus follows mouse + mouse-autoselect-window t) + +(setq-default + ;; always use space for indentation + indent-tabs-mode nil + tab-width 4 + ;; cursor shape + cursor-type 'bar) + ;; unicode support (comment (dolist (ft (fontset-list)) @@ -264,161 +355,104 @@ 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 () - "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)) +;;;; Elisp-level customizations -;; better scrolling -(setq ;; scroll-margin 1 - ;; scroll-conservatively 10000 - scroll-step 1 - scroll-conservatively 10 - scroll-preserve-screen-position 1) - -(use-feature mwheel - :defer 0.4 +(use-feature startup + :no-require + :demand :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 - :defer 0.4 - :config (pixel-scroll-mode 1)) - -;; ask for GPG passphrase in minibuffer -(setq epg-pinentry-mode 'loopback) - -;; useful libraries -(require 'cl-lib) -(require 'subr-x) - - -;;; Useful utilities - -(defmacro a/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) - "Same as `start-process', but doesn't bother about name and buffer." - (let ((process-name (concat program "_process")) - (buffer-name (generate-new-buffer-name - (concat program "_output")))) - (apply #'start-process - process-name buffer-name program args))) - -(defun a/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 - program - (remove nil (list args (dired-get-file-for-visit))))) - -(defun a/add-elisp-section () - (interactive) - (insert "\n") - (previous-line) - (insert "\n \n;;; ")) - - -;;; Defaults + ;; don't need to see the startup echo area message + (advice-add #'display-startup-echo-area-message :override #'ignore) + :custom + ;; i want *scratch* as my startup buffer + (initial-buffer-choice t) + ;; i don't need the default hint + (initial-scratch-message nil) + ;; use customizable text-mode as major mode for *scratch* + ;; (initial-major-mode 'text-mode) + ;; inhibit buffer list when more than 2 files are loaded + (inhibit-startup-buffer-menu t) + ;; don't need to see the startup screen or echo area message + (inhibit-startup-screen t) + (inhibit-startup-echo-area-message user-login-name)) + +(use-feature files + :no-require + :demand + :custom + ;; backups (C-h v make-backup-files RET) + (backup-by-copying t) + (version-control t) + (delete-old-versions t) -;; time and battery in mode-line -(comment - (use-package time - :init - (setq display-time-default-load-average nil) - :config - (display-time-mode)) + ;; auto-save + (auto-save-file-name-transforms + `((".*" ,(b/var "auto-save/") t))) - (use-package battery - :config - (display-battery-mode))) + ;; insert newline at the end of files + (require-final-newline t) -;; smaller fringe -;; (fringe-mode '(3 . 1)) -(fringe-mode nil) + ;; open read-only file buffers in view-mode + ;; (enables niceties like `q' for quit) + (view-read-only t)) ;; 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")))) +;; enable automatic reloading of changed buffers and files +(use-feature autorevert + :demand + :config + (global-auto-revert-mode 1) + :custom + (auto-revert-verbose nil) + (global-auto-revert-non-file-buffers nil)) -;; backups (C-h v make-backup-files RET) -(setq backup-by-copying t - version-control t - delete-old-versions t) +;; time and battery in mode-line +(use-feature time + :if b/exwm-p + :demand + :config + (display-time-mode) + :custom + (display-time-default-load-average nil) + (display-time-format "%a %b %-e, %-l:%M%P")) -;; 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) +(use-feature battery + :if b/exwm-p + :demand + :config + (display-battery-mode) + :custom + (battery-mode-line-format " %p%% %t")) -;; always use space for indentation -(setq-default - indent-tabs-mode nil - require-final-newline t - tab-width 4) +(use-feature fringe + :demand + :config + ;; smaller fringe + ;; (fringe-mode '(3 . 1)) + (fringe-mode nil)) -;; enable winner-mode (C-h f winner-mode RET) -(winner-mode 1) +(use-feature winner + :demand + :config + ;; 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) +(use-feature compile + :config + ;; 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'. + (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) @@ -431,28 +465,60 @@ For disabling the behaviour for certain buffers and/or modes." 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) +(use-feature isearch + :custom + ;; allow scrolling in Isearch + (isearch-allow-scroll t) + ;; 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 + (search-default-mode #'char-fold-to-regexp)) + +;; uncomment to extend the above behaviour to query-replace +(comment + (use-feature replace + :custom + (replace-char-fold t))) (use-feature vc :bind ("C-x v C-=" . vc-ediff)) +(use-feature vc-git + :after vc + :custom + (vc-git-print-log-follow t)) + (use-feature ediff :config (add-hook 'ediff-after-quit-hook-internal 'winner-undo) :custom ((ediff-window-setup-function 'ediff-setup-windows-plain) (ediff-split-window-function 'split-window-horizontally))) +(use-feature face-remap + :custom + ;; gentler font resizing + (text-scale-mode-step 1.05)) + +(use-feature mwheel + :defer 0.4 + :config + (setq mouse-wheel-scroll-amount '(1 ((shift) . 1)) ; one line at a time + mouse-wheel-progressive-speed nil ; don't accelerate scrolling + mouse-wheel-follow-mouse t)) ; scroll window under mouse + +(use-feature pixel-scroll + :defer 0.4 + :config (pixel-scroll-mode 1)) + +(use-feature epg-config + :custom + ((epg-gpg-program (executable-find "gpg")))) + +(use-feature auth-source + :custom + (auth-sources '("~/.authinfo.gpg")) + (authinfo-hidden (regexp-opt '("password" "client-secret" "token")))) + ;;; General bindings @@ -460,41 +526,52 @@ For disabling the behaviour for certain buffers and/or modes." ("C-c a i" . ielm) ("C-c e b" . eval-buffer) + ("C-c e e" . eval-last-sexp) ("C-c e r" . eval-region) ("C-c e i" . emacs-init-time) ("C-c e u" . emacs-uptime) + ("C-c e v" . emacs-version) ("C-c F m" . make-frame-command) ("C-c F d" . delete-frame) ("C-c F D" . server-edit) - ("C-c o" . other-window) - ("C-S-h C" . describe-char) ("C-S-h F" . describe-face) ("C-x k" . kill-this-buffer) ("C-x K" . kill-buffer) - - ("s-p" . beginning-of-buffer) - ("s-n" . end-of-buffer) + ("C-x s" . save-buffer) + ("C-x S" . save-some-buffers) :map emacs-lisp-mode-map - ("" . a/add-elisp-section)) + ("" . b/add-elisp-section)) (when (display-graphic-p) (unbind-key "C-z" global-map)) (bind-keys - :prefix-map a/straight-prefix-map + ;; for back and forward mouse keys + ("" . previous-buffer) + ("" . previous-buffer) + ;; ("" . previous-buffer) + ("" . next-buffer) + ("" . next-buffer) + ;; ("" . next-buffer) + ;; ("" . kill-this-buffer) + ;; ("" . switch-to-buffer) + ) + +(bind-keys + :prefix-map b/straight-prefix-map :prefix "C-c p s" ("u" . straight-use-package) ("f" . straight-freeze-versions) ("t" . straight-thaw-versions) ("P" . straight-prune-build) ("g" . straight-get-recipe) - ("r" . a/reload-init) + ("r" . b/reload-init) ;; M-x ^straight-.*-all$ ("a c" . straight-check-all) ("a f" . straight-fetch-all) @@ -515,21 +592,219 @@ For disabling the behaviour for certain buffers and/or modes." ;;; Essential packages -(use-package auto-compile - :demand t +(use-package exwm + :if b/exwm-p + :demand + :config + ;; make class name the buffer name, truncating beyond 60 characters + (defun b/exwm-rename-buffer () + (interactive) + (exwm-workspace-rename-buffer + (concat exwm-class-name ":" + (if (<= (length exwm-title) 60) exwm-title + (concat (substring exwm-title 0 59) "..."))))) + ;; Enable EXWM + (exwm-enable) + :hook ((exwm-update-class . b/exwm-rename-buffer) + (exwm-update-title . b/exwm-rename-buffer))) + +(use-feature exwm-config + :demand + :after exwm + :hook (exwm-init . exwm-config--fix/ido-buffer-window-other-frame)) + +(use-feature exwm-input + :demand + :after exwm + :config + (defun b/exwm-ws-prev-index () + "Return the index for the previous EXWM workspace, wrapping +around if needed." + (if (= exwm-workspace-current-index 0) + (1- exwm-workspace-number) + (1- exwm-workspace-current-index))) + + (defun b/exwm-ws-next-index () + "Return the index for the next EXWM workspace, wrapping +around if needed." + (if (= exwm-workspace-current-index + (1- exwm-workspace-number)) + 0 + (1+ exwm-workspace-current-index))) + + ;; shorten 'C-c C-q' to 'C-q' + (define-key exwm-mode-map [?\C-q] #'exwm-input-send-next-key) + + (setq exwm-workspace-number 4 + exwm-input-global-keys + `(([?\s-R] . exwm-reset) + ([?\s-\\] . exwm-workspace-switch) + ([?\s-\s] . dmenu) + ([?\S-\s-\s] . (lambda (command) + (interactive + (list (read-shell-command "➜ "))) + (start-process-shell-command + command nil command))) + ([s-return] . (lambda () + (interactive) + (start-process "" nil "urxvt"))) + ([?\C-\s-\s] . counsel-linux-app) + ([?\M-\s-\s] . (lambda () + (interactive) + (start-process-shell-command + "rofi-pass" nil "rofi-pass"))) + ([?\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) + ([?\M-\s-h] . shrink-window-horizontally) + ([?\M-\s-l] . enlarge-window-horizontally) + ([?\M-\s-k] . shrink-window) + ([?\M-\s-j] . enlarge-window) + ([?\s-\[] . (lambda () + (interactive) + (exwm-workspace-switch-create + (b/exwm-ws-prev-index)))) + ([?\s-\]] . (lambda () + (interactive) + (exwm-workspace-switch-create + (b/exwm-ws-next-index)))) + ([?\s-{] . (lambda () + (interactive) + (exwm-workspace-move-window + (b/exwm-ws-prev-index)))) + ([?\s-}] . (lambda () + (interactive) + (exwm-workspace-move-window + (b/exwm-ws-next-index)))) + ,@(mapcar (lambda (i) + `(,(kbd (format "s-%d" i)) . + (lambda () + (interactive) + (exwm-workspace-switch-create ,i)))) + (number-sequence 0 (1- exwm-workspace-number))) + ([?\s-t] . exwm-floating-toggle-floating) + ([?\s-f] . exwm-layout-toggle-fullscreen) + ([?\s-W] . (lambda () + (interactive) + (kill-buffer (current-buffer)))) + ([?\s-Q] . (lambda () + (interactive) + (exwm-manage--kill-client))) + ([?\s-\'] . (lambda () + (interactive) + (start-process-shell-command + "rofi-light" nil "rofi-light"))) + ([XF86AudioMute] . + (lambda () + (interactive) + (start-process "" nil "pamixer" "--toggle-mute"))) + ([XF86AudioLowerVolume] . + (lambda () + (interactive) + (start-process + "" nil "pamixer" "--allow-boost" "--decrease" "5"))) + ([XF86AudioRaiseVolume] . + (lambda () + (interactive) + (start-process + "" nil "pamixer" "--allow-boost" "--increase" "5"))) + ([XF86AudioPlay] . + (lambda () + (interactive) + (start-process "" nil "mpc" "toggle"))) + ([XF86AudioPrev] . + (lambda () + (interactive) + (start-process "" nil "mpc" "prev"))) + ([XF86AudioNext] . + (lambda () + (interactive) + (start-process "" nil "mpc" "next"))) + ([XF86ScreenSaver] . + (lambda () + (interactive) + (start-process "" nil "dm-tool" "lock"))) + ([\s-XF86Back] . previous-buffer) + ([\s-XF86Forward] . next-buffer))) + + ;; Line-editing shortcuts + (setq exwm-input-simulation-keys + '(;; movement + ([?\C-b] . [left]) + ([?\M-b] . [C-left]) + ([?\C-f] . [right]) + ([?\M-f] . [C-right]) + ([?\C-p] . [up]) + ([?\C-n] . [down]) + ([?\C-a] . [home]) + ([?\C-e] . [end]) + ([?\M-v] . [prior]) + ([?\C-v] . [next]) + ([?\C-d] . [delete]) + ([?\C-k] . [S-end ?\C-x]) + ([?\M-<] . C-home) + ([?\M->] . C-end) + ;; cut/copy/paste + ([?\C-w] . [?\C-x]) + ([?\M-w] . [?\C-c]) + ([?\C-y] . [?\C-v]) + ([?\M-d] . [C-S-right ?\C-x]) + ([?\M-\d] . [C-S-left ?\C-x]) + ;; window + ([?\s-w] . [?\C-w]) + ([?\s-q] . [?\C-q]) + ;; misc + ([?\C-s] . [?\C-f]) + ([?\s-s] . [?\C-s]) + ([?\C-g] . [escape])))) + +(use-feature exwm-manage + :demand + :after exwm + :hook + (exwm-manage-finish . (lambda () + (when exwm-class-name + (cond + ((string= exwm-class-name "Abrowser") + (exwm-input-set-local-simulation-keys + `(,@exwm-input-simulation-keys + ([?\C-\S-d] . [?\C-d])))) + ((string= exwm-class-name "URxvt") + (exwm-input-set-local-simulation-keys + '(([?\C-c ?\C-c] . [?\C-c]) + ([?\C-c ?\C-u] . [?\C-u])))) + ((string= exwm-class-name "Zathura") + (exwm-input-set-local-simulation-keys + '(([?\C-p] . [C-up]) + ([?\C-n] . [C-down]))))))))) + +(use-feature exwm-randr + :demand + :after exwm + :config + (exwm-randr-enable) + :custom + (exwm-randr-workspace-monitor-plist '(1 "VGA-1"))) + +(use-feature exwm-systemtray + :demand + :after exwm :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)) + (exwm-systemtray-enable)) + +(use-feature exwm-workspace) + +(use-package exwm-edit + :demand + :after exwm) ;; use the org-plus-contrib package to get the whole deal -(straight-use-package 'org-plus-contrib) +(use-package org-plus-contrib) (use-feature org :defer 0.5 @@ -543,20 +818,27 @@ For disabling the behaviour for certain buffers and/or modes." org-startup-folded 'content org-catch-invisible-edits 'show-and-error org-log-done 'time) + (when (version< org-version "9.3") + (setq org-email-link-description-format + org-link-email-description-format)) (add-to-list 'org-structure-template-alist '("L" . "src emacs-lisp") t) + (add-to-list 'org-modules 'org-habit) :bind (("C-c a o a" . org-agenda) :map org-mode-map ("M-L" . org-insert-last-stored-link) - ("M-O" . org-toggle-link-display) - ("s-T" . org-todo)) + ("M-O" . org-toggle-link-display)) :hook ((org-mode . org-indent-mode) (org-mode . auto-fill-mode) (org-mode . flyspell-mode)) :custom + (org-pretty-entities t) (org-agenda-files '("~/usr/org/todos/personal.org" - "~/usr/org/todos/masters.org")) + "~/usr/org/todos/habits.org" + "~/src/git/masters-thesis/todo.org")) (org-agenda-start-on-weekday 0) + (org-agenda-time-leading-zero t) + (org-habit-graph-column 44) (org-latex-packages-alist '(("" "listings") ("" "color"))) :custom-face '(org-block-begin-line ((t (:foreground "#5a5b5a" :background "#1d1f21")))) @@ -587,13 +869,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 +887,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,40 +901,110 @@ For disabling the behaviour for certain buffers and/or modes." (add-to-list 'safe-local-variable-values - '(eval add-hook 'after-save-hook #'a/async-babel-tangle 'append 'local)) + '(eval add-hook 'after-save-hook #'b/async-babel-tangle 'append 'local)) ;; *the* right way to do git (use-package magit :defer 0.5 - :bind (("C-x g" . magit-status) - ("s-g s" . magit-status) - ("s-g l" . magit-log-buffer-file)) + :bind (("C-x g" . magit-status) + ("C-c g g" . magit-status) + ("C-c g b" . magit-blame-addition) + ("C-c g l" . magit-log-buffer-file)) :config (magit-add-section-hook 'magit-status-sections-hook 'magit-insert-modules 'magit-insert-stashes 'append) + ;; (magit-add-section-hook 'magit-status-sections-hook + ;; 'magit-insert-ignored-files + ;; 'magit-insert-untracked-files + ;; 'append) (setq magit-repository-directories '(("~/" . 0) ("~/src/git/" . 1))) (nconc magit-section-initial-visibility-alist '(([unpulled status] . show) ([unpushed status] . show))) - :custom (magit-display-buffer-function #'magit-display-buffer-fullframe-status-v1) + :custom + (magit-diff-refine-hunk t) + (magit-display-buffer-function #'magit-display-buffer-fullframe-status-v1) + ;; (magit-completing-read-function 'magit-ido-completing-read) :custom-face (magit-diff-file-heading ((t (:weight normal))))) ;; recently opened files (use-feature recentf :defer 0.2 + ;; :config + ;; (add-to-list 'recentf-exclude "^/\\(?:ssh\\|su\\|sudo\\)?:") :config - (add-to-list 'recentf-exclude "^/\\(?:ssh\\|su\\|sudo\\)?:") - (setq recentf-max-saved-items 40)) + (recentf-mode) + :custom + (recentf-max-saved-items 2000)) ;; smart M-x enhancement (needed by counsel for history) -(use-package smex) +;; (use-package smex) + +(bind-keys + ("C-c f ." . find-file) + ("C-c f l" . find-library) + ("C-c f r" . recentf-open-files) + ("C-c x" . execute-extended-command)) + +(comment + (use-feature ido + :demand + :bind + (:map ido-common-completion-map + ([escape] . minibuffer-keyboard-quit) + ("DEL" . b/ido-backspace)) + :config + (require 'delsel) + (defun b/ido-backspace () + "Forward to `backward-delete-char'. On error (read-only), quit." + (interactive) + (condition-case nil + (backward-delete-char 1) + (error + (minibuffer-keyboard-quit)))) + (ido-mode 1) + (ido-everywhere 1) + :custom + (ido-enable-flex-matching t) + ;; (ido-enable-regexp t) + ;; (ido-enable-prefix t) + (ido-max-window-height 10) + (ido-use-virtual-buffers t)) + + (use-package ido-vertical-mode + :defer 0.3 + :config + (ido-vertical-mode 1) + :custom + (ido-vertical-define-keys 'C-n-C-p-up-and-down) + (ido-vertical-show-count t)) + + (use-package ido-completing-read+ + :defer 0.3 + :after ido + :config + (ido-ubiquitous-mode 1)) + + (use-package crm-custom + :defer 0.3 + :config + (crm-custom-mode 1)) + + (use-feature icomplete + :defer 0.3 + :config + (icomplete-mode 1))) + +(use-package amx + :defer 0.3 + :config + (amx-mode)) (use-package ivy :defer 0.3 - :delight ;; " 🙒" :bind (:map ivy-minibuffer-map ([escape] . keyboard-escape-quit) @@ -661,34 +1013,43 @@ For disabling the behaviour for certain buffers and/or modes." ("DEL" . ivy-backward-delete-char)) :config (setq ivy-wrap t - ivy-height 14 + ;; ivy-height 14 ivy-use-virtual-buffers t ivy-virtual-abbreviate 'abbreviate ivy-count-format "%d/%d ") + + (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)))) - ;; (ivy-minibuffer-match-face-3 ((t (:background "#bbbbff" :weight semi-bold)))) - ;; (ivy-minibuffer-match-face-4 ((t (:background "#ffbbff" :weight semi-bold)))) -) + :custom-face + (ivy-minibuffer-match-face-1 ((t (:background "#eeeeee")))) + (ivy-minibuffer-match-face-2 ((t (:background "#e7e7e7" :weight bold)))) + (ivy-minibuffer-match-face-3 ((t (:background "light goldenrod" :weight semi-bold)))) + (ivy-minibuffer-match-face-4 ((t (:background "misty rose" :weight semi-bold)))) + (ivy-current-match ((((class color) (background light)) + :background "#d7d7d7" :foreground "black") + (((class color) (background dark)) + :background "#65a7e2" :foreground "black")))) (use-package swiper + :demand :after ivy - :bind (("C-s" . swiper-isearch) - ("C-r" . swiper) - ("C-S-s" . isearch-forward))) + :bind (("C-S-s" . swiper-isearch))) (use-package counsel + :demand :after ivy - :delight - :bind (([remap execute-extended-command] . counsel-M-x) - ([remap find-file] . counsel-find-file) - ("C-c x" . counsel-M-x) - ("C-c f ." . counsel-find-file) - ("C-c f l" . counsel-find-library) - ("C-c f r" . counsel-recentf) - ("s-." . counsel-find-file) - ("s-r" . ivy-switch-buffer) + :bind (("C-c f r" . counsel-recentf) :map minibuffer-local-map ("C-r" . counsel-minibuffer-history)) :config @@ -704,7 +1065,6 @@ For disabling the behaviour for certain buffers and/or modes." ("C-x C-b" . helm-buffers-list) ("C-x C-f" . helm-find-files) ("C-h r" . helm-info-emacs) - ("s-r" . helm-recentf) ("C-s-r" . helm-resume) :map helm-map ("" . helm-execute-persistent-action) @@ -718,36 +1078,38 @@ For disabling the behaviour for certain buffers and/or modes." :bind ("C-c a s e" . eshell) :config (eval-when-compile (defvar eshell-prompt-regexp)) - (defun a/eshell-quit-or-delete-char (arg) + (defun b/eshell-quit-or-delete-char (arg) (interactive "p") (if (and (eolp) (looking-back eshell-prompt-regexp nil)) (eshell-life-is-too-much) (delete-char arg))) - (defun a/eshell-clear () + (defun b/eshell-clear () (interactive) (let ((inhibit-read-only t)) (erase-buffer)) (eshell-send-input)) - (defun a/eshell-setup () + (defun b/eshell-setup () (make-local-variable 'company-idle-delay) (defvar company-idle-delay) (setq company-idle-delay nil) (bind-keys :map eshell-mode-map - ("C-d" . a/eshell-quit-or-delete-char) - ("C-S-l" . a/eshell-clear) + ("C-d" . b/eshell-quit-or-delete-char) + ("C-S-l" . b/eshell-clear) ("M-r" . counsel-esh-history) - ([tab] . company-complete))) + ;; ([tab] . company-complete) + :map eshell-hist-mode-map + ("M-r" . counsel-esh-history))) - :hook (eshell-mode . a/eshell-setup) + :hook (eshell-mode . b/eshell-setup) :custom (eshell-hist-ignoredups t) (eshell-input-filter 'eshell-input-filter-initial-space)) (use-feature ibuffer :bind - (("C-x C-b" . ibuffer-other-window) + (("C-x C-b" . ibuffer) :map ibuffer-mode-map ("P" . ibuffer-backward-filter-group) ("N" . ibuffer-forward-filter-group) @@ -805,10 +1167,11 @@ For disabling the behaviour for certain buffers and/or modes." (or (name . "^\\*scratch\\*$") (name . "^\\*Messages\\*$"))) + ("exwm" (mode . exwm-mode)) ("erc" (mode . erc-mode))))) (ibuffer-formats '((mark modified read-only locked " " - (name 18 18 :left :elide) + (name 72 72 :left :elide) " " (size-h 9 -1 :right) " " @@ -820,16 +1183,16 @@ For disabling the behaviour for certain buffers and/or modes." :hook (ibuffer . (lambda () (ibuffer-switch-to-saved-filter-groups "default")))) (use-feature outline + :disabled :hook (prog-mode . outline-minor-mode) - :delight (outline-minor-mode " outl") :bind (: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) @@ -842,7 +1205,8 @@ For disabling the behaviour for certain buffers and/or modes." (use-feature dired :config - (setq dired-listing-switches "-alh" + (setq dired-dwim-target t + dired-listing-switches "-alh" ls-lisp-use-insert-directory-program nil) ;; easily diff 2 marked files @@ -886,7 +1250,7 @@ For disabling the behaviour for certain buffers and/or modes." ("\\" . dired-hide-details-mode) ("z" . (lambda () (interactive) - (a/dired-start-process "zathura")))) + (b/dired-start-process "zathura")))) :hook (dired-mode . dired-hide-details-mode)) (use-feature help @@ -904,7 +1268,7 @@ For disabling the behaviour for certain buffers and/or modes." (use-package dash :config (dash-enable-font-lock)) -(use-package doc-view +(use-feature doc-view :bind (:map doc-view-mode-map ("M-RET" . image-previous-line))) @@ -922,7 +1286,6 @@ For disabling the behaviour for certain buffers and/or modes." ;; display Lisp objects at point in the echo area (use-feature eldoc :when (version< "25" emacs-version) - :delight " eldoc" :config (global-eldoc-mode)) ;; highlight matching parens @@ -935,12 +1298,20 @@ For disabling the behaviour for certain buffers and/or modes." :config (electric-pair-mode)) (use-feature simple - :delight (auto-fill-function " fill") - :config (column-number-mode)) + :config (column-number-mode) + :custom + ;; 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. + (save-interprogram-paste-before-kill t)) ;; save minibuffer history (use-feature savehist - :config (savehist-mode)) + :demand + :config + (savehist-mode) + (add-to-list 'savehist-additional-variables 'kill-ring)) ;; automatically save place in files (use-feature saveplace @@ -954,7 +1325,9 @@ For disabling the behaviour for certain buffers and/or modes." (add-hook 'prog-mode-hook #'indicate-buffer-boundaries-left)) (use-feature text-mode - :hook (text-mode . indicate-buffer-boundaries-left)) + :bind (:map text-mode-map ("C-*" . b/insert-asterism)) + :hook ((text-mode . indicate-buffer-boundaries-left) + (text-mode . flyspell-mode))) (use-feature conf-mode :mode "\\.*rc$") @@ -963,20 +1336,21 @@ For disabling the behaviour for certain buffers and/or modes." :mode "\\.bashrc$") (use-package company - :defer 0.6 - :delight " company" :bind (:map company-active-map ([tab] . company-complete-common-or-cycle) - ([escape] . company-abort)) + ([escape] . company-abort) + ("C-p" . company-select-previous-or-abort) + ("C-n" . company-select-next-or-abort)) :custom (company-minimum-prefix-length 1) (company-selection-wrap-around t) (company-dabbrev-char-regexp "\\sw\\|\\s_\\|[-_]") (company-dabbrev-downcase nil) (company-dabbrev-ignore-case nil) - :config - (global-company-mode t)) + ;; :config + ;; (global-company-mode t) + ) (use-package flycheck :defer 0.6 @@ -993,17 +1367,17 @@ For disabling the behaviour for certain buffers and/or modes." (setq flycheck-check-syntax-automatically '(mode-enabled save)) :custom (flycheck-mode-line-prefix "flyc")) -(use-feature flyspell - :delight " flysp") +(use-feature flyspell) ;; http://endlessparentheses.com/ispell-and-apostrophes.html -(use-package ispell +(use-feature ispell :defer 0.6 :config ;; ’ can be part of a word (setq ispell-local-dictionary-alist `((nil "[[:alpha:]]" "[^[:alpha:]]" - "['\x2019]" nil ("-B") nil utf-8))) + "['\x2019]" nil ("-B") nil utf-8)) + ispell-program-name (executable-find "hunspell")) ;; don't send ’ to the subprocess (defun endless/replace-apostrophe (args) (cons (replace-regexp-in-string @@ -1023,7 +1397,6 @@ For disabling the behaviour for certain buffers and/or modes." #'endless/replace-quote)) (use-feature abbrev - :delight " abbr" :hook (text-mode . abbrev-mode)) @@ -1036,19 +1409,15 @@ For disabling the behaviour for certain buffers and/or modes." (add-hook 'lisp-interaction-mode-hook #'indent-spaces-mode)) (use-feature reveal - :delight (reveal-mode " reveal") :hook (emacs-lisp-mode . reveal-mode)) -(use-feature elisp-mode - :delight (emacs-lisp-mode "Elisp" :major)) +(use-feature elisp-mode) (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) + :config (setq alloy-basic-offset 2) + :hook (alloy-mode . (lambda () (setq-local indent-tabs-mode nil)))) (eval-when-compile (defvar lean-mode-map)) (use-package lean-mode @@ -1064,44 +1433,51 @@ For disabling the behaviour for certain buffers and/or modes." lean-input-user-translations '(("/" "/"))) (lean-input-setup)) -(use-package haskell-mode - :config - (setq haskell-indentation-layout-offset 4 - haskell-indentation-left-offset 4 - flycheck-checker 'haskell-hlint - flycheck-disabled-checkers '(haskell-stack-ghc haskell-ghc))) - -(use-package dante - :after haskell-mode - :commands dante-mode - :hook (haskell-mode . dante-mode)) - -(use-package hlint-refactor - :after haskell-mode - :bind (:map hlint-refactor-mode-map - ("C-c l b" . hlint-refactor-refactor-buffer) - ("C-c l r" . hlint-refactor-refactor-at-point)) - :hook (haskell-mode . hlint-refactor-mode)) +(comment + (use-package proof-site ; for Coq + :straight proof-general) -(use-package flycheck-haskell - :after haskell-mode) -;; alternative: hs-lint https://github.com/ndmitchell/hlint/blob/20e116a043f2073c57b17b24ae6364b5e433ba7e/data/hs-lint.el + (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 +(use-feature sgml-mode :config (setq sgml-basic-offset 2)) -(use-package css-mode +(use-feature css-mode :config (setq css-indent-offset 2)) (use-package web-mode :mode "\\.html\\'" :config - (a/setq-every 2 + (b/setq-every 2 web-mode-code-indent-offset web-mode-css-indent-offset - web-mode-markup-indent-offset)) + web-mode-markup-indent-offset) + :custom + (web-mode-enable-auto-indentation nil)) (use-package emmet-mode :after (:any web-mode css-mode sgml-mode) @@ -1149,8 +1525,8 @@ For disabling the behaviour for certain buffers and/or modes." (use-package lsp-java :config (add-hook 'java-mode-hook - (lambda () - (setq-local company-backends (list 'company-lsp)))) + (lambda () + (setq-local company-backends (list 'company-lsp)))) (add-hook 'java-mode-hook 'lsp-java-enable) (add-hook 'java-mode-hook 'flycheck-mode) @@ -1199,98 +1575,166 @@ For disabling the behaviour for certain buffers and/or modes." (use-package go-mode) +(use-package po-mode + :hook + (po-mode . (lambda () (run-with-timer 0.1 nil 'View-exit)))) + +(use-feature tex-mode + :config + (cl-delete-if + (lambda (p) (string-match "^---?" (car p))) + tex--prettify-symbols-alist) + :hook ((tex-mode . auto-fill-mode) + (tex-mode . flyspell-mode))) + +(use-package george-mode + :straight (:host nil :repo "https://git.shemshak.org/amin/george-mode") + :mode "\\.grg\\'") + ;;; 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)) + (setq sml/theme 'tangomod) + (sml/setup) + (smart-mode-line-enable)) + +(use-package doom-modeline + :disabled + :demand + :hook (after-init . doom-modeline-init) + :custom + (doom-modeline-buffer-file-name-style 'relative-to-project)) (use-package doom-themes) -(defvar a/org-mode-font-lock-keywords +(use-package solarized-theme + :disabled + :config + (load-theme 'solarized-light t)) + +(use-package moody + :disabled + :demand + :config + (setq x-underline-at-descent-line t) + (let ((line (face-attribute 'mode-line :underline))) + (set-face-attribute 'mode-line nil :overline line) + (set-face-attribute 'mode-line-inactive nil :overline line) + (set-face-attribute 'mode-line-inactive nil :underline line) + (set-face-attribute 'mode-line nil :box nil) + (set-face-attribute 'mode-line-inactive nil :box nil) + (set-face-attribute 'mode-line-inactive nil :background "#e1e1e1")) ; d3d7cf + (moody-replace-mode-line-buffer-identification) + (moody-replace-vc-mode)) + +(use-package mini-modeline + :disabled + :demand + :config (mini-modeline-mode)) + +(defvar b/org-mode-font-lock-keywords '(("[ \t]*\\(#\\+\\(BEGIN\\|END\\|begin\\|end\\)_\\(\\S-+\\)\\)[ \t]*\\([^\n:]*\\)" (1 '(:foreground "#5a5b5a" :background "#292b2b") t) ; directive (3 '(:foreground "#81a2be" :background "#292b2b") t) ; kind - (4 '(:foreground "#c5c8c6") t)))) ; title + (4 '(:foreground "#c5c8c6") t))) ; title + "For use with the `doom-tomorrow-night' theme.") -(defun 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) + (sml/apply-theme 'tangomod) (font-lock-remove-keywords - 'org-mode a/org-mode-font-lock-keywords)) + 'org-mode b/org-mode-font-lock-keywords) + (when (featurep 'erc-hl-nicks) + (erc-hl-nicks-reset-face-table)) + (when (featurep 'exwm-systemtray) + (exwm-systemtray--refresh))) -(defun 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-one 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) + (when (featurep 'erc-hl-nicks) + (erc-hl-nicks-reset-face-table)) + (when (featurep 'exwm-systemtray) + (exwm-systemtray--refresh))) (bind-keys - ("s-t d" . a/lights-off) - ("s-t l" . a/lights-on)) + ("C-c t d" . b/lights-off) + ("C-c t l" . b/lights-on)) ;;; Emacs enhancements & auxiliary packages -(use-feature man +(use-package man :config (setq Man-width 80)) (use-package which-key :defer 0.4 - :delight :config (which-key-add-key-based-replacements ;; prefixes for global prefixes and minor modes "C-c @" "outline" "C-c !" "flycheck" - "C-c 8" "typo" - "C-c 8 -" "typo/dashes" - "C-c 8 <" "typo/left-brackets" - "C-c 8 >" "typo/right-brackets" + ;; "C-c 8" "typo" + ;; "C-c 8 -" "typo/dashes" + ;; "C-c 8 <" "typo/left-brackets" + ;; "C-c 8 >" "typo/right-brackets" + "C-x RET" "coding system" "C-x 8" "unicode" + "C-x @" "event modifiers" "C-x a" "abbrev/expand" "C-x r" "rectangle/register/bookmark" + "C-x t" "tabs" "C-x v" "version control" + "C-x X" "edebug" + "C-x C-a" "edebug" + "C-x C-k" "kmacro" ;; prefixes for my personal bindings + "C-c &" "yasnippet" "C-c a" "applications" "C-c a e" "erc" "C-c a o" "org" "C-c a s" "shells" - "C-c p" "package-management" - ;; "C-c p e" "package-management/epkg" - "C-c p s" "straight.el" - "C-c psa" "all" - "C-c psp" "package" + "C-c b" "buffers" "C-c c" "compile-and-comments" "C-c e" "eval" "C-c f" "files" "C-c F" "frames" + "C-c g" "magit" "C-S-h" "help(ful)" "C-c m" "multiple-cursors" "C-c P" "projectile" "C-c P s" "projectile/search" "C-c P x" "projectile/execute" "C-c P 4" "projectile/other-window" + "C-c p" "package management" + "C-c ps" "straight" + "C-c psa" "all" + "C-c psp" "package" "C-c q" "boxquote" - "s-g" "magit" - "s-o" "outline" - "s-t" "themes") + "C-c t" "themes" + ;; "s-O" "outline" + ) ;; prefixes for major modes (which-key-add-major-mode-key-based-replacements 'message-mode - "C-c f" "footnote") + "C-c f n" "footnote") (which-key-add-major-mode-key-based-replacements 'org-mode "C-c C-v" "org-babel") (which-key-add-major-mode-key-based-replacements 'web-mode @@ -1307,12 +1751,11 @@ For disabling the behaviour for certain buffers and/or modes." (use-package crux ; results in Waiting for git... [2 times] :defer 0.4 - :bind (("C-c b k" . crux-kill-other-buffers) - ("C-c d" . crux-duplicate-current-line-or-region) - ("C-c D" . crux-duplicate-and-comment-current-line-or-region) - ("C-c f c" . crux-copy-file-preserve-attributes) - ("C-c f d" . crux-delete-file-and-buffer) - ("C-c f r" . crux-rename-file-and-buffer) + :bind (("C-c d" . crux-duplicate-current-line-or-region) + ("C-c M-d" . crux-duplicate-and-comment-current-line-or-region) + ("C-c f C" . crux-copy-file-preserve-attributes) + ("C-c f D" . crux-delete-file-and-buffer) + ("C-c f R" . crux-rename-file-and-buffer) ("C-c j" . crux-top-join-line) ("C-S-j" . crux-top-join-line))) @@ -1323,10 +1766,22 @@ For disabling the behaviour for certain buffers and/or modes." ("" . mwim-end-of-line-or-code))) (use-package projectile + :defer 0.5 :bind-keymap ("C-c P" . projectile-command-map) :config (projectile-mode) + (defun b/projectile-mode-line-fun () + "Report project name and type in the modeline." + (let ((project-name (projectile-project-name)) + (project-type (projectile-project-type))) + (format "%s%s" + projectile-mode-line-prefix + (if project-type + (format ":%s" project-type) + "")))) + (setq projectile-mode-line-function 'b/projectile-mode-line-fun) + (defun my-projectile-invalidate-cache (&rest _args) ;; ignore the args to `magit-checkout' (projectile-invalidate-cache nil)) @@ -1363,28 +1818,28 @@ For disabling the behaviour for certain buffers and/or modes." (use-package boxquote :defer 0.6 :bind - (:prefix-map a/boxquote-prefix-map - :prefix "C-c q" - ("b" . boxquote-buffer) - ("B" . boxquote-insert-buffer) - ("d" . boxquote-defun) - ("F" . boxquote-insert-file) - ("hf" . boxquote-describe-function) - ("hk" . boxquote-describe-key) - ("hv" . boxquote-describe-variable) - ("hw" . boxquote-where-is) - ("k" . boxquote-kill) - ("p" . boxquote-paragraph) - ("q" . boxquote-boxquote) - ("r" . boxquote-region) - ("s" . boxquote-shell-command) - ("t" . boxquote-text) - ("T" . boxquote-title) - ("u" . boxquote-unbox) - ("U" . boxquote-unbox-region) - ("y" . boxquote-yank) - ("M-q" . boxquote-fill-paragraph) - ("M-w" . boxquote-kill-ring-save))) + (:prefix-map b/boxquote-prefix-map + :prefix "C-c q" + ("b" . boxquote-buffer) + ("B" . boxquote-insert-buffer) + ("d" . boxquote-defun) + ("F" . boxquote-insert-file) + ("hf" . boxquote-describe-function) + ("hk" . boxquote-describe-key) + ("hv" . boxquote-describe-variable) + ("hw" . boxquote-where-is) + ("k" . boxquote-kill) + ("p" . boxquote-paragraph) + ("q" . boxquote-boxquote) + ("r" . boxquote-region) + ("s" . boxquote-shell-command) + ("t" . boxquote-text) + ("T" . boxquote-title) + ("u" . boxquote-unbox) + ("U" . boxquote-unbox-region) + ("y" . boxquote-yank) + ("M-q" . boxquote-fill-paragraph) + ("M-w" . boxquote-kill-ring-save))) (use-package orgalist ;; http://lists.gnu.org/archive/html/emacs-orgmode/2019-04/msg00007.html @@ -1394,11 +1849,18 @@ For disabling the behaviour for certain buffers and/or modes." ;; easily type pretty quotes & other typography, like ‘’“”-–—«»‹› (use-package typo + :disabled :defer 0.5 - :delight " typo" :config (typo-global-mode 1) - :hook ((text-mode erc-mode) . typo-mode)) + :hook (((text-mode erc-mode web-mode) . typo-mode) + (tex-mode . (lambda ()(typo-mode -1))))) + +(use-feature electric + :disabled + :demand + :config + (electric-quote-mode)) ;; highlight TODOs in buffers (use-package hl-todo @@ -1410,16 +1872,17 @@ For disabling the behaviour for certain buffers and/or modes." :defer 0.5 :after eshell :config - (defvar user-@-host (concat (user-login-name) "@" (system-name) " ")) + (defvar user-@-host (concat (user-login-name) "@" (system-name) ":")) (defun +eshell/prompt () - (let ((base/dir (shrink-path-prompt default-directory))) - (concat (propertize user-@-host 'face 'default) - (propertize (car base/dir) - 'face 'font-lock-comment-face) - (propertize (cdr base/dir) - 'face 'font-lock-constant-face) - (propertize "> " 'face 'default)))) - (setq eshell-prompt-regexp (concat user-@-host ".*> ") + (concat (propertize user-@-host 'face 'default) + (propertize (abbreviate-file-name default-directory) + 'face 'font-lock-comment-face) + (propertize "\n" 'face 'default) + (if (= (user-uid) 0) + (propertize "#" 'face 'red) + (propertize "$" 'face 'default)) + (propertize " " 'face 'default))) + (setq eshell-prompt-regexp "\\(.*\n\\)*[$#] " eshell-prompt-function #'+eshell/prompt)) (use-package eshell-up @@ -1427,6 +1890,7 @@ For disabling the behaviour for certain buffers and/or modes." :commands eshell-up) (use-package multi-term + :disabled :defer 0.6 :bind (("C-c a s m m" . multi-term) ("C-c a s m d" . multi-term-dedicated-toggle) @@ -1480,7 +1944,8 @@ 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)) @@ -1490,7 +1955,7 @@ 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) @@ -1498,29 +1963,55 @@ For disabling the behaviour for certain buffers and/or modes." ("a" . mc/mark-all-like-this)))) (use-package forge - :after magit - :demand) + :demand + :after magit) (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)) + + (defun b/yas--maybe-expand-key-filter (cmd) + (when (and (yas--maybe-expand-key-filter cmd) + (not (bound-and-true-p git-commit-mode))) + cmd)) + (defconst b/yas-maybe-expand + '(menu-item "" yas-expand :filter b/yas--maybe-expand-key-filter)) + (define-key yas-minor-mode-map + (kbd "SPC") b/yas-maybe-expand) + + (yas-global-mode)) (use-package debbugs :straight (debbugs :host github :repo "emacs-straight/debbugs" - :files (:defaults "Debbugs.wsdl"))) + :files (:defaults "Debbugs.wsdl")) + :bind + (("C-c D d" . debbugs-gnu) + ("C-c D e" . + (lambda () + (interactive) + (setq debbugs-gnu-current-suppress t) + (debbugs-gnu debbugs-gnu-default-severities '("emacs")))) + ("C-c D g" . + (lambda () + (interactive) + (setq debbugs-gnu-current-suppress t) + (debbugs-gnu debbugs-gnu-default-severities '("gnuzilla")))) + ("C-c D G" . + (lambda () + (interactive) + (setq debbugs-gnu-current-suppress t) + (debbugs-gnu debbugs-gnu-default-severities '("guix")))))) (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 @@ -1531,175 +2022,352 @@ 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 + :disabled + :hook (erc-mode . emojify-mode)) + +(use-feature window + :bind + (("C-c w e" . (lambda () + (interactive) + (split-window-right) + (other-window 1) + (erc-switch-to-buffer))) + ("C-c w s l" . (lambda () + (interactive) + (split-window-right) + (other-window 1))) + ("C-c w s j" . (lambda () + (interactive) + (split-window-below) + (other-window 1))) + ("C-c w q" . quit-window)) + :custom + (split-width-threshold 150)) + +(use-feature windmove + :defer 0.6 + :bind + (("C-c w h" . windmove-left) + ("C-c w j" . windmove-down) + ("C-c w k" . windmove-up) + ("C-c w l" . windmove-right) + ("C-c w H" . windmove-swap-states-left) + ("C-c w J" . windmove-swap-states-down) + ("C-c w K" . windmove-swap-states-up) + ("C-c w L" . windmove-swap-states-right))) + +(use-package pass + :commands pass + :bind ("C-c a p" . pass) + :hook (pass-mode . View-exit)) + +(use-package pdf-tools + :defer 0.5 + :bind (:map pdf-view-mode-map + ("" . pdf-history-backward) + ("" . pdf-history-backward) + ("" . pdf-history-backward) + ("" . pdf-history-forward) + ("" . pdf-history-forward) + ("" . pdf-history-forward) + ("M-RET" . image-previous-line) + ("C-s" . isearch-forward) + ("s s" . isearch-forward)) + :config (pdf-tools-install nil t) + :custom (pdf-view-resize-factor 1.05)) + +(use-package org-pdftools + :straight (:host github :repo "fuxialexander/org-pdftools") + :demand + :after org + :config + (with-eval-after-load 'org + (require 'org-pdftools))) + +(use-package biblio) + +(use-feature reftex + :hook (latex-mode . reftex-mode)) + +(use-feature reftex-cite + :after reftex + :disabled ; enable to disable + ; reftex-cite's default choice + ; of previous word + :config + (defun reftex-get-bibkey-default () + "If the cursor is in a citation macro, return the word before the macro." + (let* ((macro (reftex-what-macro 1))) + (save-excursion + (when (and macro (string-match "cite" (car macro))) + (goto-char (cdr macro))) + (reftex-this-word))))) + +(use-package minions + :demand + :config (minions-mode)) + +(use-package dmenu + :custom + (dmenu-prompt-string "run: ") + (dmenu-save-file (b/var "dmenu-items"))) + +(use-package eosd + ;; TODO: fix build by properly building the eosd-pixbuf.c module + ;; e.g. see https://github.com/raxod502/straight.el/issues/386 + :disabled + :straight (:host github :repo "clarete/eosd") + :demand + :after exwm + :config + (eosd-start)) + +(use-package nnreddit + :disabled + :demand + :after gnus + :custom + (nnreddit-python-command "python3")) + +(use-package hyperbole + :disabled + :straight (hyperbole + :host github :repo "rswgnu/hyperbole" + :files ("*.el" ("kotl" "kotl/*.el") + "DEMO" "man/*.info" "man/*.texi"))) + +(use-package oddmuse-curl + :straight (:host github :repo "kensanata/oddmuse-curl") + :config + (setq + oddmuse-wikis + (append + '(("EmacsConf" "https://emacsconf.org" utf-8 "question" nil) + ("EmacsConf 2019" "https://emacsconf.org/2019" utf-8 "question" nil)) + oddmuse-wikis)) + :custom + (oddmuse-username "bandali")) + +(use-package debpaste + :custom + (debpaste-paste-is-hidden t)) + +(use-package scpaste + :disabled + :config + (setq scpaste-http-destination "https://p.bndl.org" + scpaste-scp-destination "nix:/var/www/p.bndl.org")) ;;; Email (with Gnus) -(defvar a/maildir (expand-file-name "~/mail/")) +(defvar b/maildir (expand-file-name "~/mail/")) (with-eval-after-load 'recentf - (add-to-list 'recentf-exclude a/maildir)) + (add-to-list 'recentf-exclude b/maildir)) (setq - a/gnus-init-file (no-littering-expand-etc-file-name "gnus") + b/gnus-init-file (b/etc "gnus") mail-user-agent 'gnus-user-agent read-mail-command 'gnus) (use-feature gnus - :bind (("s-m" . gnus) - ("s-M" . gnus-unplugged)) + :bind (("s-m" . gnus) + ("s-M" . gnus-unplugged) + ("C-c a m" . gnus) + ("C-c a M" . gnus-unplugged)) :init (setq gnus-select-method '(nnnil "") gnus-secondary-select-methods - '((nnimap "amin" - (nnimap-stream plain) - (nnimap-address "127.0.0.1") - (nnimap-server-port 143) - (nnimap-authenticator plain) - (nnimap-user "amin@bndl.local")) + '((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 "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 ".*emacsconf-discuss.gnu.org" "l.gnu.emacsconf.discuss") - (list ".*fencepost-users.gnu.org" "l.gnu.fencepost.users") - (list ".*gnunet-developers.gnu.org" "l.gnu.gnunet.developers") - (list ".*help-gnunet.gnu.org" "l.gnu.gnunet.help") - (list ".*bug-gnuzilla.gnu.org" "l.gnu.gnuzilla.bug") - (list ".*gnuzilla-dev.gnu.org" "l.gnu.gnuzilla.dev") - (list ".*guile-devel.gnu.org" "l.gnu.guile.devel") - (list ".*guix-devel.gnu.org" "l.gnu.guix.devel") - (list ".*info-guix.gnu.org" "l.gnu.guix.info") - (list ".*www-commits.gnu.org" "l.gnu.www.commits") - (list ".*www-discuss.gnu.org" "l.gnu.www.discuss") - ;; 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 ".*deepspec.lists.cs.princeton.edu" "l.deepspec") - (list ".*notmuch.notmuchmail.org" "l.notmuch") - (list ".*dev.lists.parabola.nu" "l.parabola.dev") - ;; *@lists.sr.ht - (list ".*~bandali/public-inbox@lists.sr.ht" "l.~bandali.public-inbox") - (list ".*~sircmpwn/sr.ht-admins@lists.sr.ht" "l.~sircmpwn.srht.admins") - (list ".*~sircmpwn/sr.ht-announce@lists.sr.ht" "l.~sircmpwn.srht.announce") - (list ".*~sircmpwn/sr.ht-dev@lists.sr.ht" "l.~sircmpwn.srht.dev") - (list ".*~sircmpwn/sr.ht-discuss@lists.sr.ht" "l.~sircmpwn.srht.discuss") - "INBOX"))) + (nnimap-stream plain) + (nnimap-address "127.0.0.1") + (nnimap-server-port 143) + (nnimap-authenticator plain) + (nnimap-user "bandali@gnu.local") + (nnimap-inbox "INBOX") + (nnimap-split-methods 'nnimap-split-fancy) + (nnimap-split-fancy (| + ;; (: gnus-registry-split-fancy-with-parent) + ;; (: gnus-group-split-fancy "INBOX" t "INBOX") + ;; gnu + (list ".*<\\(.*\\)\\.\\(non\\)?gnu\\.org>.*" "l.\\1") + ;; gnus + (list ".*<\\(.*\\)\\.gnus\\.org>.*" "l.\\1") + ;; *.lists.sr.ht, omitting one dot if present + ;; add more \\.?\\([^.]*\\) if needed + (list ".*<~\\(.*\\)/\\([^.]*\\)\\.?\\([^.]*\\)\\.lists.sr.ht>.*" "l.~\\1.\\2\\3") + ;; webmasters + (from "webmasters\\(-comment\\)?@gnu\\.org" "webmasters") + ;; other + (list ".*atreus.freelists.org" "l.atreus") + (list ".*deepspec.lists.cs.princeton.edu" "l.deepspec") + ;; (list ".*haskell-art.we.lurk.org" "l.haskell.art") ;d + (list ".*haskell-cafe.haskell.org" "l.haskell-cafe") + ;; (list ".*notmuch.notmuchmail.org" "l.notmuch") ;u + ;; (list ".*dev.lists.parabola.nu" "l.parabola-dev") ;u + ;; ---------------------------------- + ;; legend: (u)nsubscribed | (d)ead + ;; ---------------------------------- + ;; otherwise, leave mail in INBOX + "INBOX"))) (nnimap "uw" (nnimap-stream plain) (nnimap-address "127.0.0.1") (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) + ;; 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@csc.uw.local"))) - gnus-message-archive-group "nnimap+amin:Sent" + gnus-message-archive-group "nnimap+gnu:INBOX" gnus-parameters - '(("l\\.deepspec" + '(("l\\.atreus" + (to-address . "atreus@freelists.org") + (to-list . "atreus@freelists.org")) + ("l\\.deepspec" (to-address . "deepspec@lists.cs.princeton.edu") (to-list . "deepspec@lists.cs.princeton.edu") (list-identifier . "\\[deepspec\\]")) - ("l\\.gnu\\.emacs\\.devel" + ("l\\.emacs-devel" (to-address . "emacs-devel@gnu.org") (to-list . "emacs-devel@gnu.org")) - ("l\\.gnu\\.emacs\\.help" + ("l\\.help-gnu-emacs" (to-address . "help-gnu-emacs@gnu.org") (to-list . "help-gnu-emacs@gnu.org")) - ("l\\.gnu\\.emacs\\.info" + ("l\\.info-gnu-emacs" (to-address . "info-gnu-emacs@gnu.org") (to-list . "info-gnu-emacs@gnu.org")) - ("l\\.gnu\\.emacs\\.orgmode" + ("l\\.emacs-orgmode" (to-address . "emacs-orgmode@gnu.org") (to-list . "emacs-orgmode@gnu.org") (list-identifier . "\\[O\\]")) - ("l\\.gnu\\.emacsconf\\.discuss" + ("l\\.emacs-tangents" + (to-address . "emacs-tangents@gnu.org") + (to-list . "emacs-tangents@gnu.org")) + ("l\\.emacsconf-committee" + (to-address . "emacsconf-committee@gnu.org") + (to-list . "emacsconf-committee@gnu.org")) + ("l\\.emacsconf-discuss" (to-address . "emacsconf-discuss@gnu.org") (to-list . "emacsconf-discuss@gnu.org")) - ("l\\.gnu\\.fencepost\\.users" + ("l\\.emacsconf-register" + (to-address . "emacsconf-register@gnu.org") + (to-list . "emacsconf-register@gnu.org")) + ("l\\.emacsconf-submit" + (to-address . "emacsconf-submit@gnu.org") + (to-list . "emacsconf-submit@gnu.org")) + ("l\\.fencepost-users" (to-address . "fencepost-users@gnu.org") (to-list . "fencepost-users@gnu.org") (list-identifier . "\\[Fencepost-users\\]")) - ("l\\.gnu\\.gnunet\\.developers" + ("l\\.gnewsense-art" + (to-address . "gnewsense-art@nongnu.org") + (to-list . "gnewsense-art@nongnu.org") + (list-identifier . "\\[gNewSense-art\\]")) + ("l\\.gnewsense-dev" + (to-address . "gnewsense-dev@nongnu.org") + (to-list . "gnewsense-dev@nongnu.org") + (list-identifier . "\\[Gnewsense-dev\\]")) + ("l\\.gnewsense-users" + (to-address . "gnewsense-users@nongnu.org") + (to-list . "gnewsense-users@nongnu.org") + (list-identifier . "\\[gNewSense-users\\]")) + ("l\\.gnunet-developers" (to-address . "gnunet-developers@gnu.org") (to-list . "gnunet-developers@gnu.org") (list-identifier . "\\[GNUnet-developers\\]")) - ("l\\.gnu\\.gnunet\\.help" + ("l\\.help-gnunet" (to-address . "help-gnunet@gnu.org") (to-list . "help-gnunet@gnu.org") (list-identifier . "\\[Help-gnunet\\]")) - ("l\\.gnu\\.gnuzilla\\.bug" + ("l\\.bug-gnuzilla" (to-address . "bug-gnuzilla@gnu.org") (to-list . "bug-gnuzilla@gnu.org") (list-identifier . "\\[Bug-gnuzilla\\]")) - ("l\\.gnu\\.gnuzilla\\.dev" + ("l\\.gnuzilla-dev" (to-address . "gnuzilla-dev@gnu.org") (to-list . "gnuzilla-dev@gnu.org") (list-identifier . "\\[Gnuzilla-dev\\]")) - ("l\\.gnu\\.guile\\.devel" + ("l\\.guile-devel" (to-address . "guile-devel@gnu.org") (to-list . "guile-devel@gnu.org")) - ("l\\.gnu\\.guix\\.devel" + ("l\\.guile-user" + (to-address . "guile-user@gnu.org") + (to-list . "guile-user@gnu.org")) + ("l\\.guix-devel" (to-address . "guix-devel@gnu.org") (to-list . "guix-devel@gnu.org")) - ("l\\.gnu\\.guix\\.info" + ("l\\.help-guix" + (to-address . "help-guix@gnu.org") + (to-list . "help-guix@gnu.org")) + ("l\\.info-guix" (to-address . "info-guix@gnu.org") (to-list . "info-guix@gnu.org")) - ("l\\.gnu\\.www\\.commits" + ("l\\.savannah-hackers-public" + (to-address . "savannah-hackers-public@gnu.org") + (to-list . "savannah-hackers-public@gnu.org")) + ("l\\.savannah-users" + (to-address . "savannah-users@gnu.org") + (to-list . "savannah-users@gnu.org")) + ("l\\.www-commits" (to-address . "www-commits@gnu.org") (to-list . "www-commits@gnu.org")) - ("l\\.gnu\\.www\\.discuss" + ("l\\.www-discuss" (to-address . "www-discuss@gnu.org") (to-list . "www-discuss@gnu.org")) - ("l\\.haskell\\.art" + ("l\\.haskell-art" (to-address . "haskell-art@we.lurk.org") (to-list . "haskell-art@we.lurk.org") (list-identifier . "\\[haskell-art\\]")) - ("l\\.haskell\\.cafe" + ("l\\.haskell-cafe" (to-address . "haskell-cafe@haskell.org") (to-list . "haskell-cafe@haskell.org") (list-identifier . "\\[Haskell-cafe\\]")) ("l\\.notmuch" (to-address . "notmuch@notmuchmail.org") (to-list . "notmuch@notmuchmail.org")) - ("l\\.parabola\\.dev" + ("l\\.parabola-dev" (to-address . "dev@lists.parabola.nu") (to-list . "dev@lists.parabola.nu") (list-identifier . "\\[Dev\\]")) ("l\\.~bandali\\.public-inbox" (to-address . "~bandali/public-inbox@lists.sr.ht") (to-list . "~bandali/public-inbox@lists.sr.ht")) - ("l\\.~sircmpwn\\.srht\\.admins" + ("l\\.~sircmpwn\\.free-writers-club" + (to-address . "~sircmpwn/free-writers-club@lists.sr.ht") + (to-list . "~sircmpwn/free-writers-club@lists.sr.ht")) + ("l\\.~sircmpwn\\.srht-admins" (to-address . "~sircmpwn/sr.ht-admins@lists.sr.ht") (to-list . "~sircmpwn/sr.ht-admins@lists.sr.ht")) - ("l\\.~sircmpwn\\.srht\\.announce" + ("l\\.~sircmpwn\\.srht-announce" (to-address . "~sircmpwn/sr.ht-announce@lists.sr.ht") (to-list . "~sircmpwn/sr.ht-announce@lists.sr.ht")) - ("l\\.~sircmpwn\\.srht\\.dev" + ("l\\.~sircmpwn\\.srht-dev" (to-address . "~sircmpwn/sr.ht-dev@lists.sr.ht") (to-list . "~sircmpwn/sr.ht-dev@lists.sr.ht")) - ("l\\.~sircmpwn\\.srht\\.discuss" + ("l\\.~sircmpwn\\.srht-discuss" (to-address . "~sircmpwn/sr.ht-discuss@lists.sr.ht") (to-list . "~sircmpwn/sr.ht-discuss@lists.sr.ht")) ("webmasters" @@ -1707,12 +2375,12 @@ For disabling the behaviour for certain buffers and/or modes." (to-list . "webmasters@gnu.org")) ("gnu.*" (gcc-self . t)) - ("gnu\\." + ("l\\." (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/") @@ -1721,11 +2389,13 @@ 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) + (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) + ;; (gnus-registry-initialize) (with-eval-after-load 'recentf (add-to-list 'recentf-exclude gnus-home-directory))) @@ -1733,13 +2403,35 @@ For disabling the behaviour for certain buffers and/or modes." (use-feature gnus-art :config (setq - gnus-visible-headers - (concat gnus-visible-headers "\\|^List-Id:\\|^X-RT-Originator:\\|^User-Agent:") - gnus-sorted-header-list - '("^From:" "^Subject:" "^Summary:" "^Keywords:" - "^Followup-To:" "^To:" "^Cc:" "X-RT-Originator" - "^Newsgroups:" "List-Id:" "^Organization:" - "^User-Agent:" "^Date:") + gnus-buttonized-mime-types '("multipart/\\(signed\\|encrypted\\)") + gnus-sorted-header-list '("^From:" + "^X-RT-Originator" + "^Newsgroups:" + "^Subject:" + "^Date:" + "^Envelope-To:" + "^Followup-To:" + "^Reply-To:" + "^Organization:" + "^Summary:" + "^Abstract:" + "^Keywords:" + "^To:" + "^[BGF]?Cc:" + "^Posted-To:" + "^Mail-Copies-To:" + "^Mail-Followup-To:" + "^Apparently-To:" + "^Resent-From:" + "^User-Agent:" + "^X-detected-operating-system:" + "^Message-ID:" + ;; "^References:" + "^List-Id:" + "^Gnus-Warning:") + gnus-visible-headers (mapconcat 'identity + gnus-sorted-header-list + "\\|") ;; local-lapsed article dates ;; from https://www.emacswiki.org/emacs/GnusFormatting#toc11 gnus-article-date-headers '(user-defined) @@ -1759,7 +2451,7 @@ For disabling the behaviour for certain buffers and/or modes." (use-feature gnus-sum :bind (:map gnus-summary-mode-map - :prefix-map a/gnus-summary-prefix-map + :prefix-map b/gnus-summary-prefix-map :prefix "v" ("r" . gnus-summary-reply) ("w" . gnus-summary-wide-reply) @@ -1768,41 +2460,58 @@ 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) + :custom + (gnus-thread-sort-functions '(gnus-thread-sort-by-number + gnus-thread-sort-by-subject + gnus-thread-sort-by-date))) (use-feature gnus-msg :config - (defvar a/gnu-signature "Amin Bandali | GNU Webmaster -https://bandali.eu.org | https://gnu.org -GPG Key: BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103") - (defvar a/uw-signature "Amin Bandali, MMath Student + (defvar b/gnu-signature "Amin Bandali +Free Software Activist | GNU Maintainer & Webmaster +GPG: BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103 +https://bandali.eu.org") + (defvar b/shemshak-signature "Amin Bandali +https://shemshak.org/~amin") + (defvar b/uw-signature "Amin Bandali, MMath Student Cheriton School of Computer Science University of Waterloo https://bandali.eu.org") - (defvar a/csc-signature "Amin Bandali | Termcom, CSC -https://csclub.uwaterloo.ca/~abandali/") - (setq gnus-posting-styles + (defvar b/csc-signature "Amin Bandali +Systems Committee +Computer Science Club, University of Waterloo +https://csclub.uwaterloo.ca/~abandali") + (setq gnus-message-replysign t + gnus-posting-styles '((".*" - (address "amin@bndl.org") - (body "\nBest,\n") - (eval (setq a/message-cite-say-hi t))) - ("nnimap\\+gnu:.*" (address "bandali@gnu.org") - (signature a/gnu-signature) - (eval (set (make-local-variable 'message-user-fqdn) "fencepost.gnu.org"))) + (signature b/gnu-signature)) + ("nnimap\\+gnu:l\\..*" + (signature nil)) ((header "subject" "ThankCRM") (to "webmasters-comment@gnu.org") - (body "Added to 2019supporters.html.\n\nMoving to campaigns.\n") - (eval (setq a/message-cite-say-hi nil))) + (body "") + (eval (setq b/message-cite-say-hi nil))) + ("nnimap\\+shemshak:.*" + (address "amin@shemshak.org") + (body "\nBest,\n") + (signature b/shemshak-signature) + (gcc "nnimap+shemshak:Sent") + (eval (setq b/message-cite-say-hi t))) ("nnimap\\+uw:.*" - (address "abandali@uwaterloo.ca") - (signature a/uw-signature)) + (address "bandali@uwaterloo.ca") + (body "\nBest,\n") + (signature b/uw-signature)) ("nnimap\\+uw:INBOX" (gcc "\"nnimap+uw:Sent Items\"")) ("nnimap\\+csc:.*" - (address "abandali@csclub.uwaterloo.ca") - (signature a/csc-signature) - (gcc "nnimap+csc:Sent"))))) + (address "bandali@csclub.uwaterloo.ca") + (signature b/csc-signature) + (gcc "nnimap+csc:Sent")))) + :hook (gnus-message-setup . (lambda () + (unless (mml-secure-is-encrypted-p) + (mml-secure-message-sign))))) (use-feature gnus-topic :hook (gnus-group-mode . gnus-topic-mode) @@ -1828,18 +2537,31 @@ https://csclub.uwaterloo.ca/~abandali/") :init (add-hook 'dired-mode-hook 'gnus-dired-mode)) +(comment + (use-feature gnus-utils + :custom + (gnus-completing-read-function 'gnus-ido-completing-read))) + (use-feature mm-decode :config - (setq mm-discouraged-alternatives '("text/html" "text/richtext"))) + (setq mm-discouraged-alternatives '("text/html" "text/richtext") + mm-decrypt-option 'known + mm-verify-option 'known)) + +(use-feature mm-uu + :custom + (mm-uu-diff-groups-regexp + "\\(gmane\\|gnu\\|l\\)\\..*\\(diff\\|commit\\|cvs\\|bug\\|dev\\)")) (use-feature sendmail :config - (setq sendmail-program "/usr/bin/msmtp" + (setq sendmail-program (executable-find "msmtp") ;; message-sendmail-extra-arguments '("-v" "-d") mail-specify-envelope-from t mail-envelope-from 'header)) (use-feature message + :bind (:map message-mode-map ("" . b/insert-asterism)) :config ;; redefine for a simplified In-Reply-To header ;; (see https://todo.sr.ht/~sircmpwn/lists.sr.ht/67) @@ -1847,11 +2569,11 @@ https://csclub.uwaterloo.ca/~abandali/") "Return the In-Reply-To header for this message." (when message-reply-headers (let ((from (mail-header-from message-reply-headers)) - (msg-id (mail-header-id message-reply-headers))) + (msg-id (mail-header-id message-reply-headers))) (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) @@ -1860,9 +2582,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 @@ -1871,23 +2593,23 @@ 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\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(bandali\\|mab\\|aminb?\\)@gnu\\.org\\)\\|\\(a?bandali@\\(csclub\\.\\)?uwaterloo\\.ca\\)\\)") + ;; (require 'company-ebdb) :hook (;; (message-setup . mml-secure-message-sign-pgpmime) (message-mode . flyspell-mode) (message-mode . (lambda () - ;; (setq fill-column 65 - ;; message-fill-column 65) + (setq-local fill-column b/fill-column + message-fill-column b/fill-column) (make-local-variable 'company-idle-delay) (setq company-idle-delay 0.2)))) ;; :custom-face ;; (message-header-subject ((t (:foreground "#111" :weight semi-bold)))) ;; (message-header-to ((t (:foreground "#111" :weight normal)))) ;; (message-header-cc ((t (:foreground "#333" :weight normal)))) - ) + :custom + (message-elide-ellipsis "[...]\n")) -(use-feature mml - :delight " mml") +(use-feature mml) (use-feature mml-sec :custom @@ -1902,8 +2624,8 @@ https://csclub.uwaterloo.ca/~abandali/") ;; footnote-style 'unicode) :bind (:map message-mode-map - :prefix-map a/footnote-prefix-map - :prefix "C-c f" + :prefix-map b/footnote-prefix-map + :prefix "C-c f n" ("a" . footnote-add-footnote) ("b" . footnote-back-to-message) ("c" . footnote-cycle-style) @@ -1912,47 +2634,56 @@ https://csclub.uwaterloo.ca/~abandali/") ("r" . footnote-renumber-footnotes) ("s" . footnote-set-style))) +(use-package bbdb + :disabled + :demand + :after gnus + :bind (:map gnus-group-mode-map ("e" . bbdb)) + :config + (bbdb-initialize 'gnus 'message) + :custom + (bbdb-complete-mail-allow-cycling t) + (bbdb-user-mail-address-re message-dont-reply-to-names)) + (use-package ebdb - :straight (:host github :repo "girzel/ebdb") + :demand :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 :after ebdb) -;; (use-package ebdb-complete -;; :after ebdb -;; :config -;; (ebdb-complete-enable)) - -(use-package company-ebdb +(use-feature ebdb-complete + :after ebdb :config - (defun company-ebdb--post-complete (_) nil)) + ;; (setq ebdb-complete-mail 'capf) + (ebdb-complete-enable)) + +(use-feature ebdb-message + :demand + :after ebdb) + +;; (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)))))) + (ebdb-gnus-window-size 0.3)) (use-feature ebdb-mua + :demand :after ebdb - ;; :custom (ebdb-mua-pop-up nil) - ) + :custom (ebdb-mua-pop-up t)) ;; (use-package ebdb-message ;; :after ebdb) - ;; (use-package ebdb-vcard ;; :after ebdb) @@ -1979,11 +2710,79 @@ https://csclub.uwaterloo.ca/~abandali/") (gnus-harvest-install 'message-x) (gnus-harvest-install)))) +(use-feature gnus-article-treat-patch + :disabled + :demand + :load-path "lisp/" + :config + ;; note: be sure to customize faces with `:foreground "white"' when + ;; using a theme with a white/light background :) + (setq ft/gnus-article-patch-conditions + '("^@@ -[0-9]+,[0-9]+ \\+[0-9]+,[0-9]+ @@"))) + -;;; IRC +;;; IRC (with ERC and ZNC) + +(use-feature erc + :bind (("C-c b 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 + (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)) + +(use-feature erc-fill + :after erc + :custom + (erc-fill-column 77) + (erc-fill-function 'erc-fill-static) + (erc-fill-static-center 18)) + +(use-feature erc-pcomplete + :after erc + :custom + (erc-pcomplete-nick-postfix ", ")) + +(use-feature erc-track + :after erc + :bind (("C-c a e t d" . erc-track-disable) + ("C-c a e t e" . erc-track-enable)) + :custom + (erc-track-enable-keybindings nil) + (erc-track-exclude-types '("JOIN" "MODE" "NICK" "PART" "QUIT" + "324" "329" "332" "333" "353" "477")) + (erc-track-position-in-mode-line t) + (erc-track-priority-faces-only 'all) + (erc-track-shorten-function nil)) + +(use-package erc-hl-nicks + :after erc) + +(use-package erc-scrolltoplace + :after erc) (use-package znc - :straight (:host nil :repo "https://git.bndl.org/amin/znc.el") + :straight (:host nil :repo "https://git.shemshak.org/amin/znc.el") :bind (("C-c a e e" . znc-erc) ("C-c a e a" . znc-all)) :config @@ -1992,16 +2791,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