[emacs] update 4 drones

[~bandali/configs] / init.org

diff --git a/init.org b/init.org
index 0f1e578..5c24b9e 100644 (file)
--- a/init.org
+++ b/init.org
@@ -348,7 +348,7 @@ in my shell.
   (exec-path-from-shell-copy-env "SSH_AUTH_SOCK"))
 #+end_src
 
   (exec-path-from-shell-copy-env "SSH_AUTH_SOCK"))
 #+end_src
 

-** Only one custom theme at a time
+** COMMENT Only one custom theme at a time

 
 #+begin_src emacs-lisp
 (defadvice load-theme (before clear-previous-themes activate)
 
 #+begin_src emacs-lisp
 (defadvice load-theme (before clear-previous-themes activate)


@@ -645,6 +645,19 @@ Enable =winner-mode=.
          (cons msg code)))
 #+end_src
 
          (cons msg code)))
 #+end_src
 

+*** Search for non-ASCII characters
+
+I’d like non-ASCII characters such as ‘’“”«»‹›áⓐ𝒶 to be selected when
+I search for their ASCII counterpart.  Shoutout to [[http://endlessparentheses.com/new-in-emacs-25-1-easily-search-non-ascii-characters.html][endlessparentheses]]
+for this.
+
+#+begin_src emacs-lisp
+(setq search-default-mode #'char-fold-to-regexp)
+
+;; uncomment to extend this behaviour to query-replace
+;; (setq replace-char-fold t)
+#+end_src
+

 ** Bindings
 
 #+begin_src emacs-lisp
 ** Bindings
 
 #+begin_src emacs-lisp


@@ -703,23 +716,17 @@ customizing it.
 (use-package evil
   :demand t
   ;; :hook (org-src-mode . evil-motion-state)
 (use-package evil
   :demand t
   ;; :hook (org-src-mode . evil-motion-state)

-  :init
-  (setq evil-want-integration nil)

   :config
   (evil-mode 1)
   (general-swap-key nil '(normal motion) ";" ":")
 
   :config
   (evil-mode 1)
   (general-swap-key nil '(normal motion) ";" ":")
 

-  (setq
-   evil-want-visual-char-semi-exclusive t
-   evil-move-beyond-eol  t
-   ;; evil-move-cursor-back nil
-   )
+  (setq evil-want-visual-char-semi-exclusive t)

 
 

-  ;; motion state modes
-  (dolist (mode '(ebdb-mode
-                  helpful-mode
-                  view-mode))
-    (evil-set-initial-state mode 'motion))
+  ;; custom mode state mappings
+  (dolist (mspair '((ebdb-mode    . emacs)
+                    (helpful-mode . motion)
+                    (view-mode    . motion)))
+    (evil-set-initial-state (car mspair) (cdr mspair)))

 
   ;; fix tab and indentation in src blocks inside org-mode buffer
   ;; also see https://git.sr.ht/~bandali/dotfiles/commit/0e2ffd584aafdd4cf256bcdf2473f01c3aaaed55
 
   ;; fix tab and indentation in src blocks inside org-mode buffer
   ;; also see https://git.sr.ht/~bandali/dotfiles/commit/0e2ffd584aafdd4cf256bcdf2473f01c3aaaed55


@@ -731,7 +738,14 @@ customizing it.
   (unbind-key "C-a" evil-insert-state-map)
   (unbind-key "C-e" evil-insert-state-map)
   (unbind-key "C-p" evil-insert-state-map)
   (unbind-key "C-a" evil-insert-state-map)
   (unbind-key "C-e" evil-insert-state-map)
   (unbind-key "C-p" evil-insert-state-map)

-  (unbind-key "C-n" evil-insert-state-map))
+  (unbind-key "C-n" evil-insert-state-map)
+  (unbind-key "C-k" evil-insert-state-map)
+  (bind-keys
+    :map evil-insert-state-map
+    ("C-k"   . kill-line)
+    ("C-S-k" . evil-insert-digraph)
+    :map evil-motion-state-map
+    ([down-mouse-1] . nil)))

 #+end_src
 
 #+begin_src emacs-lisp
 #+end_src
 
 #+begin_src emacs-lisp


@@ -776,6 +790,9 @@ customizing it.
 (amin--leader-keys
   "/"   '(:ignore t :wk "search")
 
 (amin--leader-keys
   "/"   '(:ignore t :wk "search")
 

+  "a"   '(:ignore t :wk "apps")
+  "a i" 'ielm
+

   "b"   '(:ignore t :wk "buffers")
   "b k" 'kill-this-buffer
   "b s" 'save-buffer
   "b"   '(:ignore t :wk "buffers")
   "b k" 'kill-this-buffer
   "b s" 'save-buffer


@@ -784,8 +801,6 @@ customizing it.
   "e b" 'eval-buffer
   "e r" 'eval-region
 
   "e b" 'eval-buffer
   "e r" 'eval-region
 

-  "e e" 'shell-pop
-

   "f"   '(:ignore t :wk "files")
 
   "F"   '(:ignore t :wk "frames")
   "f"   '(:ignore t :wk "files")
 
   "F"   '(:ignore t :wk "frames")


@@ -807,6 +822,12 @@ customizing it.
 
   "w"   '(:ignore t :wk "window")
   "w o" 'other-window
 
   "w"   '(:ignore t :wk "window")
   "w o" 'other-window

+  "w 0" 'delete-window
+  "w 1" 'delete-other-windows
+  "w 2" 'split-window-below
+  "w 3" 'split-window-right
+  "w u" 'winner-undo
+  "w r" 'winner-redo

 
   "q"   '(:ignore t :wk "quit")
   "q q" 'save-buffers-kill-terminal)
 
   "q"   '(:ignore t :wk "quit")
   "q q" 'save-buffers-kill-terminal)


@@ -967,6 +988,9 @@ Not just how I do git, but /the/ way to do git.
   (setq
    magit-repository-directories '(("~/.emacs.d/" . 0)
                                   ("~/src/git/" . 1)))
   (setq
    magit-repository-directories '(("~/.emacs.d/" . 0)
                                   ("~/src/git/" . 1)))

+  (nconc magit-section-initial-visibility-alist
+         '(([unpulled status] . show)
+           ([unpushed status] . show)))

   :custom-face (magit-diff-file-heading ((t (:weight normal)))))
 #+end_src
 
   :custom-face (magit-diff-file-heading ((t (:weight normal)))))
 #+end_src
 


@@ -1035,7 +1059,7 @@ There's no way I could top that, so I won't attempt to.
 
 #+begin_src emacs-lisp
 (use-package eshell
 
 #+begin_src emacs-lisp
 (use-package eshell

-  :defer t
+  :defer 1

   :commands eshell
   :config
   (eval-when-compile (defvar eshell-prompt-regexp))
   :commands eshell
   :config
   (eval-when-compile (defvar eshell-prompt-regexp))


@@ -1225,12 +1249,14 @@ TODO: break this giant source block down into individual org sections.
                (list (regexp-quote (system-name)) nil nil)))
 
 (use-package undo-tree
                (list (regexp-quote (system-name)) nil nil)))
 
 (use-package undo-tree

-  :bind (("C-?" . undo-tree-undo)
-         ("M-_" . undo-tree-redo))

   :config
   :config

-  (global-undo-tree-mode)
-  (setq undo-tree-mode-lighter ""
-        undo-tree-auto-save-history t))
+  (global-undo-tree-mode -1))
+  ;; :bind (("C-?" . undo-tree-undo)
+  ;;        ("M-_" . undo-tree-redo))
+  ;; :config
+  ;; (global-undo-tree-mode)
+  ;; (setq undo-tree-mode-lighter ""
+  ;;       undo-tree-auto-save-history t))

 #+end_src
 
 * Editing
 #+end_src
 
 * Editing


