[emacs] update 9 drones

[~bandali/configs] / init.org

diff --git a/init.org b/init.org
index 84d1ae2..d64925d 100644 (file)
--- a/init.org
+++ b/init.org
@@ -324,6 +324,12 @@ it it's own file. While at it, treat themes as safe.
   (setf custom-safe-themes t))
 #+end_src
 
   (setf custom-safe-themes t))
 #+end_src
 

+** Secrets file
+
+#+begin_src emacs-lisp
+(load (no-littering-expand-etc-file-name "secrets"))
+#+end_src
+

 ** Better =$PATH= handling
 
 Let's use [[https://github.com/purcell/exec-path-from-shell][exec-path-from-shell]] to make Emacs use the =$PATH= as set up
 ** Better =$PATH= handling
 
 Let's use [[https://github.com/purcell/exec-path-from-shell][exec-path-from-shell]] to make Emacs use the =$PATH= as set up


@@ -642,11 +648,14 @@ Enable =winner-mode=.
 #+begin_src emacs-lisp
 (bind-keys
  ("C-c b k" . kill-this-buffer)
 #+begin_src emacs-lisp
 (bind-keys
  ("C-c b k" . kill-this-buffer)

- ("C-c s s" . save-buffer)
+ ;; ("C-c s s" . save-buffer)

  ("C-c b s" . save-buffer)
  ("C-c S"   . save-buffer)
  ("C-c o"   . other-window)
  ("C-c b s" . save-buffer)
  ("C-c S"   . save-buffer)
  ("C-c o"   . other-window)

- ("C-c q q" . save-buffers-kill-terminal))
+ ("C-c q q" . save-buffers-kill-terminal)
+ ("C-c F m" . make-frame-command)
+ ("C-c F d" . delete-frame)
+ ("C-c F D" . delete-other-frames))

 #+end_src
 
 ** Packages
 #+end_src
 
 ** Packages


@@ -690,7 +699,9 @@ In short, my favourite way of life.
         org-src-preserve-indentation nil
         org-edit-src-content-indentation 0
         org-log-done 'time)
         org-src-preserve-indentation nil
         org-edit-src-content-indentation 0
         org-log-done 'time)

