diff --git a/README.org b/README.org index 9fc6832a..b8242f1e 100644 --- a/README.org +++ b/README.org @@ -1961,7 +1961,7 @@ I'm gonna try this to speed up emacs and make it nicer *** C++ In c++ I just want to make sure lsp is called when enter c++-mode #+BEGIN_SRC emacs-lisp -(add-hook 'c++-mode-hook 'lsp) +(add-hook 'c++-mode-hook 'eglot) #+END_SRC *** Lua @@ -1980,7 +1980,7 @@ I've been transitioning more of my OS to NixOS. Let's get =nix-mode= working. *** LSP LSP is useful... -#+begin_src emacs-lisp :tangle yes +#+begin_src emacs-lisp :tangle no (use-package lsp-mode :commands (lsp lsp-deferred) :custom diff --git a/init.el b/init.el index 9ab63357..83c5a1e1 100644 --- a/init.el +++ b/init.el @@ -1362,7 +1362,7 @@ targets." (add-hook 'prog-mode-hook 'hl-line-mode) (add-hook 'prog-mode-hook 'hs-minor-mode) -(add-hook 'c++-mode-hook 'lsp) +(add-hook 'c++-mode-hook 'eglot) (use-package lua-mode :mode ("\\.lua\\'" . lua-mode)) @@ -2341,20 +2341,3 @@ interfere with the default `bongo-playlist-buffer'." gcmh-verbose nil)) (setq warning-suppress-types '((comp))) -(custom-set-variables - ;; custom-set-variables was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - '(pdf-misc-print-program "/usr/bin/lpr") - '(pdf-misc-print-program-args '("-o media=Letter" "-o fitplot")) - '(safe-local-variable-values - '((aggressive-indent-mode) - (projectile-project-run-cmd . "./build/bin/presenter") - (projectile-project-compilation-cmd . "cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -B build/ . && make --dir build/")))) -(custom-set-faces - ;; custom-set-faces was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - '(org-modern-tag ((t :background "#9aedfe" :foreground "#282a36"))))