dotfiles

commit de5420e2fc7532224361b62fa5253782a36bd122
parent 3c02b7690756ef7f48374f324412e1bc93f7c614
Author: Anders Hedman <anders.hedman01@gmail.com>
Date:   Thu,  9 Oct 2025 21:40:58 +0200

doom(lsp): Switch to eglot

Diffstat:
M
.doom.d/config.el
 | 
26
+++++++++++++-------------
M
.doom.d/init.el
 | 
5
+++--

2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/.doom.d/config.el b/.doom.d/config.el
@@ -307,19 +307,19 @@
       :prefix "o"
       :desc "Toggle imenu-list" "i" #'imenu-list-smart-toggle)
 
-(defun my/lsp-vars ()
-  ;; (interactive)
-  (setq lsp-terraform-ls-enable-show-reference t)
-  (setq lsp-semantic-tokens-enable t)
-  (setq lsp-headerline-breadcrumb-enable t)
-  (setq lsp-yaml-custom-tags ["!reference sequence" "!Ref sequence"])
-  (setq lsp-semantic-tokens-honor-refresh-requests t)
-  ;; (setq lsp-terraform-ls-prefill-required-fields t))
-  (setq lsp-nix-nil-formatter ["nixfmt"])
-  ;; (setq lsp-nix-nixd-formatting-command [ "nixfmt" ])
-  ;; (setq lsp-nix-nixd-nixpkgs-expr "import <nixpkgs> { }")
-)
-(add-hook 'lsp-mode-hook 'my/lsp-vars)
+;; (defun my/lsp-vars ()
+;;   ;; (interactive)
+;;   (setq lsp-terraform-ls-enable-show-reference t)
+;;   (setq lsp-semantic-tokens-enable t)
+;;   (setq lsp-headerline-breadcrumb-enable t)
+;;   (setq lsp-yaml-custom-tags ["!reference sequence" "!Ref sequence"])
+;;   (setq lsp-semantic-tokens-honor-refresh-requests t)
+;;   ;; (setq lsp-terraform-ls-prefill-required-fields t))
+;;   (setq lsp-nix-nil-formatter ["nixfmt"])
+;;   ;; (setq lsp-nix-nixd-formatting-command [ "nixfmt" ])
+;;   ;; (setq lsp-nix-nixd-nixpkgs-expr "import <nixpkgs> { }")
+;; )
+;; (add-hook 'lsp-mode-hook 'my/lsp-vars)
 
 (map! :map terraform-mode-map
       :localleader
diff --git a/.doom.d/init.el b/.doom.d/init.el
@@ -45,7 +45,8 @@
        ophints           ; highlight the region an operation acts on
        (popup +defaults)   ; tame sudden yet inevitable temporary windows
        ;;tabs              ; a tab bar for Emacs
-       (treemacs +lsp)          ; a project drawer, like neotree but cooler
+       treemacs          ; a project drawer, like neotree but cooler
+       ;;(treemacs +lsp)          ; a project drawer, like neotree but cooler
        ;;unicode           ; extended unicode support for various languages
        ;; (vc-gutter +pretty +diff-hl)         ; vcs diff in the fringe
        (vc-gutter +pretty)         ; vcs diff in the fringe
@@ -98,7 +99,7 @@
        (eval +overlay)     ; run code, run (also, repls)
        ;;gist              ; interacting with github gists
        lookup              ; navigate your code and its documentation
-       lsp               ; M-x vscode
+       (lsp +eglot)        ; M-x vscode
        (magit +forge)             ; a git porcelain for Emacs
        ;;make              ; run make tasks from Emacs
        pass              ; password manager for nerds