@@ -1671,16 +1697,48 @@ Emacs package that displays available keybindings in popup
   :config (which-key-mode))
 #+end_src
 
   :config (which-key-mode))
 #+end_src
 

+** theme
+
+#+begin_src emacs-lisp
+(add-to-list 'custom-theme-load-path "~/.emacs.d/lisp")
+(load-theme 'tangomod t)
+#+end_src
+

 ** [[https://github.com/Malabarba/smart-mode-line][smart-mode-line]]
 
 #+begin_src emacs-lisp
 (use-package smart-mode-line
   :config
   (sml/setup)
 ** [[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)
+  (sml/apply-theme 'light)

   (remove-hook 'display-time-hook 'sml/propertize-time-string))
 #+end_src
 
   (remove-hook 'display-time-hook 'sml/propertize-time-string))
 #+end_src
 

+** theme helper functions
+
+#+begin_src emacs-lisp
+(defun amin/light ()
+  "Load light theme(s)."
+  (interactive)
+  (progn
+    (mapc #'disable-theme custom-enabled-themes)
+    (load-theme 'tangomod t)
+    (sml/apply-theme 'light)))
+
+(defun amin/dark ()
+  "Load dark theme(s)."
+  (interactive)
+  (progn
+    (mapc #'disable-theme custom-enabled-themes)
+    (load-theme 'tangomod-dark t)
+    (sml/apply-theme 'dark)))
+
+(amin--leader-keys
+  "t"   '(:ignore t :wk "theme")
+  "t d" 'amin/dark
+  "t l" 'amin/light)
+#+end_src
+

 ** [[https://github.com/bbatsov/crux][crux]]
 
 #+begin_src emacs-lisp
 ** [[https://github.com/bbatsov/crux][crux]]
 
 #+begin_src emacs-lisp


@@ -1750,14 +1808,52 @@ Emacs package that displays available keybindings in popup
     "h h p" 'helpful-at-point))
 #+end_src
 
     "h h p" 'helpful-at-point))
 #+end_src
 

-** [[https://github.com/kyagi/shell-pop-el][shell-pop]]
+** [[https://github.com/knu/shell-toggle.el][shell-toggle]]

 
 #+begin_src emacs-lisp
 
 #+begin_src emacs-lisp

-(use-package shell-pop
-  :defer 1
-  :init
-  (setq shell-pop-universal-key "C-c e"
-        shell-pop-shell-type '("eshell" "*eshell*" (lambda nil (eshell)))))
+(use-package shell-toggle
+  :after eshell
+  :general (amin--leader-keys "a s" 'amin/shell-toggle)
+  :bind ("C-c e" . amin/shell-toggle)
+  :config
+  (defun amin/shell-toggle (make-cd)
+    "Toggle between the shell buffer and whatever buffer you are editing.
+With a prefix argument MAKE-CD also insert a \"cd DIR\" command
+into the shell, where DIR is the directory of the current buffer.
+
+When called in the shell buffer returns you to the buffer you were editing
+before calling this the first time.
+
+Options: `shell-toggle-goto-eob'"
+    (interactive "P")
+    ;; Try to decide on one of three possibilities:
+    ;; If not in shell-buffer, switch to it.
+    ;; If in shell-buffer, return to state before going to the shell-buffer
+    (if (eq (current-buffer) shell-toggle-shell-buffer)
+        (shell-toggle-buffer-return-from-shell)
+      (progn
+        (shell-toggle-buffer-goto-shell make-cd)
+        (if shell-toggle-full-screen-window-only (delete-other-windows)))))
+
+  ;; override to split horizontally instead
+  (defun shell-toggle-buffer-switch-to-other-window ()
+    "Switch to other window.
+If the current window is the only window in the current frame,
+create a new window and switch to it.
+
+\(This is less intrusive to the current window configuration than
+`switch-buffer-other-window')"
+    (let ((this-window (selected-window)))
+      (other-window 1)
+      ;; If we did not switch window then we only have one window and need to
+      ;; create a new one.
+      (if (eq this-window (selected-window))
+             (progn
+               (split-window-horizontally)
+            (other-window 1)))))
+
+  :custom
+  (shell-toggle-launch-shell 'shell-toggle-eshell))

 #+end_src
 
 ** [[https://github.com/EricCrosson/unkillable-scratch][unkillable-scratch]]
 #+end_src
 
 ** [[https://github.com/EricCrosson/unkillable-scratch][unkillable-scratch]]


@@ -1898,6 +1994,9 @@ Hopefully temporary.
    :subscribed-channels '(general)
    :full-and-display-names t)
   (add-to-list 'swiper-font-lock-exclude 'slack-message-buffer-mode t)
    :subscribed-channels '(general)
    :full-and-display-names t)
   (add-to-list 'swiper-font-lock-exclude 'slack-message-buffer-mode t)

+  (setq lui-time-stamp-format "[%Y-%m-%d %H:%M:%S]"
+        lui-time-stamp-only-when-changed-p t
+        lui-time-stamp-position 'right)

   :bind
   (("C-c s s" . slack-start)
    ("C-c s u" . slack-select-unread-rooms)
   :bind
   (("C-c s s" . slack-start)
    ("C-c s u" . slack-select-unread-rooms)


@@ -2023,7 +2122,7 @@ For when I /have to/ use GH.
              (nnimap-server-port 143)
              (nnimap-authenticator plain)
              (nnimap-user "abandali@uwaterloo.ca")))
              (nnimap-server-port 143)
              (nnimap-authenticator plain)
              (nnimap-user "abandali@uwaterloo.ca")))

-   gnus-message-archive-group "nnimap:Sent"
+   gnus-message-archive-group "nnimap+amin:Sent"

    gnus-parameters
    '(("gnu.*"
       (gcc-self . t)))
    gnus-parameters
    '(("gnu.*"
       (gcc-self . t)))


@@ -2088,6 +2187,8 @@ For when I /have to/ use GH.
            (body "\nBest,\namin\n"))
           ("gnu.*"
            (address "bandali@gnu.org"))
            (body "\nBest,\namin\n"))
           ("gnu.*"
            (address "bandali@gnu.org"))

+          ((header "subject" "ThankCRM")
+           (to "webmasters-comment@gnu.org"))

           ("nnimap\\+uwaterloo:.*"
            (address "abandali@uwaterloo.ca")
            (gcc "\"nnimap+uwaterloo:Sent Items\"")))))
           ("nnimap\\+uwaterloo:.*"
            (address "abandali@uwaterloo.ca")
            (gcc "\"nnimap+uwaterloo:Sent Items\"")))))


@@ -2125,7 +2226,17 @@ For when I /have to/ use GH.
 #+begin_src emacs-lisp
 (use-package message
   :config
 #+begin_src emacs-lisp
 (use-package message
   :config

-  (setq message-kill-buffer-on-exit t
+  (defconst message-cite-style-bandali
+    '((message-cite-function  'message-cite-original)
+      (message-citation-line-function  'message-insert-formatted-citation-line)
+      (message-cite-reply-position 'traditional)
+      (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:"))
+    "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
         message-send-mail-function 'message-send-mail-with-sendmail
         message-sendmail-envelope-from 'header
         message-dont-reply-to-names


@@ -2169,7 +2280,7 @@ Convenient footnotes in =message-mode=.
         footnote-style     'unicode))
 #+end_src
 
         footnote-style     'unicode))
 #+end_src
 

-** supercite
+** COMMENT supercite

 
 #+begin_src emacs-lisp
 (use-package supercite
 
 #+begin_src emacs-lisp
 (use-package supercite


@@ -2179,20 +2290,32 @@ Convenient footnotes in =message-mode=.
         ;; sc-cite-blank-lines-p t
         sc-citation-leader ""
         sc-reference-tag-string ""
         ;; 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
         sc-auto-fill-region-p nil
         sc-confirm-always-p nil)
   :config

-  (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)
-  (setq sc-preferred-header-style (1- (length sc-rewrite-header-list)))
+  ;;   (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
 
   (add-hook 'mail-citation-hook 'sc-cite-original))
 #+end_src