X-Git-Url: https://git.shemshak.org/gitweb.cgi/~bandali/configs/blobdiff_plain/2d7a5a85817b1f361a2e1ade61470eaf895c3885..7d1b2f9ae4bacd453401c2cca174a2a5f85fe0ad:/init.org?ds=sidebyside

diff --git a/init.org b/init.org
index a8dddd0..7c12ad5 100644
--- a/init.org
+++ b/init.org
@@ -191,7 +191,7 @@ but for now I've decided to keep them enabled. See documentation for
 
 #+begin_src emacs-lisp
 (setq user-full-name "Amin Bandali"
-      user-mail-address "amin@bandali.me")
+      user-mail-address "amin@aminb.org")
 #+end_src
 
 ** Package management
@@ -327,8 +327,11 @@ it it's own file. While at it, treat themes as safe.
 
 ** Secrets file
 
+Load the secrets file if it exists, otherwise show a warning.
+
 #+begin_src emacs-lisp
-(load (no-littering-expand-etc-file-name "secrets"))
+(with-demoted-errors
+    (load (no-littering-expand-etc-file-name "secrets")))
 #+end_src
 
 ** Better =$PATH= handling
@@ -724,9 +727,11 @@ customizing it.
         evil-cross-lines t)
 
   ;; custom mode state mappings
-  (dolist (mspair '((ebdb-mode    . emacs)
-                    (helpful-mode . motion)
-                    (view-mode    . motion)))
+  (dolist (mspair '((ebdb-mode        . emacs)
+                    (term-mode        . emacs)
+                    (helpful-mode     . motion)
+                    (magit-blame-mode . motion)
+                    (view-mode        . motion)))
     (evil-set-initial-state (car mspair) (cdr mspair)))
 
   ;; fix tab and indentation in src blocks inside org-mode buffer
@@ -794,6 +799,8 @@ customizing it.
   "a"   '(:ignore t :wk "apps")
   "a i" 'ielm
 
+  "a s" '(:ignore t :wk "shells/terms")
+
   "b"   '(:ignore t :wk "buffers")
   "b k" 'kill-this-buffer
   "b s" 'save-buffer
