whitepace and nits

5 files changed, 58 insertions, 55 deletions

diff --git a/exwm.org b/exwm.org
index 4bbb23a..1975cc3 100644
--- a/exwm.org
+++ b/exwm.org
@@ -6,9 +6,12 @@
   #+begin_src emacs-lisp
     (defvar jao-exwm--use-afio t)
 
+    (jao-load-path "exwm")
+
     (use-package exwm
       :ensure t
-      :init (setq exwm-workspace-number 1
+      :init (setq exwm-debug nil
+                  exwm-workspace-number 1
                   exwm-workspace-show-all-buffers t
                   exwm-workspace-warp-cursor nil
                   exwm-layout-show-all-buffers t
@@ -147,16 +150,18 @@
     (add-hook 'exwm-manage-finish-hook #'jao-exwm--maybe-float)
 
   #+end_src
-* Minibuffer and system tray
+* Minibuffer
   #+begin_src emacs-lisp
-    (require 'exwm-systemtray)
-    (exwm-systemtray-enable)
-
     (setq jao-minibuffer-frame-width 271)
     (add-hook 'exwm-workspace-switch-hook #'jao-minibuffer-refresh)
+  #+end_src
+* System tray
+  #+begin_src emacs-lisp
+    (require 'exwm-systemtray)
+    ;; (exwm-systemtray-enable)
 
     (defun jao-exwm--watch-tray (sym newval op where)
-      (setq jao-minibuffer-right-margin (make-string (* 2 (length newval)) ?\ ))
+      (setq jao-minibuffer-right-margin (* 2 (length newval)))
       (jao-minibuffer-refresh))
 
     (add-variable-watcher 'exwm-systemtray--list #'jao-exwm--watch-tray)
@@ -529,7 +534,7 @@
        ([?\s-A] . org-agenda-list)
        ([?\s-a] . jao-first-window)
        ([?\s-b] . jao-transient-org-blog)
-       ([?\s-e] . jao-exwm-firefox-1)
+       ([?\s-f] . jao-exwm-firefox-1)
        ([?\s-m] . jao-transient-media)
        ([?\s-O] . jao-transpose-windows)
        ([?\s-o] . jao-other-window)
diff --git a/gnus.org b/gnus.org
index c6320c8..aee07d4 100644
--- a/gnus.org
+++ b/gnus.org
@@ -230,7 +230,7 @@
            (comment . "feeds.\\1")
            (jao-gnus--archiving-group "nnml:feeds.trove"))
           ("^nnml:feeds\\.\\(news\\)$" (expiry-wait . 2))
-          ("nnml:feeds\\.\\(trove\\|lobsters\\)"
+          ("nnml:feeds\\.\\(trove\\|lobsters\\|philosophy\\)"
            (auto-expire . nil)
            (total-expire . nil))
           ("nnml:feeds\\.fun"
diff --git a/init.org b/init.org
index c310be0..e2e1dba 100644
--- a/init.org
+++ b/init.org
@@ -491,7 +491,6 @@
 
       (defun jao-xmonad-enable ()
         (setq jao-browse-doc-use-emacs-p t)
-        (setq jao-minibuffer-right-margin " ")
         (setq jao-wallpaper-random-wake nil)
         (setq jao-transparent-only-bg t jao-frames-default-alpha 88)
         (jao-set-transparency)
@@ -542,7 +541,6 @@
 
       (defun jao-sway-enable ()
         (setq jao-browse-doc-use-emacs-p t)
-        (setq jao-minibuffer-right-margin "")
         (setq jao-wallpaper-random-wake nil)
         (jao-trisect)
         (jao-set-transparency 85)
diff --git a/lib/media/jao-mpc.el b/lib/media/jao-mpc.el
index 783e23c..dc8ff6d 100644
--- a/lib/media/jao-mpc.el
+++ b/lib/media/jao-mpc.el
@@ -73,7 +73,7 @@
          (composer (alist-get 'composer current))
          (no (string-to-number (alist-get 'position current "0")))
          (time (alist-get 'time current "")))
-    (format " %s%s %s%s%s%s"
+    (format "> %s%s %s%s%s%s" ;; 
             (jao--put-face (if (zerop no) "" (format "%02d/%s " no len))
                            'jao-themes-f02)
             (jao--put-face title 'jao-themes-f00)
diff --git a/notmuch.org b/notmuch.org
index 4a0a98d..fee756c 100644
--- a/notmuch.org
+++ b/notmuch.org
@@ -493,50 +493,50 @@
   #+end_src
 * org mode
   Stolen and adapted from [[https://gist.github.com/fedxa/fac592424473f1b70ea489cc64e08911][Fedor Bezrukov]].
-    #+begin_src emacs-lisp
-      (defvar jao-org-notmuch-last-subject nil)
-      (defun jao-org-notmuch-last-subject () jao-org-notmuch-last-subject)
-
-      (defun jao-notmuch--add-tags (tags)
-        (if (derived-mode-p 'notmuch-show-mode)
-            (notmuch-show-add-tag tags)
-          (notmuch-tree-add-tag tags)))
-
-      (defun org-notmuch-store-link ()
-        "Store a link to a notmuch mail message."
-        (cl-case major-mode
-          ((notmuch-show-mode notmuch-tree-mode)
-           ;; Store link to the current message
-           (let* ((id (notmuch-show-get-message-id))
-                  (link (concat "notmuch:" id))
-                  (subj (notmuch-show-get-subject))
-                  (description (format "Mail: %s" subj)))
-             (setq jao-org-notmuch-last-subject subj)
-             (when (y-or-n-p "Archive message? ")
-               (jao-notmuch--add-tags '("+trove")))
-             (when (y-or-n-p "Flag message as todo? ")
-               (jao-notmuch--add-tags '("+flagged")))
-             (org-store-link-props
-	      :type "notmuch"
-	      :link link
-	      :description description)))
-          (notmuch-search-mode
-           ;; Store link to the thread on the current line
-           (let* ((id (notmuch-search-find-thread-id))
-                  (link (concat "notmuch:" id))
-                  (subj (notmuch-search-find-subject))
-                  (description (format "Mail: %s" subj)))
-             (setq jao-org-notmuch-last-subject subj)
-             (org-store-link-props
-              :type "notmuch"
-              :link link
-              :description description)))))
-
-      (with-eval-after-load "org"
-        (org-link-set-parameters "notmuch"
-                                 :follow 'notmuch-show
-                                 :store 'org-notmuch-store-link))
-    #+end_src
+  #+begin_src emacs-lisp
+    (defvar jao-org-notmuch-last-subject nil)
+    (defun jao-org-notmuch-last-subject () jao-org-notmuch-last-subject)
+
+    (defun jao-notmuch--add-tags (tags)
+      (if (derived-mode-p 'notmuch-show-mode)
+          (notmuch-show-add-tag tags)
+        (notmuch-tree-add-tag tags)))
+
+    (defun org-notmuch-store-link ()
+      "Store a link to a notmuch mail message."
+      (cl-case major-mode
+        ((notmuch-show-mode notmuch-tree-mode)
+         ;; Store link to the current message
+         (let* ((id (notmuch-show-get-message-id))
+                (link (concat "notmuch:" id))
+                (subj (notmuch-show-get-subject))
+                (description (format "Mail: %s" subj)))
+           (setq jao-org-notmuch-last-subject subj)
+           (when (y-or-n-p "Archive message? ")
+             (jao-notmuch--add-tags '("+trove")))
+           (when (y-or-n-p "Flag message as todo? ")
+             (jao-notmuch--add-tags '("+flagged")))
+           (org-store-link-props
+	    :type "notmuch"
+	    :link link
+	    :description description)))
+        (notmuch-search-mode
+         ;; Store link to the thread on the current line
+         (let* ((id (notmuch-search-find-thread-id))
+                (link (concat "notmuch:" id))
+                (subj (notmuch-search-find-subject))
+                (description (format "Mail: %s" subj)))
+           (setq jao-org-notmuch-last-subject subj)
+           (org-store-link-props
+            :type "notmuch"
+            :link link
+            :description description)))))
+
+    (with-eval-after-load "org"
+      (org-link-set-parameters "notmuch"
+                               :follow 'notmuch-show
+                               :store 'org-notmuch-store-link))
+  #+end_src
 * arXiv
     #+begin_src emacs-lisp
       (use-package org-capture