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

1 files changed, 41 insertions, 25 deletions

@@ -113,7 +113,8 @@
   (+ensure-after-init #'+pulse-location-mode))
 
 (setup (:require reading)
-  (:global "C-c C-r" #'reading-mode))
+  (:hook-into view-mode)                ; XXX doesn't go back
+  )
 
 (setup (:require user-save)
   (add-hook 'user-save-hook #'+clean-empty-lines)
@@ -178,9 +179,12 @@
              (cond ((executable-find "mpv") #'+browse-image-with-mpv)
                    (t #'eww-browse-url))
              args)))
-    (cons (rx                           ; videos
+    (cons (rx
            (or "youtube.com" "youtu.be" "yewtu.be"
-               (seq "." (or "mp4" "gif" "mov" "MOV" "webm") eos)))
+               ;; videos
+               (seq "." (or "mp4" "gif" "mov" "MOV" "webm") eos)
+               ;; music
+               (seq "." (or "ogg" "mp3") eos)))
           (lambda (&rest args)
             (apply (if (executable-find "mpv")
                        #'+browse-url-with-mpv
@@ -1038,6 +1042,7 @@ See also `crux-reopen-as-root-mode'."
   (:+key "M-q" #'filldent-dwim))
 
 (setup (:straight flyspell-correct)
+  (:load-after flyspell)
   (:also-load +flyspell-correct)
   (:option flyspell-correct--cr-key ";")
   (:bind-into flyspell
@@ -1230,7 +1235,8 @@ See also `crux-reopen-as-root-mode'."
   (:hook-into org-mode))
 
 (setup (:straight org-sticky-header)
-  (:hook-into org-mode))
+  ;; (:hook-into org-mode)
+  )
 
 (setup (:straight org-visibility)
   (:option org-visibility-state-file (.etc "org-visibility")
@@ -1289,27 +1295,32 @@ See also `crux-reopen-as-root-mode'."
 (setup (:straight (simple-modeline
                    :fork (:host github :repo "duckwork/simple-modeline")))
   (:require +modeline)
-  (:option simple-modeline-segments `((;; left
-                                       +modeline-ace-window-display
-                                       +modeline-modified
-                                       ,(+modeline-concat
-                                         '(+modeline-god-mode
-                                           +modeline-reading-mode
-                                           +modeline-narrowed)
-                                         ",")
-                                       +modeline-buffer-name
-                                       +modeline-position
-                                       +modeline-anzu
-                                       )
-                                      (;; right
-                                       +modeline-track
-                                       +modeline-vc
-                                       simple-modeline-segment-misc-info
-                                       simple-modeline-segment-process
-                                       +modeline-text-scale
-                                       +modeline-minions
-                                       +modeline-major-mode
-                                       )))
+  (:option simple-modeline-segments
+           `(( ; left
+              +modeline-ace-window-display
+              +modeline-modified
+              +modeline-buffer-name
+              (lambda () (+modeline-vc ": "))
+              ,(+modeline-concat
+                '(+modeline-minions
+                  +modeline-major-mode))
+              +modeline-anzu
+              )
+             ( ; right
+              (lambda ()
+                (unless +tab-bar-misc-info-mode
+                  (+modeline-concat
+                   '(+modeline-track
+                     simple-modeline-segment-misc-info))))
+
+              simple-modeline-segment-process
+              +modeline-text-scale
+              ,(+modeline-concat
+                '(+modeline-god-mode
+                  +modeline-reading-mode
+                  +modeline-narrowed)
+                ",")
+              +modeline-position)))
   (simple-modeline-mode +1))
 
 (setup (:straight smartscan)
@@ -1480,3 +1491,8 @@ 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))