@@ -846,7 +853,7 @@ In short, my favourite way of life.
 
 #+begin_src emacs-lisp
 (use-package org
-  :defer 3
+  :defer 1
   :general
   (amin--leader-keys
     :states 'normal
@@ -990,7 +997,7 @@ Not just how I do git, but /the/ way to do git.
 
 #+begin_src emacs-lisp
 (use-package magit
-  :defer 2
+  :defer 1
   :general (amin--leader-keys "g s" 'magit-status)
   :bind ("s-g" . magit-status)
   :config
@@ -1259,7 +1266,8 @@ TODO: break this giant source block down into individual org sections.
   :config (column-number-mode))
 
 (progn ;    `text-mode'
-  (add-hook 'text-mode-hook #'indicate-buffer-boundaries-left))
+  (add-hook 'text-mode-hook #'indicate-buffer-boundaries-left)
+  (add-hook 'text-mode-hook #'abbrev-mode))
 
 (use-package tramp
   :defer t
@@ -1286,7 +1294,7 @@ TODO: break this giant source block down into individual org sections.
 
 #+begin_src emacs-lisp
 (use-package company
-  :defer 2
+  :defer 1
   :bind
   (:map company-active-map
         ([tab]    . company-complete-common-or-cycle)
@@ -1724,16 +1732,6 @@ Emacs package that displays available keybindings in popup
 (load-theme 'tangomod t)
 #+end_src
 
-** COMMENT [[https://github.com/Malabarba/smart-mode-line][smart-mode-line]]
-
-#+begin_src emacs-lisp
-(use-package smart-mode-line
-  :config
-  (sml/setup)
-  (sml/apply-theme 'light)
-  (remove-hook 'display-time-hook 'sml/propertize-time-string))
-#+end_src
-
 ** doom-modeline
 
 #+begin_src emacs-lisp
@@ -1809,7 +1807,7 @@ Emacs package that displays available keybindings in popup
 
 #+begin_src emacs-lisp
 (use-package projectile
-  :defer 2
+  :defer t
   :bind-keymap ("C-c p" . projectile-command-map)
   :config
   (projectile-mode)
@@ -1846,7 +1844,7 @@ Emacs package that displays available keybindings in popup
 #+begin_src emacs-lisp
 (use-package shell-toggle
   :after eshell
-  :general (amin--leader-keys "a s" 'amin/shell-toggle)
+  :general (amin--leader-keys "a s e" 'amin/shell-toggle)
   :bind ("C-c e" . amin/shell-toggle)
   :config
   (defun amin/shell-toggle (make-cd)
@@ -2117,6 +2115,40 @@ For when I /have to/ use GH.
   :after eshell)
 #+end_src
 
+** multi-term
+
+#+begin_src emacs-lisp
+(use-package multi-term
+  :defer 1
+  :general (amin--leader-keys
+             "a s m" 'multi-term
+             "a s p" 'multi-term-dedicated-toggle)
+  :bind ("C-c C-j" . term-line-mode)
+  :config
+  (setq multi-term-program "/bin/screen"
+        ;; TODO: add separate bindings for connecting to existing
+        ;; session vs. always creating a new one
+        multi-term-dedicated-select-after-open-p t
+        multi-term-dedicated-window-height 20
+        multi-term-dedicated-max-window-height 30
+        term-bind-key-alist
+        '(("C-c C-c" . term-interrupt-subjob)
+          ("C-c C-e" . term-send-esc)
+          ("C-k" . kill-line)
+          ("C-y" . term-paste)
+          ("M-f" . term-send-forward-word)
+          ("M-b" . term-send-backward-word)
+          ("M-p" . term-send-up)
+          ("M-n" . term-send-down)
+          ("<C-backspace>" . term-send-backward-kill-word)
+          ("<M-DEL>" . term-send-backward-kill-word)
+          ("M-d" . term-send-delete-word)
+          ("M-," . term-send-raw)
+          ("M-." . comint-dynamic-complete))
+        term-unbind-key-alist
+        '("C-z" "C-x" "C-c" "C-h" "C-y" "<ESC>")))
+#+end_src
+
 * Email
 
 #+begin_src emacs-lisp
@@ -2217,12 +2249,15 @@ For when I /have to/ use GH.
   :config
   (setq gnus-posting-styles
         '((".*"
-           (address "amin@bandali.me")
-           (body "\nBest,\namin\n"))
+           (address "amin@aminb.org")
+           (body "\nBest,\namin\n")
+           (eval (setq amin--message-cite-say-hi t)))
           ("gnu.*"
            (address "bandali@gnu.org"))
           ((header "subject" "ThankCRM")
-           (to "webmasters-comment@gnu.org"))
+           (to "webmasters-comment@gnu.org")
+           (body "\nAdded  to 2018supporters.html.\n\nMoving to campaigns.\n\n-amin\n")
+           (eval (setq amin--message-cite-say-hi nil)))
           ("nnimap\\+uwaterloo:.*"
            (address "abandali@uwaterloo.ca")
            (gcc "\"nnimap+uwaterloo:Sent Items\"")))))
@@ -2260,6 +2295,7 @@ For when I /have to/ use GH.
 #+begin_src emacs-lisp
 (use-package message
   :config
+  (defconst amin--message-cite-style-format "On %Y-%m-%d %l:%M %p, %N wrote:")
   (defconst message-cite-style-bandali
     '((message-cite-function  'message-cite-original)
       (message-citation-line-function  'message-insert-formatted-citation-line)
@@ -2267,19 +2303,25 @@ For when I /have to/ use GH.
       (message-yank-prefix  "> ")
       (message-yank-cited-prefix  ">")
       (message-yank-empty-prefix  ">")
-      (message-citation-line-format "Hi %F,\n\nOn %Y-%m-%d %l:%M %p, %N wrote:"))
+      (message-citation-line-format
+       (if amin--message-cite-say-hi
+           (concat "Hi %F,\n\n" amin--message-cite-style-format)
+         amin--message-cite-style-format)))
     "Citation style based on Mozilla Thunderbird's. Use with message-cite-style.")
   (setq message-cite-style 'message-cite-style-bandali
         message-kill-buffer-on-exit t
         message-send-mail-function 'message-send-mail-with-sendmail
         message-sendmail-envelope-from 'header
         message-dont-reply-to-names
-        "\\(\\(amin@bandali\\.me\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(aminb?\\|mab\\|bandali\\)@gnu\\.org\\)\\|\\(\\(m\\|a\\(min\\.\\)?\\)bandali@uwaterloo\\.ca\\)\\)"
+        "\\(\\(.*@aminb\\.org\\)\\|\\(amin@bandali\\.me\\)\\|\\(\\(aminb?\\|mab\\|bandali\\)@gnu\\.org\\)\\|\\(\\(m\\|a\\(min\\.\\)?\\)bandali@uwaterloo\\.ca\\)\\)"
         message-user-fqdn "aminb.org")
   :hook (;; (message-setup . mml-secure-message-sign-pgpmime)
          (message-mode . flyspell-mode)
-         (message-mode . (lambda () (setq fill-column 65
-                                     message-fill-column 65))))
+         (message-mode . (lambda ()
+                           ;; (setq fill-column 65
+                           ;;       message-fill-column 65)
+                           (make-local-variable 'company-idle-delay)
+                           (setq company-idle-delay 0.2))))
   ;; :custom-face
   ;; (message-header-subject ((t (:foreground "#111" :weight semi-bold))))
   ;; (message-header-to      ((t (:foreground "#111" :weight normal))))
@@ -2315,92 +2357,37 @@ Convenient footnotes in =message-mode=.
         footnote-style     'unicode))
 #+end_src
 
-** COMMENT supercite
+** bbdb
 
-#+begin_src emacs-lisp
-(use-package supercite
-  :after message
-  :init
-  (setq sc-nested-citation-p t
-        ;; sc-cite-blank-lines-p t
-        sc-citation-leader ""
-        sc-reference-tag-string ""
-        sc-preferred-header-style 5     ; (sc-header-author-writes)
-        sc-auto-fill-region-p nil
-        sc-confirm-always-p nil)
-  :config
-  ;;   (defun amin--sc-header-on-wrote ()
-  ;;     "\"On <date>, <sc-author> wrote:\" unless:
-  ;; 1. the \"sc-author\" field cannot be found, in which case nothing is inserted;
-  ;; 2. the \"date\" field is missing in which case only the from part is printed."
-  ;;     (let ((sc-mumble "")
-  ;; 	      (whofrom (sc-whofrom)))
-  ;;       (if whofrom
-  ;; 	      (insert sc-reference-tag-string
-  ;; 		          (sc-hdr "On " (sc-mail-field "date") ", ")
-  ;; 		          (sc-hdr "" (sc-mail-field "sc-author")) " wrote:\n"))))
-  ;;   (defun amin--sc-header ()
-  ;;     "Hi <firstname>,\n\n <from> writes:"
-  ;;     (let ((sc-mumble "")
-  ;; 	      (whofrom (sc-whofrom)))
-  ;;       (if whofrom
-  ;; 	      (insert (sc-hdr "Hi " (sc-mail-field "sc-firstname") ",\n\n")
-  ;;                   sc-reference-tag-string
-  ;; 		          whofrom
-  ;; 		          " writes:\n"))))
-  ;; (add-to-list 'sc-rewrite-header-list '(amin--sc-header) t)
-  ;; (add-to-list 'sc-rewrite-header-list '(amin--sc-header-on-wrote) t)
-  ;; (setq sc-preferred-header-style (1- (length sc-rewrite-header-list)))
-  (add-hook 'mail-citation-hook 'sc-cite-original))
-#+end_src
-
-** ebdb
-
-#+begin_src emacs-lisp
-(use-package ebdb
-  :defer 1
-  :bind (:map gnus-group-mode-map ("e" . ebdb))
-  :config
-  (setq ebdb-sources (no-littering-expand-var-file-name "ebdb")))
-
-(use-package ebdb-com
-  :after ebdb)
-
-(use-package ebdb-complete
-  :after ebdb
-  :config
-  (ebdb-complete-enable))
+Manually install bbdb (=lisp/bbdb= copied from an ELPA-based setup),
+because installing it from source on Emacs 27 using the following
+submodule configuration for some reason doesn’t work and results in
+very strange errors when using any of the functions.
 
-(use-package ebdb-gnus
-  :after ebdb)
-
-(use-package ebdb-message
-  :after ebdb)
-
-;; (use-package ebdb-vcard
-;;   :after ebdb)
-#+end_src
-
-** COMMENT bbdb
-
-#+begin_comment
+#+begin_src conf :tangle no
 [submodule "bbdb"]
 	path = lib/bbdb
 	url = https://git.savannah.nongnu.org/git/bbdb.git
-	load-path = lisp/elisp
+	load-path = lisp
 	info-path = doc
 	build-step = ./autogen.sh
-	build-step = ./configure --with-lispdir=elisp
+	build-step = ./configure
 	build-step = make
 	build-step = make install
-#+end_comment
+#+end_src
+
+I tried using =borg-elpa= instead of doing it like this, but it added
+2 seconds to my startup time, which is unacceptable to me.
 
 #+begin_src emacs-lisp
 (use-package bbdb
+  :load-path "lisp/bbdb"
   :init
-  (bbdb-mua-auto-update-init 'message)
-  (setq bbdb-mua-auto-update-p 'query)
-  (add-hook 'gnus-startup-hook 'bbdb-insinuate-gnus))
+  (load (expand-file-name "lisp/bbdb/bbdb-autoloads.el" user-emacs-directory))
+  ;; (bbdb-mua-auto-update-init 'message)
+  (setq bbdb-mua-auto-update-p 'query
+        bbdb-complete-mail nil)
+  (bbdb-initialize 'gnus 'message))
 #+end_src
 
 ** COMMENT message-x
@@ -2430,181 +2417,6 @@ Convenient footnotes in =message-mode=.
     (gnus-harvest-install)))
 #+end_src
 
-** COMMENT gnus-alias                                              :ARCHIVE:
-
-#+begin_src emacs-lisp
-(use-package gnus-alias
-  :commands (gnus-alias-determine-identity
-             gnus-alias-select-identity)
-  :bind (:map  message-mode-map
-               ("s-i" . gnus-alias-select-identity))
-  :config
-  (setq
-   gnus-alias-default-identity "amin"
-   gnus-alias-identity-alist
-   '(("amin"
-      nil   ;; Does not refer to any other identity
-      "Amin Bandali <amin@aminb.org>"
-      nil   ;; Organization
-      nil   ;; extra headers
-      nil   ;; extra body text
-      nil)  ;; signature file
-     ("gnu"
-      nil
-      "Amin Bandali <bandali@gnu.org>"
-      nil
-      nil
-      nil
-      nil)
-     ("uw"
-      nil
-      "Amin Bandali <abandali@uwaterloo.ca>"
-      nil
-      (("Gcc" . "\"nnimap+uwaterloo:Sent Items\""))
-      nil
-      nil))
-   gnus-alias-identity-rules
-   '(("amin" ("Delivered-To" "<amin\\@aminb\\.org" both) "amin")
-     ("gnu" ("Delivered-To" "<gnu\\@aminb\\.org" both) "gnu")
-     ("uw" ("any" "<\\(.+\\)\\@uwaterloo\\.ca" both) "uw"))
-   gnus-alias-override-user-mail-address t)
-  :hook (message-setup . gnus-alias-determine-identity))
-#+end_src
-
-** COMMENT [[https://notmuchmail.org][notmuch]]                                                 :ARCHIVE:
-
-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
-   (when (equal current-prefix-arg nil)
-     (delete-other-windows)))
-  (notmuch))
-
-(use-package notmuch
-  :commands notmuch
-  :bind ("C-c n" . amin/notmuch)
-  :custom (notmuch-always-prompt-for-sender t)
-  :config
-  (setq notmuch-hello-sections
-        '(notmuch-hello-insert-header
-          notmuch-hello-insert-saved-searches
-          ;; notmuch-hello-insert-search
-          notmuch-hello-insert-alltags)
-        notmuch-search-oldest-first nil
-        notmuch-show-all-tags-list t
-        notmuch-message-headers  ; see bug follow-up above
-        '("Subject" "To" "Cc" "Date" "List-Id" "X-RT-Originator")
-        notmuch-hello-thousands-separator ","
-        notmuch-fcc-dirs
-        '(("amin@aminb.org"        . "amin/Sent")
-          ("bandali@gnu.org"       . "gnu/Sent")
-          ("abandali@uwaterloo.ca" . "\"uwaterloo/Sent Items\"")
-          ("mab@gnu.org"           . "gnu/Sent")
-          ("amin@gnu.org"          . "gnu/Sent")
-          ("aminb@gnu.org"         . "gnu/Sent")
-          (".*"                    . "sent"))
-        notmuch-search-result-format
-        '(("date"    . "%12s ")
-          ("count"   . "%-7s ")
-          ("authors" . "%-40s ")
-          ("subject" . "%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)
-  ;;               (setq visual-fill-column-width 70))))
-  ;; (set! :evil-state 'notmuch-message-mode 'insert)
-  ;; (advice-add #'notmuch-bury-or-kill-this-buffer
-  ;;             :override #'kill-this-buffer)
-  :hook (notmuch-message-mode . doom-modeline-set-special-modeline)
-  :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"
-                 (interactive)
-                 (notmuch-search-tag '("-unread"))
-                 ;; (notmuch-search-archive-thread)
-                 (notmuch-search-next-thread)))
-        ("u" . (lambda ()
-                 "Mark message unread"
-                 (interactive)
-                 (notmuch-search-tag '("+unread"))
-                 (notmuch-search-next-thread)))
-        ("K" . (lambda ()
-                 "Mark message deleted"
-                 (interactive)
-                 (notmuch-search-tag '("-unread" "-inbox" "+deleted"))
-                 (notmuch-search-next-thread)))
-        ("S" . (lambda ()
-                 "Mark message as spam"
-                 (interactive)
-                 (notmuch-search-tag '("-unread" "-inbox" "-webmasters" "+spam"))
-                 (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-next-message))))
-  :custom-face
-  (notmuch-search-unread-face ((t (:weight semi-bold))))
-  (notmuch-tag-face ((t (:foreground "navy blue" :weight semi-bold)))))
-
-(use-package counsel-notmuch
-  :bind ("C-c s m" . counsel-notmuch))
-
-(after! notmuch-crypto
-  (setq notmuch-crypto-process-mime t))
-
-(use-package org-notmuch
-  :after (:any org notmuch))
-#+end_src
-
 * Blogging
 ** [[https://ox-hugo.scripter.co][ox-hugo]]