nits

2 files changed, 21 insertions, 12 deletions

diff --git a/custom/jao-custom-notmuch.el b/custom/jao-custom-notmuch.el
index bbae862..858ae6b 100644
--- a/custom/jao-custom-notmuch.el
+++ b/custom/jao-custom-notmuch.el
@@ -129,15 +129,16 @@
 
 (defvar jao-notmuch-widened-searches nil)
 
-(defun jao-notmuch-define-searches (s &optional other)
+(defun jao-notmuch-init-searches (s &optional other)
   (jao-notmuch--set-new-search s)
 
   (setq notmuch-hello-sections nil
         notmuch-saved-searches nil
         jao-notmuch-widened-searches nil)
 
-  (when other (jao-notmuch--def-searches (car other) (cdr other)))
+  (when other (jao-notmuch--def-searches (car other) (cdr other))))
 
+(defun jao-notmuch-define-personal-searches ()
   (jao-notmuch--def-searches "inbox"
     `(,(jao-notmuch--q "inbox" "i")
       ,(jao-notmuch--q "write" "w")
@@ -175,8 +176,9 @@
               ("sp" "physics")
               ("ss" "sci")
               ("sg" "gr-qc")
-              ("sq" "quant-ph"))))
+              ("sq" "quant-ph")))))
 
+(defun jao-notmuch-define-summary-searches ()
   (jao-notmuch--def-searches "flags"
     (jao-notmuch-widen-searches notmuch-saved-searches " AND tag:flagged")
     t)
@@ -201,8 +203,12 @@
       (:query "tag:sent" :name "sent")))
 
   (jao-notmuch--def-searches nil
-    '((:query "*" :name "messages" :search-type tree)))
+    '((:query "*" :name "messages" :search-type tree))))
 
+(defun jao-notmuch-define-searches (s &optional other skip-jao)
+  (jao-notmuch-init-searches s other)
+  (unless skip-jao (jao-notmuch-define-personal-searches))
+  (jao-notmuch-define-summary-searches)
   ;; (add-to-list 'notmuch-hello-sections 'notmuch-hello-insert-alltags t)
 
   (when (display-graphic-p)
diff --git a/init.el b/init.el
index c924962..ec79845 100644
--- a/init.el
+++ b/init.el
@@ -1006,12 +1006,12 @@
 (if window-system
     (setq scroll-preserve-screen-position 'always
           scroll-conservatively most-positive-fixnum
-          scroll-margin 0
+          scroll-margin 5
           scroll-step 2
           redisplay-skip-fontification-on-input t)
   (setq scroll-preserve-screen-position nil
         scroll-conservatively 0
-        scroll-margin 0
+        scroll-margin 5
         scroll-step 1
         redisplay-skip-fontification-on-input nil))
 
@@ -1120,7 +1120,7 @@
 
 (use-package spatial-window
   :ensure t
-  :bind ("C-M-o" . spatial-window-select))
+  :bind ("M-o" . spatial-window-select))
 
 ;;;; transposing windows
 (defun transpose-windows (arg)
@@ -1149,8 +1149,8 @@
    (scroll-bar-width . 0)
    ,@(jao-when-linux '((menu-bar . nil)))
    ,@(jao-when-darwin '((internal-border-width . 5)
-                        (width . 163)
-                        (height . 70)
+                        ;; (width . 163)
+                        ;; (height . 70)
                         (menu-bar . t)
                         ;; (right-divider-width . 6)
                         ;; (bottom-divider-width . 6)
@@ -1182,10 +1182,12 @@
   (delete-window))
 
 ;;;; afio
+(defvar jao-afio-skip-default-set nil)
+
 (use-package jao-afio
   :demand t
   :config
-  (jao-afio-setup (or (not window-system) (jao-is-darwin)))
+  (jao-afio-setup (not window-system))
   (add-hook 'jao-afio-switch-hook 'jao-minibuffer-refresh t)
 
   (defun jao-current--frame-id ()
@@ -1204,7 +1206,8 @@
 
   (jao-when-darwin
    (jao-afio-add-frame-parameters "docs" (width . 195) (height . 75))
-   (jao-afio-add-frame-parameters nil (width . 163) (height . 70))
+   (unless jao-afio-skip-default-set
+     (jao-afio-add-frame-parameters nil (width . 163) (height . 70)))
    (add-to-list 'default-frame-alist '(width . 80)))
 
   :bind (("C-c f" . 'jao-afio-goto-main)
@@ -1213,7 +1216,7 @@
          ("C-c z" . 'jao-afio-goto-docs)
          ("C-c t" . 'jao-afio-goto-chats)
          ("C-c 0" . 'jao-afio-goto-scratch)
-         ("M-o" . 'jao-afio-toggle)))
+         ("s-o" . 'jao-afio-toggle)))
 
 ;;; Writing and writing modes
 ;;;; copyright notices