1 files changed, 44 insertions, 15 deletions

@@ -163,7 +163,6 @@
                     "imgur.com"
                     "pixelfed" "instagram.com" "bibliogram.art"
                     "reddit.com" "teddit.net"
-                    "tildes.net"
                     "taskiq"
                     "twitter.com" "nitter.net"
                     "streamable.com"
@@ -402,7 +401,12 @@
     ;;            context-menu-region
     ;;            context-menu-undo
     ;;            context-menu-dictionary))
-    (context-menu-mode +1)))
+    (context-menu-mode +1))
+  (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)
+    (global-set-key (vector 'left-margin click) 'mwheel-scroll)))
 
 (setup org
   ;; Plain org with the `setup' form for sorting, but I install with straight.
@@ -566,9 +570,21 @@
   (:option shr-width (- fill-column 5)  ; pad out for wide letters
            shr-use-fonts t))
 
+(setup tab-bar
+  (:require +tab-bar)
+  (:option tab-bar-tab-name-function '+tab-bar-tab-name-truncated-left
+           tab-bar-tab-name-truncated-max 20
+           tab-bar-tab-name-ellipsis truncate-string-ellipsis)
+  (tab-bar-mode +1)
+  (+tab-bar-misc-info-mode +1))
+
 (setup text
   (:hook #'turn-on-auto-fill))
 
+(setup time
+  (:option display-time-format "%H:%M")
+  (display-time-mode +1))
+
 (setup (:straight 0x0)
   (:option 0x0-default-server 'ttm)
   (with-eval-after-load 'embark
@@ -746,7 +762,7 @@
            #'+circe-F/C-mode
            ;; For some reason `+circe-shorten-url-mode' won't work right out of
            ;; the gate.
-           (lambda () (run-with-idle-timer 0.25 nil #'+circe-shorten-url-mode)))
+           (lambda () (run-at-time 0.25 nil #'+circe-shorten-url-mode)))
     (:bind "C-c C-s" #'circe-command-SLAP))
 
   (:with-mode lui-mode
@@ -774,13 +790,23 @@
     (:local-set fringes-outside-margins t
                 right-margin-width (length lui-time-stamp-format)
                 scroll-margin 0
+                scroll-step 1
                 word-wrap t
                 wrap-prefix (+string-repeat +circe-left-margin " ")
                 line-number-mode nil
                 column-number-mode nil
                 file-percentage-mode nil
                 visual-fill-column-extra-text-width
-                (cons +circe-left-margin 0)))
+                (cons +circe-left-margin 0))
+    (with-eval-after-load 'vertico-multiform
+      (setf (alist-get 'lui-next-button-or-complete vertico-multiform-commands)
+            '(flat))))
+
+  (:with-mode tracking-mode
+    (:option tracking-position 'before-modes)
+    (add-to-list 'mode-line-misc-info
+                 '(tracking-mode
+                   tracking-mode-line-buffers)))
 
   (with-eval-after-load 'topsy
     (:option (append topsy-mode-functions)
@@ -942,6 +968,7 @@ See also `crux-reopen-as-root-mode'."
    elfeed-search-trailing-width 24
    elfeed-search-title-min-width 24
    elfeed-search-title-max-width 78
+   elfeed-search-remain-on-entry t
    elfeed-show-unique-buffers t
    elfeed-db-directory (elfeed/ "db/" t)
    elfeed-log 'debug                   ; until I can figure out syncing...
@@ -1047,7 +1074,9 @@ See also `crux-reopen-as-root-mode'."
   (:option flyspell-correct--cr-key ";")
   (:bind-into flyspell
     "C-;" #'flyspell-correct-wrapper
-    "<f7>" #'+flyspell-correct-buffer))
+    "<f7>" #'+flyspell-correct-buffer)
+  (with-eval-after-load 'vertico-multiform
+    (setf (alist-get 'flyspell-correct-wrapper vertico-multiform-commands) nil)))
 
 (setup (:straight-when (forge
                         :host github :repo "magit/forge")
@@ -1200,8 +1229,6 @@ See also `crux-reopen-as-root-mode'."
       (setf (alist-get 'gfm-mode apheleia-mode-alist) 'markdownfmt))))
 
 (setup (:straight minions)
-  (:option minions-prominent-modes
-           '(tracking-mode))
   (minions-mode +1))
 
 (setup (:straight (mode-line-bell
@@ -1428,12 +1455,17 @@ See also `crux-reopen-as-root-mode'."
                                         (helpful-function)
                                         (helpful-macro)
                                         (helpful-callable)
-                                        (helpful-variable))
+                                        (helpful-variable)
+                                        (completion-at-point flat)
+                                        (indent-for-tab-command flat)
+                                        (consult-buffer flat)
+                                        (insert-char))
            ;; This is applied /after/ the above, so default is at the end of
            ;; this alist.
            vertico-multiform-categories '((file buffer grid)
-                                          (t unobtrusive)))
+                                          (t flat)))
   (dolist (buf-cmd '(consult-find
+                     consult-yank-pop
                      consult-locate
                      consult-grep
                      consult-git-grep
@@ -1442,7 +1474,9 @@ See also `crux-reopen-as-root-mode'."
                      consult-line-multi
                      consult-multi-occur
                      consult-keep-lines
-                     consult-focus-lines))
+                     consult-focus-lines
+                     consult-imenu
+                     consult-outline))
     (setf (alist-get buf-cmd vertico-multiform-commands) '(buffer)))
   (:with-map vertico-map
     (:bind "RET" #'vertico-directory-enter
@@ -1491,8 +1525,3 @@ See also `crux-reopen-as-root-mode'."
   (:require +zzz-to-char)
   (:option zzz-to-char-reach 1024)
   (:global "M-z" #'+zzz-to-char))
-
-(setup tab-bar
-  (:require +tab-bar)
-  (tab-bar-mode +1)
-  (+tab-bar-misc-info-mode +1))