diff options
| -rw-r--r-- | emacs-init.el | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/emacs-init.el b/emacs-init.el index e6c2dfcc..58114669 100644 --- a/emacs-init.el +++ b/emacs-init.el @@ -124,7 +124,7 @@ :bind (("<leader>tR" . rainbow-mode))) (use-package linum - :hook (prog-mode . linum-mode)) + :hook prog-mode) (use-package which-key :commands (which-key-mode) :demand t @@ -151,7 +151,7 @@ :bind-keymap ("<leader>g" . vc-prefix-map)) (use-package company - :hook (prog-mode . company-mode) + :hook prog-mode ;; Use TAB for selecting completions. Config from: ;; https://github.com/company-mode/company-mode/blob/master/company-tng.el :bind (:map company-active-map @@ -165,7 +165,7 @@ (use-package company-quickhelp :after (company autothemer) ; autothemer needed for `tw/get-catppuccin-color' - :hook (company-mode . company-quickhelp-mode) + :hook company-mode :custom (company-quickhelp-delay 0.2 "Automatically show quickhelp for completions.") (company-quickhelp-color-background (tw/get-catppuccin-color "surface0") "Give the quickhelp tooltip a nicer background colour.") @@ -173,12 +173,12 @@ (use-package company-posframe :after (company company-quickhelp) - :hook (company-mode . company-posframe-mode) + :hook company-mode :diminish company-posframe-mode) (use-package flymake :after (evil which-key) - :hook (prog-mode . flymake-mode) + :hook prog-mode :init (which-key-add-key-based-replacements "<leader>e" '("errors" . "Flymake")) :bind (("<leader>el" . flymake-show-buffer-diagnostics) @@ -200,7 +200,8 @@ (use-package eglot ;; I have clang (for clangd) and python-lsp-server installed. - :hook (python-mode c-mode c++-mode) + ;; `:hook' adds `-mode' to the package name, but `eglot-mode' doesn't exist. + :hook ((python-mode c-mode c++-mode) . eglot) :custom (eglot-autoshutdown t "Shut down language servers after deleting their last associated buffer.") (eglot-sync-connect 0.1 "Wait for the language server in the background if it takes longer than 100ms.") @@ -357,7 +358,7 @@ (use-package evil-org :after (evil org) - :hook (org-mode . evil-org-mode) + :hook org-mode :config (evil-define-key '(normal visual) org-mode-map (kbd "<localleader>\\") #'org-ctrl-c-ctrl-c @@ -389,7 +390,7 @@ (use-package evil-smartparens :after (evil smartparens) - :hook (smartparens-enabled-hook . evil-smartparens-mode)) + :hook smartparens-enabled-hook) (use-package evil-multiedit ;; See: https://github.com/hlissner/evil-multiedit#usage @@ -427,7 +428,7 @@ (use-package evil-markdown :after (evil) - :hook (markdown-mode . evil-markdown-mode)) + :hook markdown-mode) ;; Lisp features (use-package smartparens @@ -449,8 +450,8 @@ :functions (sp-pair sp-local-pair)) (use-package aggressive-indent - :hook (; (scheme-mode . aggressive-indent-mode) - ((emacs-lisp-mode common-lisp-mode) . aggressive-indent-mode))) + :hook (; scheme-mode + emacs-lisp-mode common-lisp-mode)) (defun tw/lisp-evil-setup () "Set up evil in general `lisp-mode' buffers." |