X-Git-Url: https://git.shemshak.org/~bandali/configs/blobdiff_plain/850dd012bd83fb5d89e31695c4e66df4f1684e87..1dde553d9a6d52523575f41a560162c79f10c0a3:/init.org

diff --git a/init.org b/init.org
index b47a513..51cd9ca 100644
--- a/init.org
+++ b/init.org
@@ -233,6 +233,17 @@ can then be managed with the help of Magit or other tools.
              (expand-file-name "lib/borg" user-emacs-directory))
 (require 'borg)
 (borg-initialize)
+
+(require 'borg-nix-shell)
+(setq borg-build-shell-command 'borg-nix-shell-build-command)
+
+(with-eval-after-load 'bind-key
+  (bind-keys
+   :package borg
+   ("C-c B A" . borg-activate)
+   ("C-c B a" . borg-assimilate)
+   ("C-c B b" . borg-build)
+   ("C-c B c" . borg-clone)))
 #+end_src
 
 *** =use-package=
@@ -268,7 +279,12 @@ database, low-level functions for querying the database, and a
 
 #+begin_src emacs-lisp
 (use-package epkg
-  :defer t)
+  :defer t
+  :bind
+  (("C-c B d" . epkg-describe-package)
+   ("C-c B p" . epkg-list-packages)
+   ("C-c B r" . borg-remove)
+   ("C-c B u" . epkg-update)))
 #+end_src
 
 ** No littering in =~/.emacs.d=
@@ -445,14 +461,12 @@ Note: using =i3status= on sway at the moment, so disabling this.
 
 #+begin_src emacs-lisp :tangle no
 (use-package time
-  :ensure nil
   :init
   (setq display-time-default-load-average nil)
   :config
   (display-time-mode))
 
 (use-package battery
-  :ensure nil
   :config
   (display-battery-mode))
 #+end_src
@@ -585,6 +599,26 @@ Enable automatic reloading of changed buffers and files.
  tab-width 4)
 #+end_src
 
+*** Winner mode
+
+Enable =winner-mode=.
+
+#+begin_src emacs-lisp
+(winner-mode 1)
+#+end_src
+
+** Bindings
+
+#+begin_src emacs-lisp
+(bind-keys
+ ("C-c b B" . ibuffer-list-buffers)
+ ("C-c b k" . kill-this-buffer)
+ ("C-c b s" . save-buffer)
+ ("C-c S"   . save-buffer)
+ ("C-c o"   . other-window)
+ ("C-c q q" . save-buffers-kill-terminal))
+#+end_src
+
 ** Packages
 
 The packages in this section are absolutely essential to my everyday
@@ -609,70 +643,6 @@ customizing it.
             'auto-compile-inhibit-compile-detached-git-head))
 #+end_src
 
-*** [[https://github.com/Kungsgeten/ryo-modal][ryo-modal]]
-
-#+begin_quote
-Roll your own modal mode
-#+end_quote
-
-#+begin_src emacs-lisp
-(use-package ryo-modal
-  :commands ryo-modal-mode
-  :bind ("M-m" . ryo-modal-mode)
-  :after which-key
-  :config
-  (push '((nil . "ryo:.*:") . (nil . "")) which-key-replacement-alist)
-  (ryo-modal-keys
-   ("," ryo-modal-repeat)
-   ("b" backward-char)
-   ("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)
-                 ("i" info)
-                 ("k" describe-key)
-                 ("l" view-lossage)
-                 ("v" describe-variable)))
-           ("q" (("q" save-buffers-kill-terminal)))))
-   ("d" (("w" kill-word)
-         ("b" backward-kill-word)))
-   ("c w" kill-word :exit t))
-
-  (ryo-modal-keys
-   ;; First argyment to ryo-modal-keys may be a list of keywords.
-   ;; These keywords will be applied to all keybindings.
-   (:norepeat t)
-   ("0" "M-0")
-   ("1" "M-1")
-   ("2" "M-2")
-   ("3" "M-3")
-   ("4" "M-4")
-   ("5" "M-5")
-   ("6" "M-6")
-   ("7" "M-7")
-   ("8" "M-8")
-   ("9" "M-9"))
-  :hook ((text-mode . ryo-modal-mode)
-         (prog-mode . ryo-modal-mode)))
-#+end_src
-
 *** [[https://orgmode.org/][Org mode]]
 
 #+begin_quote
@@ -685,12 +655,12 @@ In short, my favourite way of life.
 
 #+begin_src emacs-lisp
 (use-package org
-  :ryo ("SPC b t" org-babel-tangle)
   :config
   (setq org-src-tab-acts-natively t
         org-src-preserve-indentation nil
         org-edit-src-content-indentation 0)
   :hook (org-mode . org-indent-mode))
+
 (use-package org-notmuch
   :after (:any org notmuch))
 #+end_src
@@ -705,11 +675,25 @@ Not just how I do git, but /the/ way to do git.
 
 #+begin_src emacs-lisp
 (use-package magit
-  :ryo ("SPC" (("g s" magit-status)))
   :defer t
-  :bind (("s-g"     . magit-status)
-         ("C-x g"   . magit-status)
-         ("C-x M-g" . magit-dispatch-popup))
+  :bind
+  (("s-g"   . magit-dispatch-popup)
+   ("C-x g" . magit-status)
+   :prefix-map amin--magit-prefix-map
+   :prefix "C-c g"
+   ("SPC" . magit-status)
+   ("s"   . magit-status)
+   ("S"   . magit-status-prefix)
+   ("B"   . magit-blame)
+   ("C"   . magit-clone)
+   ("f"   . magit-fetch)
+   ("F"   . magit-pull)
+   ("P"   . magit-push)
+   ("p"   . magit-dispatch-popup)
+   ("c c" . magit-commit)
+   ("c a" . magit-commit-amend)
+   ("b b" . magit-checkout)
+   ("b c" . magit-branch))
   :config
   (magit-add-section-hook 'magit-status-sections-hook
                           'magit-insert-modules
@@ -732,14 +716,12 @@ There's no way I could top that, so I won't attempt to.
 (use-package ivy
   :defer 1
   :bind
-  (:map ivy-minibuffer-map
-        ([escape] . keyboard-escape-quit)
-        ;; ("C-j"    . ivy-next-line)
-        ;; ("C-k"    . ivy-previous-line)
-        ([S-up]   . ivy-previous-history-element)
-        ([S-down] . ivy-next-history-element)
-        ("DEL"    . ivy-backward-delete-char))
-  :ryo ("SPC ," ivy-switch-buffer)
+  (("C-c b b" . ivy-switch-buffer)
+   :map ivy-minibuffer-map
+   ([escape] . keyboard-escape-quit)
+   ([S-up]   . ivy-previous-history-element)
+   ([S-down] . ivy-next-history-element)
+   ("DEL"    . ivy-backward-delete-char))
   :config
   (setq ivy-wrap t)
   (ivy-mode 1))
@@ -749,9 +731,6 @@ There's no way I could top that, so I won't attempt to.
 
 #+begin_src emacs-lisp
 (use-package swiper
-  :ryo
-  ("SPC /" swiper)
-  ("s" swiper)
   :bind (([remap isearch-forward]  . swiper)
          ([remap isearch-backward] . swiper)))
 #+end_src
@@ -761,13 +740,12 @@ There's no way I could top that, so I won't attempt to.
 #+begin_src emacs-lisp
 (use-package counsel
   :defer 1
-  :ryo
-  ("SPC" (("f r" counsel-recentf)
-          ("SPC" counsel-M-x)
-          ("."   counsel-find-file)))
   :bind (([remap execute-extended-command] . counsel-M-x)
-         ([remap find-file] . counsel-find-file)
-         ("s-r"     . counsel-recentf)
+         ([remap find-file]                . counsel-find-file)
+         ("s-r"                            . counsel-recentf)
+         ("C-c x"                          . counsel-M-x)
+         ("C-c f ."                        . counsel-find-file)
+         ("C-c f r"                        . counsel-recentf)
          :map minibuffer-local-map
          ("C-r" . counsel-minibuffer-history))
   :config
@@ -851,9 +829,6 @@ TODO: break this giant source block down into individual org sections.
                (list (regexp-quote (system-name)) nil nil)))
 
 (use-package undo-tree
-  :ryo
-  ("?" undo-tree-undo)
-  ("_" undo-tree-redo)
   :bind (("C-?" . undo-tree-undo)
          ("M-_" . undo-tree-redo))
   :config
@@ -911,6 +886,7 @@ TODO: break this giant source block down into individual org sections.
 ** [[https://leanprover.github.io][Lean]] (with [[https://github.com/leanprover/lean-mode][lean-mode]])
 
 #+begin_src emacs-lisp
+(eval-when-compile (defvar lean-mode-map))
 (use-package lean-mode
   :bind (:map lean-mode-map
               ("S-SPC" . company-complete)))
@@ -1142,17 +1118,12 @@ Emacs package that displays available keybindings in popup
 
 #+begin_src emacs-lisp
 (use-package crux
-  :bind (("C-c d"    . crux-duplicate-current-line-or-region)
-         ("C-c M-d"  . crux-duplicate-and-comment-current-line-or-region))
-  :ryo
-  ("o" crux-smart-open-line :exit t)
-  ("O" crux-smart-open-line-above :exit t)
-  ("SPC b K" crux-kill-other-buffers)
-  ("d d" crux-kill-whole-line)
-  ("c c" crux-kill-whole-line :then '(crux-smart-open-line-above) :exit t)
-  ("SPC f" (("c" crux-copy-file-preserve-attributes)
-            ("D" crux-delete-file-and-buffer)
-            ("R" crux-rename-file-and-buffer))))
+  :bind (("C-c d"   . crux-duplicate-current-line-or-region)
+         ("C-c M-d" . crux-duplicate-and-comment-current-line-or-region)
+         ("C-c b K" . crux-kill-other-buffers)
+         ("C-c f c" . crux-copy-file-preserve-attributes)
+         ("C-c f D" . crux-delete-file-and-buffer)
+         ("C-c f R" . crux-rename-file-and-buffer)))
 #+end_src
 
 ** [[https://github.com/alezost/mwim.el][mwim]]
@@ -1162,22 +1133,28 @@ Emacs package that displays available keybindings in popup
   :bind (("C-a"    . mwim-beginning-of-code-or-line)
          ("C-e"    . mwim-end-of-code-or-line)
          ("<home>" . mwim-beginning-of-line-or-code)
-         ("<end>"  . mwim-end-of-line-or-code))
-  :ryo
-  ("a" mwim-beginning-of-code-or-line)
-  ("e" mwim-end-of-code-or-line))
+         ("<end>"  . mwim-end-of-line-or-code)))
 #+end_src
 
-** [[https://www.emacswiki.org/emacs/KeyChord][key-chord]]
+** projectile
 
 #+begin_src emacs-lisp
-(use-package key-chord
-  :demand t
+(use-package projectile
+  :defer 5
+  :bind-keymap ("C-c p" . projectile-command-map)
   :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))
+  (projectile-mode)
+
+  (defun my-projectile-invalidate-cache (&rest _args)
+    ;; ignore the args to `magit-checkout'
+    (projectile-invalidate-cache nil))
+
+  (eval-after-load 'magit-branch
+    '(progn
+       (advice-add 'magit-checkout
+                   :after #'my-projectile-invalidate-cache)
+       (advice-add 'magit-branch-and-checkout
+                   :after #'my-projectile-invalidate-cache))))
 #+end_src
 
 * Email
@@ -1185,21 +1162,6 @@ Emacs package that displays available keybindings in popup
 
 See [[notmuch:id:87muuqsvci.fsf@fencepost.gnu.org][bug follow-up]].
 
-#+begin_src emacs-lisp
-(defun amin/notmuch ()
-  "Delete other windows, then launch `notmuch'."
-  (interactive)
-  (require 'notmuch)
-  (delete-other-windows)
-  (notmuch))
-
-;; (map!
-;;  :leader
-;;  :desc "notmuch" :n "m" #'amin/notmuch
-;;  (:desc "search" :prefix "/"
-;;    :desc "notmuch" :n "m" #'counsel-notmuch))
-#+end_src
-
 #+begin_src emacs-lisp
 (defvar amin-maildir "~/mail")
 
@@ -1240,8 +1202,16 @@ See [[notmuch:id:87muuqsvci.fsf@fencepost.gnu.org][bug follow-up]].
   (setq mml-secure-openpgp-encrypt-to-self t
         mml-secure-openpgp-sign-with-sender t))
 
+(defun amin/notmuch ()
+  "Delete other windows, then launch `notmuch'."
+  (interactive)
+  (delete-other-windows)
+  (notmuch))
+
 (use-package notmuch
-  :ryo ("SPC m" amin/notmuch)
+  :commands notmuch
+  :bind ("C-c m" . amin/notmuch)
+  :custom (notmuch-always-prompt-for-sender t)
   :config
   (setq notmuch-hello-sections
         '(notmuch-hello-insert-header
@@ -1254,18 +1224,27 @@ See [[notmuch:id:87muuqsvci.fsf@fencepost.gnu.org][bug follow-up]].
         '("Subject" "To" "Cc" "Date" "List-Id" "X-RT-Originator")
         notmuch-hello-thousands-separator ","
         notmuch-fcc-dirs
-        '(("amin@aminb.org"            . "amin/Sent")
-          ("amin@gnu.org"              . "gnu/Sent")
-          ("abandali@uwaterloo.ca"     . "\"uwaterloo/Sent Items\"")
-          ("mab@gnu.org"               . "gnu/Sent")
-          ("aminb@gnu.org"             . "gnu/Sent")
-          (".*"                        . "sent"))
+        '(("amin@aminb.org"        . "amin/Sent")
+          ("amin@gnu.org"          . "gnu/Sent")
+          ("abandali@uwaterloo.ca" . "\"uwaterloo/Sent Items\"")
+          ("mab@gnu.org"           . "gnu/Sent")
+          ("aminb@gnu.org"         . "gnu/Sent")
+          (".*"                    . "sent"))
         notmuch-search-result-format
-        '(("date" . "%12s ")
-          ("count" . "%-7s ")
+        '(("date"    . "%12s ")
+          ("count"   . "%-7s ")
           ("authors" . "%-40s ")
           ("subject" . "%s ")
-          ("tags" . "(%s)")))
+          ("tags"    . "(%s)"))
+        notmuch-saved-searches
+        '((:name "inbox"     :query "tag:inbox"     :key "i")
+          (:name "unread"    :query "tag:unread"    :key "u")
+          (:name "latest"    :query "tag:latest"    :key "l")
+          (:name "encrypted" :query "tag:encrypted" :key "e")
+          (:name "flagged"   :query "tag:flagged"   :key "f")
+          (:name "sent"      :query "tag:sent"      :key "s")
+          (:name "drafts"    :query "tag:draft"     :key "d")
+          (:name "all mail"  :query "*"             :key "a")))
   ;; (add-hook 'visual-fill-column-mode-hook
   ;;           (lambda ()
   ;;             (when (string= major-mode 'notmuch-message-mode)
@@ -1275,30 +1254,23 @@ See [[notmuch:id:87muuqsvci.fsf@fencepost.gnu.org][bug follow-up]].
   ;;             :override #'kill-this-buffer)
   :bind
   (:map notmuch-hello-mode-map
-        ("g" . notmuch-poll-and-refresh-this-buffer)
         ("u" . (lambda ()
-                 "Search for `unread' tagged messages"
+                 "Search for `unread'-tagged messages"
                  (interactive)
                  (notmuch-hello-search "tag:unread")))
         ("i" . (lambda ()
-                 "Search for `inbox' tagged messages"
+                 "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"
+                 "Search for `encrypted'-tagged messages"
                  (interactive)
-                 (let ((current-prefix-arg t))
-                   (call-interactively #'notmuch-mua-new-mail)))))
+                 (notmuch-hello-search "tag:encrypted"))))
   (:map notmuch-search-mode-map
-        ("g" . notmuch-poll-and-refresh-this-buffer)
         ("k" . (lambda ()
                  "Mark message read"
                  (interactive)
@@ -1314,32 +1286,41 @@ See [[notmuch:id:87muuqsvci.fsf@fencepost.gnu.org][bug follow-up]].
                  "Mark message deleted"
                  (interactive)
                  (notmuch-search-tag '("-unread" "-inbox" "+deleted"))
-                 (notmuch-search-archive-thread)))
+                 (notmuch-search-next-thread)))
         ("S" . (lambda ()
                  "Mark message as spam"
                  (interactive)
                  (notmuch-search-tag '("-unread" "-inbox" "-webmasters" "+spam"))
-                 (notmuch-search-archive-thread))))
-  (:map notmuch-tree-mode-map  ; TODO: additional bindings
+                 (notmuch-search-next-thread))))
+  (:map notmuch-tree-mode-map
+        ("k" . (lambda ()
+                 "Mark message read"
+                 (interactive)
+                 (notmuch-tree-tag '("-unread"))
+                 ;; (notmuch-tree-archive-thread)
+                 (notmuch-tree-next-message)))
+        ("u" . (lambda ()
+                 "Mark message unread"
+                 (interactive)
+                 (notmuch-tree-tag '("+unread"))
+                 (notmuch-tree-next-message)))
+        ("K" . (lambda ()
+                 "Mark message deleted"
+                 (interactive)
+                 (notmuch-tree-tag '("-unread" "-inbox" "+deleted"))
+                 (notmuch-tree-next-message)))
         ("S" . (lambda ()
                  "Mark message as spam"
                  (interactive)
                  (notmuch-tree-tag '("-unread" "-inbox" "-webmasters" "+spam"))
-                 (notmuch-tree-archive-thread))))
-)
+                 (notmuch-tree-next-message)))))
 
-;; (use-package counsel-notmuch
-;;   :commands counsel-notmuch)
+(use-package counsel-notmuch
+  :bind ("C-c s m" . counsel-notmuch))
 
 (after! notmuch-crypto
   (setq notmuch-crypto-process-mime t))
 
-;; (after! evil
-;;   (mapc (lambda (str) (evil-set-initial-state (car str) (cdr str)))
-;;         '((notmuch-hello-mode . emacs)
-;;           (notmuch-search-mode . emacs)
-;;           (notmuch-tree-mode . emacs))))
-
 (after! recentf
   (add-to-list 'recentf-exclude (expand-file-name amin-maildir)))
 #+end_src