X-Git-Url: https://git.shemshak.org/~bandali/configs/blobdiff_plain/bb93c9e100723ad7b5311a35f600adb856456f85..e473bc2094947be1b104aad25c3d04400452ed8a:/init.org

diff --git a/init.org b/init.org
index a345921..6575a91 100644
--- a/init.org
+++ b/init.org
@@ -442,7 +442,9 @@ Enable displaying time and battery in the mode-line, since I'm not
 using the Xfce panel anymore. Also, I don't need to see the load
 average on a regular basis, so disable that.
 
-#+begin_src emacs-lisp
+Note: using =i3status= on sway at the moment, so disabling this.
+
+#+begin_src emacs-lisp :tangle no
 (use-package time
   :ensure nil
   :init
@@ -627,10 +629,21 @@ Roll your own modal mode
    ("n" next-line)
    ("p" previous-line)
    ("f" forward-char)
+   ("/" undo)
+   ("i" ryo-modal-mode)
+   ("l" recenter-top-bottom)
+   ("v" scroll-up-command)
+   ("V" scroll-down-command)
+   ("x" delete-forward-char)
    ("SPC" (("b" (("b" ibuffer-list-buffers)
                  ("k" kill-this-buffer)
                  ("o" other-window)
                  ("s" save-buffer)))
+           ("B" (("A" borg-activate)
+                 ("a" borg-assimilate)
+                 ("b" borg-build)
+                 ("c" borg-clone)
+                 ("r" borg-remove)))
            ("h" (("c" describe-char)
                  ("f" describe-function)
                  ("F" describe-face)
@@ -848,13 +861,14 @@ TODO: break this giant source block down into individual org sections.
 
 (use-package undo-tree
   :ryo
-  ("/" undo-tree-undo)
+  ("?" undo-tree-undo)
   ("_" undo-tree-redo)
-  :bind (("C-/" . undo-tree-undo)
+  :bind (("C-?" . undo-tree-undo)
          ("M-_" . undo-tree-redo))
   :config
   (global-undo-tree-mode)
-  (setq undo-tree-mode-lighter ""))
+  (setq undo-tree-mode-lighter ""
+        undo-tree-auto-save-history t))
 #+end_src
 
 * Editing
@@ -1163,6 +1177,18 @@ Emacs package that displays available keybindings in popup
   ("e" mwim-end-of-code-or-line))
 #+end_src
 
+** [[https://www.emacswiki.org/emacs/KeyChord][key-chord]]
+
+#+begin_src emacs-lisp
+(use-package key-chord
+  :demand t
+  :config
+  (key-chord-mode 1)
+  (key-chord-define-global "jk" 'ryo-modal-mode)
+  (setq key-chord-one-key-delay 0 ; i don't need one-key chords for now
+        key-chord-two-keys-delay 0.005))
+#+end_src
+
 * Email
 ** [[https://notmuchmail.org][notmuch]]
 
@@ -1190,6 +1216,7 @@ See [[notmuch:id:87muuqsvci.fsf@fencepost.gnu.org][bug follow-up]].
   ;; :ensure nil
   :config
   (setq sendmail-program "/usr/bin/msmtp"
+        ; message-sendmail-extra-arguments '("-v" "-d")
         mail-specify-envelope-from t
         mail-envelope-from 'header))
 
@@ -1237,8 +1264,9 @@ See [[notmuch:id:87muuqsvci.fsf@fencepost.gnu.org][bug follow-up]].
         notmuch-hello-thousands-separator ","
         notmuch-fcc-dirs
         '(("amin@aminb.org"            . "amin/Sent")
+          ("amin@gnu.org"              . "gnu/Sent")
           ("abandali@uwaterloo.ca"     . "\"uwaterloo/Sent Items\"")
-          ("amin.bandali@uwaterloo.ca" . "\"uwaterloo/Sent Items\"")
+          ("mab@gnu.org"               . "gnu/Sent")
           ("aminb@gnu.org"             . "gnu/Sent")
           (".*"                        . "sent"))
         notmuch-search-result-format
@@ -1257,18 +1285,22 @@ See [[notmuch:id:87muuqsvci.fsf@fencepost.gnu.org][bug follow-up]].
   :bind
   (:map notmuch-hello-mode-map
         ("g" . notmuch-poll-and-refresh-this-buffer)
-        ("i" . (lambda ()
-                 "Search for `inbox' tagged messages"
-                 (interactive)
-                 (notmuch-hello-search "tag:inbox")))
         ("u" . (lambda ()
                  "Search for `unread' tagged messages"
                  (interactive)
                  (notmuch-hello-search "tag:unread")))
+        ("i" . (lambda ()
+                 "Search for `inbox' tagged messages"
+                 (interactive)
+                 (notmuch-hello-search "tag:inbox")))
         ("l" . (lambda ()
-                 "Search for `latest tagged messages"
+                 "Search for `latest' tagged messages"
                  (interactive)
                  (notmuch-hello-search "tag:latest")))
+        ("e" . (lambda ()
+                 "Search for `encrypted' tagged messages"
+                 (interactive)
+                 (notmuch-hello-search "tag:encrypted")))
         ("M" . (lambda ()
                  "Compose new mail and prompt for sender"
                  (interactive)