X-Git-Url: https://git.shemshak.org/gitweb.cgi/~bandali/configs/blobdiff_plain/6ca3a7b10aa6f8130c5b079578bb0cc19d2b0b3d..a225edd9cbe2a14e8461bc64bb78ab3bf8fbefb1:/.emacs.d/init.el diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 3ce4a3d..4219bdf 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -1,6 +1,6 @@ -;;; init.el --- bandali's emacs configuration -*- lexical-binding: t -*- +;;; init.el --- mab's emacs configuration -*- lexical-binding: t -*- -;; Copyright (C) 2018-2019 Amin Bandali +;; Copyright (C) 2018-2019 Amin Bandali ;; This program is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -17,9 +17,11 @@ ;;; Commentary: -;; Emacs configuration of Amin Bandali, computer scientist, functional -;; programmer, and free software activist. Uses straight.el for -;; purely functional and fully reproducible package management. +;; Emacs configuration of Amin Bandali, computer scientist, free +;; software activist, GNU maintainer & webmaster. Packages are +;; installed from GNU Guix, for purely functional and fully +;; reproducible package management. Before switching to GNU Guix, +;; I used straight.el for package management, and before that, Borg. ;; 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: @@ -80,7 +82,7 @@ ;;; whoami (setq user-full-name "Amin Bandali" - user-mail-address "bandali@gnu.org") + user-mail-address "mab@gnu.org") ;;; comment macro @@ -94,80 +96,16 @@ ;;; 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")) +;; No package.el (for emacs 26 and before) +(when (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 b/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... - -(b/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 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 b/reload-init () - "Reload `user-init-file'." - (interactive) - (setq b/before-user-init-time (current-time) - b/file-name-handler-alist file-name-handler-alist) - (load user-init-file nil 'nomessage) - (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 @@ -195,7 +133,7 @@ (defalias 'b/var 'no-littering-expand-var-file-name)) ;; separate custom file (don't want it mixing with init.el) -(use-feature custom +(use-package custom :no-require :config (setq custom-file (b/etc "custom.el")) @@ -228,7 +166,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))) @@ -266,9 +204,21 @@ (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 "\n\n * * *\n\n")) + (insert + (concat + "\n\n" + (make-string (floor (/ (- fill-column (length b/asterism)) 2)) + ?\s) + b/asterism + "\n\n"))) (defun b/no-mouse-autoselect-window () "Conveniently disable `focus-follows-mouse'. @@ -276,6 +226,12 @@ For disabling the behaviour for certain buffers and/or modes." (make-local-variable 'mouse-autoselect-window) (setq mouse-autoselect-window nil)) +(defun b/kill-current-buffer () + "Kill the current buffer." + ;; also see https://redd.it/64xb3q + (interactive) + (kill-buffer (current-buffer))) + ;;; Defaults @@ -345,7 +301,7 @@ For disabling the behaviour for certain buffers and/or modes." ;;;; Elisp-level customizations -(use-feature startup +(use-package startup :no-require :demand :config @@ -364,7 +320,7 @@ For disabling the behaviour for certain buffers and/or modes." (inhibit-startup-screen t) (inhibit-startup-echo-area-message user-login-name)) -(use-feature files +(use-package files :no-require :demand :custom @@ -391,7 +347,7 @@ For disabling the behaviour for certain buffers and/or modes." (defalias 'yes-or-no-p #'y-or-n-p) ;; enable automatic reloading of changed buffers and files -(use-feature autorevert +(use-package autorevert :demand :config (global-auto-revert-mode 1) @@ -400,16 +356,18 @@ For disabling the behaviour for certain buffers and/or modes." (global-auto-revert-non-file-buffers nil)) ;; time and battery in mode-line -(use-feature time +(use-package 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")) + (display-time-format "%a %b %-e, %-l:%M%P") + (display-time-mail-icon '(image :type xpm :file "gnus/gnus-pointer.xpm" :ascent center)) + (display-time-use-mail-icon t)) -(use-feature battery +(use-package battery :if b/exwm-p :demand :config @@ -417,20 +375,20 @@ For disabling the behaviour for certain buffers and/or modes." :custom (battery-mode-line-format " %p%% %t")) -(use-feature fringe +(use-package fringe :demand :config ;; smaller fringe ;; (fringe-mode '(3 . 1)) (fringe-mode nil)) -(use-feature winner +(use-package winner :demand :config ;; enable winner-mode (C-h f winner-mode RET) (winner-mode 1)) -(use-feature compile +(use-package compile :config ;; don't display *compilation* buffer on success. based on ;; https://stackoverflow.com/a/17788551, with changes to use `cl-letf' @@ -453,7 +411,7 @@ For disabling the behaviour for certain buffers and/or modes." ad-do-it)) (ad-activate 'compilation-start)) -(use-feature isearch +(use-package isearch :custom ;; allow scrolling in Isearch (isearch-allow-scroll t) @@ -465,44 +423,61 @@ For disabling the behaviour for certain buffers and/or modes." ;; uncomment to extend the above behaviour to query-replace (comment - (use-feature replace + (use-package replace :custom (replace-char-fold t))) -(use-feature vc +(use-package vc :bind ("C-x v C-=" . vc-ediff)) -(use-feature vc-git +(use-package vc-git :after vc :custom (vc-git-print-log-follow t)) -(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))) -(use-feature face-remap +(use-package face-remap :custom ;; gentler font resizing (text-scale-mode-step 1.05)) -(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)) -(use-feature epg-config +(use-package epg-config + :config + ;; ask for GPG passphrase in minibuffer + ;; this will fail if gpg>=2.1 is not available + (if (version< "27" emacs-version) + (setq epg-pinentry-mode 'loopback) + (setq epa-pinentry-mode 'loopback)) :custom - ((epg-gpg-program (executable-find "gpg")))) + (epg-gpg-program (executable-find "gpg"))) + +(use-package epg + :after epg-config) -(use-feature auth-source +(use-package pinentry + :demand + :after (epa epg server) + :config + ;; workaround for systemd-based distros: + ;; (setq pinentry--socket-dir server-socket-dir) + (pinentry-start)) + +(use-package auth-source :custom (auth-sources '("~/.authinfo.gpg")) (authinfo-hidden (regexp-opt '("password" "client-secret" "token")))) @@ -528,7 +503,7 @@ For disabling the behaviour for certain buffers and/or modes." ("C-S-h C" . describe-char) ("C-S-h F" . describe-face) - ("C-x k" . kill-this-buffer) + ("C-x k" . b/kill-current-buffer) ("C-x K" . kill-buffer) ("C-x s" . save-buffer) ("C-x S" . save-some-buffers) @@ -543,38 +518,13 @@ For disabling the behaviour for certain buffers and/or modes." ;; for back and forward mouse keys ("" . previous-buffer) ("" . previous-buffer) - ("" . previous-buffer) + ;; ("" . previous-buffer) ("" . next-buffer) ("" . next-buffer) - ("" . next-buffer) - ("" . kill-this-buffer) - ("" . 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" . b/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)) + ;; ("" . next-buffer) + ;; ("" . kill-this-buffer) + ;; ("" . switch-to-buffer) + ) ;;; Essential packages @@ -595,12 +545,12 @@ For disabling the behaviour for certain buffers and/or modes." :hook ((exwm-update-class . b/exwm-rename-buffer) (exwm-update-title . b/exwm-rename-buffer))) -(use-feature exwm-config +(use-package exwm-config :demand :after exwm :hook (exwm-init . exwm-config--fix/ido-buffer-window-other-frame)) -(use-feature exwm-input +(use-package exwm-input :demand :after exwm :config @@ -750,7 +700,7 @@ around if needed." ([?\s-s] . [?\C-s]) ([?\C-g] . [escape])))) -(use-feature exwm-manage +(use-package exwm-manage :demand :after exwm :hook @@ -770,7 +720,7 @@ around if needed." '(([?\C-p] . [C-up]) ([?\C-n] . [C-down]))))))))) -(use-feature exwm-randr +(use-package exwm-randr :demand :after exwm :config @@ -778,13 +728,13 @@ around if needed." :custom (exwm-randr-workspace-monitor-plist '(1 "VGA-1"))) -(use-feature exwm-systemtray +(use-package exwm-systemtray :demand :after exwm :config (exwm-systemtray-enable)) -(use-feature exwm-workspace) +(use-package exwm-workspace) (use-package exwm-edit :demand @@ -793,7 +743,7 @@ around if needed." ;; use the org-plus-contrib package to get the whole deal (use-package org-plus-contrib) -(use-feature org +(use-package org :defer 0.5 :config (setq org-src-tab-acts-natively t @@ -832,7 +782,7 @@ around if needed." '(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 @@ -848,7 +798,7 @@ around if needed." t) (require 'ox-beamer)) -(use-feature ox-extra +(use-package ox-extra :config (ox-extras-activate '(latex-header-blocks ignore-headlines))) @@ -907,7 +857,7 @@ around if needed." ;; 'magit-insert-untracked-files ;; 'append) (setq magit-repository-directories '(("~/" . 0) - ("~/src/git/" . 1))) + ("~/src/git/" . 2))) (nconc magit-section-initial-visibility-alist '(([unpulled status] . show) ([unpushed status] . show))) @@ -918,7 +868,7 @@ around if needed." :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\\)?:") @@ -937,7 +887,7 @@ around if needed." ("C-c x" . execute-extended-command)) (comment - (use-feature ido + (use-package ido :demand :bind (:map ido-common-completion-map @@ -980,7 +930,7 @@ around if needed." :config (crm-custom-mode 1)) - (use-feature icomplete + (use-package icomplete :defer 0.3 :config (icomplete-mode 1))) @@ -1018,25 +968,27 @@ This function is intended for use with `ivy-ignore-buffers'." (add-to-list 'ivy-ignore-buffers 'b/ivy-ignore-buffer-p) (ivy-mode 1) - ;; :custom-face - ;; (ivy-minibuffer-match-face-2 ((t (:background "#e99ce8" :weight semi-bold)))) - ;; (ivy-minibuffer-match-face-3 ((t (:background "#bbbbff" :weight semi-bold)))) - ;; (ivy-minibuffer-match-face-4 ((t (:background "#ffbbff" :weight semi-bold)))) -) + :custom-face + (ivy-minibuffer-match-face-1 ((t (:background "#eeeeee")))) + (ivy-minibuffer-match-face-2 ((t (:background "#e7e7e7" :weight bold)))) + (ivy-minibuffer-match-face-3 ((t (:background "light goldenrod" :weight semi-bold)))) + (ivy-minibuffer-match-face-4 ((t (:background "misty rose" :weight semi-bold)))) + (ivy-current-match ((((class color) (background light)) + :background "#d7d7d7" :foreground "black") + (((class color) (background dark)) + :background "#65a7e2" :foreground "black")))) (use-package swiper :demand :after ivy - :bind (("C-s" . swiper-isearch) - ("C-r" . swiper-isearch-backward) - ("C-S-s" . swiper-isearch))) + :bind (("C-S-s" . swiper-isearch))) (use-package counsel - :bind (;; ([remap execute-extended-command] . counsel-M-x) - ;; ([remap find-file] . counsel-find-file) - ("C-c f r" . counsel-recentf) + :demand + :after ivy + :bind (("C-c f r" . counsel-recentf) :map minibuffer-local-map - ("C-r" . counsel-minibuffer-history)) + ("C-r" . counsel-minibuffer-history)) :config (counsel-mode 1) (defalias 'locate #'counsel-locate)) @@ -1057,7 +1009,7 @@ This function is intended for use with `ivy-ignore-buffers'." ("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) @@ -1084,14 +1036,15 @@ This function is intended for use with `ivy-ignore-buffers'." ("C-S-l" . b/eshell-clear) ("M-r" . counsel-esh-history) ;; ([tab] . company-complete) - )) + :map eshell-hist-mode-map + ("M-r" . counsel-esh-history))) :hook (eshell-mode . b/eshell-setup) :custom (eshell-hist-ignoredups t) (eshell-input-filter 'eshell-input-filter-initial-space)) -(use-feature ibuffer +(use-package ibuffer :bind (("C-x C-b" . ibuffer) :map ibuffer-mode-map @@ -1141,7 +1094,7 @@ This function is intended for use with `ivy-ignore-buffers'." (mode . scheme-mode) (mode . haskell-mode) (mode . lean-mode) - (mode . go-mode) + ;; (mode . go-mode) (mode . alloy-mode))) ("tex" (or @@ -1166,7 +1119,7 @@ This function is intended for use with `ivy-ignore-buffers'." " " filename))) :hook (ibuffer . (lambda () (ibuffer-switch-to-saved-filter-groups "default")))) -(use-feature outline +(use-package outline :disabled :hook (prog-mode . outline-minor-mode) :bind @@ -1184,10 +1137,10 @@ This function is intended for use with `ivy-ignore-buffers'." ("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-dwim-target t dired-listing-switches "-alh" @@ -1237,12 +1190,12 @@ This function is intended for use with `ivy-ignore-buffers'." (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)) @@ -1252,7 +1205,7 @@ This function is intended for use with `ivy-ignore-buffers'." (use-package dash :config (dash-enable-font-lock)) -(use-feature doc-view +(use-package doc-view :bind (:map doc-view-mode-map ("M-RET" . image-previous-line))) @@ -1268,20 +1221,20 @@ This function is intended for use with `ivy-ignore-buffers'." :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) :config (global-eldoc-mode)) ;; highlight matching parens -(use-feature paren +(use-package paren :demand :config (show-paren-mode)) -(use-feature elec-pair +(use-package elec-pair :demand :config (electric-pair-mode)) -(use-feature simple +(use-package simple :config (column-number-mode) :custom ;; Save what I copy into clipboard from other applications into Emacs' @@ -1291,38 +1244,41 @@ This function is intended for use with `ivy-ignore-buffers'." (save-interprogram-paste-before-kill t)) ;; save minibuffer history -(use-feature savehist +(use-package savehist :demand :config (savehist-mode) (add-to-list 'savehist-additional-variables 'kill-ring)) ;; automatically save place in files -(use-feature saveplace +(use-package saveplace :when (version< "25" emacs-version) :config (save-place-mode)) -(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 +(use-package text-mode :bind (:map text-mode-map ("C-*" . b/insert-asterism)) - :hook (text-mode . indicate-buffer-boundaries-left)) + :hook ((text-mode . indicate-buffer-boundaries-left) + (text-mode . flyspell-mode))) -(use-feature conf-mode +(use-package conf-mode :mode "\\.*rc$") -(use-feature sh-mode +(use-package sh-mode :mode "\\.bashrc$") (use-package 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) @@ -1348,10 +1304,10 @@ This function is intended for use with `ivy-ignore-buffers'." (setq flycheck-check-syntax-automatically '(mode-enabled save)) :custom (flycheck-mode-line-prefix "flyc")) -(use-feature flyspell) +(use-package flyspell) ;; http://endlessparentheses.com/ispell-and-apostrophes.html -(use-feature ispell +(use-package ispell :defer 0.6 :config ;; ’ can be part of a word @@ -1377,28 +1333,42 @@ This function is intended for use with `ivy-ignore-buffers'." (advice-add #'ispell-parse-output :filter-args #'endless/replace-quote)) -(use-feature abbrev +(use-package abbrev :hook (text-mode . abbrev-mode)) ;;; Programming modes -(use-feature lisp-mode +(use-package lisp-mode :config (defun indent-spaces-mode () (setq indent-tabs-mode nil)) (add-hook 'lisp-interaction-mode-hook #'indent-spaces-mode)) -(use-feature reveal +(use-package reveal :hook (emacs-lisp-mode . reveal-mode)) -(use-feature elisp-mode) +(use-package elisp-mode) -(use-package alloy-mode - :straight (:host github :repo "dwwmmn/alloy-mode") - :mode "\\.als\\'" - :config (setq alloy-basic-offset 2) - :hook (alloy-mode . (lambda () (setq-local indent-tabs-mode nil)))) +;; (use-package alloy-mode +;; :straight (:host github :repo "dwwmmn/alloy-mode") +;; :mode "\\.\\(als\\|dsh\\)\\'" +;; :config +;; (setq alloy-basic-offset 2) +;; ;; (defun b/alloy-simple-indent (start end) +;; ;; (interactive "r") +;; ;; ;; (if (region-active-p) +;; ;; ;; (indent-rigidly start end alloy-basic-offset) +;; ;; ;; (if (bolp) +;; ;; ;; (indent-rigidly (line-beginning-position) +;; ;; ;; (line-end-position) +;; ;; ;; alloy-basic-offset))) +;; ;; (indent-to (+ (current-column) alloy-basic-offset))) +;; :bind (:map alloy-mode-map +;; ("RET" . electric-newline-and-maybe-indent) +;; ;; ("TAB" . b/alloy-simple-indent) +;; ("TAB" . indent-for-tab-command)) +;; :hook (alloy-mode . (lambda () (setq-local indent-tabs-mode nil)))) (eval-when-compile (defvar lean-mode-map)) (use-package lean-mode @@ -1442,11 +1412,11 @@ This function is intended for use with `ivy-ignore-buffers'." ;; alternative: hs-lint https://github.com/ndmitchell/hlint/blob/20e116a043f2073c57b17b24ae6364b5e433ba7e/data/hs-lint.el ) -(use-feature sgml-mode +(use-package sgml-mode :config (setq sgml-basic-offset 2)) -(use-feature css-mode +(use-package css-mode :config (setq css-indent-offset 2)) @@ -1456,7 +1426,9 @@ This function is intended for use with `ivy-ignore-buffers'." (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) @@ -1541,7 +1513,7 @@ This function is intended for use with `ivy-ignore-buffers'." (use-package geiser) -(use-feature geiser-guile +(use-package geiser-guile :config (setq geiser-guile-load-path "~/src/git/guix")) @@ -1552,13 +1524,14 @@ This function is intended for use with `ivy-ignore-buffers'." :custom (font-latex-fontify-sectioning 'color))) -(use-package go-mode) +(use-package go-mode + :disabled) (use-package po-mode :hook (po-mode . (lambda () (run-with-timer 0.1 nil 'View-exit)))) -(use-feature tex-mode +(use-package tex-mode :config (cl-delete-if (lambda (p) (string-match "^---?" (car p))) @@ -1566,9 +1539,9 @@ This function is intended for use with `ivy-ignore-buffers'." :hook ((tex-mode . auto-fill-mode) (tex-mode . flyspell-mode))) -(use-package george-mode - :straight (:host nil :repo "https://git.shemshak.org/amin/george-mode") - :mode "\\.grg\\'") +;; (use-package george-mode +;; :straight (:host nil :repo "https://git.shemshak.org/amin/george-mode") +;; :mode "\\.grg\\'") ;;; Theme @@ -1670,10 +1643,6 @@ This function is intended for use with `ivy-ignore-buffers'." ;; 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-x RET" "coding system" "C-x 8" "unicode" "C-x @" "event modifiers" @@ -1698,14 +1667,10 @@ This function is intended for use with `ivy-ignore-buffers'." "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 p" "projectile" + "C-c p s" "projectile/search" + "C-c p x" "projectile/execute" + "C-c p 4" "projectile/other-window" "C-c q" "boxquote" "C-c t" "themes" ;; "s-O" "outline" @@ -1731,7 +1696,7 @@ This function is intended for use with `ivy-ignore-buffers'." (use-package crux ; results in Waiting for git... [2 times] :defer 0.4 :bind (("C-c d" . crux-duplicate-current-line-or-region) - ("C-c D" . crux-duplicate-and-comment-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) @@ -1746,7 +1711,7 @@ This function is intended for use with `ivy-ignore-buffers'." (use-package projectile :defer 0.5 - :bind-keymap ("C-c P" . projectile-command-map) + :bind-keymap ("C-c p" . projectile-command-map) :config (projectile-mode) @@ -1772,7 +1737,7 @@ This function is intended for use with `ivy-ignore-buffers'." (advice-add 'magit-branch-and-checkout :after #'my-projectile-invalidate-cache))) :custom - ;; (projectile-completion-system 'ivy) + (projectile-completion-system 'ivy) (projectile-mode-line-prefix " proj")) (use-package helpful @@ -1821,8 +1786,9 @@ This function is intended for use with `ivy-ignore-buffers'." ("M-w" . boxquote-kill-ring-save))) (use-package orgalist - ;; http://lists.gnu.org/archive/html/emacs-orgmode/2019-04/msg00007.html - :disabled t + ;; breaks auto-fill-mode, showing this error: + ;; orgalist--boundaries: Lisp nesting exceeds ‘max-lisp-eval-depth’ + :disabled :after message :hook (message-mode . orgalist-mode)) @@ -1830,9 +1796,14 @@ This function is intended for use with `ivy-ignore-buffers'." (use-package typo :defer 0.5 :config - (typo-global-mode 1) :hook (((text-mode erc-mode web-mode) . typo-mode) - (tex-mode . (lambda ()(typo-mode -1))))) + ((tex-mode git-commit-mode) . (lambda ()(typo-mode -1))))) + +(use-package electric + :disabled + :demand + :config + (electric-quote-mode)) ;; highlight TODOs in buffers (use-package hl-todo @@ -1935,6 +1906,7 @@ This function is intended for use with `ivy-ignore-buffers'." ("a" . mc/mark-all-like-this)))) (use-package forge + :disabled :demand :after magit) @@ -1959,10 +1931,24 @@ This function is intended for use with `ivy-ignore-buffers'." (yas-global-mode)) (use-package debbugs - :straight (debbugs - :host github - :repo "emacs-straight/debbugs" - :files (:defaults "Debbugs.wsdl"))) + :bind + (("C-c D d" . debbugs-gnu) + ("C-c D b" . debbugs-gnu-bugs) + ("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 @@ -1983,7 +1969,7 @@ This function is intended for use with `ivy-ignore-buffers'." :disabled :hook (erc-mode . emojify-mode)) -(use-feature window +(use-package window :bind (("C-c w e" . (lambda () (interactive) @@ -2002,7 +1988,7 @@ This function is intended for use with `ivy-ignore-buffers'." :custom (split-width-threshold 150)) -(use-feature windmove +(use-package windmove :defer 0.6 :bind (("C-c w h" . windmove-left) @@ -2035,6 +2021,7 @@ This function is intended for use with `ivy-ignore-buffers'." :custom (pdf-view-resize-factor 1.05)) (use-package org-pdftools + :disabled :straight (:host github :repo "fuxialexander/org-pdftools") :demand :after org @@ -2044,10 +2031,10 @@ This function is intended for use with `ivy-ignore-buffers'." (use-package biblio) -(use-feature reftex +(use-package reftex :hook (latex-mode . reftex-mode)) -(use-feature reftex-cite +(use-package reftex-cite :after reftex :disabled ; enable to disable ; reftex-cite's default choice @@ -2094,22 +2081,28 @@ This function is intended for use with `ivy-ignore-buffers'." :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 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) @@ -2122,7 +2115,7 @@ This function is intended for use with `ivy-ignore-buffers'." mail-user-agent 'gnus-user-agent read-mail-command 'gnus) -(use-feature gnus +(use-package gnus :bind (("s-m" . gnus) ("s-M" . gnus-unplugged) ("C-c a m" . gnus) @@ -2142,7 +2135,7 @@ This function is intended for use with `ivy-ignore-buffers'." (nnimap-address "127.0.0.1") (nnimap-server-port 143) (nnimap-authenticator plain) - (nnimap-user "bandali@gnu.local") + (nnimap-user "mab@gnu.local") (nnimap-inbox "INBOX") (nnimap-split-methods 'nnimap-split-fancy) (nnimap-split-fancy (| @@ -2150,6 +2143,10 @@ This function is intended for use with `ivy-ignore-buffers'." ;; (: gnus-group-split-fancy "INBOX" t "INBOX") ;; gnu (list ".*<\\(.*\\)\\.\\(non\\)?gnu\\.org>.*" "l.\\1") + ;; gnus + (list ".*<\\(.*\\)\\.gnus\\.org>.*" "l.\\1") + ;; libreplanet + (list ".*<\\(.*\\)\\.libreplanet\\.org>.*" "l.\\1") ;; *.lists.sr.ht, omitting one dot if present ;; add more \\.?\\([^.]*\\) if needed (list ".*<~\\(.*\\)/\\([^.]*\\)\\.?\\([^.]*\\)\\.lists.sr.ht>.*" "l.~\\1.\\2\\3") @@ -2322,7 +2319,7 @@ This function is intended for use with `ivy-ignore-buffers'." (to-list . "webmasters@gnu.org")) ("gnu.*" (gcc-self . t)) - ("gnu\\." + ("l\\." (subscribed . t)) ("nnimap\\+uw:.*" (gcc-self . t))) @@ -2337,17 +2334,18 @@ This function is intended for use with `ivy-ignore-buffers'." gnus-gcc-mark-as-read t) :config (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)) + (with-eval-after-load 'nnmail + (add-to-list + 'nnmail-split-abbrev-alist + '(list . "list-id\\|list-post\\|x-mailing-list\\|x-beenthere\\|x-loop") + t))) ;; (gnus-registry-initialize) (with-eval-after-load 'recentf (add-to-list 'recentf-exclude gnus-home-directory))) -(use-feature gnus-art +(use-package gnus-art :config (setq gnus-buttonized-mime-types '("multipart/\\(signed\\|encrypted\\)") @@ -2396,7 +2394,7 @@ This function is intended for use with `ivy-ignore-buffers'." :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 b/gnus-summary-prefix-map :prefix "v" @@ -2413,12 +2411,8 @@ This function is intended for use with `ivy-ignore-buffers'." gnus-thread-sort-by-subject gnus-thread-sort-by-date))) -(use-feature gnus-msg +(use-package gnus-msg :config - (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 @@ -2426,16 +2420,17 @@ Cheriton School of Computer Science University of Waterloo https://bandali.eu.org") (defvar b/csc-signature "Amin Bandali -Systems Committee +System Administrator, Systems Committee Computer Science Club, University of Waterloo https://csclub.uwaterloo.ca/~abandali") (setq gnus-message-replysign t gnus-posting-styles '((".*" - (address "bandali@gnu.org") - (signature b/gnu-signature)) + (address "mab@gnu.org")) ("nnimap\\+gnu:l\\..*" (signature nil)) + ("nnimap\\+gnu:.*" + (organization "GNU")) ((header "subject" "ThankCRM") (to "webmasters-comment@gnu.org") (body "") @@ -2456,57 +2451,60 @@ https://csclub.uwaterloo.ca/~abandali") (address "bandali@csclub.uwaterloo.ca") (signature b/csc-signature) (gcc "nnimap+csc:Sent")))) - ;; :hook (gnus-message-setup . mml-secure-message-sign) - ) + :hook (gnus-message-setup . (lambda () + (unless (mml-secure-is-encrypted-p) + (mml-secure-message-sign))))) -(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)) (comment - (use-feature gnus-utils + (use-package gnus-utils :custom (gnus-completing-read-function 'gnus-ido-completing-read))) -(use-feature mm-decode +(use-package mm-decode :config (setq mm-discouraged-alternatives '("text/html" "text/richtext") mm-decrypt-option 'known mm-verify-option 'known)) -(use-feature mm-uu +(use-package mm-uu + :config + (set-face-attribute 'mm-uu-extract nil :extend t) :custom (mm-uu-diff-groups-regexp "\\(gmane\\|gnu\\|l\\)\\..*\\(diff\\|commit\\|cvs\\|bug\\|dev\\)")) -(use-feature sendmail +(use-package sendmail :config (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 :bind (:map message-mode-map ("" . b/insert-asterism)) :config ;; redefine for a simplified In-Reply-To header @@ -2539,13 +2537,13 @@ https://csclub.uwaterloo.ca/~abandali") message-subscribed-address-functions '(gnus-find-subscribed-addresses) message-dont-reply-to-names - "\\(\\(\\(amin\\|mab\\)@shemshak\\.org\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(bandali\\|mab\\|aminb?\\)@gnu\\.org\\)\\|\\(a?bandali@\\(csclub\\.\\)?uwaterloo\\.ca\\)\\)") + "\\(\\(\\(amin\\|mab\\)@shemshak\\.org\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(mab\\|bandali\\|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 @@ -2555,14 +2553,14 @@ https://csclub.uwaterloo.ca/~abandali") :custom (message-elide-ellipsis "[...]\n")) -(use-feature mml) +(use-package mml) -(use-feature mml-sec +(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 "" @@ -2580,6 +2578,17 @@ 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 :demand :after gnus @@ -2589,16 +2598,16 @@ https://csclub.uwaterloo.ca/~abandali") (with-eval-after-load 'swiper (add-to-list 'swiper-font-lock-exclude 'ebdb-mode t))) -(use-feature ebdb-com +(use-package ebdb-com :after ebdb) -(use-feature ebdb-complete +(use-package ebdb-complete :after ebdb :config ;; (setq ebdb-complete-mail 'capf) (ebdb-complete-enable)) -(use-feature ebdb-message +(use-package ebdb-message :demand :after ebdb) @@ -2606,12 +2615,12 @@ https://csclub.uwaterloo.ca/~abandali") ;; :config ;; (defun company-ebdb--post-complete (_) nil)) -(use-feature ebdb-gnus +(use-package ebdb-gnus :after ebdb :custom (ebdb-gnus-window-size 0.3)) -(use-feature ebdb-mua +(use-package ebdb-mua :demand :after ebdb :custom (ebdb-mua-pop-up t)) @@ -2645,7 +2654,7 @@ https://csclub.uwaterloo.ca/~abandali") (gnus-harvest-install 'message-x) (gnus-harvest-install)))) -(use-feature gnus-article-treat-patch +(use-package gnus-article-treat-patch :disabled :demand :load-path "lisp/" @@ -2658,7 +2667,7 @@ https://csclub.uwaterloo.ca/~abandali") ;;; IRC (with ERC and ZNC) -(use-feature erc +(use-package erc :bind (("C-c b b" . erc-switch-to-buffer) :map erc-mode-map ("M-a" . erc-track-switch-buffer)) @@ -2682,23 +2691,24 @@ https://csclub.uwaterloo.ca/~abandali") (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 'smiley) (add-to-list 'erc-modules 'spelling) (add-to-list 'erc-modules 'scrolltoplace) (erc-update-modules)) -(use-feature erc-fill +(use-package erc-fill :after erc :custom (erc-fill-column 77) (erc-fill-function 'erc-fill-static) (erc-fill-static-center 18)) -(use-feature erc-pcomplete +(use-package erc-pcomplete :after erc :custom - (erc-pcomplete-nick-postfix ",")) + (erc-pcomplete-nick-postfix ", ")) -(use-feature erc-track +(use-package erc-track :after erc :bind (("C-c a e t d" . erc-track-disable) ("C-c a e t e" . erc-track-enable)) @@ -2716,22 +2726,22 @@ https://csclub.uwaterloo.ca/~abandali") (use-package erc-scrolltoplace :after erc) -(use-package znc - :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 - (let ((pwd (let ((auth (auth-source-search :host "znca"))) - (cond - ((null auth) (error "Couldn't find znca's authinfo")) - (t (funcall (plist-get (car auth) :secret))))))) - (setq znc-servers - `(("znc.shemshak.org" 1337 t - ((freenode "amin/freenode" ,pwd))) - ("znc.shemshak.org" 1337 t - ((moznet "amin/moznet" ,pwd))) - ("znc.shemshak.org" 1337 t - ((oftc "amin/oftc" ,pwd))))))) +;; (use-package znc +;; :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 +;; (let ((pwd (let ((auth (auth-source-search :host "znca"))) +;; (cond +;; ((null auth) (error "Couldn't find znca's authinfo")) +;; (t (funcall (plist-get (car auth) :secret))))))) +;; (setq znc-servers +;; `(("znc.shemshak.org" 1337 t +;; ((freenode "amin/freenode" ,pwd))) +;; ("znc.shemshak.org" 1337 t +;; ((moznet "amin/moznet" ,pwd))) +;; ("znc.shemshak.org" 1337 t +;; ((oftc "amin/oftc" ,pwd))))))) ;;; Post initialization