From 3379638199bf15bb1439209c1d5ace8daa560cfd Mon Sep 17 00:00:00 2001
From: Case Duckworth
Date: Mon, 10 Jan 2022 23:44:45 -0600
Subject: Change mode-line and tab-bar

---
 init.el | 52 +++++++++++++++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 21 deletions(-)

(limited to 'init.el')

diff --git a/init.el b/init.el
index f4d6533..f0a93a6 100644
--- a/init.el
+++ b/init.el
@@ -1278,27 +1278,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)
@@ -1469,3 +1474,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))
-- 
cgit 1.4.1-21-gabe81


From 4d1605ce45ef684176672830bec34173862b2cd1 Mon Sep 17 00:00:00 2001
From: Case Duckworth
Date: Mon, 10 Jan 2022 23:52:11 -0600
Subject: Hook reading-mode into view-mode

I need to fix reading-mode, however.
---
 init.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'init.el')

diff --git a/init.el b/init.el
index f0a93a6..9722a64 100644
--- a/init.el
+++ b/init.el
@@ -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)
-- 
cgit 1.4.1-21-gabe81


From e91bb5a1bef2770169987c88c730c735c10e0eb4 Mon Sep 17 00:00:00 2001
From: Case Duckworth
Date: Mon, 10 Jan 2022 23:52:31 -0600
Subject: Add music to browse-url-with-mpv

---
 init.el | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'init.el')

diff --git a/init.el b/init.el
index 9722a64..c4f71b0 100644
--- a/init.el
+++ b/init.el
@@ -179,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
-- 
cgit 1.4.1-21-gabe81


From 0e43d013ea22fe622d13370a50a44d548c94ccd0 Mon Sep 17 00:00:00 2001
From: Case Duckworth
Date: Mon, 10 Jan 2022 23:52:43 -0600
Subject: Bleh

---
 init.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'init.el')

diff --git a/init.el b/init.el
index c4f71b0..be470ab 100644
--- a/init.el
+++ b/init.el
@@ -1042,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
@@ -1223,7 +1224,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")
-- 
cgit 1.4.1-21-gabe81