summary refs log tree commit diff stats
path: root/user
diff options
context:
space:
mode:
authorAlan Pearce2024-05-21 09:01:03 +0200
committerAlan Pearce2024-05-21 09:01:03 +0200
commit65ad9cd252346a0ab3af05d299ea67bda8886139 (patch)
tree7fadd1aaa21e18613025d174ec1d9a39d0425e6e /user
parentaa212dd7bef8c8326d639d72391e05d47a45be8a (diff)
downloadnixfiles-65ad9cd252346a0ab3af05d299ea67bda8886139.tar.lz
nixfiles-65ad9cd252346a0ab3af05d299ea67bda8886139.tar.zst
nixfiles-65ad9cd252346a0ab3af05d299ea67bda8886139.zip
emacs: fix lsp-mode in daemon sessions
Diffstat (limited to 'user')
-rw-r--r--user/emacs/early-init.el2
-rw-r--r--user/settings/emacs.nix3
2 files changed, 3 insertions, 2 deletions
diff --git a/user/emacs/early-init.el b/user/emacs/early-init.el
index 29dadb92..8617e3f2 100644
--- a/user/emacs/early-init.el
+++ b/user/emacs/early-init.el
@@ -10,3 +10,5 @@
 (scroll-bar-mode -1)
 (tool-bar-mode -1)
 (set-fringe-mode '(4 . 4))
+
+(setenv "LSP_USE_PLISTS" "true") ; must match with lsp-mode override
diff --git a/user/settings/emacs.nix b/user/settings/emacs.nix
index f6e32ec1..bab94999 100644
--- a/user/settings/emacs.nix
+++ b/user/settings/emacs.nix
@@ -180,11 +180,10 @@ in
         };
       });
       lsp-mode = self.melpaPackages.lsp-mode.overrideAttrs {
-        LSP_USE_PLISTS = "true"; # sync with below
+        LSP_USE_PLISTS = "true"; # must be set in early-init
       };
     };
     extraConfig = ''
-      (setenv "LSP_USE_PLISTS" "true") ; sync with above
       (with-eval-after-load 'editorconfig
         (setq editorconfig-exec-path "${pkgs.editorconfig-core-c}/bin/editorconfig"))
       (when (featurep 'native-compile)