Changeset 07d6016 in dotfiles for emacs

Timestamp:

Jul 19, 2022, 6:46:51 PM (3 years ago)

Author:

Mikhail Kirillov <w96k@…>

Branches:

master

Children:

1a961f6

Parents:

13a1472

Message:

Remove Company; Add Corfu;

File:

• emacs/.emacs.d/.emacs-config.org (modified) (4 diffs)

emacs/.emacs.d/.emacs-config.org

@@ -158 +158 @@
           (package-install 'pdf-tools)
           ;;(package-install 'phpactor)
-          (package-install 'company-quickhelp)
+          ;; (package-install 'company-quickhelp)
           (package-install 'ac-php)
           (package-install 'php-mode)
@@ -164 +164 @@
           (package-install 'phan)
           (package-install 'php-cs-fixer)
-          (package-install 'company-php)
+          ;; (package-install 'company-php)
           (package-install 'php-eldoc)
           (package-install 'phps-mode)
@@ -737 +737 @@
 #+end_src
 
-*** Автодополнение и документация
-По большей части я использую дефолтный Completion buffer, но для работы
-вынужден использовать company ради PHP.
-#+begin_src elisp :tangle nil
-  ;;(require 'auto-complete)
-
-  ;; (when (package-loaded? "auto-complete")
-  ;;   (progn
-  ;;     (setq ac-use-menu-map t)
-  ;;     (setq ac-menu-height 20)
-  ;;     (setq ac-ignore-case t)
-  ;;     (ac-config-default)))
+*** Автодополнение кода и документация
+По большей части я использую дефолтный Completion Buffer и Corfu
+#+begin_src elisp :tangle init.el
+  (require 'corfu)
+
+  (when (package-loaded? "corfu")
+    (progn
+      (add-hook 'prog-mode-hook 'corfu-mode)))y
 #+end_src
 *** Модификация дефолта
@@ -1000 +996 @@
       (add-hook 'php-mode-hook 
                 '(lambda ()
-                   (require 'company-quickhelp)
                    (require 'yasnippet)
                    (require 'yasnippet-snippets)
-                   ;; (require 'phpactor)
-                   (require 'company)
-                   (company-mode t)
-
-                   (company-quickhelp-mode t)
                    (yas-minor-mode t)
                    (define-key php-mode-map (kbd "C-c h") 'php-quickhelp-at-point)