-  :hook (org-mode . org-indent-mode)
+  :hook ((org-mode . org-indent-mode)
+         (org-mode . auto-fill-mode)
+         (org-mode . flyspell-mode))

   :custom
   (org-latex-packages-alist '(("" "listings") ("" "color"))))
 
   :custom
   (org-latex-packages-alist '(("" "listings") ("" "color"))))
 


@@ -713,7 +724,11 @@ In short, my favourite way of life.
 (use-package org-notmuch
   :after (:any org notmuch))
 
 (use-package org-notmuch
   :after (:any org notmuch))
 

-(use-package orgalist)
+(use-package orgalist
+  :hook (message-mode . orgalist-mode))
+
+;; (use-package org-outline-numbering)
+;; TODO: auto-updating by calling org-outline-numbering-display

 #+end_src
 
 **** asynchronous tangle
 #+end_src
 
 **** asynchronous tangle


@@ -1060,7 +1075,8 @@ TODO: break this giant source block down into individual org sections.
   :defer 5
   :bind
   (:map company-active-map
   :defer 5
   :bind
   (:map company-active-map

-        ([tab] . company-complete-common-or-cycle))
+        ([tab]    . company-complete-common-or-cycle)
+        ([escape] . company-abort))

   :custom
   (company-idle-delay 0.3)
   (company-minimum-prefix-length 1)
   :custom
   (company-idle-delay 0.3)
   (company-minimum-prefix-length 1)


@@ -1082,6 +1098,31 @@ TODO: break this giant source block down into individual org sections.
 
   ;; Only flycheck when I actually save the buffer
   (setq flycheck-check-syntax-automatically '(mode-enabled save)))
 
   ;; Only flycheck when I actually save the buffer
   (setq flycheck-check-syntax-automatically '(mode-enabled save)))

+
+;; http://endlessparentheses.com/ispell-and-apostrophes.html
+(use-package ispell
+  :config
+  ;; ’ can be part of a word
+  (setq ispell-local-dictionary-alist
+        `((nil "[[:alpha:]]" "[^[:alpha:]]"
+               "['\x2019]" nil ("-B") nil utf-8)))
+  ;; don't send ’ to the subprocess
+  (defun endless/replace-apostrophe (args)
+    (cons (replace-regexp-in-string
+           "’" "'" (car args))
+          (cdr args)))
+  (advice-add #'ispell-send-string :filter-args
+              #'endless/replace-apostrophe)
+
+  ;; convert ' back to ’ from the subprocess
+  (defun endless/replace-quote (args)
+    (if (not (derived-mode-p 'org-mode))
+        args
+      (cons (replace-regexp-in-string
+             "'" "’" (car args))
+            (cdr args))))
+  (advice-add #'ispell-parse-output :filter-args
+              #'endless/replace-quote))

 #+end_src
 * Programming modes
 
 #+end_src
 * Programming modes
 


@@ -1104,9 +1145,13 @@ TODO: break this giant source block down into individual org sections.
 #+begin_src emacs-lisp
 (eval-when-compile (defvar lean-mode-map))
 (use-package lean-mode
 #+begin_src emacs-lisp
 (eval-when-compile (defvar lean-mode-map))
 (use-package lean-mode

+  :defer 2

   :bind (:map lean-mode-map
   :bind (:map lean-mode-map

-              ("S-SPC" . company-complete)))
-#+end_src
+              ("S-SPC" . company-complete))
+  :config
+  (require 'lean-input)
+  (setq default-input-method "Lean"))
+  #+end_src

 
 ** Haskell
 
 
 ** Haskell
 


@@ -1343,6 +1388,70 @@ instead.
   :mode "\\.nix\\'")
 #+end_src
 
   :mode "\\.nix\\'")
 #+end_src
 

+** Java
+
+*** meghanada
+
+#+begin_src emacs-lisp :tangle yes
+(use-package meghanada
+  :bind
+  (:map meghanada-mode-map
+        (("C-M-o" . meghanada-optimize-import)
+         ("C-M-t" . meghanada-import-all)))
+  :hook (java-mode . meghanada-mode))
+#+end_src
+
+*** lsp-java
+
+#+begin_src emacs-lisp :tangle no
+(use-package treemacs)
+
+(use-package yasnippet
+  :config
+  ;; (yas-global-mode)
+  )
+
+(use-package lsp-mode
+  :init (setq lsp-eldoc-render-all nil
+              lsp-highlight-symbol-at-point nil)
+  )
+
+(use-package hydra)
+
+(use-package company-lsp
+  :after  company
+  :config
+  (setq company-lsp-cache-candidates t
+        company-lsp-async t))
+
+(use-package lsp-ui
+  :config
+  (setq lsp-ui-sideline-update-mode 'point))
+
+(use-package lsp-java
+  :config
+  (add-hook 'java-mode-hook
+           (lambda ()
+             (setq-local company-backends (list 'company-lsp))))
+
+  (add-hook 'java-mode-hook 'lsp-java-enable)
+  (add-hook 'java-mode-hook 'flycheck-mode)
+  (add-hook 'java-mode-hook 'company-mode)
+  (add-hook 'java-mode-hook 'lsp-ui-mode))
+
+(use-package dap-mode
+  :after lsp-mode
+  :config
+  (dap-mode t)
+  (dap-ui-mode t))
+
+(use-package dap-java
+  :after (lsp-java))
+
+(use-package lsp-java-treemacs
+  :after (treemacs))
+#+end_src
+

 * Emacs Enhancements
 
 ** [[https://github.com/justbur/emacs-which-key][which-key]]
 * Emacs Enhancements
 
 ** [[https://github.com/justbur/emacs-which-key][which-key]]


@@ -1495,7 +1604,8 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
 (use-package highlight-indent-guides
   :demand t
   :hook ((prog-mode . highlight-indent-guides-mode)
 (use-package highlight-indent-guides
   :demand t
   :hook ((prog-mode . highlight-indent-guides-mode)

-         (org-mode  . highlight-indent-guides-mode))
+         ;; (org-mode  . highlight-indent-guides-mode)
+         )

   :config
   (setq highlight-indent-guides-character ?\|)
   (setq highlight-indent-guides-auto-enabled nil)
   :config
   (setq highlight-indent-guides-character ?\|)
   (setq highlight-indent-guides-auto-enabled nil)


@@ -1510,13 +1620,17 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
 #+begin_src emacs-lisp
 (use-package pdf-tools
   :magic ("%PDF" . pdf-view-mode)
 #+begin_src emacs-lisp
 (use-package pdf-tools
   :magic ("%PDF" . pdf-view-mode)

-  :config (pdf-tools-install)
+  :config
+  (setq pdf-view-resize-factor 1.05)
+  (pdf-tools-install)

   :bind
   (:map pdf-view-mode-map
         ("C-s" . isearch-forward)
         ("C-r" . isearch-backward)
         ("j"   . pdf-view-next-line-or-next-page)
   :bind
   (:map pdf-view-mode-map
         ("C-s" . isearch-forward)
         ("C-r" . isearch-backward)
         ("j"   . pdf-view-next-line-or-next-page)

-        ("j"   . pdf-view-previous-line-or-previous-page)))
+        ("k"   . pdf-view-previous-line-or-previous-page)
+        ("h"   . image-backward-hscroll)
+        ("l"   . image-forward-hscroll)))

 #+end_src
 
 ** anzu
 #+end_src
 
 ** anzu


@@ -1525,6 +1639,68 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
 (use-package anzu)
 #+end_src
 
 (use-package anzu)
 #+end_src
 

+** typo.el
+
+#+begin_src emacs-lisp
+(use-package typo
+  :config
+  (typo-global-mode 1)
+  :hook (text-mode . typo-mode))
+#+end_src
+
+** slack
+
+Hopefully temporary.
+
+#+begin_src emacs-lisp
+(use-package slack
+  :commands (slack-start)
+  :init
+  (eval-when-compile                    ; silence the byte-compiler
+    (defvar url-http-data nil)
+    (defvar url-http-extra-headers nil)
+    (defvar url-http-method nil)
+    (defvar url-callback-function nil)
+    (defvar url-callback-arguments nil)
+    (defvar oauth--token-data nil))
+  (setq slack-buffer-emojify t
+        slack-prefer-current-team t)
+  :config
+  (slack-register-team
+   :name "uw-apv"
+   :default t
+   :client-id uw-apv-client-id
+   :client-secret uw-apv-client-secret
+   :token uw-apv-token
+   :subscribed-channels '(general)
+   :full-and-display-names t)
+  (slack-register-team
+   :name "watform"
+   :default nil
+   :client-id watform-client-id
+   :client-secret watform-client-secret
+   :token watform-token
+   :subscribed-channels '(general)
+   :full-and-display-names t);
+  :bind
+  (("C-c s s" . slack-start)
+   ("C-c s u" . slack-select-unread-rooms)
+   ("C-c s b" . slack-select-rooms)
+   ("C-c s t" . slack-change-current-team)
+   ("C-c s c" . slack-ws-close)
+   :map slack-mode-map
+   ("C-c e"   . slack-message-edit)
+   ("C-c k"   . slack-message-delete)
+   ("C-c C-k" . slack-channel-leave)
+   ("@"       . slack-message-embed-mention)
+   ("#"       . slack-message-embed-channel)));
+
+(use-package alert
+  :commands (alert)
+  :init
+  (setq alert-default-style 'notifier))
+#+end_src
+

 * Email
 
 #+begin_src emacs-lisp
 * Email
 
 #+begin_src emacs-lisp


@@ -1554,6 +1730,7 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
         message-sendmail-envelope-from 'header
         ;; message-directory "drafts"
         message-user-fqdn "aminb.org")
         message-sendmail-envelope-from 'header
         ;; message-directory "drafts"
         message-user-fqdn "aminb.org")

+  ;; (add-hook 'message-mode-hook 'electric-quote-local-mode)

   (add-hook 'message-mode-hook
             (lambda () (setq fill-column 65
                         message-fill-column 65)))
   (add-hook 'message-mode-hook
             (lambda () (setq fill-column 65
                         message-fill-column 65)))


@@ -1577,8 +1754,9 @@ See [[notmuch:id:87muuqsvci.fsf@fencepost.gnu.org][bug follow-up]].
 #+begin_src emacs-lisp
 (defun amin/notmuch ()
   "Delete other windows, then launch `notmuch'."
 #+begin_src emacs-lisp
 (defun amin/notmuch ()
   "Delete other windows, then launch `notmuch'."

-  (interactive)
-  (delete-other-windows)
+  (interactive
+   (when (equal current-prefix-arg nil)
+     (delete-other-windows)))

   (notmuch))
 
 (use-package notmuch
   (notmuch))
 
 (use-package notmuch