Changeset 6782e9b in dotfiles

Timestamp:

Jul 4, 2024, 1:25:04 AM (4 months ago)

Author:

Mikhail Kirillov <w96k@…>

Branches:

master

Children:

a6193f9

Parents:

8f6be2b

Message:

Make emacs work again

File:

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

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

@@ -117 +117 @@
   (require 'gnutls)
 
-  (when (not package-archive-contents)
-    (progn
+  (progn
       (package-refresh-contents)
       (package-install 'avy)
+      (package-install 'php-mode)
+      (package-install 'phps-mode)
       ;; (package-install 'anzu)
       (package-install 'anaconda-mode)
       (package-install 'auctex)
-      (package-install 'rmsbolt)
+      ;; (package-install 'rmsbolt)
       ;; (package-install 'beginend)
       ;; (package-install 'composer)
@@ -155 +156 @@
       (package-install 'flycheck)
       (package-install 'flycheck-phpstan)
-      ;; (package-install 'phpactor)
+      (package-install 'phpactor)
       ;;(package-install 'robe)
       (package-install 'geiser)
@@ -183 +184 @@
       ;;(package-install 'phps-mode)
       (package-install 'realgud)
-      (package-install 'realgud-xdebug)
+      ;; (package-install 'realgud-xdebug)
       ;; (package-install 'kiwix)
       ;;(package-install 'sml-mode)
@@ -213 +214 @@
       ;; (package-install 'psysh)
       ;; (package-install 'restclient)
-      ))
+      )
 #+end_src
 
@@ -256 +257 @@
 ** EXWM
 
-#+begin_src emacs-lisp :tangle init.el
+#+begin_src emacs-lisp :tangle nil
   (require 'exwm)
   (require 'exwm-config)
@@ -397 +398 @@
 
   (require 'package)
+  (package-initialize)
 
   (defun package-loaded? (string)
@@ -767 +769 @@
 
 ** Клиент LSP
-#+begin_src emacs-lisp :tangle nil
-  (with-eval-after-load 'eglot
-    (add-to-list 'eglot-server-programs '((php-mode phps-mode) . ("~/projects/phpactor/bin/phpactor" "language-server" "-vvv")))
-    (add-to-list 'eglot-server-programs '((php-mode phps-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))
+#+begin_src emacs-lisp :tangle init.el
+  ;; (with-eval-after-load 'eglot
+  ;;   (add-to-list 'eglot-server-programs '((php-mode phps-mode) . ("~/projects/phpactor/bin/phpactor" "language-server" "-vvv")))
+  ;;   (add-to-list 'eglot-server-programs '((php-mode phps-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
@@ -871 +873 @@
 Показывает собранное состояние будь то собранный куски на ассемблере
 или байт-код при помощи пакета RMSbolt.
-#+begin_src emacs-lisp :tangle init.el
+#+begin_src emacs-lisp :tangle nil
   (add-hook 'prog-mode-hook 'rmsbolt-mode)
 #+end_src
@@ -951 +953 @@
   ;; (defun init-php-mode ()
   ;;   (eglot-ensure))
-
+  
   (with-eval-after-load 'php-mode
-    (custom-set-variables '(lsp-phpactor-path "/home/w96k/php/phpactor"))
+
     ;; (add-hook 'php-mode-hook #'init-php-mode)
     )
@@ -961 +963 @@
       (add-hook 'php-mode-hook 'php-enable-symfony2-coding-style)
       (setq lsp-intelephense-php-version "8.1.16")
-      (defvar phpactor-executable "~/.local/bin/phpactor")
+      (defvar phpactor-executable "~/.bin/phpactor")
       (custom-set-variables '(lsp-phpactor-path "~/usr/local/bin/phpactor"))
 
@@ -1035 +1037 @@
 
 *** Composer
+#+begin_src emacs-lisp :tangle init.el
+  (setq composer-executable-bin "~/.bin/composer")
+#+end_src
+
 *** Flymake PHP
 *** REPL
@@ -1040 +1046 @@
 PHPactor
 #+begin_src emacs-lisp :tangle nil
-  (with-eval-after-load 'php-mode
-    (define-key php-mode-map (kbd "M-.") #'phpactor-goto-definition)
-    (define-key php-mode-map (kbd "M-?") #'phpactor-find-references))
+  (setq phpactor-executable "~/.bin/phpactor")
+  (custom-set-variables '(lsp-phpactor-path "~/.bin/phpactor"))
+
+  (use-package phpactor :ensure t)
+  (use-package company-phpactor :ensure t)
+
+
+
+  ;; (with-eval-after-load 'php-mode
+  ;;   (define-key php-mode-map (kbd "M-.") #'phpactor-goto-definition)
+  ;;   (define-key php-mode-map (kbd "M-?") #'phpactor-find-references))
 #+end_src
 
@@ -1216 +1230 @@
   (when (package-loaded? "org-roam")
     (progn
-      (setq org-roam-directory (file-truename "~/projects/at-w96k/content/digarden/pages/")
+      (setq org-roam-directory (file-truename "~/Zettelkasten")
             org-roam-v2-ack t
             org-roam-completion-everywhere t