Changeset 3600aa2 in dotfiles

Timestamp:

Feb 13, 2023, 12:25:44 AM (2 years ago)

Author:

w96k <w96k@…>

Branches:

master

Children:

d881dae

Parents:

688b524

Message:

Change lsp-mode to eglot

File:

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

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

@@ -1 @@
-#+TITLE: Конфигурация Emacs
+#+TITLE: Конфигурация Emacs
 #+AUTHOR: Кириллов <w96k.dev> Михаил
 #+OPTIONS: toc:nil
 #+PROPERTY: header-args:elisp :results silent
+#+STARTUP: showeverything
 
 * Вклады
@@ -85 +86 @@
 | Dumb Jump                      | Прыжки по определениям при помощи grep и ему подобных |
 | Docker                         | Интерфейс к Docker                                    |
-| LSP-mode                       | LSP клиент                                            |
 | Exec Path From Shell           | Синхронизация путей чтения из .bashrc в Emacs         |
 | Expand Region                  | Семантическое расширение выделения на курсоре         |
@@ -131 +131 @@
       (package-install 'rmsbolt)
       (package-install 'beginend)
-      (package-install 'composer)
-      (package-install 'mini-modeline)
+      ;; (package-install 'composer)
       (package-install 'cinspect)
       (package-install 'debian-el)
@@ -168 +167 @@
       ;;(package-install 'sqlite3)
       (package-install 'org-roam)
-      (package-install 'org-roam-ui)
+      ;; (package-install 'org-roam-ui)
       (package-install 'org-download)
       (package-install 'org-babel-eval-in-repl)
       ;;(package-install 'ob-php)
-      (package-install 'lsp-mode)
       (package-install 'on-screen)
       ;;(package-install 'nix-mode)
@@ -485 +483 @@
 #+END_SRC
 ** Объединение эхо зоны и модлайна
-#+begin_src emacs-lisp :tangle init.el
+#+begin_src emacs-lisp :tangle nil
   (when (package-loaded? "mini-modeline")
     (setq mini-modeline-r-format
@@ -1032 +1030 @@
 ** Клиент LSP
 #+begin_src emacs-lisp :tangle init.el
-  (when (package-loaded? "lsp-mode")
-    (progn
-      (define-key prog-mode-map (kbd "C-c h") 'eldoc)
-      ;; (define-key prog-mode-map (kbd "M-<tab>") 'completion-at-point)
-      (define-key prog-mode-map (kbd "<f6>") 'xref-find-definitions)
-
-      (add-hook 'sql-mode-hook 'lsp)
-      (add-hook 'php-mode-hook 'lsp)
-      (add-hook 'c-mode-hook 'lsp-mode)
-      (add-hook 'c++-mode-hook 'lsp-mode)))
+    (with-eval-after-load 'eglot
+      (add-to-list 'eglot-server-programs '(php-mode . ("intelephense" "--stdio")))
+
+      ;; No event buffers, disable providers cause a lot of hover traffic. Shutdown unused servers.
+      (setq eglot-events-buffer-size 0
+            eglot-ignored-server-capabilities '(:hoverProvider
+                                                :documentHighlightProvider)
+            eglot-autoshutdown t))
+
+    ;; Show all of the available eldoc information when we want it. This way Flymake errors
+    ;; don't just get clobbered by docstrings.        
+    (add-hook 'eglot-managed-mode-hook
+              (lambda ()
+                "Make sure Eldoc will show us all of the feedback at point."
+                (setq-local eldoc-documentation-strategy
+                            #'eldoc-documentation-compose)))
 #+end_src
    
@@ -1066 +1070 @@
 ** Сессия
 #+BEGIN_SRC emacs-lisp :tangle init.el
-  (desktop-save-mode 1)
+  (desktop-save-mode 0)
 #+END_SRC
 ** Скроллинг
@@ -1192 +1196 @@
     (progn
       (add-hook 'php-mode-hook 'php-enable-symfony2-coding-style)
-      ;; (setq lsp-intelephense-php-version "7.4.26")
       (setq lsp-intelephense-php-version "8.1.6")
       ;; (defvar phpactor-executable "~/.bin/phpactor")
@@ -1376 +1379 @@
      (shell . t)
      (sql . t)
-     (js . t)
-     (sqlite . t)))
+     (js . t)))
 
   (defun org-babel-edit-prep:sql (babel-info)
@@ -1444 +1446 @@
     (progn
       (setq org-roam-directory (file-truename "~/projects/at-w96k/content/digarden/")
-            org-roam-graph-viewer "abrowser"
             org-roam-v2-ack t
             org-roam-completion-everywhere t
@@ -1452 +1453 @@
       ;; (org-roam-db-sync)
 
-      (org-roam-db-autosync-mode t)
+      ;; (org-roam-db-autosync-mode t)
 
       (defun org-roam-jump-to-index ()