whitespace and shuffling

2 files changed, 57 insertions, 48 deletions

diff --git a/init.org b/init.org
index 2660395..a505ce5 100644
--- a/init.org
+++ b/init.org
@@ -205,12 +205,38 @@
         :config (setq repeat-echo-function #'repeat-echo-mode-line))
       (when (> emacs-major-version 27) (repeat-mode))
 
+      (defun jao-kb-toggle (&optional lyt)
+        (interactive)
+        (shell-command-to-string (or lyt
+                                     (if (jao-kb-toggled-p)
+                                         "setxkbmap us"
+                                       "setxkbmap us -variant intl"))))
+
+      (defun jao-kb-toggled-p ()
+        (not (string-empty-p
+              (shell-command-to-string "setxkbmap -query|grep variant"))))
+
+      (set-keyboard-coding-system 'latin-1)
+      (set-language-environment "UTF-8")
+      ;; must be set after current-language-environment
+      (customize-set-variable 'default-input-method "catalan-prefix")
+
+      (defun jao--set-kb-system (frame)
+        (select-frame frame)
+        (set-keyboard-coding-system 'latin-1)
+        t)
+      (add-to-list 'after-make-frame-functions 'jao--set-kb-system)
+
+      (setq echo-keystrokes 1
+            suggest-key-bindings nil)
+    #+end_src
+*** Transient
+    #+begin_src emacs-lisp
       (use-package transient
         :init (setq transient-show-popup 2.0)
+        :demand t
         :config
-        (transient-bind-q-to-quit)
-
-        :bind (("s-SPC" . jao-transient-major-mode)))
+        (transient-bind-q-to-quit))
 
       (defmacro jao-transient-major-mode (mode &rest suffix)
         (declare (indent defun))
@@ -232,35 +258,9 @@
 
       (defmacro jao-transient-major-mode+ (mode &rest suffixes)
         (declare (indent defun))
-        `(progn
-           ,@(mapcar (lambda (s) `(jao-transient-major-mode+1 ,mode ,s))
-                     suffixes)))
-
-
-      (defun jao-kb-toggle (&optional lyt)
-        (interactive)
-        (shell-command-to-string (or lyt
-                                     (if (jao-kb-toggled-p)
-                                         "setxkbmap us"
-                                       "setxkbmap us -variant intl"))))
-
-      (defun jao-kb-toggled-p ()
-        (not (string-empty-p
-              (shell-command-to-string "setxkbmap -query|grep variant"))))
+        `(progn ,@(mapcar (lambda (s) `(jao-transient-major-mode+1 ,mode ,s))
+                          suffixes)))
 
