From 3c98c5829e7f9e8cd47ce7e0a2e103428a530bd6 Mon Sep 17 00:00:00 2001
From: Timo Wilken
Date: Sat, 9 Mar 2024 13:50:38 +0100
Subject: Replace corfu with company

Corfu was throwing weird errors on completion sometimes. It also doesn't play
well with evil-mode, often breaking the "escape" key.
---
 tw/home.scm                 |  3 +--
 tw/home/files/emacs-init.el | 18 +++++++++---------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/tw/home.scm b/tw/home.scm
index 14ae7b97..c47a8d5d 100644
--- a/tw/home.scm
+++ b/tw/home.scm
@@ -222,8 +222,7 @@ like a calendar and mail reader?"))
           emacs-counsel
           emacs-counsel-dash sqlite  ; emacs-counsel-dash requires the sqlite3 binary
           emacs-ivy
-          ;; emacs-company emacs-company-quickhelp emacs-company-posframe
-          emacs-corfu emacs-corfu-doc
+          emacs-company emacs-company-quickhelp emacs-company-posframe
           emacs-undo-tree
           emacs-aggressive-indent
           emacs-which-key
diff --git a/tw/home/files/emacs-init.el b/tw/home/files/emacs-init.el
index ad0a7630..5bdce3dc 100644
--- a/tw/home/files/emacs-init.el
+++ b/tw/home/files/emacs-init.el
@@ -278,16 +278,16 @@ If CREATE is true and the resulting directory does not exist, create it."
     (kbd "<localleader>k") #'log-edit-kill-buffer
     (kbd "<localleader>w") #'log-edit-generate-changelog-from-diff))
 
-(use-package corfu  ; https://github.com/minad/corfu
-  :hook (prog-mode ledger-mode shell-mode eshell-mode)
-  :custom
-  (corfu-auto t "Show completion popup after a few seconds automatically.")
-  :diminish corfu-mode)
+(use-package company
+  :config (global-company-mode +1))
+
+(use-package company-quickhelp
+  :after (company)
+  :config (company-quickhelp-mode +1))
 
-(use-package corfu-doc
-  :after (corfu)
-  :hook (corfu-mode)
-  :diminish corfu-doc-mode)
+(use-package company-posframe
+  :after (company)
+  :config (company-posframe-mode +1))
 
 (use-package flyspell
   :hook mail-mode)
-- 
cgit v1.2.3