wee tweaks

6 files changed, 17 insertions, 13 deletions

diff --git a/custom/jao-custom-notmuch.el b/custom/jao-custom-notmuch.el
index a374ebd..142b962 100644
--- a/custom/jao-custom-notmuch.el
+++ b/custom/jao-custom-notmuch.el
@@ -250,7 +250,8 @@
 ;;; hello
 (defun jao-notmuch-hello--header () (insert " "))
 
-(add-to-list 'notmuch-hello-sections 'jao-notmuch-hello--header)
+(when (display-graphic-p)
+  (add-to-list 'notmuch-hello-sections 'jao-notmuch-hello--header))
 (add-to-list 'notmuch-hello-sections 'notmuch-hello-insert-alltags t)
 
 (defun jao-notmuch-refresh-agenda ()
@@ -363,9 +364,9 @@
         notmuch-show-only-matching-messages t
         notmuch-show-part-button-default-action 'notmuch-show-view-part
         notmuch-wash-signature-lines-max 0
-        notmuch-wash-wrap-lines-length 80
-        notmuch-wash-citation-lines-prefix 10
-        notmuch-wash-citation-lines-suffix 20
+        notmuch-wash-wrap-lines-length 120
+        notmuch-wash-citation-lines-prefix 120
+        notmuch-wash-citation-lines-suffix 120
         notmuch-show-text/html-blocked-images "."
         jao-notmuch-header-line-format
         (if jao-modeline-in-minibuffer
diff --git a/data/kitty.conf b/data/kitty.conf
index 3c03db3..efe2477 100644
--- a/data/kitty.conf
+++ b/data/kitty.conf
@@ -46,7 +46,7 @@ initial_window_height 400
 enabled_layouts *
 window_border_width 1
 window_margin_width 1
-window_padding_width 2
+window_padding_width 0
 active_border_color #00ff00
 inactive_border_color #cccccc
 inactive_text_alpha 1.0
diff --git a/init.el b/init.el
index c841bf1..c6bff7e 100644
--- a/init.el
+++ b/init.el
@@ -251,8 +251,10 @@
       (pdf-view-mode "application/pdf" (display-graphic-p))
       ("zathura \"%s\"" "application/pdf")
       (image-mode "image/*" (display-graphic-p))
-      ("firefox \"%s\" && swaymsg [app_id=Firefox] focus" "text/html"
+      ("firefox --private-window \"%s\"" "text/html"
        (and jao-sway-enabled (not (display-graphic-p))))
+      ;; ("firefox \"%s\" && swaymsg [app_id=Firefox] focus" "text/html"
+      ;;  (and jao-sway-enabled (not (display-graphic-p))))
       ("swayimg \"%s\"" "image/*" jao-sway-enabled)
       ("feh \"%s\"" "image/*")))))
 ;;; Crypto
@@ -1316,8 +1318,8 @@
   (propertize (cond ((and (jao-exwm-enabled-p)
                           (not (bound-and-true-p jao-exwm--use-afio)))
                      (format "F%s" exwm-workspace-current-index))
-                    (jao-afio-use-frames (jao-afio-frame-name))
-                    (t (format "%s" (jao-afio-frame-no))))
+                    (jao-afio-use-frames (or (jao-afio-frame-name) ""))
+                    (t (format "%s" (or (jao-afio-frame-no) ""))))
               'face 'font-lock-warning-face))
 
 (jao-minibuffer-add-variable '(jao-current--frame-id) 100)
@@ -3255,7 +3257,7 @@
 ;;; Global transients
 (defun jao-list-packages ()
   (interactive)
-  (jao-afio--goto-scratch-1)
+  (jao-afio--goto-scratch)
   (package-list-packages))
 
 (defun jao-window-system-p ()
diff --git a/lib/eos/jao-afio.el b/lib/eos/jao-afio.el
index f57838a..0f1ae43 100644
--- a/lib/eos/jao-afio.el
+++ b/lib/eos/jao-afio.el
@@ -56,7 +56,7 @@
   (let ((jao-doc-session-inhibit-save t))
     (dolist (doc (or docs (jao-doc-session)))
       (when (file-exists-p doc)
-        (jao-open-doc doc)
+        (if (jao-pdf-is-pdf-file doc) (jao-open-doc doc) (find-file doc))
         (other-window 1)))
     (other-window 1)))
 
diff --git a/lib/eos/jao-tracking.el b/lib/eos/jao-tracking.el
index badffae..cf64c89 100644
--- a/lib/eos/jao-tracking.el
+++ b/lib/eos/jao-tracking.el
@@ -133,7 +133,8 @@
         (unless (eq 0 n) (setq jao-tracking--start-frame n))
         (cond (tracking-buffers
                (let ((b (car tracking-buffers)))
-                 (if (eq 0 n) (tracking-next-buffer)
+                 (if (eq 0 n)
+                     (tracking-next-buffer)
                    (jao-afio--goto-scratch)
                    (when b (pop-to-buffer b))
                    (tracking-remove-visible-buffers))))
diff --git a/lib/themes/jao-light-term-theme.el b/lib/themes/jao-light-term-theme.el
index f7b2eb8..ccd6a3f 100644
--- a/lib/themes/jao-light-term-theme.el
+++ b/lib/themes/jao-light-term-theme.el
@@ -97,13 +97,13 @@
                          :box (:line-width 1 :color "grey90"))
             (magit-diff-context-highlight (c nil hl) ex)
             (magit-diff-hunk-heading-highlight (c nil hl) it bf)
-            (mode-line (c blue "gray91") nbf)
+            (mode-line (c "grey20" "gray90") nbf)
             (mode-line-inactive (c "grey40" "gray95"))
             (mode-line-buffer-id (~ default) (c dark-blue-2 nil) nit)
             (mode-line-emphasis (c green nil))
             (mode-line-highlight (c green nil))
             (org-link (p link) (ul "grey80"))
-            (scroll-bar (c "grey80" nil))
+            (scroll-bar (c "grey90" nil))
             (show-paren-match (c nil "grey85"))
             (shr-text (c nil nil))
             (shr-link (~ link) (ul light-gray))