Merge branch 'main' of https://tildegit.org/acdw/emacs

2 files changed, 23 insertions, 11 deletions

@@ -27,6 +27,11 @@
                 (nnir-search-engine imap))
         (nntp "news.tilde.club")))
 
+;;; Gnus behavior options
+(setq gnus-gcc-mark-as-read t
+      message-signature (or (file-exists-p message-signature-file)
+                            "~ acdw"))
+
 ;;; Gnus UI options
 (setq gnus-thread-sort-functions '(gnus-thread-sort-by-most-recent-date
                                    (not gnus-thread-sort-by-number))
@@ -47,9 +52,9 @@
 (setq gnus-summary-line-format
       (concat
        "%0{%U%R%z%}"
-       "%3{│%}" "%1{%d%}" "%3{│%}" ;; date
+       "%3{│%}" "%1{%d%}" "%3{│%}"      ; date
        "  "
-       "%4{%-20,20f%}"               ;; name
+       "%4{%-20,20f%}"                  ; name
        "  "
        "%3{│%}"
        " "
@@ -59,6 +64,7 @@
 (setq gnus-summary-display-arrow t)
 
 (add-hook 'gnus-group-mode-hook #'hl-line-mode)
+(add-hook 'gnus-article-mode-hook #'acdw/reading-mode)
 
 ;;; Sending mail
 (setq send-mail-function #'smtpmail-send-it
@@ -176,12 +176,15 @@
   ;; (icomplete-mode +1)
 
   ;; Emoji
-  (when-let* ((ffl (font-family-list))
-              (symbol-font (car (or (member "Segoe UI Emoji" ffl)
-                                    (member "Noto Color Emoji" ffl)
-                                    (member "Apple Emoji" ffl)))))
-    (set-fontset-font t 'symbol (font-spec :family symbol-font) nil 'prepend))
-
+  (let ((ffl (font-family-list)))
+    (dolist (emoji-font '("Segoe UI Emoji"
+                          "Noto Color Emoji"
+                          "Apple Color Emoji"
+                          "Symbola"))
+      (when (member emoji-font ffl)
+        (set-fontset-font t 'symbol
+                          (font-spec :family emoji-font) nil 'append))))
+  
   ;; Etc.
   (:option inhibit-startup-screen t
            initial-buffer-choice t
@@ -560,7 +563,8 @@
            gnus-directory (expand-file-name "gnus/News" user-emacs-directory)
            gnus-init-file (expand-file-name "gnus.el" user-emacs-directory))
   (when (not (file-exists-p gnus-directory))
-    (make-directory gnus-directory :parents)))
+    (make-directory gnus-directory :parents))
+  (:leader "m" gnus))
 
 (when (eq acdw/system :home)
   ;; Apparently the original repo is unmaintained, thus this fork.
@@ -878,9 +882,11 @@ if ripgrep is installed, otherwise `consult-grep'."
           (eval-region (region-beginning) (region-end)))
       (with-message "Evaluating buffer"
         (eval-buffer))))
-  
+
+  ;; Emulate slime's eval binds
   (:with-map emacs-lisp-mode-map
-    (:bind "C-c C-c" acdw/eval-region-or-buffer
+    (:bind "C-c C-c" eval-defun
+           "C-c C-k" acdw/eval-region-or-buffer
            "C-c C-z" ielm))
 
   (add-hook 'emacs-lisp-mode-hook 'turn-on-eldoc-mode)