-      (set-keyboard-coding-system 'latin-1)
-      (set-language-environment "UTF-8")
-      ;; must be set after current-language-environment
-      (customize-set-variable 'default-input-method "catalan-prefix")
-
-      (defun jao--set-kb-system (frame)
-        (select-frame frame)
-        (set-keyboard-coding-system 'latin-1)
-        t)
-      (add-to-list 'after-make-frame-functions 'jao--set-kb-system)
-
-      (setq echo-keystrokes 1
-            suggest-key-bindings nil)
     #+end_src
 * Crypto
 *** PGP, EPG, passwords
diff --git a/notmuch.org b/notmuch.org
index f4f111d..b5a8f26 100644
--- a/notmuch.org
+++ b/notmuch.org
@@ -12,14 +12,16 @@
                :face jao-themes-error)
         (:name "S" :query "tag:new and tag:bigml and tag:support")
         (:name "W" :query "tag:new and tag:bigml" :face jao-themes-dimm)
-        (:name "H" :query "tag:new and tag:jao and tag:hacking")
+        (:name "H" :query "tag:new and tag:jao and tag:hacking" :face jao-themes-dimm)
         (:name "T" :query "tag:new and tag:jao and tag:think" :face jao-themes-dimm)
         (:name "E" :query "tag:new and tag:\"/emacs/\"" :face jao-themes-dimm)
         (:name "l" :query "tag:new and tag:local" :face jao-themes-dimm)
         (:name "J" :query
-               "tag:new and tag:jao and not tag:\"/local|emacs|hacking|feeds|think/\""
+               "tag:new and tag:jao and not tag:\"/local|emacs|hacking|think/\""
                :face jao-themes-dimm)
         (:name "F" :query "tag:new and tag:feeds and not tag:\"/emacs/\""
+               :face jao-themes-dimm)
+        (:name "G" :query "tag:new and tag:gmane and not tag:\"/emacs|papers/\""
                :face jao-themes-dimm)))
 
     (defun jao-notmuch-notify ()
@@ -71,14 +73,20 @@
             ,(jao-notmuch--qn "emacs" "devel" "ed" '("tag:emacs-devel"))
             ,(jao-notmuch--qn "emacs" "bugs" "eb" '("tag:emacs-bugs"))
             ,(jao-notmuch--qn "emacs" "diffs" "ec" '("tag:emacs-diffs"))
+            ,(jao-notmuch--qn "feeds" "clojure" "fc" '("tag:clojure"))
+            ,(jao-notmuch--qn "feeds" "elixir" "fex" '("tag:elixir"))
+            ,(jao-notmuch--qn "feeds" "erlang" "fe" '("tag:erlang"))
+            ,(jao-notmuch--qn "feeds" "gnus" "fg" '("tag:gnus"))
+            ,(jao-notmuch--qn "feeds" "haskell" "fh" '("tag:haskell"))
+            ,(jao-notmuch--qn "feeds" "idris" "fid" '("tag:idris"))
             ,(jao-notmuch--qn "feeds" "lobsters" "fl" '("tag:lobsters"))
+            ,(jao-notmuch--qn "feeds" "mailutils" "fm" '("tag:mailutils"))
             ,(jao-notmuch--qn "feeds" "notmuch" "fn" '("tag:notmuch"))
-            ,(jao-notmuch--qn "feeds" "haskell" "fh" '("tag:haskell"))
-            ,(jao-notmuch--qn "feeds" "erlang" "fe" '("tag:erlang"))
+            ,(jao-notmuch--qn "feeds" "papers" "fax" '("tag:papers"))
+            ,(jao-notmuch--qn "feeds" "scheme" "fl" '("tag:scheme"))
             ,(jao-notmuch--qn "feeds" "xmobar" "fx" '("tag:xmobar"))
             ,(jao-notmuch--qn "feeds" "prog" "fp"
-                              '("tag:prog"
-                                "not tag:\"/(lobsters|xmobar|notmuch|haskell|erlang)/\""))
+                              '("tag:prog" "not tag:\"/(lobsters|clojure|xmobar|gmane)/\""))
             ,@(jao-notmuch--mboxes-search "feeds" "emacs" "prog")
             ,(jao-notmuch--q "jao" "draft" "d" '("tag:draft"))
             ,(jao-notmuch--q "bml" "today" "tb" '("tag:bigml" "date:24h.."))
@@ -131,7 +139,8 @@
               ("flagged" "!" (propertize tag 'face ',e))
               ("jao" "j")
               ("bigml" "b")
-              ("feeds" "f")))
+              ("feeds" "f")
+              ("gmane" "g")))
           notmuch-tag-deleted-formats
           '(("unread")
             ("new")
@@ -148,16 +157,16 @@
       (add-to-list 'load-path "/usr/local/share/emacs/site-lisp/"))
 
     (use-package notmuch
-      :init
-      (setq notmuch-draft-folder "jao/drafts"
-            notmuch-draft-quoted-tags '("part")
-            notmuch-address-internal-completion '(received nil)
-            notmuch-fcc-dirs
-            '(("\\(support\\|education\\)@bigml.com" . nil)
-              (".*@bigml.com" . "bigml/sent +bigml +sent -new")
-              (".*" . "jao/trove +jao +sent +trove -new"))
-            notmuch-maildir-use-notmuch-insert t
-            notmuch-message-headers '("Subject" "To" "Cc" "Date" "List-Id"))
+      :custom
+      ((notmuch-draft-folder "jao/drafts")
+       (notmuch-draft-quoted-tags '("part"))
+       (notmuch-address-internal-completion '(received nil))
+       (notmuch-fcc-dirs
+        '(("\\(support\\|education\\)@bigml.com" . nil)
+          (".*@bigml.com" . "bigml/sent +bigml +sent -new")
+          (".*" . "jao/trove +jao +sent +trove -new")))
+       (notmuch-maildir-use-notmuch-insert t)
+       (notmuch-message-headers '("Subject" "To" "Cc" "Date" "List-Id")))
 
       :config