nits

6 files changed, 65 insertions, 11 deletions

diff --git a/attic/elisp/misc.el b/attic/elisp/misc.el
index 7e15ee9..36c39d3 100644
--- a/attic/elisp/misc.el
+++ b/attic/elisp/misc.el
@@ -298,17 +298,13 @@
         mu4e-user-mail-address-list jao-mails
         mu4e-view-show-addresses t
         mu4e-view-show-images t
-        mu4e-maildir-shortcuts '((:maildir "/jao/inbox" :key ?j))
+        mu4e-maildir-shortcuts '((:maildir "/jao.inbox" :key ?j))
         jao-mu4e-uninteresting-mail-query
         (concat
          "flag:unread AND NOT flag:trashed"
-         " AND NOT (maildir:/bigml/inbox OR maildir:/bigml/bugs OR"
-         " maildir:/bigml/support OR maildir:/jao/inbox)")
+         " AND NOT (" " maildir:/jao.inbox)")
         jao-mu4e-interesting-mail-query
-        (concat
-         "flag:unread AND NOT flag:trashed"
-         " AND (maildir:/bigml/inbox OR maildir:/bigml/bugs OR"
-         " maildir:/bigml/support OR maildir:/jao/inbox)")
+        "flag:unread AND NOT flag:trashed AND maildir:/jao.inbox"
         mu4e-bookmarks
         `((:name "Inbox" :query ,jao-mu4e-interesting-mail-query :key ?i)
           (:name "Other messages"
@@ -1312,3 +1308,56 @@ It should be the title of the web page as returned by `rdrview'"
   (let ((cnts (notmuch-hello-query-counts jao-notmuch-xbar-queries)))
     (jao-shell-exec (format "echo '%s | color=#8b3626 | size=11' >/tmp/xbar"
                             (mapconcat 'jao-notmuch--qstr cnts " ")))))
+;;; afio frame(s) as workspaces
+(defun jao-exwm--new-frame-p ()
+  (not (frame-parameter nil 'jao-frames-initialized)))
+
+(defun jao-exwm--mark-frame (force)
+  (prog1 (or force (jao-exwm--new-frame-p))
+    (set-frame-parameter nil 'jao-frames-initialized t)))
+
+(defun jao-exwm--goto-main (&optional init)
+  (interactive "P")
+  (exwm-workspace-switch-create 1)
+  (when (jao-exwm--mark-frame init) (jao-trisect)))
+
+(defun jao-exwm--goto-mail (&optional init)
+  (interactive "P")
+  (exwm-workspace-switch-create 2)
+  (when (jao-exwm--mark-frame init)
+    (jao-afio-open-gnus)))
+
+(defun jao-exwm--goto-www (&optional init)
+  (interactive "P")
+  (exwm-workspace-switch-create 5)
+  (when (jao-exwm--mark-frame init)
+    (jao-afio-open-www)
+    (let ((scroll-bar-mode 'left))
+      (toggle-scroll-bar 1)
+      (set-frame-parameter (window-frame) 'scroll-bar-width 12))
+    (jao-toggle-inactive-mode-line)))
+
+(defun jao-exwm--goto-docs (&optional init)
+  (interactive "P")
+  (exwm-workspace-switch-create 4)
+  (when (jao-exwm--mark-frame init)
+    (jao-afio-open-doc)))
+
+(defun jao-exwm-open-doc (file)
+  (jao-exwm--goto-docs)
+  (jao-find-or-open file))
+
+(defun jao-exwm-no-afio-setup ()
+  (interactive)
+  (defalias 'jao-open-gnus-frame 'jao-exwm--goto-mail)
+  (defalias 'jao-goto-www-frame 'jao-exwm--goto-www)
+  (setq jao-open-doc-fun #'jao-exwm-open-doc)
+  (setq minibuffer-follows-selected-frame t)
+  (global-set-key "\C-cf" 'jao-exwm--goto-main)
+  (global-set-key "\C-cg" 'jao-exwm--goto-mail)
+  (global-set-key "\C-cw" 'jao-exwm--goto-www)
+  (global-set-key "\C-cz" 'jao-exwm--goto-docs))
+
+(if jao-exwm-use-afio
+    (setq minibuffer-follows-selected-frame nil)
+  (jao-exwm-no-afio-setup))
diff --git a/custom/jao-custom-multimedia.el b/custom/jao-custom-multimedia.el
index aab9cf1..e5ee7f3 100644
--- a/custom/jao-custom-multimedia.el
+++ b/custom/jao-custom-multimedia.el
@@ -40,7 +40,7 @@
 
 (defun jao-toggle-audio-applet ()
   (interactive)
-  (or (jao-shell-kill-p "paystray") (jao-audio-applet)))
+  (or (jao-shell-kill-p "pasystray") (jao-audio-applet)))
 
 (global-set-key (kbd "<f4>") #'jao-toggle-audio-applet)
 
diff --git a/init.el b/init.el
index 1c98e6f..9a4d6a6 100644
--- a/init.el
+++ b/init.el
@@ -89,8 +89,8 @@
 (add-to-list 'load-path "/usr/local/share/emacs/site-lisp/")
 
 (defvar jao-info-dir (expand-file-name "info" jao-doc-dir))
-(require 'info)
-(add-to-list 'Info-directory-list jao-info-dir)
+(with-eval-after-load 'info
+  (add-to-list 'Info-default-directory-list jao-info-dir))
 
 (jao-when-darwin (require 'jao-custom-mac))
 
diff --git a/lib/eos/jao-tracking.el b/lib/eos/jao-tracking.el
index 4cf80c1..b8514c8 100644
--- a/lib/eos/jao-tracking.el
+++ b/lib/eos/jao-tracking.el
@@ -25,6 +25,10 @@
 (require 'jao-minibuffer)
 (require 'jao-afio)
 
+;;; frame tracking for exwm
+(with-eval-after-load 'tracking
+  (add-hook 'exwm-workspace-switch-hook 'tracking-remove-visible-buffers))
+
 ;;; shorten
 ;;;###autoload
 (defun jao-shorten-modes (&rest modes)
diff --git a/lib/net/jao-notmuch.el b/lib/net/jao-notmuch.el
index 154f0d5..254e4b2 100644
--- a/lib/net/jao-notmuch.el
+++ b/lib/net/jao-notmuch.el
@@ -183,6 +183,7 @@
 (defvar-local jao-notmuch--showing-images nil)
 
 (defun jao-notmuch--shr-toggle-images ()
+  (require 'eww)
   (let* ((b notmuch-tree-message-buffer)
          (show (not (buffer-local-value 'jao-notmuch--showing-images b)))
          (mm-text-html-renderer 'shr)
diff --git a/themes/jao-light-theme.el b/themes/jao-light-theme.el
index 7f75c68..73c34b3 100644
--- a/themes/jao-light-theme.el
+++ b/themes/jao-light-theme.el
@@ -124,7 +124,7 @@
             (shr-link (~ link) (ul light-gray))
             (shr-code (c blue nil))
             (success (c green))
-            (vertical-border (c "#dfdfdf" nil))
+            (vertical-border (c "#cfcfcf" nil))
             (vterm-color-yellow (c "darkgoldenrod4" yellow))
             (window-divider (c "grey99" nil))
             (widget-button (~ default) nit (ul "grey80"))))