diff options
| -rw-r--r-- | home/dots/.emacs | 51 |
1 files changed, 29 insertions, 22 deletions
diff --git a/home/dots/.emacs b/home/dots/.emacs index c56c028..2090da1 100644 --- a/home/dots/.emacs +++ b/home/dots/.emacs @@ -1,5 +1,6 @@ ;; -*- lexical-binding: t; -*- (add-to-list 'load-path "~/.emacs.d/elisp") +(add-to-list 'load-path "~/.emacs.d/site-lisp") (setq use-package-enable-imenu-support t) (setq package-list @@ -9,7 +10,6 @@ diminish direnv ednc - eldoc-box elfeed elfeed-protocol enwc @@ -160,8 +160,6 @@ (buffer-file-coding-system 'utf-8-unix) (create-lockfiles nil) (idle-update-delay 1.0) - (custom-safe-themes - '(default "~/.emacs.d/BOGO-theme.el" "~/.emacs.d/BOGO-dark-theme.el")) (auto-save-list-file-prefix (expand-file-name "autosave/" user-emacs-directory)) (tramp-auto-save-directory @@ -260,7 +258,6 @@ (use-package geiser :ensure t - :defer t :init (with-eval-after-load 'geiser-guile (add-to-list 'geiser-guile-load-path "~/dev/nonguix") @@ -471,6 +468,8 @@ ("d" . kill-word)) :custom (repeat-on-final-keystroke t) + ;; When you have repeat maps while in the minibuffer, repeat-echo-message + ;; becomes distracting (repeat-echo-function 'repeat-echo-mode-line) (set-mark-command-repeat-pop t) (repeat-exit-key (kbd "i")) @@ -738,20 +737,20 @@ :ensure t :demand t :diminish eldoc-mode - :custom - (eldoc-print-after-edit t) - (echo-area-display-truncation-message nil) - (eldoc-echo-area-prefer-doc-buffer 'maybe) - (eldoc-echo-area-use-multiline-p nil) - :hook (prog-mode . eldoc-mode)) - -(use-package eldoc-box - :ensure t - :defer t - :hook - (eglot-managed-mode . #'eldoc-box-hover-mode) + :init + (defun kill-help-and-eldoc-buffers () + "Removes the help window or eldoc window." + (interactive) + (kill-matching-buffers "^\\*Help\\*" nil t) + (kill-matching-buffers "^\\*eldoc" nil t)) :bind - ("C-h ." . eldoc-box-help-at-point)) + ("C-h ." . eldoc) + ("C-h ," . kill-help-and-eldoc-buffers) + :custom + (eldoc-print-after-edit nil) + (eldoc-echo-area-display-truncation-message t) + (eldoc-echo-area-prefer-doc-buffer t) + (eldoc-echo-area-use-multiline-p 'truncate-sym-name-if-fit)) (use-package markdown-mode :defer t @@ -880,7 +879,7 @@ (use-package go-mode :ensure t - :defer t + :demand t :hook ((go-mode . (lambda () (add-hook @@ -1229,7 +1228,7 @@ -1 "}")) (use-package abbrev - :after (skeleton) + :after (skeleton go-mode) :diminish abbrev-mode :init (setq-default abbrev-mode t) @@ -1277,6 +1276,9 @@ (use-package message :custom + (user-mail-address "marc@coquand.email") + (message-default-headers "FCC: ~/personal-db/mail/home/out/sent.mbox") + (message-signature "Marc") (message-expand-name-standard-ui t) (message-wide-reply-confirm-recipients t) (message-interactive t) @@ -1337,7 +1339,8 @@ (without-yes-or-no (rmail-output-as-seen path nil t) (rmail-process-file-through-pipe path cmd)))) - + :hook + ((rmail-quit . rmail-expunge-and-save)) :bind (("C-c m" . rmail-open) ("C-c M" . rmail-open-no-check) @@ -1399,7 +1402,7 @@ (tmm-prompt rmail-prompt-account) (unless (eq selected-rmail-account prev) ;; First kill all RMAIL buffers to not leave any dangling - (kill-matching-buffers "\\.mbox\\|^RMAIL"))) + (kill-matching-buffers "\\.mbox\\|^RMAIL" nil t))) (rmail-no-check)) (defun rmail-open () @@ -1408,7 +1411,7 @@ (tmm-prompt rmail-prompt-account) (unless (eq selected-rmail-account prev) ;; First kill all RMAIL buffers to not leave any dangling - (kill-matching-buffers "\\.mbox\\|^RMAIL"))) + (kill-matching-buffers "\\.mbox\\|^RMAIL" nil t))) (rmail)) :custom (rmail-mime-prefer-html nil) @@ -1440,3 +1443,7 @@ (emms-default-players)) (put 'secrets-mode 'disabled nil) + +(custom-set-variables + '(custom-safe-themes + '(default "~/.emacs.d/BOGO-theme.el" "~/.emacs.d/BOGO-dark-theme.el"))) |