X-Git-Url: https://git.shemshak.org/gitweb.cgi/~bandali/configs/blobdiff_plain/06e1660015051599b192f89faadc35b4e754f8e2..ba8fa06bd61b31db9868d19a25cd239e4cfd51e8:/init.org?ds=inline

diff --git a/init.org b/init.org
index da741f1..bc73a1d 100644
--- a/init.org
+++ b/init.org
@@ -234,6 +234,9 @@ can then be managed with the help of Magit or other tools.
 (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
@@ -750,6 +753,33 @@ There's no way I could top that, so I won't attempt to.
   (defalias 'locate #'counsel-locate))
 #+end_src
 
+*** eshell
+
+#+begin_src emacs-lisp
+(use-package eshell
+  :commands eshell
+  :config
+  (eval-when-compile (defvar eshell-prompt-regexp))
+  (defun amin/eshell-quit-or-delete-char (arg)
+    (interactive "p")
+    (if (and (eolp) (looking-back eshell-prompt-regexp nil))
+        (eshell-life-is-too-much)
+      (delete-char arg)))
+
+  (defun amin/eshell-clear ()
+    (interactive)
+    (let ((inhibit-read-only t))
+      (erase-buffer))
+    (eshell-send-input))
+
+  (defun amin|eshell-setup ()
+    (bind-keys :map eshell-mode-map
+               ("C-d" . amin/eshell-quit-or-delete-char)
+               ("C-l" . amin/eshell-clear)))
+
+  :hook (eshell-mode . amin|eshell-setup))
+#+end_src
+
 * Borg's =layer/essentials=
 
 TODO: break this giant source block down into individual org sections.
@@ -883,6 +913,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)))
@@ -1119,7 +1150,9 @@ Emacs package that displays available keybindings in popup
          ("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)))
+         ("C-c f R" . crux-rename-file-and-buffer)
+         ("C-S-j"   . crux-top-join-line)
+         ("C-c j"   . crux-top-join-line)))
 #+end_src
 
 ** [[https://github.com/alezost/mwim.el][mwim]]
@@ -1132,6 +1165,70 @@ Emacs package that displays available keybindings in popup
          ("<end>"  . mwim-end-of-line-or-code)))
 #+end_src
 
+** projectile
+
+#+begin_src emacs-lisp
+(use-package projectile
+  :defer 5
+  :bind-keymap ("C-c p" . projectile-command-map)
+  :config
+  (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
+
+** [[https://github.com/wasamasa/shackle][shackle]]
+
+#+begin_src emacs-lisp
+(use-package shackle
+  :demand t
+  :commands shackle-mode
+  :config
+  (shackle-mode 1)
+  (setq shackle-rules
+        '(("*Help*" :align right :select t :size 0.5)
+          ("\\`\\*helm.*?\\*\\'" :regexp t :align t)
+          ((compilation-mode "\\`\\*magit-diff: .*?\\'") :regexp t :noselect t)
+          ("*magit-dispatch-popup*" :align bottom)
+          ((inferior-scheme-mode "*shell*" "*eshell*") :popup t))
+        shackle-default-rule '(:select t)
+        shackle-default-size 0.4
+        shackle-inhibit-window-quit-on-same-windows t))
+#+end_src
+
+** [[https://github.com/Wilfred/helpful][helpful]]
+
+#+begin_src emacs-lisp
+(use-package helpful
+  :bind
+  (("C-h f"   . helpful-callable)
+   ("C-h v"   . helpful-variable)
+   ("C-h k"   . helpful-key)
+   ("C-c C-d" . helpful-at-point)
+   ("C-h F"   . helpful-function)
+   ("C-h C"   . helpful-command)))
+#+end_src
+
+** [[https://github.com/kyagi/shell-pop-el][shell-pop]]
+
+#+begin_src emacs-lisp
+(use-package shell-pop
+  :config
+  (add-to-list 'shackle-rules '("\\*eshell\\*" :regexp t :same t))
+  :custom
+  (shell-pop-universal-key "C-c e")
+  (shell-pop-shell-type '("eshell" "*eshell*" (lambda nil (eshell)))))
+#+end_src
+
 * Email
 ** [[https://notmuchmail.org][notmuch]]
 
@@ -1186,6 +1283,7 @@ See [[notmuch:id:87muuqsvci.fsf@fencepost.gnu.org][bug follow-up]].
 (use-package 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
@@ -1226,13 +1324,24 @@ See [[notmuch:id:87muuqsvci.fsf@fencepost.gnu.org][bug follow-up]].
   ;; (set! :evil-state 'notmuch-message-mode 'insert)
   ;; (advice-add #'notmuch-bury-or-kill-this-buffer
   ;;             :override #'kill-this-buffer)
-  ;; (evil-collection-define-key 'normal 'notmuch-common-keymap
-  ;;   "c" (lambda ()
-  ;;         "Compose new mail and prompt for sender"
-  ;;         (interactive)
-  ;;         (let ((current-prefix-arg t))
-  ;;           (call-interactively #'notmuch-mua-new-mail))))
   :bind
+  (:map notmuch-hello-mode-map
+        ("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"
+                 (interactive)
+                 (notmuch-hello-search "tag:latest")))
+        ("e" . (lambda ()
+                 "Search for `encrypted'-tagged messages"
+                 (interactive)
+                 (notmuch-hello-search "tag:encrypted"))))
   (:map notmuch-search-mode-map
         ("k" . (lambda ()
                  "Mark message read"
@@ -1249,19 +1358,34 @@ 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
   :bind ("C-c s m" . counsel-notmuch))