Changeset 09e91e8 in dotfiles

Timestamp:

Apr 16, 2023, 5:57:05 PM (21 months ago)

Author:

w96k <w96k@…>

Branches:

master

Children:

420782f

Parents:

56a7a86

Message:

Update emacs config

Files:

• emacs/.emacs.d/.emacs-config.org (modified) (9 diffs)
• wm/.stumpwmrc (modified) (2 diffs)

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

@@ -153 +153 @@
       (package-install 'org-sql)
       ;;(package-install 'eglot)
+      (package-install 'eglot-java)
       (package-install 'mastodon)
       (package-install 'exec-path-from-shell)
@@ -905 +906 @@
 По большей части я использую дефолтный Completion Buffer и Corfu
 #+begin_src elisp :tangle init.el
-    (when (package-loaded? "corfu")
-      (progn
-        (setq corfu-preview-current 'nil
-              corfu-popupinfo-delay t)
+  (when (package-loaded? "corfu")
+    (progn
+      (setq corfu-preview-current 'nil
+            corfu-popupinfo-delay t)
+      (corfu-mode 1)
+      (corfu-popupinfo-mode 1)
+      (defun show-default-completion-buffer ()
+        (interactive)
+        (corfu-quit)
+        (corfu-mode -1)
+        (completion-at-point)
         (corfu-mode 1)
-        (defun show-default-completion-buffer ()
-          (interactive)
-          (corfu-quit)
-          (corfu-mode -1)
-          (completion-at-point)
-          (corfu-mode 1)
-          (corfu-popupinfo-mode 1))
-        (define-key corfu-map (kbd "M-TAB") 'show-default-completion-buffer)
-        (define-key corfu-map (kbd "TAB") 'show-default-completion-buffer)
-        (define-key corfu-map (kbd "C-M-i") 'show-default-completion-buffer)      
-        (corfu-mode -1)
-        (add-hook 'prog-mode-hook 'corfu-mode)
-
-        (defun corfu-send-shell (&rest _)
-          "Send completion candidate when inside comint/eshell."
-          (cond
-           ((and (derived-mode-p 'eshell-mode) (fboundp 'eshell-send-input))
-            (eshell-send-input))
-           ((and (derived-mode-p 'comint-mode)  (fboundp 'comint-send-input))
-            (comint-send-input))))
-
-        (advice-add #'corfu-insert :after #'corfu-send-shell)
-
-        (add-hook 'eshell-mode-hook 'corfu-mode)))
+        (corfu-popupinfo-mode 1))
+      (define-key corfu-map (kbd "M-TAB") 'show-default-completion-buffer)
+      (define-key corfu-map (kbd "TAB") 'show-default-completion-buffer)
+      (define-key corfu-map (kbd "C-M-i") 'show-default-completion-buffer)      
+      (corfu-mode -1)
+      (add-hook 'prog-mode-hook 'corfu-mode)
+
+      (defun corfu-send-shell (&rest _)
+        "Send completion candidate when inside comint/eshell."
+        (cond
+         ((and (derived-mode-p 'eshell-mode) (fboundp 'eshell-send-input))
+          (eshell-send-input))
+         ((and (derived-mode-p 'comint-mode)  (fboundp 'comint-send-input))
+          (comint-send-input))))
+
+      (advice-add #'corfu-insert :after #'corfu-send-shell)
+
+      (add-hook 'eshell-mode-hook 'corfu-mode)))
+
 #+end_src
 *** Модификация дефолта
@@ -1033 +1036 @@
 ** Клиент LSP
 #+begin_src emacs-lisp :tangle init.el
-    (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
-   
+  (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
+  ;; 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
+
 ** Линтеры
-#+BEGIN_SRC emacs-lisp :tangle nil
-  ;;(add-hook 'php-mode-hook 'flymake-php-load)
-  ;; (add-hook 'php-mode-hook 'flymake-phpstan-turn-on)p
-  ;;(add-hook 'php-mode-hook 'flymake-phpcs-load)
+#+BEGIN_SRC emacs-lisp :tangle init.el
+  ;; (add-hook 'php-mode-hook 'flymake-php-load)
+   ;; (add-hook 'php-mode-hook 'flymake-phpstan-turn-on)
+
+    ;; (require 'flycheck-phpstan)
+
 
   ;;(add-to-list 'auto-mode-alist '("\\.\\(php\\|phtml\\)\\'" . phps-mode))
@@ -1196 +1202 @@
   ;; (require 'realgud-xdebug)
 
+  (defun init-php-mode ()
+    (eglot-ensure))
+
+  (with-eval-after-load 'php-mode
+    (custom-set-variables '(lsp-phpactor-path "/home/w96k/projects/phpactor"))
+    ;; (add-hook 'php-mode-hook #'init-php-mode)
+    )
+
   (when (package-loaded? "transient")
     (progn
       (transient-define-prefix
-       php ()
-       "Php"
-       [["Class"
-         ("cc" "Copy" phpactor-copy-class)
-         ("cn" "New" phpactor-create-new-class)
-         ("cr" "Move" phpactor-move-class)
-         ("ci" "Inflect" phpactor-inflect-class)
-         ("n"  "Namespace" phpactor-fix-namespace)]
-        ["Properties"
-         ("a"  "Accessor" phpactor-generate-accessors)
-         ("pc" "Constructor" phpactor-complete-constructor)
-         ("pm" "Add missing props" phpactor-complete-properties)
-         ("r" "Rename var locally" phpactor-rename-variable-local)
-         ("R" "Rename var in file" phpactor-rename-variable-file)]
-        ["Extract"
-         ("ec" "constant" phpactor-extract-constant)
-         ("ee" "expression" phpactor-extract-expression)
-         ("em"  "method" phpactor-extract-method)]
-        ["Methods"
-         ("i" "Implement Contracts" phpactor-implement-contracts)
-         ("m"  "Generate method" phpactor-generate-method)]
-        ["Navigate"
-         ("x" "List refs" phpactor-list-references)
-         ("X" "Replace refs" phpactor-replace-references)
-         ("."  "Goto def" phpactor-goto-definition)]
-        ["Phpactor"
-         ("s" "Status" phpactor-status)
-         ("u" "Install" phpactor-install-or-update)]])))
+        php ()
+        "Php"
+        [["Class"
+          ("cc" "Copy" phpactor-copy-class)
+          ("cn" "New" phpactor-create-new-class)
+          ("cr" "Move" phpactor-move-class)
+          ("ci" "Inflect" phpactor-inflect-class)
+          ("n"  "Namespace" phpactor-fix-namespace)]
+         ["Properties"
+          ("a"  "Accessor" phpactor-generate-accessors)
+          ("pc" "Constructor" phpactor-complete-constructor)
+          ("pm" "Add missing props" phpactor-complete-properties)
+          ("r" "Rename var locally" phpactor-rename-variable-local)
+          ("R" "Rename var in file" phpactor-rename-variable-file)]
+         ["Extract"
+          ("ec" "constant" phpactor-extract-constant)
+          ("ee" "expression" phpactor-extract-expression)
+          ("em"  "method" phpactor-extract-method)]
+         ["Methods"
+          ("i" "Implement Contracts" phpactor-implement-contracts)
+          ("m"  "Generate method" phpactor-generate-method)]
+         ["Navigate"
+          ("x" "List refs" phpactor-list-references)
+          ("X" "Replace refs" phpactor-replace-references)
+          ("."  "Goto def" phpactor-goto-definition)]
+         ["Phpactor"
+          ("s" "Status" phpactor-status)
+          ("u" "Install" phpactor-install-or-update)]])))
 
   (when (package-loaded? "php-mode")
@@ -1232 +1246 @@
       (add-hook 'php-mode-hook 'php-enable-symfony2-coding-style)
       (setq lsp-intelephense-php-version "8.1.6")
-      (defvar phpactor-executable "~/.bin/phpactor")
+      (defvar phpactor-executable "~/.local/bin/phpactor")
+      (custom-set-variables '(lsp-phpactor-path "~/.local/bin/phpactor"))
 
       (add-hook 'php-mode-hook 
@@ -1241 +1256 @@
                    (set-fill-column 120)
 
-                   (make-local-variable 'eldoc-documentation-function)
-                   (setq eldoc-documentation-function
-                         'phpactor-hover)
+                   ;; (make-local-variable 'eldoc-documentation-function)
+                   ;; (setq eldoc-documentation-function
+                   ;;       'phpactor-hover)
                    (yas-minor-mode t)
                    (define-key php-mode-map (kbd "C-c h") 'php-quickhelp-at-point)))
@@ -1446 +1461 @@
         org-outline-path-complete-in-steps nil
         org-src-tab-acts-natively t
+        org-id-track-globally t
         org-confirm-babel-evaluate nil)
 
@@ -1486 +1502 @@
   (when (package-loaded? "org-roam")
     (progn
-      (setq org-roam-directory (file-truename "~/projects/at-w96k/content/digarden/")
+      (setq org-roam-directory (file-truename "~/projects/at-w96k/content/digarden/pages/")
             org-roam-v2-ack t
             org-roam-completion-everywhere t
-            org-roam-index-file (concat org-roam-directory "/20210409054712-жизнь.org"))
-
-      ;; (load "org-roam-ui-autoloads")
-      ;; (org-roam-db-sync)
-
-      ;; (org-roam-db-autosync-mode t)
+            org-roam-index-file (concat org-roam-directory "/20210409054712-жизнь.org")
+            org-roam-dailies-directory (concat org-roam-directory "journals/"))
+
+      (org-roam-db-autosync-mode t)
 
       (defun org-roam-jump-to-index ()
@@ -1504 +1518 @@
 
       (define-key global-map
-        (kbd "C-c n l") 'org-roam-node-insert)
+                  (kbd "C-c n l") 'org-roam-node-insert)
       (define-key global-map
-        (kbd "C-c n f") 'org-roam-node-find)
+                  (kbd "C-c n f") 'org-roam-node-find)
       (define-key global-map
-        (kbd "C-c n b") 'org-roam-buffer-toggle)
+                  (kbd "C-c n b") 'org-roam-buffer-toggle)
       (define-key global-map
-        (kbd "C-c n t t") 'org-roam-tag-add)
+                  (kbd "C-c n t t") 'org-roam-tag-add)
       (define-key global-map
-        (kbd "C-c n t r") 'org-roam-tag-remove)
+                  (kbd "C-c n t r") 'org-roam-tag-remove)
       (define-key global-map
-        (kbd "C-c n i") 'org-roam-jump-to-index)
+                  (kbd "C-c n i") 'org-roam-jump-to-index)
       (define-key global-map
-        (kbd "C-c n g") 'org-roam-graph)
+                  (kbd "C-c n g") 'org-roam-graph)
       (define-key global-map
-        (kbd "C-c n d") 'org-roam-db-build-cache)
+                  (kbd "C-c n d") 'org-roam-db-build-cache)
       (define-key global-map
-        (kbd "C-c n r") 'org-roam-node-random)
+                  (kbd "C-c n r") 'org-roam-node-random)
       (define-key global-map  
-        (kbd "C-c n j") 'org-roam-dailies-find-date)))
+                  (kbd "C-c n j") 'org-roam-dailies-find-date)))
 
   (customize-set-variable 'org-link-descriptive t)

wm/.stumpwmrc

@@ -12 +12 @@
 (defcommand icecat () ()
             (run-or-raise "icecat" '(:class "IceCat")))
+
+(defcommand firefox () ()
+            (run-or-raise "firefox" '(:class "Firefox")))
 
 (defcommand nyxt () ()
@@ -52 +55 @@
 
 ;; Gaps: useless concept to be honest
-(load-module "swm-gaps")
+;; (load-module "swm-gaps")
 ;; (setf swm-gaps:*inner-gaps-size* 0)
 ;; (setf swm-gaps:*outer-gaps-size* 2)