a few keybinding adjustments

3 files changed, 23 insertions, 43 deletions

diff --git a/exwm.org b/exwm.org
index 37129df..c0c5670 100644
--- a/exwm.org
+++ b/exwm.org
@@ -476,8 +476,8 @@
        ([?\s-e] . jao-exwm-firefox-1)
        ([?\s-t] . jao-vterm-here-toggle)
        ([?\s-n] . jao-hydra-ednc/body)
-       ([?\s-O] . switch-window-then-swap-buffer)
-       ([?\s-o] . switch-window)
+       ([?\s-O] . ace-swap-window)
+       ([?\s-o] . ace-window)
        ([?\s-x] . jao-hydra-exwm-misc/body)
        ([?\s-z] . jao-hydra-sleep/body)
        ([XF86AudioMute] . jao-mixer-master-toogle)
diff --git a/gnus.org b/gnus.org
index 96ff95d..9332301 100644
--- a/gnus.org
+++ b/gnus.org
@@ -244,8 +244,9 @@
     ;; (remove-hook 'gnus-summary-prepare-exit-hook 'gnus-summary-expire-articles)
     ;; (define-key gnus-group-mode-map "g" 'jao-gnus-get-new-news)
 
-    (define-key gnus-group-mode-map "Z" 'jao-gnus-restart-servers)
-  #+END_SRC
+    (define-key gnus-group-mode-map "Z" #'jao-gnus-restart-servers)
+    (define-key gnus-group-mode-map "Gg"#'consult-notmuch)
+#+END_SRC
 * Group parameters
   #+begin_src emacs-lisp
     (setq jao-gnus-expirable
@@ -261,17 +262,18 @@
 
     (setq gnus-parameters
           `(("^nnimap:jao/.*"
-             (jao-gnus--trash-group "nnimap:trash")
+             (jao-gnus--trash-group "nnimap:jao/trash")
+             (jao-gnus--spam-group "nnimap:jao/spam")
              (jao-gnus--archiving-group "nnimap:trove/jao"))
             ("^nnimap:pm/.*"
              (jao-gnus--trash-group "nnimap:pm/trash")
              (jao-gnus--spam-group "nnimap:pm/spam")
              (jao-gnus--archiving-group "nnimap:pm/archive"))
-            ("^nnimap:\\(jao\\|pm\\)/\\(trash\\|spam\\)"
+            ("^nnimap:\\(jao\\|pm\\|bigml\\)/\\(trash\\|spam\\)"
              (gcc-self . nil)
              (auto-expire . t)
              (total-expire . t)
-             (expiry-wait . 0.1)
+             (expiry-wait . 1)
              (jao-gnus--trash-group nil)
              (expiry-target . delete))
             ("^nnimap:jao/inbox"
@@ -289,7 +291,8 @@
              (expiry-target . "nnimap:bml/trove"))
             ("^nnimap:b\\(ig\\)?ml/.*"
              (posting-style (address "jao@bigml.com"))
-             (jao-gnus--archiving-group "nnimap:bml/trove"))
+             (jao-gnus--spam-group "nnimap:bigml/spam")
+             (jao-gnus--archiving-group "nnimap:bigml/trove"))
             ("^nnimap:b\\(ig\\)?ml/support"
              (posting-style (address "support@bigml.com")))
             (,jao-gnus-expirable
diff --git a/init.org b/init.org
index 0276752..e1b3347 100644
--- a/init.org
+++ b/init.org
@@ -1271,27 +1271,6 @@
                ("M-O" . ace-swap-window)
                ("C-x p" . ace-window)))
     #+end_src
-*** Switch window
-    An alternative for this one is ace-window, but it has the problem
-    of not displaying its overlay over org buffers (sometimes) and
-    introducing a dependency (avy).
-    #+begin_src emacs-lisp :load no
-      (use-package switch-window
-        :ensure t
-        :demand t
-        :custom ((switch-window-minibuffer-shortcut ?z)
-                 (switch-window-background t)
-                 (switch-window-shortcut-style 'qwerty)
-                 (switch-window-timeout 7)
-                 (switch-window-threshold 3))
-        :bind (("M-o" . switch-window)
-               ("M-O" . switch-window-then-swap-buffer)
-               ("H-s-o" . switch-window)
-               ("H-s-O" . switch-window-then-swap-buffer)
-               ("C-x 4 d" . switch-window-then-dired)
-               ("C-x 4 f" . switch-window-then-find-file)
-               ("C-x 4 b" . switch-window-then-display-buffer)))
-    #+end_src
 *** first window and transient other window
     #+begin_src emacs-lisp
 
@@ -3860,20 +3839,18 @@
         ;;   (signel-start))
         (jao-circe p))
 
-     (global-set-key
-      (kbd "s-c")
-      (pretty-hydra-define jao-hydra-chats (global-map "s-c" :color blue :quit-key "q")
-        ("Connect"
-         (("A" (jao-chats t) "all chats -y")
-          ("a" jao-chats "all chats")
-          ("S" slack-start "slack")
-          ("C" (jao-circe t) "circe -y")
-          ("s-c" jao-hydra-chats/body nil))
-         "Go"
-         (("c" (jao-buffer-same-mode 'circe-channel-mode) "circe buffer")
-          ("s" (jao-buffer-same-mode 'slack-message-buffer-mode) "slack buffer")
-          ("t" (jao-buffer-same-mode 'telega-chat-mode) "telega buffer")
-          ("T" telega "telega rooster")))))
+     (pretty-hydra-define jao-hydra-chats (global-map "s-q" :color blue :quit-key "q")
+       ("Connect"
+        (("A" (jao-chats t) "all chats -y")
+         ("a" jao-chats "all chats")
+         ("S" slack-start "slack")
+         ("C" (jao-circe t) "circe -y")
+         ("s-q" jao-hydra-chats/body nil))
+        "Go"
+        (("c" (jao-buffer-same-mode 'circe-channel-mode) "circe buffer")
+         ("s" (jao-buffer-same-mode 'slack-message-buffer-mode) "slack buffer")
+         ("t" (jao-buffer-same-mode 'telega-chat-mode) "telega buffer")
+         ("T" telega "telega rooster"))))
 
      #+end_src
 * Multimedia