about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorCase Duckworth2021-04-27 13:51:42 -0500
committerCase Duckworth2021-04-27 13:51:42 -0500
commit06409e4bd192314076bedb497b9de87901ea7266 (patch)
tree69b59c1d7ea7cca9f639675642aa4f836c8258d7
parentAdd a leader key for elpher-bookmarks; add gemini-write (diff)
parentAdd gnus leader mapping (diff)
downloademacs-06409e4bd192314076bedb497b9de87901ea7266.tar.gz
emacs-06409e4bd192314076bedb497b9de87901ea7266.zip
Merge branch 'main' of https://tildegit.org/acdw/emacs
-rw-r--r--gnus.el10
-rw-r--r--init.el24
2 files changed, 23 insertions, 11 deletions
diff --git a/gnus.el b/gnus.el index 185849b..fa20133 100644 --- a/gnus.el +++ b/gnus.el
@@ -27,6 +27,11 @@
27 (nnir-search-engine imap)) 27 (nnir-search-engine imap))
28 (nntp "news.tilde.club"))) 28 (nntp "news.tilde.club")))
29 29
30;;; Gnus behavior options
31(setq gnus-gcc-mark-as-read t
32 message-signature (or (file-exists-p message-signature-file)
33 "~ acdw"))
34
30;;; Gnus UI options 35;;; Gnus UI options
31(setq gnus-thread-sort-functions '(gnus-thread-sort-by-most-recent-date 36(setq gnus-thread-sort-functions '(gnus-thread-sort-by-most-recent-date
32 (not gnus-thread-sort-by-number)) 37 (not gnus-thread-sort-by-number))
@@ -47,9 +52,9 @@
47(setq gnus-summary-line-format 52(setq gnus-summary-line-format
48 (concat 53 (concat
49 "%0{%U%R%z%}" 54 "%0{%U%R%z%}"
50 "%3{│%}" "%1{%d%}" "%3{│%}" ;; date 55 "%3{│%}" "%1{%d%}" "%3{│%}" ; date
51 " " 56 " "
52 "%4{%-20,20f%}" ;; name 57 "%4{%-20,20f%}" ; name
53 " " 58 " "
54 "%3{│%}" 59 "%3{│%}"
55 " " 60 " "
@@ -59,6 +64,7 @@
59(setq gnus-summary-display-arrow t) 64(setq gnus-summary-display-arrow t)
60 65
61(add-hook 'gnus-group-mode-hook #'hl-line-mode) 66(add-hook 'gnus-group-mode-hook #'hl-line-mode)
67(add-hook 'gnus-article-mode-hook #'acdw/reading-mode)
62 68
63;;; Sending mail 69;;; Sending mail
64(setq send-mail-function #'smtpmail-send-it 70(setq send-mail-function #'smtpmail-send-it
diff --git a/init.el b/init.el index 2d63ee6..a064bda 100644 --- a/init.el +++ b/init.el
@@ -176,12 +176,15 @@
176 ;; (icomplete-mode +1) 176 ;; (icomplete-mode +1)
177 177
178 ;; Emoji 178 ;; Emoji
179 (when-let* ((ffl (font-family-list)) 179 (let ((ffl (font-family-list)))
180 (symbol-font (car (or (member "Segoe UI Emoji" ffl) 180 (dolist (emoji-font '("Segoe UI Emoji"
181 (member "Noto Color Emoji" ffl) 181 "Noto Color Emoji"
182 (member "Apple Emoji" ffl))))) 182 "Apple Color Emoji"
183 (set-fontset-font t 'symbol (font-spec :family symbol-font) nil 'prepend)) 183 "Symbola"))
184 184 (when (member emoji-font ffl)
185 (set-fontset-font t 'symbol
186 (font-spec :family emoji-font) nil 'append))))
187
185 ;; Etc. 188 ;; Etc.
186 (:option inhibit-startup-screen t 189 (:option inhibit-startup-screen t
187 initial-buffer-choice t 190 initial-buffer-choice t
@@ -560,7 +563,8 @@
560 gnus-directory (expand-file-name "gnus/News" user-emacs-directory) 563 gnus-directory (expand-file-name "gnus/News" user-emacs-directory)
561 gnus-init-file (expand-file-name "gnus.el" user-emacs-directory)) 564 gnus-init-file (expand-file-name "gnus.el" user-emacs-directory))
562 (when (not (file-exists-p gnus-directory)) 565 (when (not (file-exists-p gnus-directory))
563 (make-directory gnus-directory :parents))) 566 (make-directory gnus-directory :parents))
567 (:leader "m" gnus))
564 568
565(when (eq acdw/system :home) 569(when (eq acdw/system :home)
566 ;; Apparently the original repo is unmaintained, thus this fork. 570 ;; Apparently the original repo is unmaintained, thus this fork.
@@ -878,9 +882,11 @@ if ripgrep is installed, otherwise `consult-grep'."
878 (eval-region (region-beginning) (region-end))) 882 (eval-region (region-beginning) (region-end)))
879 (with-message "Evaluating buffer" 883 (with-message "Evaluating buffer"
880 (eval-buffer)))) 884 (eval-buffer))))
881 885
886 ;; Emulate slime's eval binds
882 (:with-map emacs-lisp-mode-map 887 (:with-map emacs-lisp-mode-map
883 (:bind "C-c C-c" acdw/eval-region-or-buffer 888 (:bind "C-c C-c" eval-defun
889 "C-c C-k" acdw/eval-region-or-buffer
884 "C-c C-z" ielm)) 890 "C-c C-z" ielm))
885 891
886 (add-hook 'emacs-lisp-mode-hook 'turn-on-eldoc-mode) 892 (add-hook 'emacs-lisp-mode-hook 'turn-on-eldoc-mode)