Adjust some init/config/hooks for better startup

This commit is contained in:
Evie Litherland-Smith 2024-07-07 07:21:48 +01:00
parent c51d11ed9e
commit 0c2d33cd48

31
init.el
View file

@ -669,12 +669,12 @@
:hook (after-init . (lambda () (vertico-mode +1))) :hook (after-init . (lambda () (vertico-mode +1)))
:custom :custom
(vertico-cycle t) (vertico-cycle t)
(require 'vertico-directory) :config
(require 'marginalia) (require 'vertico-directory))
(require 'orderless))
(use-package marginalia (use-package marginalia
:functions marginalia-mode :functions marginalia-mode
:hook (after-init . (lambda () (marginalia-mode +1)))
:custom :custom
(marginalia-annotators '(marginalia-annotators-heavy (marginalia-annotators '(marginalia-annotators-heavy
marginalia-annotators-light marginalia-annotators-light
@ -701,17 +701,16 @@
:functions (corfu-mode :functions (corfu-mode
global-corfu-mode global-corfu-mode
corfu-history-mode) corfu-history-mode)
:hook (minibuffer-setup . (lambda () :hook ((after-init . (lambda () (global-corfu-mode +1)))
(minibuffer-setup . (lambda ()
"Enable `corfu-mode' for `M-:' and `M-!'." "Enable `corfu-mode' for `M-:' and `M-!'."
(when (local-variable-p 'completion-at-point-functions) (when (local-variable-p 'completion-at-point-functions)
(corfu-mode +1)))) (corfu-mode +1)))))
:bind ( :map corfu-map :bind ( :map corfu-map
("M-SPC" . corfu-insert-separator) ("M-SPC" . corfu-insert-separator)
("RET" . nil) ("RET" . nil)
("TAB" . corfu-insert) ("TAB" . corfu-insert)
([tab] . corfu-insert)) ([tab] . corfu-insert))
:init
(global-corfu-mode +1)
:custom :custom
(corfu-cycle t) (corfu-cycle t)
(corfu-auto nil) (corfu-auto nil)
@ -842,9 +841,9 @@
:requires treesit :requires treesit
:functions (treesit-auto-add-to-auto-mode-alist :functions (treesit-auto-add-to-auto-mode-alist
global-treesit-auto-mode) global-treesit-auto-mode)
:hook (after-init . (lambda () (global-treesit-auto-mode +1)))
:config :config
(treesit-auto-add-to-auto-mode-alist) (treesit-auto-add-to-auto-mode-alist))
(global-treesit-auto-mode +1))
(use-package eldoc (use-package eldoc
:custom :custom
@ -929,7 +928,7 @@
(use-package flymake (use-package flymake
:bind (("C-c C-." . flymake-goto-next-error) :bind (("C-c C-." . flymake-goto-next-error)
("C-c C-," . flymake-goto-prev-error)) ("C-c C-," . flymake-goto-prev-error))
:hook (prog-mode . (lambda () (flymake-mode +1))) :hook ((prog-mode yaml-ts-mode) . (lambda () (flymake-mode +1)))
:custom :custom
(flymake-no-changes-timeout 1) (flymake-no-changes-timeout 1)
(flymake-show-diagnostics-at-end-of-line nil)) (flymake-show-diagnostics-at-end-of-line nil))
@ -938,7 +937,7 @@
:diminish :diminish
:functions flymake-popon-mode :functions flymake-popon-mode
:requires flymake :requires flymake
:hook (flymake-mode . (lambda () (flymake-popon-mode +1)))) :hook ((flymake-mode . (lambda () (flymake-popon-mode +1)))))
(use-package flymake-shellcheck (use-package flymake-shellcheck
:if (executable-find "shellcheck") :if (executable-find "shellcheck")
@ -949,9 +948,7 @@
:if (executable-find "yamllint") :if (executable-find "yamllint")
:functions flymake-yamllint-setup :functions flymake-yamllint-setup
:requires flymake :requires flymake
:hook (yaml-ts-mode . (lambda () :hook (yaml-ts-mode . flymake-yamllint-setup))
(progn (flymake-mode +1)
(flymake-yamllint-setup)))))
(use-package flymake-eslint (use-package flymake-eslint
:if (executable-find "eslint") :if (executable-find "eslint")
@ -1007,10 +1004,6 @@ Calls `project-remember-projects-under' for ~/Projects/"
("\\`\\(?:sourcehut:\\|sh:\\)\\([^:]+\\)\\'" "git.sr.ht" "sourcehut.user") ("\\`\\(?:sourcehut:\\|sh:\\)\\([^:]+\\)\\'" "git.sr.ht" "sourcehut.user")
("\\`\\(?:gitea:\\|gt:\\)\\([^:]+\\)\\'" "git.xenia.me.uk" "gitea.user")))) ("\\`\\(?:gitea:\\|gt:\\)\\([^:]+\\)\\'" "git.xenia.me.uk" "gitea.user"))))
(use-package forge-topic
:custom
(forge-topic-list-limit '(60 . 10)))
(use-package treemacs (use-package treemacs
:functions (treemacs treemacs-load-theme) :functions (treemacs treemacs-load-theme)
:bind (("M-g t" . treemacs-select-window)) :bind (("M-g t" . treemacs-select-window))
@ -1210,10 +1203,10 @@ Calls `project-remember-projects-under' for ~/Projects/"
(elfeed-tube-setup)) (elfeed-tube-setup))
(use-package password-store (use-package password-store
:defer t
:functions password-store-get) :functions password-store-get)
(use-package pass (use-package pass
:defer t
:bind (("C-c P" . pass)) :bind (("C-c P" . pass))
:custom :custom
(pass-show-keybindings nil) (pass-show-keybindings nil)