X-Git-Url: https://git.shemshak.org/~bandali/configs/blobdiff_plain/34fc3c29aacc20e306d8235e10a6437fb1f221ef..b1fb0f48d5a7d3057f6ddb0473356cc6d07c0ecf:/init.org

diff --git a/init.org b/init.org
index 7b4a1a9..b06abe7 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
@@ -244,7 +244,6 @@ can then be managed with the help of Magit or other tools.
    ("C-c b a" . borg-assimilate)
    ("C-c b b" . borg-build)
    ("C-c b c" . borg-clone)
-   ("C-c b m" . borg-insert-update-message)
    ("C-c b r" . borg-remove)))
 #+end_src
 
@@ -327,8 +326,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
@@ -348,12 +350,14 @@ in my shell.
   (exec-path-from-shell-copy-env "SSH_AUTH_SOCK"))
 #+end_src
 
-** COMMENT Only one custom theme at a time
+** Only one custom theme at a time
 
 #+begin_src emacs-lisp
-(defadvice load-theme (before clear-previous-themes activate)
-  "Clear existing theme settings instead of layering them"
-  (mapc #'disable-theme custom-enabled-themes))
+;; only one custom theme at a time
+;;
+;; (defadvice load-theme (before clear-previous-themes activate)
+;;   "Clear existing theme settings instead of layering them"
+;;   (mapc #'disable-theme custom-enabled-themes))
 #+end_src
 
 ** Server
@@ -372,42 +376,44 @@ See [[https://www.gnu.org/software/emacs/manual/html_node/emacs/Emacs-Server.htm
   :config (or (server-running-p) (server-mode)))
 #+end_src
 
-** COMMENT Unicode support
+** Unicode support
 
 Font stack with better unicode support, around =Ubuntu Mono= and
 =Hack=.
 
-#+begin_src emacs-lisp :tangle no
-(dolist (ft (fontset-list))
-  (set-fontset-font
-   ft
-   'unicode
-   (font-spec :name "Source Code Pro" :size 14))
-  (set-fontset-font
-   ft
-   'unicode
-   (font-spec :name "DejaVu Sans Mono")
-   nil
-   'append)
-  ;; (set-fontset-font
-  ;;  ft
-  ;;  'unicode
-  ;;  (font-spec
-  ;;   :name "Symbola monospacified for DejaVu Sans Mono")
-  ;;  nil
-  ;;  'append)
-  ;; (set-fontset-font
-  ;;  ft
-  ;;  #x2115  ; ℕ
-  ;;  (font-spec :name "DejaVu Sans Mono")
-  ;;  nil
-  ;;  'append)
-  (set-fontset-font
-   ft
-   (cons ?Α ?ω)
-   (font-spec :name "DejaVu Sans Mono" :size 14)
-   nil
-   'prepend))
+#+begin_src emacs-lisp
+;; unicode support
+;;
+;; (dolist (ft (fontset-list))
+;;   (set-fontset-font
+;;    ft
+;;    'unicode
+;;    (font-spec :name "Source Code Pro" :size 14))
+;;   (set-fontset-font
+;;    ft
+;;    'unicode
+;;    (font-spec :name "DejaVu Sans Mono")
+;;    nil
+;;    'append)
+;;   ;; (set-fontset-font
+;;   ;;  ft
+;;   ;;  'unicode
+;;   ;;  (font-spec
+;;   ;;   :name "Symbola monospacified for DejaVu Sans Mono")
+;;   ;;  nil
+;;   ;;  'append)
+;;   ;; (set-fontset-font
+;;   ;;  ft
+;;   ;;  #x2115  ; ℕ
+;;   ;;  (font-spec :name "DejaVu Sans Mono")
+;;   ;;  nil
+;;   ;;  'append)
+;;   (set-fontset-font
+;;    ft
+;;    (cons ?Α ?ω)
+;;    (font-spec :name "DejaVu Sans Mono" :size 14)
+;;    nil
+;;    'prepend))
 #+end_src
 
 ** Gentler font resizing
@@ -416,6 +422,24 @@ Font stack with better unicode support, around =Ubuntu Mono= and
 (setq text-scale-mode-step 1.05)
 #+end_src
 
+** Focus follows mouse
+
+I’d like focus to follow the mouse when I move the cursor from one
+window to the next.
+
+#+begin_src emacs-lisp
+(setq mouse-autoselect-window t)
+#+end_src
+
+Let’s define a function to conveniently disable this for certain
+buffers and/or modes.
+
+#+begin_src emacs-lisp
+(defun amin--no-mouse-autoselect-window ()
+  (make-local-variable 'mouse-autoselect-window)
+  (setq mouse-autoselect-window nil))
+#+end_src
+
 ** Libraries
 
 #+begin_src emacs-lisp
@@ -662,8 +686,23 @@ for this.
 
 #+begin_src emacs-lisp
 (bind-keys
- ("s-c e b" . eval-buffer)
- ("s-c e r" . eval-region)
+ ("C-c a i" . ielm)
+
+ ("C-c e b" . eval-buffer)
+ ("C-c e r" . eval-region)
+
+ ("C-c F m" . make-frame-command)
+ ("C-c F d" . delete-frame)
+ ("C-c F D" . delete-other-frames)
+
+ ("C-c o"   . other-window)
+
+ ("C-c Q"   . save-buffers-kill-terminal)
+
+ ("C-S-h C" . describe-char)
+ ("C-S-h F" . describe-face)
+
+ ("C-x K"   . kill-this-buffer)
 
  ("s-p"     . beginning-of-buffer)
  ("s-n"     . end-of-buffer))
@@ -693,147 +732,6 @@ customizing it.
             'auto-compile-inhibit-compile-detached-git-head))
 #+end_src
 
-*** [[https://github.com/noctuid/general.el][general]]
-
-#+begin_src emacs-lisp
-(use-package general
-  :demand t
-  :config
-  (general-evil-setup t)
-  (general-override-mode)
-
-  (general-create-definer
-   amin--leader-keys
-   :keymaps 'override
-   :states '(emacs normal visual motion insert)
-   :non-normal-prefix "M-m"
-   :prefix "SPC"))
-#+end_src
-
-*** [[https://github.com/emacs-evil/evil][evil]]
-
-#+begin_src emacs-lisp
-(use-package evil
-  :demand t
-  ;; :hook (org-src-mode . evil-motion-state)
-  :config
-  (evil-mode 1)
-  (general-swap-key nil '(normal motion) ";" ":")
-
-  (setq evil-want-visual-char-semi-exclusive t
-        evil-cross-lines t)
-
-  ;; 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
-  (unbind-key "TAB" evil-motion-state-map)
-
-  (unbind-key "C-d" evil-insert-state-map)
-  (unbind-key "C-v" evil-insert-state-map)
-  (unbind-key "C-y" 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-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
-(use-package evil-escape
-  :after evil
-  :init
-  (setq evil-escape-excluded-states '(normal visual multiedit emacs motion)
-        evil-escape-excluded-major-modes '(neotree-mode)
-        evil-escape-key-sequence "jk"
-        evil-escape-delay 0.25)
-  ;; :general
-  ;; (:states '(insert replace visual operator)
-  ;;          "C-g" #'evil-escape)
-  :config
-  (evil-escape-mode 1)
-  ;; no `evil-escape' in minibuffer
-  (push #'minibufferp evil-escape-inhibit-functions))
-#+end_src
-
-#+begin_src emacs-lisp
-(use-package evil-nerd-commenter
-  :after evil
-  :general
-  (nmap
-    "gc" 'evilnc-comment-operator
-    "gy" 'evilnc-copy-and-comment-lines))
-#+end_src
-
-#+begin_src emacs-lisp
-(use-package evil-surround
-  :after evil
-  :general
-  (omap
-    "s" 'evil-surround-edit
-    "S" 'evil-Surround-edit)
-  (vmap
-    "S" 'evil-surround-region
-    "gS" 'evil-Surround-region))
-#+end_src
-
-#+begin_src emacs-lisp
-(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
-
-  "e"   '(:ignore t :wk "eval")
-  "e b" 'eval-buffer
-  "e r" 'eval-region
-
-  "f"   '(:ignore t :wk "files")
-
-  "F"   '(:ignore t :wk "frames")
-  "F m" 'make-frame-command
-  "F d" 'delete-frame
-  "F D" 'delete-other-frames
-
-  "h"   '(:ignore t :wk "help(ful)")
-  "h c" 'describe-char
-  "h f" 'describe-function
-  "h F" 'describe-face
-  "h H" 'view-hello-file
-  "h i" 'info
-  "h k" 'describe-key
-  "h l" 'view-lossage
-  "h v" 'describe-variable
-
-  "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)
-#+end_src
-
 *** [[https://orgmode.org/][Org mode]]
 
 #+begin_quote
@@ -847,22 +745,6 @@ In short, my favourite way of life.
 #+begin_src emacs-lisp
 (use-package org
   :defer 1
-  :general
-  (amin--leader-keys
-    :states 'normal
-    :keymaps 'org-mode-map
-    "'" 'org-edit-special)
-  (amin--leader-keys
-    :definer 'minor-mode
-    :states 'normal
-    :keymaps 'org-src-mode
-    "'" 'org-edit-src-exit
-    "k" 'org-edit-src-abort)
-  (general-define-key
-   :definer 'minor-mode
-   :states 'normal
-   :keymaps 'org-src-mode
-   "q" 'org-edit-src-exit)
   :config
   (setq org-src-tab-acts-natively t
         org-src-preserve-indentation nil
@@ -871,17 +753,6 @@ In short, my favourite way of life.
         org-highlight-latex-and-related '(entities)
         org-log-done 'time)
   (add-to-list 'org-structure-template-alist '("L" . "src emacs-lisp") t)
-  (after! org-src
-    (define-key org-src-mode-map [remap evil-write] 'org-edit-src-save)
-    (define-key org-src-mode-map [remap evil-save-and-close]
-      (lambda () (interactive)
-        (org-edit-src-save)
-        (org-edit-src-exit)))
-    (define-key org-src-mode-map [remap evil-save-modified-and-close]
-      (lambda () (interactive)
-        (org-edit-src-save)
-        (org-edit-src-exit)))
-    (define-key org-src-mode-map [remap evil-quit] 'org-edit-src-abort))
   (font-lock-add-keywords
    'org-mode
    '(("[ \t]*\\(#\\+\\(BEGIN\\|END\\|begin\\|end\\)_\\(\\S-+\\)\\)[ \t]*\\([^\n:]*\\)"
@@ -920,13 +791,6 @@ In short, my favourite way of life.
 (use-package ox-beamer
   :after ox)
 
-(use-package ob-tangle
-  :general
-  (amin--leader-keys
-    :states 'normal
-    :keymaps 'org-mode-map
-    "b t" 'org-babel-tangle))
-
 (use-package orgalist
   :after message
   :hook (message-mode . orgalist-mode))
@@ -991,8 +855,9 @@ Not just how I do git, but /the/ way to do git.
 #+begin_src emacs-lisp
 (use-package magit
   :defer 1
-  :general (amin--leader-keys "g s" 'magit-status)
-  :bind ("s-g" . magit-status)
+  :bind (("C-x g" . magit-status)
+         ("s-g s" . magit-status)
+         ("s-g l" . magit-log-buffer-file))
   :config
   (magit-add-section-hook 'magit-status-sections-hook
                           'magit-insert-modules
@@ -1021,7 +886,6 @@ There's no way I could top that, so I won't attempt to.
 #+begin_src emacs-lisp
 (use-package ivy
   :defer 1
-  :general (amin--leader-keys "," 'ivy-switch-buffer)
   :bind
   (:map ivy-minibuffer-map
    ([escape] . keyboard-escape-quit)
@@ -1042,7 +906,6 @@ There's no way I could top that, so I won't attempt to.
 
 #+begin_src emacs-lisp
 (use-package swiper
-  :general (:states '(normal motion) "/" 'swiper)
   :bind (("C-s" . swiper)
          ("C-r" . swiper)))
 #+end_src
@@ -1052,11 +915,6 @@ There's no way I could top that, so I won't attempt to.
 #+begin_src emacs-lisp
 (use-package counsel
   :defer 1
-  :general
-  (amin--leader-keys
-    "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)
@@ -1109,7 +967,6 @@ There's no way I could top that, so I won't attempt to.
 #+begin_src emacs-lisp
 (use-package ibuffer
   :defer t
-  :general (amin--leader-keys "b b" 'ibuffer-other-window)
   :bind
   (("C-x C-b" . ibuffer-other-window)
    :map ibuffer-mode-map
@@ -1259,7 +1116,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
@@ -1756,10 +1614,9 @@ Emacs package that displays available keybindings in popup
     (mapc #'disable-theme custom-enabled-themes)
     (load-theme 'doom-tomorrow-night t)))
 
-(amin--leader-keys
-  "t"   '(:ignore t :wk "theme")
-  "t d" 'amin/lights-off
-  "t l" 'amin/lights-on)
+(bind-keys
+ ("s-t d" . amin/lights-off)
+ ("s-t l" . amin/lights-on))
 #+end_src
 
 ** [[https://github.com/bbatsov/crux][crux]]
@@ -1767,28 +1624,20 @@ Emacs package that displays available keybindings in popup
 #+begin_src emacs-lisp
 (use-package crux
   :defer 1
-  :general
-  (amin--leader-keys
-    "b K" 'crux-kill-other-buffers
-    "c d" 'crux-duplicate-current-line-or-region
-    "c D" 'crux-duplicate-and-comment-current-line-or-region
-    "f c" 'crux-copy-file-preserve-attributes
-    "f d" 'crux-delete-file-and-buffer
-    "f r" 'crux-rename-file-and-buffer)
-  :bind (("C-c d" . crux-duplicate-current-line-or-region)
-         ("C-c D" . crux-duplicate-and-comment-current-line-or-region)
-         ("C-S-j" . crux-top-join-line)
-         ("C-c j" . crux-top-join-line)))
+  :bind (("C-c b k" . crux-kill-other-buffers)
+         ("C-c d"   . crux-duplicate-current-line-or-region)
+         ("C-c D"   . crux-duplicate-and-comment-current-line-or-region)
+         ("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 j"   . crux-top-join-line)
+         ("C-S-j"   . crux-top-join-line)))
 #+end_src
 
 ** [[https://github.com/alezost/mwim.el][mwim]]
 
 #+begin_src emacs-lisp
 (use-package mwim
-  :general
-  (:states '(normal visual)
-           "0" 'mwim-beginning-of-code-or-line
-           "$" 'mwim-end-of-code-or-line)
   :bind (("C-a"    . mwim-beginning-of-code-or-line)
          ("C-e"    . mwim-end-of-code-or-line)
          ("<home>" . mwim-beginning-of-line-or-code)
@@ -1821,14 +1670,12 @@ Emacs package that displays available keybindings in popup
 #+begin_src emacs-lisp
 (use-package helpful
   :defer 1
-  :general
-  (amin--leader-keys
-    "h h"   '(:ignore t :wk "helpful")
-    "h h c" 'helpful-command
-    "h h f" 'helpful-callable           ; helpful-function
-    "h h v" 'helpful-variable
-    "h h k" 'helpful-key
-    "h h p" 'helpful-at-point))
+  :bind
+  (("C-S-h c" . helpful-command)
+   ("C-S-h f" . helpful-callable)        ; helpful-function
+   ("C-S-h v" . helpful-variable)
+   ("C-S-h k" . helpful-key)
+   ("C-S-h p" . helpful-at-point)))
 #+end_src
 
 ** [[https://github.com/knu/shell-toggle.el][shell-toggle]]
@@ -1836,8 +1683,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)
-  :bind ("C-c e" . amin/shell-toggle)
+  :bind ("C-c a s e" . amin/shell-toggle)
   :config
   (defun amin/shell-toggle (make-cd)
     "Toggle between the shell buffer and whatever buffer you are editing.
@@ -1931,10 +1777,11 @@ Make =*scratch*= and =*Messages*= unkillable.
 
 Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
 
-** COMMENT [[https://github.com/DarthFennec/highlight-indent-guides][highlight-indent-guides]]                                 :ARCHIVE:
+** [[https://github.com/DarthFennec/highlight-indent-guides][highlight-indent-guides]]
 
 #+begin_src emacs-lisp
 (use-package highlight-indent-guides
+  :disabled t
   :defer 3
   :hook ((prog-mode . highlight-indent-guides-mode)
          ;; (org-mode  . highlight-indent-guides-mode)
@@ -1983,12 +1830,53 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
   :hook (text-mode . typo-mode))
 #+end_src
 
+** hl-todo
+
+#+begin_src emacs-lisp
+(use-package hl-todo
+  :defer 4
+  :config
+  (global-hl-todo-mode))
+#+end_src
+
+** shrink-path
+
+#+begin_src emacs-lisp
+(use-package shrink-path
+  :after eshell
+  :config
+  (setq eshell-prompt-regexp "\\(.*\n\\)*λ "
+        eshell-prompt-function #'+eshell/prompt)
+
+  (defun +eshell/prompt ()
+    (let ((base/dir (shrink-path-prompt default-directory)))
+      (concat (propertize (car base/dir)
+                          'face 'font-lock-comment-face)
+              (propertize (cdr base/dir)
+                          'face 'font-lock-constant-face)
+              (propertize (+eshell--current-git-branch)
+                          'face 'font-lock-function-name-face)
+              "\n"
+              (propertize "λ" 'face 'eshell-prompt-face)
+              ;; needed for the input text to not have prompt face
+              (propertize " " 'face 'default))))
+
+  (defun +eshell--current-git-branch ()
+    (let ((branch (car (loop for match in (split-string (shell-command-to-string "git branch") "\n")
+                             when (string-match "^\*" match)
+                             collect match))))
+      (if (not (eq branch nil))
+          (concat " " (substring branch 2))
+        ""))))
+#+end_src
+
 ** slack
 
 Hopefully temporary.
 
 #+begin_src emacs-lisp
 (use-package slack
+  :disabled t
   :commands (slack-start)
   :init
   (eval-when-compile                    ; silence the byte-compiler
@@ -2048,63 +1936,44 @@ Hopefully temporary.
   (setq alert-default-style 'notifier))
 #+end_src
 
-** hl-todo
-
-#+begin_src emacs-lisp
-(use-package hl-todo
-  :defer 4
-  :config
-  (global-hl-todo-mode))
-#+end_src
-
-** shrink-path
+** [[https://github.com/peterwvj/eshell-up][eshell-up]]
 
 #+begin_src emacs-lisp
-(use-package shrink-path
-  :after eshell
-  :config
-  (setq eshell-prompt-regexp "\\(.*\n\\)*λ "
-        eshell-prompt-function #'+eshell/prompt)
-
-  (defun +eshell/prompt ()
-    (let ((base/dir (shrink-path-prompt default-directory)))
-      (concat (propertize (car base/dir)
-                          'face 'font-lock-comment-face)
-              (propertize (cdr base/dir)
-                          'face 'font-lock-constant-face)
-              (propertize (+eshell--current-git-branch)
-                          'face 'font-lock-function-name-face)
-              "\n"
-              (propertize "λ" 'face 'eshell-prompt-face)
-              ;; needed for the input text to not have prompt face
-              (propertize " " 'face 'default))))
-
-  (defun +eshell--current-git-branch ()
-    (let ((branch (car (loop for match in (split-string (shell-command-to-string "git branch") "\n")
-                             when (string-match "^\*" match)
-                             collect match))))
-      (if (not (eq branch nil))
-          (concat " " (substring branch 2))
-        ""))))
+(use-package eshell-up
+  :after eshell)
 #+end_src
 
-** magithub
-
-For when I /have to/ use GH.
+** multi-term
 
 #+begin_src emacs-lisp
-(use-package magithub
-  :after magit
+(use-package multi-term
+  :defer 1
+  :bind (("C-c C-j" . term-line-mode)
+         ("C-c m m" . multi-term)
+         ("C-c m p" . multi-term-dedicated-toggle))
   :config
-  (magithub-feature-autoinject t)
-  (setq magithub-clone-default-directory "~/src/git"))
-#+end_src
-
-** [[https://github.com/peterwvj/eshell-up][eshell-up]]
-
-#+begin_src emacs-lisp
-(use-package eshell-up
-  :after eshell)
+  (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
@@ -2124,10 +1993,6 @@ For when I /have to/ use GH.
  read-mail-command   'gnus)
 
 (use-package gnus
-  :general
-  (amin--leader-keys
-    "m" 'gnus
-    "M" 'gnus-unplugged)
   :bind (("s-m" . gnus)
          ("s-M" . gnus-unplugged))
   :init
@@ -2201,27 +2066,25 @@ For when I /have to/ use GH.
    :map gnus-summary-mode-map
    ("r"   . gnus-summary-reply-with-original)
    ("R"   . gnus-summary-wide-reply-with-original)
-   ("M-L" . org-store-link)))
+   ("M-L" . org-store-link))
+  :hook (gnus-summary-mode . amin--no-mouse-autoselect-window))
 
 (use-package gnus-msg
   :config
   (setq gnus-posting-styles
         '((".*"
-           (address "amin@bandali.me")
+           (address "amin@aminb.org")
            (body "\nBest,\namin\n")
-           (signature-file "~/.signature-amin")
            (eval (setq amin--message-cite-say-hi t)))
           ("gnu.*"
-           (address "bandali@gnu.org")
-           (signature-file nil))
+           (address "bandali@gnu.org"))
           ((header "subject" "ThankCRM")
            (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\"")
-           (signature-file nil)))))
+           (gcc "\"nnimap+uwaterloo:Sent Items\"")))))
 
 (use-package gnus-topic
   :hook (gnus-group-mode . gnus-topic-mode))
@@ -2274,13 +2137,13 @@ For when I /have to/ use GH.
         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)
+                           ;; (setq fill-column 65
+                           ;;       message-fill-column 65)
                            (make-local-variable 'company-idle-delay)
                            (setq company-idle-delay 0.2))))
   ;; :custom-face
@@ -2351,10 +2214,11 @@ I tried using =borg-elpa= instead of doing it like this, but it added
   (bbdb-initialize 'gnus 'message))
 #+end_src
 
-** COMMENT message-x
+** message-x
 
 #+begin_src emacs-lisp
 (use-package message-x
+  :disabled t
   :custom
   (message-x-completion-alist
    (quote
@@ -2366,10 +2230,11 @@ I tried using =borg-elpa= instead of doing it like this, but it added
       . message-expand-group)))))
 #+end_src
 
-** COMMENT gnus-harvest
+** gnus-harvest
 
 #+begin_src emacs-lisp
 (use-package gnus-harvest
+  :disabled t
   :commands gnus-harvest-install
   :demand t
   :config