From d34ac9d5a3552ee2dabeddb0fabd46a0590292ec Mon Sep 17 00:00:00 2001 From: Benson Chu Date: Sat, 20 May 2023 15:36:43 -0500 Subject: [PATCH] Out with company, in with corfu --- config-min.org | 13 +++++++++---- config-programming.org | 10 +++++++++- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/config-min.org b/config-min.org index 16bf449..e001eba 100644 --- a/config-min.org +++ b/config-min.org @@ -393,10 +393,15 @@ (window-height . 0.10))) ;; Autocompletion - (use-package company) - (setq company-idle-delay 0.2) - (add-hook 'emacs-lisp-mode-hook 'company-mode) - (add-hook 'lisp-mode-hook 'company-mode) + (use-package corfu + :after orderless + :custom + (corfu-quit-at-boundary nil) + (corfu-quit-no-match t) + (corfu-cycle t) + (corfu-auto t) + :init + (global-corfu-mode)) ;; Magit (use-package magit) diff --git a/config-programming.org b/config-programming.org index 13d6113..65b57f2 100644 --- a/config-programming.org +++ b/config-programming.org @@ -3,10 +3,17 @@ * lsp #+begin_src emacs-lisp (use-package lsp-mode + :after corfu :commands lsp :config (setq lsp-lens-enable nil) - (setq read-process-output-max (* 1024 1024))) + (setq read-process-output-max (* 1024 1024)) + (setq lsp-completion-provider :none) + ;; (defun corfu-lsp-setup () + ;; (setq-local completion-styles '(orderless) + ;; completion-category-defaults nil)) + ;; (add-hook 'lsp-mode-hook #'corfu-lsp-setup) + ) (use-package lsp-ui :after lsp-mode @@ -35,6 +42,7 @@ (let ((fetcher (if (or noninteractive my-ec/at-ti) "github" "github-ssh"))) (quelpa `(yasnippet :repo "pestctrl/yasnippet" :branch "quit-undo-tree" :fetcher ,fetcher))) (use-package java-snippets) + (add-hook 'lsp-mode-hook 'yas-minor-mode) #+END_SRC * c++