X-Git-Url: https://git.shemshak.org/~bandali/configs/blobdiff_plain/a4eace5127b5a0f3a99b02b0514e6f50b647cc97..e1f6f6a2e9eb4de7890b6ee4e2d1c1096ce0bffe:/.emacs.d/init.el?ds=inline diff --git a/.emacs.d/init.el b/.emacs.d/init.el index a3d38ab..b7be16a 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -184,6 +184,9 @@ ;;; Initial setup +(defvar b/exwm-p (string= (system-name) "jirud") + "Whether or not we will be using `exwm'.") + ;; keep ~/.emacs.d clean (use-package no-littering :demand @@ -263,6 +266,10 @@ (previous-line) (insert "\n \n;;; ")) +(defun b/insert-asterism () + (interactive) + (insert "\n\n * * *\n\n")) + (defun b/no-mouse-autoselect-window () "Conveniently disable `focus-follows-mouse'. For disabling the behaviour for certain buffers and/or modes." @@ -394,6 +401,7 @@ For disabling the behaviour for certain buffers and/or modes." ;; time and battery in mode-line (use-feature time + :if b/exwm-p :demand :config (display-time-mode) @@ -402,6 +410,7 @@ For disabling the behaviour for certain buffers and/or modes." (display-time-format "%a %b %-e, %-l:%M%P")) (use-feature battery + :if b/exwm-p :demand :config (display-battery-mode) @@ -488,6 +497,11 @@ For disabling the behaviour for certain buffers and/or modes." :custom ((epg-gpg-program (executable-find "gpg")))) +(use-feature auth-source + :custom + (auth-sources '("~/.authinfo.gpg")) + (authinfo-hidden (regexp-opt '("password" "client-secret" "token")))) + ;;; General bindings @@ -561,6 +575,7 @@ For disabling the behaviour for certain buffers and/or modes." ;;; Essential packages (use-package exwm + :if b/exwm-p :demand :config ;; make class name the buffer name, truncating beyond 60 characters @@ -754,7 +769,9 @@ around if needed." :demand :after exwm :config - (exwm-randr-enable)) + (exwm-randr-enable) + :custom + (exwm-randr-workspace-monitor-plist '(1 "VGA-1"))) (use-feature exwm-systemtray :demand @@ -949,7 +966,6 @@ This function is intended for use with `ivy-ignore-buffers'." :after ivy :bind (([remap execute-extended-command] . counsel-M-x) ([remap find-file] . counsel-find-file) - ("C-c b b" . ivy-switch-buffer) ("C-c f ." . counsel-find-file) ("C-c f l" . counsel-find-library) ("C-c f r" . counsel-recentf) @@ -1107,7 +1123,8 @@ This function is intended for use with `ivy-ignore-buffers'." (use-feature dired :config - (setq dired-listing-switches "-alh" + (setq dired-dwim-target t + dired-listing-switches "-alh" ls-lisp-use-insert-directory-program nil) ;; easily diff 2 marked files @@ -1226,6 +1243,7 @@ This function is intended for use with `ivy-ignore-buffers'." (add-hook 'prog-mode-hook #'indicate-buffer-boundaries-left)) (use-feature text-mode + :bind (:map text-mode-map ("C-*" . b/insert-asterism)) :hook (text-mode . indicate-buffer-boundaries-left)) (use-feature conf-mode @@ -1235,7 +1253,6 @@ This function is intended for use with `ivy-ignore-buffers'." :mode "\\.bashrc$") (use-package company - :defer 0.6 :bind (:map company-active-map ([tab] . company-complete-common-or-cycle) @@ -1313,12 +1330,11 @@ This function is intended for use with `ivy-ignore-buffers'." (use-package alloy-mode :straight (:host github :repo "dwwmmn/alloy-mode") :mode "\\.als\\'" - :config (setq alloy-basic-offset 2)) + :config (setq alloy-basic-offset 2) + :hook (alloy-mode . (lambda () (setq-local indent-tabs-mode nil)))) (eval-when-compile (defvar lean-mode-map)) (use-package lean-mode - :straight (:host github :repo "leanprover/lean-mode" - :fork (:repo "notbandali/lean-mode" :branch "remove-cl")) :defer 0.4 :bind (:map lean-mode-map ("S-SPC" . company-complete)) @@ -1496,10 +1512,10 @@ This function is intended for use with `ivy-ignore-buffers'." (load-theme 'tangomod t) (use-package smart-mode-line - :disabled :commands (sml/apply-theme) :demand :config + (setq sml/theme 'tangomod) (sml/setup) (smart-mode-line-enable)) @@ -1518,6 +1534,7 @@ This function is intended for use with `ivy-ignore-buffers'." (load-theme 'solarized-light t)) (use-package moody + :disabled :demand :config (setq x-underline-at-descent-line t) @@ -1527,10 +1544,15 @@ This function is intended for use with `ivy-ignore-buffers'." (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 "#eeeeee")) ; d3d7cf + (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 @@ -1543,20 +1565,26 @@ This function is intended for use with `ivy-ignore-buffers'." (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 b/org-mode-font-lock-keywords) - (exwm-systemtray--refresh)) + (when (featurep 'erc-hl-nicks) + (erc-hl-nicks-reset-face-table)) + (when (featurep 'exwm-systemtray) + (exwm-systemtray--refresh))) (defun b/lights-off () "Go dark." (interactive) (mapc #'disable-theme custom-enabled-themes) (load-theme 'doom-one t) - ;; (sml/apply-theme 'automatic) + (sml/apply-theme 'automatic) (font-lock-add-keywords 'org-mode b/org-mode-font-lock-keywords t) - (exwm-systemtray--refresh)) + (when (featurep 'erc-hl-nicks) + (erc-hl-nicks-reset-face-table)) + (when (featurep 'exwm-systemtray) + (exwm-systemtray--refresh))) (bind-keys ("C-c t d" . b/lights-off) @@ -1579,11 +1607,18 @@ This function is intended for use with `ivy-ignore-buffers'." "C-c 8 -" "typo/dashes" "C-c 8 <" "typo/left-brackets" "C-c 8 >" "typo/right-brackets" + "C-x RET" "coding system" "C-x 8" "unicode" + "C-x @" "event modifiers" "C-x a" "abbrev/expand" "C-x r" "rectangle/register/bookmark" + "C-x t" "tabs" "C-x v" "version control" + "C-x X" "edebug" + "C-x C-a" "edebug" + "C-x C-k" "kmacro" ;; prefixes for my personal bindings + "C-c &" "yasnippet" "C-c a" "applications" "C-c a e" "erc" "C-c a o" "org" @@ -1600,6 +1635,10 @@ This function is intended for use with `ivy-ignore-buffers'." "C-c P s" "projectile/search" "C-c P x" "projectile/execute" "C-c P 4" "projectile/other-window" + "C-c p" "package management" + "C-c ps" "straight" + "C-c psa" "all" + "C-c psp" "package" "C-c q" "boxquote" "C-c t" "themes" ;; "s-O" "outline" @@ -1725,8 +1764,8 @@ This function is intended for use with `ivy-ignore-buffers'." :defer 0.5 :config (typo-global-mode 1) - :hook (((text-mode erc-mode) . typo-mode) - (tex-mode . (lambda ()(typo-mode -1))))) + :hook (((text-mode erc-mode web-mode) . typo-mode) + (tex-mode . (lambda ()(typo-mode -1))))) ;; highlight TODOs in buffers (use-package hl-todo @@ -1738,16 +1777,17 @@ This function is intended for use with `ivy-ignore-buffers'." :defer 0.5 :after eshell :config - (defvar user-@-host (concat (user-login-name) "@" (system-name) " ")) + (defvar user-@-host (concat (user-login-name) "@" (system-name) ":")) (defun +eshell/prompt () - (let ((base/dir (shrink-path-prompt default-directory))) - (concat (propertize user-@-host 'face 'default) - (propertize (car base/dir) - 'face 'font-lock-comment-face) - (propertize (cdr base/dir) - 'face 'font-lock-constant-face) - (propertize "> " 'face 'default)))) - (setq eshell-prompt-regexp (concat user-@-host ".*> ") + (concat (propertize user-@-host 'face 'default) + (propertize (abbreviate-file-name default-directory) + 'face 'font-lock-comment-face) + (propertize "\n" 'face 'default) + (if (= (user-uid) 0) + (propertize "#" 'face 'red) + (propertize "$" 'face 'default)) + (propertize " " 'face 'default))) + (setq eshell-prompt-regexp "\\(.*\n\\)*[$#] " eshell-prompt-function #'+eshell/prompt)) (use-package eshell-up @@ -1873,15 +1913,23 @@ This function is intended for use with `ivy-ignore-buffers'." ;; (use-package fill-column-indicator) (use-package emojify + :disabled :hook (erc-mode . emojify-mode)) (use-feature window :bind - (("C-c w " . split-window-right) - ("C-c w " . split-window-below) - ("C-c w s l" . split-window-right) - ("C-c w s j" . split-window-below) - ("C-c w q" . quit-window)) + (("C-c w s l" . b/split-window-right) + ("C-c w s j" . b/split-window-below) + ("C-c w q" . quit-window)) + :init + (defun b/split-window-right () + (interactive) + (split-window-right) + (other-window 1)) + (defun b/split-window-below () + (interactive) + (split-window-below) + (other-window 1)) :custom (split-width-threshold 150)) @@ -1911,10 +1959,20 @@ This function is intended for use with `ivy-ignore-buffers'." ("" . pdf-history-forward) ("" . pdf-history-forward) ("" . pdf-history-forward) - ("M-RET" . image-previous-line)) + ("M-RET" . image-previous-line) + ("C-s" . isearch-forward) + ("s s" . isearch-forward)) :config (pdf-tools-install nil t) :custom (pdf-view-resize-factor 1.05)) +(use-package org-pdftools + :straight (:host github :repo "fuxialexander/org-pdftools") + :demand + :after org + :config + (with-eval-after-load 'org + (require 'org-pdftools))) + (use-package biblio) (use-feature reftex @@ -1953,6 +2011,36 @@ This function is intended for use with `ivy-ignore-buffers'." :config (eosd-start)) +(use-package nnreddit + :disabled + :demand + :after gnus + :custom + (nnreddit-python-command "python3")) + +(use-package hyperbole + :disabled + :straight (hyperbole + :host github :repo "rswgnu/hyperbole" + :files ("*.el" ("kotl" "kotl/*.el") + "DEMO" "man/*.info" "man/*.texi"))) + +(use-package oddmuse-curl + :straight (:host github :repo "kensanata/oddmuse-curl") + :config + (setq + oddmuse-wikis + (append + '(("EmacsConf" "https://emacsconf.org" utf-8 "question" nil) + ("EmacsConf 2019" "https://emacsconf.org/2019" utf-8 "question" nil)) + oddmuse-wikis)) + :custom + (oddmuse-username "bandali")) + +(use-package debpaste + :custom + (debpaste-paste-is-hidden t)) + ;;; Email (with Gnus) @@ -1975,41 +2063,41 @@ This function is intended for use with `ivy-ignore-buffers'." gnus-select-method '(nnnil "") gnus-secondary-select-methods '((nnimap "shemshak" - (nnimap-stream plain) - (nnimap-address "127.0.0.1") - (nnimap-server-port 143) - (nnimap-authenticator plain) - (nnimap-user "amin@shemshak.local")) + (nnimap-stream plain) + (nnimap-address "127.0.0.1") + (nnimap-server-port 143) + (nnimap-authenticator plain) + (nnimap-user "amin@shemshak.local")) (nnimap "gnu" - (nnimap-stream plain) - (nnimap-address "127.0.0.1") - (nnimap-server-port 143) - (nnimap-authenticator plain) - (nnimap-user "bandali@gnu.local") - (nnimap-inbox "INBOX") - (nnimap-split-methods 'nnimap-split-fancy) - (nnimap-split-fancy (| - ;; (: gnus-registry-split-fancy-with-parent) - ;; (: gnus-group-split-fancy "INBOX" t "INBOX") - ;; gnu - (list ".*<\\(.*\\)\\.\\(non\\)?gnu\\.org>.*" "l.\\1") - ;; *.lists.sr.ht, omitting one dot if present - ;; add more \\.?\\([^.]*\\) if needed - (list ".*<~\\(.*\\)/\\([^.]*\\)\\.?\\([^.]*\\)\\.lists.sr.ht>.*" "l.~\\1.\\2\\3") - ;; webmasters - (from "webmasters\\(-comment\\)?@gnu\\.org" "webmasters") - ;; other - (list ".*atreus.freelists.org" "l.atreus") - (list ".*deepspec.lists.cs.princeton.edu" "l.deepspec") - ;; (list ".*haskell-art.we.lurk.org" "l.haskell.art") ;d - (list ".*haskell-cafe.haskell.org" "l.haskell-cafe") - ;; (list ".*notmuch.notmuchmail.org" "l.notmuch") ;u - ;; (list ".*dev.lists.parabola.nu" "l.parabola-dev") ;u - ;; ---------------------------------- - ;; legend: (u)nsubscribed | (d)ead - ;; ---------------------------------- - ;; otherwise, leave mail in INBOX - "INBOX"))) + (nnimap-stream plain) + (nnimap-address "127.0.0.1") + (nnimap-server-port 143) + (nnimap-authenticator plain) + (nnimap-user "bandali@gnu.local") + (nnimap-inbox "INBOX") + (nnimap-split-methods 'nnimap-split-fancy) + (nnimap-split-fancy (| + ;; (: gnus-registry-split-fancy-with-parent) + ;; (: gnus-group-split-fancy "INBOX" t "INBOX") + ;; gnu + (list ".*<\\(.*\\)\\.\\(non\\)?gnu\\.org>.*" "l.\\1") + ;; *.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") @@ -2031,7 +2119,7 @@ This function is intended for use with `ivy-ignore-buffers'." (nnimap-server-port 143) (nnimap-authenticator plain) (nnimap-user "abandali@csc.uw.local"))) - gnus-message-archive-group "nnimap+shemshak:Sent" + gnus-message-archive-group "nnimap+gnu:INBOX" gnus-parameters '(("l\\.atreus" (to-address . "atreus@freelists.org") @@ -2056,6 +2144,9 @@ This function is intended for use with `ivy-ignore-buffers'." ("l\\.emacs-tangents" (to-address . "emacs-tangents@gnu.org") (to-list . "emacs-tangents@gnu.org")) + ("l\\.emacsconf-committee" + (to-address . "emacsconf-committee@gnu.org") + (to-list . "emacsconf-committee@gnu.org")) ("l\\.emacsconf-discuss" (to-address . "emacsconf-discuss@gnu.org") (to-list . "emacsconf-discuss@gnu.org")) @@ -2191,13 +2282,34 @@ This function is intended for use with `ivy-ignore-buffers'." :config (setq gnus-buttonized-mime-types '("multipart/\\(signed\\|encrypted\\)") - gnus-visible-headers - (concat gnus-visible-headers "\\|^List-Id:\\|^X-RT-Originator:\\|^User-Agent:") - gnus-sorted-header-list - '("^From:" "^Subject:" "^Summary:" "^Keywords:" - "^Followup-To:" "^To:" "^Cc:" "X-RT-Originator" - "^Newsgroups:" "List-Id:" "^Organization:" - "^User-Agent:" "^Date:") + gnus-sorted-header-list '("^From:" + "^X-RT-Originator" + "^Newsgroups:" + "^Subject:" + "^Date:" + "^Envelope-To:" + "^Followup-To:" + "^Reply-To:" + "^Organization:" + "^Summary:" + "^Abstract:" + "^Keywords:" + "^To:" + "^[BGF]?Cc:" + "^Posted-To:" + "^Mail-Copies-To:" + "^Mail-Followup-To:" + "^Apparently-To:" + "^Resent-From:" + "^User-Agent:" + "^X-detected-operating-system:" + "^Message-ID:" + "^References:" + "^List-Id:" + "^Gnus-Warning:") + gnus-visible-headers (mapconcat 'identity + gnus-sorted-header-list + "\\|") ;; local-lapsed article dates ;; from https://www.emacswiki.org/emacs/GnusFormatting#toc11 gnus-article-date-headers '(user-defined) @@ -2234,14 +2346,12 @@ This function is intended for use with `ivy-ignore-buffers'." (use-feature gnus-msg :config - (defvar b/signature "Amin Bandali -Free Software Activist | GNU Webmaster & Volunteer -GPG: BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103 -https://shemshak.org/~amin") (defvar b/gnu-signature "Amin Bandali -Free Software Activist | GNU Webmaster & Volunteer +Free Software Activist | GNU Maintainer & Webmaster GPG: BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103 https://bandali.eu.org") + (defvar b/shemshak-signature "Amin Bandali +https://shemshak.org/~amin") (defvar b/uw-signature "Amin Bandali, MMath Student Cheriton School of Computer Science University of Waterloo @@ -2250,29 +2360,35 @@ https://bandali.eu.org") Systems Committee Computer Science Club, University of Waterloo https://csclub.uwaterloo.ca/~abandali") - (setq gnus-posting-styles + (setq gnus-message-replysign t + gnus-posting-styles '((".*" - (address "amin@shemshak.org") - (body "\nBest,\n") - (signature b/signature) - (eval (setq b/message-cite-say-hi t))) - ("nnimap\\+gnu:.*" (address "bandali@gnu.org") - (signature b/gnu-signature) - (eval (set (make-local-variable 'message-user-fqdn) "fencepost.gnu.org"))) + (signature b/gnu-signature)) + ("nnimap\\+gnu:l\\..*" + (signature nil)) ((header "subject" "ThankCRM") (to "webmasters-comment@gnu.org") (body "") (eval (setq b/message-cite-say-hi nil))) + ("nnimap\\+shemshak:.*" + (address "amin@shemshak.org") + (body "\nBest,\n") + (signature b/shemshak-signature) + (gcc "nnimap+shemshak:Sent") + (eval (setq b/message-cite-say-hi t))) ("nnimap\\+uw:.*" - (address "abandali@uwaterloo.ca") + (address "bandali@uwaterloo.ca") + (body "\nBest,\n") (signature b/uw-signature)) ("nnimap\\+uw:INBOX" (gcc "\"nnimap+uw:Sent Items\"")) ("nnimap\\+csc:.*" - (address "abandali@csclub.uwaterloo.ca") + (address "bandali@csclub.uwaterloo.ca") (signature b/csc-signature) - (gcc "nnimap+csc:Sent"))))) + (gcc "nnimap+csc:Sent")))) + ;; :hook (gnus-message-setup . mml-secure-message-sign) + ) (use-feature gnus-topic :hook (gnus-group-mode . gnus-topic-mode) @@ -2317,6 +2433,7 @@ https://csclub.uwaterloo.ca/~abandali") mail-envelope-from 'header)) (use-feature message + :bind (:map message-mode-map ("" . b/insert-asterism)) :config ;; redefine for a simplified In-Reply-To header ;; (see https://todo.sr.ht/~sircmpwn/lists.sr.ht/67) @@ -2348,7 +2465,7 @@ https://csclub.uwaterloo.ca/~abandali") message-subscribed-address-functions '(gnus-find-subscribed-addresses) message-dont-reply-to-names - "\\(\\(\\(amin\\|mab\\)@shemshak\\.org\\)\\|\\(amin@bndl\\.org\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(bandali\\|mab\\|aminb?\\)@gnu\\.org\\)\\|\\(a\\(min\\.\\)?bandali@uwaterloo\\.ca\\)\\|\\(abandali@csclub\\.uwaterloo\\.ca\\)\\)") + "\\(\\(\\(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) @@ -2411,7 +2528,6 @@ https://csclub.uwaterloo.ca/~abandali") (defun company-ebdb--post-complete (_) nil)) (use-feature ebdb-gnus - :demand :after ebdb :custom (ebdb-gnus-window-size 0.3)) @@ -2419,7 +2535,7 @@ https://csclub.uwaterloo.ca/~abandali") (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) @@ -2464,7 +2580,7 @@ https://csclub.uwaterloo.ca/~abandali") ;;; IRC (with ERC and ZNC) (use-feature erc - :bind (("C-c b e" . erc-switch-to-buffer) + :bind (("C-c b b" . erc-switch-to-buffer) :map erc-mode-map ("M-a" . erc-track-switch-buffer)) :custom