1 files changed, 73 insertions, 20 deletions

@@ -413,13 +413,13 @@
   ;; Brand new for Emacs 28: see https://ruzkuku.com/texts/emacs-mouse.html
   ;; Actually, look at this as well: https://www.emacswiki.org/emacs/Mouse3
   (when (fboundp 'context-menu-mode)
-    ;; (:option context-menu-functions
-    ;;          '(context-menu-ffap
-    ;;            context-menu-region
-    ;;            context-menu-undo
-    ;;            context-menu-dictionary))
+    (:option context-menu-functions
+             '(context-menu-ffap
+               context-menu-region
+               context-menu-undo
+               context-menu-dictionary))
     (context-menu-mode +1))
-  (dolist (click '(                     ; Fix scrolling in the margin
+  (dolist (click '(;; Fix scrolling in the margin
                    wheel-down double-wheel-down triple-wheel-down
                    wheel-up double-wheel-up triple-wheel-up))
     (global-set-key (vector 'right-margin click) 'mwheel-scroll)
@@ -505,6 +505,8 @@
   ;;   (let ((browse-url-browser-function browse-url-secondary-browser-function))
   ;;     (apply fn r)))
   (with-eval-after-load 'org
+    (setf (alist-get "\\.x?html?\\'" org-file-apps nil nil #'equal)
+          #'+org-open-html)
     (org-clock-persistence-insinuate)
     (org-link-set-parameters "tel" :follow #'+org-tel-open)
     (setf (alist-get "\\.x?html?\\'" org-file-apps nil nil #'equal)
@@ -626,11 +628,52 @@
 
 (setup time
   ;; TODO: +display-time-mode with MOAR customizations
-  (:option display-time-format "%H:%M %a %e"
-           display-time-default-load-average nil
+  (:option display-time-default-load-average nil
            display-time-mail-file :disable)
+  (with-eval-after-load 'discord
+    (with-eval-after-load '+tab-bar
+      (:option display-time-string-forms
+               '((propertize (format-time-string "%H:%M %a %e" now)
+                             'face '+tab-bar-extra
+                             'help-echo (discord-date-string))
+                 load
+                 (if mail
+                     (concat " "
+                             (propertize
+                              display-time-mail-string
+                              'display `(when (and display-time-use-mail-icon
+                                                   (display-graphic-p))
+                                          ,@display-time-mail-icon
+                                          ,@(when (and
+                                                   display-time-mail-face
+                                                   (memq
+                                                    (plist-get
+                                                     (cdr display-time-mail-icon)
+                                                     :type)
+                                                    '(pbm xbm)))
+                                              (let ((bg (face-attribute
+                                                         display-time-mail-face
+                                                         :background)))
+                                                (when (stringp bg)
+                                                  (list :background bg)))))
+                              'face display-time-mail-face))
+                   "")
+                 " "))))
+
   (display-time-mode +1))
 
+(setup tramp
+  (el-patch-feature tramp)
+  (with-eval-after-load 'tramp
+    (el-patch-defun tramp-debug-buffer-command-completion-p (_symbol buffer)
+      "A predicate for Tramp interactive commands.
+They are completed by \"M-x TAB\" only in Tramp debug buffers."
+      (with-current-buffer buffer
+        (el-patch-wrap 2
+          (save-restriction
+           (widen)
+           (string-equal (buffer-substring 1 10) ";; Emacs:")))))))
+
 (setup (:straight 0x0)
   (:option 0x0-default-server 'ttm)
   (with-eval-after-load 'embark
@@ -1015,7 +1058,7 @@ See also `crux-reopen-as-root-mode'."
   (electric-cursor-mode +1))
 
 (setup (:straight elfeed)
-  (:also-load +elfeed)
+  (:require +elfeed)
   (+define-dir elfeed/ (sync/ "emacs/elfeed/" t))
   (:option
    elfeed-curl-program-name (executable-find "curl")
@@ -1046,10 +1089,7 @@ See also `crux-reopen-as-root-mode'."
            "&" #'+elfeed-show-browse-generic
            "RET" #'shr-browse-url)
     (:hook #'reading-mode)
-    ;; (define-advice elfeed-show-entry (:after (&rest _))
-    ;;   "Re-flow the entry a short time after showing it."
-    ;;   (run-at-time 0.1 nil #'elfeed-show-refresh))
-    ))
+    (+elfeed-update-async-mode +1)))
 
 (setup (:straight elfeed-org)
   (:also-load +org-capture)
@@ -1212,6 +1252,8 @@ See also `crux-reopen-as-root-mode'."
 (setup (:straight hungry-delete)
   (:option hungry-delete-chars-to-skip " \t"
            hungry-delete-join-reluctantly nil)
+  (+with-ensure-after-init
+    (add-to-list 'hungry-delete-except-modes 'eshell-mode))
   (:bind-into paredit
     ;; I define these functions here because they really require both packages
     ;; to make any sense.  So, would I put them in `+hungry-delete' or
@@ -1297,6 +1339,17 @@ See also `crux-reopen-as-root-mode'."
       (setf (alist-get 'markdown-mode apheleia-mode-alist) 'markdownfmt)
       (setf (alist-get 'gfm-mode apheleia-mode-alist) 'markdownfmt))))
 
+(setup (:straight mastodon)
+  (:option mastodon-instance-url "https://tiny.tilde.website"
+           mastodon-client--token-file (.etc "mastodon.plstore")
+           mastodon-auth-source-file (car auth-sources)
+           mastodon-tl--enable-proportional-fonts t
+           mastodon-tl--show-avatars t)
+  (:hook #'mastodon-async-mode
+         #'reading-mode
+         #'hl-line-mode
+         #'lin-mode))
+
 (setup (:straight minions)
   (minions-mode +1))
 
@@ -1649,13 +1702,6 @@ See also `crux-reopen-as-root-mode'."
                              (sync/ "emacs/snippets" t)))
   (yas-global-mode +1))
 
-(setup (:straight zoom-frm))
-
-(setup (:straight zzz-to-char)
-  (:require +zzz-to-char)
-  (:option zzz-to-char-reach 1024)
-  (:global "M-z" #'+zzz-to-char))
-
 (setup (:straight (ytdious
                    :host github :repo "spiderbit/ytdious"
                    :fork (:host github :repo "duckwork/ytdious")))
@@ -1664,3 +1710,10 @@ See also `crux-reopen-as-root-mode'."
                                          (concat "https://" +invidious-host)
                                        "https://invidious.snopyta.org"))
   (:bind "y" #'+ytdious-watch))
+
+(setup (:straight zoom-frm))
+
+(setup (:straight zzz-to-char)
+  (:require +zzz-to-char)
+  (:option zzz-to-char-reach (+bytes 1 :kib))
+  (:global "M-z" #'+zzz-to-char))