Compare commits

..

No commits in common. "1dec1f8f4dac44a22fa6ed5a31fd2dbb9e11dad9" and "22a2910fe63719ec4b3c30f42840296e2c4904c2" have entirely different histories.

2 changed files with 11 additions and 21 deletions

View file

@ -20,14 +20,8 @@ Configure package archives and initialise.
(add-to-list 'package-archives '("melpa-stable" . "https://stable.melpa.org/packages/")) (add-to-list 'package-archives '("melpa-stable" . "https://stable.melpa.org/packages/"))
(package-initialize)) (package-initialize))
(defun my/package-ensure-installed () ;; Plugins that still need adding / configuring: `auctex' `htmlize'
"Ensure packages in `package-selected-packages' are installed." ;; `password-store'
(interactive)
(require 'package)
(package-refresh-contents)
(package-install-selected-packages t)
(package-autoremove)
(package-upgrade-all nil))
#+end_src #+end_src
** Defaults ** Defaults
Set some useful defaults. Some of these should be moved to relevant Set some useful defaults. Some of these should be moved to relevant
@ -1174,10 +1168,8 @@ Configure email with iCalendar event support, to integrate with
([tab] . corfu-insert)) ([tab] . corfu-insert))
:custom :custom
(corfu-cycle t) (corfu-cycle t)
(corfu-auto t) (corfu-auto nil)
(corfu-auto-delay 0.2) (corfu-preselect 'directory)
(corfu-auto-prefix 3)
(corfu-preselect 'valid)
:config :config
(require 'corfu-history) (require 'corfu-history)
(when (require 'nerd-icons-corfu nil :noerror) (when (require 'nerd-icons-corfu nil :noerror)
@ -1330,10 +1322,11 @@ Configure email with iCalendar event support, to integrate with
(python-base-mode . (lambda () (if (executable-find "pylsp" t) (eglot-ensure)))) (python-base-mode . (lambda () (if (executable-find "pylsp" t) (eglot-ensure))))
(lua-mode . (lambda () (if (executable-find "lua-language-server" t) (eglot-ensure)))) (lua-mode . (lambda () (if (executable-find "lua-language-server" t) (eglot-ensure))))
((rust-ts-mode rust-mode) . (lambda () (if (executable-find "rust-analyzer" t) (eglot-ensure)))) ((rust-ts-mode rust-mode) . (lambda () (if (executable-find "rust-analyzer" t) (eglot-ensure))))
((js-base-mode typescript-ts-base-mode) . (lambda () (if (executable-find "typescript-language-server" t) (eglot-ensure))))) ((js-base-mode typescript-ts-base-mode) . (lambda () (if (executable-find "typescript-language-server" t) (eglot-ensure))))
)
:custom :custom
(eglot-menu-string "lsp") (eglot-menu-string "lsp")
(eglot-send-changes-idle-time 0.5) (eglot-send-changes-idle-time 1)
(eglot-extend-to-xref t) (eglot-extend-to-xref t)
(eglot-autoshutdown t) (eglot-autoshutdown t)
(eglot-sync-connect nil) (eglot-sync-connect nil)
@ -1395,7 +1388,7 @@ Configure email with iCalendar event support, to integrate with
("C-c C-," . flymake-goto-prev-error)) ("C-c C-," . flymake-goto-prev-error))
:hook ((prog-mode yaml-ts-mode) . (lambda () (flymake-mode +1))) :hook ((prog-mode yaml-ts-mode) . (lambda () (flymake-mode +1)))
:custom :custom
(flymake-no-changes-timeout 0.5) (flymake-no-changes-timeout 1)
(flymake-show-diagnostics-at-end-of-line 'short)) (flymake-show-diagnostics-at-end-of-line 'short))
(add-to-list 'package-selected-packages 'flymake-yamllint) (add-to-list 'package-selected-packages 'flymake-yamllint)
@ -1572,11 +1565,6 @@ Configure email with iCalendar event support, to integrate with
(doc-view-scale-internally t) (doc-view-scale-internally t)
(doc-view-image-width 850)) (doc-view-image-width 850))
(add-to-list 'package-selected-packages 'auctex)
(use-package auctex
:if (package-installed-p 'auctex)
:defer t)
(add-to-list 'package-selected-packages 'markdown-mode) (add-to-list 'package-selected-packages 'markdown-mode)
(use-package markdown-mode (use-package markdown-mode
:if (package-installed-p 'markdown-mode) :if (package-installed-p 'markdown-mode)

View file

@ -3,6 +3,8 @@
;;; Code: ;;; Code:
;; Configure packages archives with priority ;; Configure packages archives with priority
(load-file (locate-user-emacs-file "init.el")) (load-file (locate-user-emacs-file "init.el"))
(my/package-ensure-installed) (package-refresh-contents)
(package-install-selected-packages t)
(package-autoremove)
(provide 'install) (provide 'install)
;;; install.el ends here ;;; install.el ends here