diff --git a/.emacs.d/include/misc.el b/.emacs.d/include/misc.el index fda3298..a849666 100644 --- a/.emacs.d/include/misc.el +++ b/.emacs.d/include/misc.el @@ -6,7 +6,6 @@ ;;; Code: (require 'meow) -(require 'lsp-mode) (require 'git-gutter) (require 'seq) (require 'justl) @@ -166,24 +165,8 @@ (meow-setup) -;; LSP -(setq lsp-inlay-hint-enable t) -(setq lsp-ui-doc-include-signature t) -(setq lsp-ui-doc-header t) -(setq lsp-ui-doc-border (face-foreground 'default)) -(setq lsp-ui-sideline-show-code-actions t) -(setq lsp-enable-file-watchers nil) -(setq lsp-log-max nil) -(setq lsp-enable-links nil) -(setq lsp-use-plists t) - -(custom-set-faces - '(lsp-ui-doc-header ((t (:inherit nano-strong :background-color nano-dark-background))))) - (setq read-process-output-max (* 4 1024 1024)) -(define-key lsp-mode-map (kbd "C-c l") lsp-command-map) - ;; Magit (setq auth-sources '("~/.authinfo")) diff --git a/.emacs.d/init.el b/.emacs.d/init.el index baeb962..1ee57f6 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -23,6 +23,15 @@ (use-package f :straight t) (use-package dash :straight t) +;; LSP +;; For some reason, eglot-related configuration MUST be put here, or +;; else it will complain about the following error: +;; Feature provided by other file: project +(use-package eglot :straight t) +(use-package eldoc :straight t + :after (eglot)) +(use-package eldoc-box :straight t + :after (eldoc)) ;; Completion (use-package corfu :straight t @@ -95,13 +104,6 @@ :bind (("C-." . embark-act))) (use-package embark-consult :straight t) (use-package wgrep :straight t) -(use-package perspective :straight t - :custom - (persp-mode-prefix-key (kbd "C-c M-p")) - :init - (persp-mode)) -(use-package persp-projectile :straight t - :after (perspective projectile)) (use-package no-littering :straight t) ;; Version control @@ -169,15 +171,6 @@ (use-package olivetti :straight t :hook (org-mode . olivetti-mode)) -(use-package hledger-mode :straight t) - -;; LSP -(use-package lsp-mode :straight t) -(use-package lsp-ui :straight t - :after (lsp-mode) - :hook ((lsp-mode . lsp-ui-mode) - (lsp-mode . lsp-inlay-hints-mode))) - ;; Languages (use-package racket-mode :straight t :hook (racket-mode . racket-xp-mode)) @@ -199,7 +192,6 @@ (use-package poetry :straight t) (use-package sly :straight t) (use-package haskell-mode :straight t) -(use-package lsp-haskell :straight t) (use-package llvm-mode :straight '(llvm-mode :type git :host github @@ -241,11 +233,3 @@ ;; ====== Hooks ============================== (add-hook 'prog-mode-hook #'display-line-numbers-mode) (add-hook 'prog-mode-hook #'hl-line-mode) - -(add-hook 'racket-mode-hook #'lsp) -(add-hook 'rustic-mode-hook #'lsp) -(add-hook 'python-mode-hook #'lsp) -(add-hook 'go-mode-hook #'lsp) -(add-hook 'tuareg-mode-hook #'lsp) -(add-hook 'haskell-mode-hook #'lsp) -(add-hook 'rjsx-mode-hook #'lsp) diff --git a/.emacs.d/straight/versions/default.el b/.emacs.d/straight/versions/default.el index 414bd32..4c421a6 100644 --- a/.emacs.d/straight/versions/default.el +++ b/.emacs.d/straight/versions/default.el @@ -14,12 +14,12 @@ ("corfu" . "921dd7c97ec41fe8ef81dd5f5a08b0f717586c86") ("dash.el" . "1de9dcb83eacfb162b6d9a118a4770b1281bcd84") ("dune" . "5607dd9428dd1a17d555f783665bbf3dc1762e87") + ("eglot" . "81eb273965be82cd56d7502cccd68b5231a8fbab") ("el-get" . "d25eb973b5469835de1f5c537e51aaa29b88f182") ("eldoc" . "91a8ae2fa66ac09f45337f9eca6c7aa643a063f4") - ("emacs-async" . "f317b0c9c3e60a959f45d035ed5e31a78f1263ac") + ("eldoc-box" . "cd01cc9cc9aee1f604f4259a41b0ab2659c946af") ("emacs-elixir" . "00d6580a040a750e019218f9392cf9a4c2dac23a") ("emacs-format-all-the-code" . "f8feea08fef7ed542b8e676e90445d57ebd2c458") - ("emacs-htmlize" . "ed5e5b05fd260e8f161a488d56f10e7f6e01fb75") ("emacs-language-id" . "44452e4f7962aca41cc2539fce1d27799d6e656c") ("emacs-libvterm" . "988279316fc89e6d78947b48513f248597ba969a") ("emacs-neotree" . "599bd049a5d9cfab8a0d7ab7bec99d58b4581751") @@ -27,9 +27,11 @@ ("emacsmirror-mirror" . "5f1fe3f3ec179873fbacd98e4c1624f438dcbfb1") ("emacsql" . "e5f0928a047dba8e3a00b6333400422b301bac35") ("embark" . "19a13e344e04bbf861eaa74491b23da52b398672") + ("external-completion" . "69f06e1eff72df60bb10153169edc859f27f58f2") ("f.el" . "1e7020dc0d4c52d3da9bd610d431cab13aa02d8c") ("flycheck" . "7a6398ea3538a898eba0276f0f89b2f878325a89") ("flycheck-ocaml" . "77f8ddbd9bfc3a11957ac7ec7e45d5fa9179b192") + ("flymake" . "c4c8adc8df3ee0442b90c602613a74845bd1d8f7") ("forge" . "7f118f62feede9a27f62881e3b0eb9332d9bca7b") ("ghub" . "9f679f1cbbdc6d8e87ee118b029cdf4c4868c7d0") ("git-gutter" . "a41a601160818241d69414007e7679d6bf16fd8a") @@ -37,20 +39,16 @@ ("go-mode.el" . "602d73e22646b1b98b2eb97927fd426c0d1d2f92") ("haskell-mode" . "727f72a2a4b8e4fd0a7b62129668baea55a2c3e0") ("hl-todo" . "82eba6b8f7b5a4cbcf22436d5c5b88fb3134f57e") - ("hledger-mode" . "5492509a23047f0a1f05a112b47fa34eba7c5e1d") - ("ht.el" . "1c49aad1c820c86f7ee35bf9fff8429502f60fef") ("hydra" . "317e1de33086637579a7aeb60f77ed0405bf359b") ("inf-elixir" . "857210b83f3c6a68673222c1271c40cb0b5641bc") ("inheritenv" . "bac62ca6324828623cf8ce5a3d6aee0fcb65d620") ("irony-mode" . "40e0ce19eb850bdf1f77225f11713cc816250d95") ("js2-mode" . "9b90d31ed968e5c51bd3e279d4003248ea896807") + ("jsonrpc" . "9c60f597f925c826146535dcd7263be7af23406a") ("just-mode.el" . "4c0df4cc4b8798f1a7e99fb78b79c4bf7eec12c1") ("justl.el" . "9bf1fc645682b8dcb638d448cd2e804960ee625f") ("let-alist" . "4e05e158612f360f6080b1349d3962b1c8fee902") ("llvm-mode" . "96b7e911c4fc292fdde9cc100a446065aa7dd052") - ("lsp-haskell" . "ba49fa9822556aff58aa47929cd426e9427baaea") - ("lsp-mode" . "c36b95be6625dac5a37d3874a1a738e0c84ac39f") - ("lsp-ui" . "072bb29152038518c2478813b82c8d04d07df84c") ("magit" . "fe427e64382db783d33cf1cfd46fe851dc3c8113") ("major-mode-hydra.el" . "d0a5dadee97c3752fcdef113cf2ba1923972a480") ("map" . "cc174d5d2b3f9dacc31e9c55da1c80eb5f49c112") @@ -73,10 +71,7 @@ ("org-roam" . "0b9fcbc97b65b349826e63bad89ca121a08fd2be") ("paredit" . "037b9b8acbca75151f133b6c0f7f3ff97d9042e5") ("pdf-tools" . "30b50544e55b8dbf683c2d932d5c33ac73323a16") - ("persp-projectile" . "4e374d7650c7e041df5af5ac280a44d4a4ec705a") - ("perspective-el" . "f50eb57855f3996ef1e66755bf94620d7342ecfc") ("poetry.el" . "1dff0d4a51ea8aff5f6ce97b154ea799902639ad") - ("popup-el" . "c83d6e5f5fa693e08a542ea9ad7c06eced652de9") ("project" . "5c77d78936364e2e6e9641af2091fde0bee729ce") ("projectile" . "8cc2ee8937b89f1639304cbd2526e85b17135372") ("pyvenv" . "31ea715f2164dd611e7fc77b26390ef3ca93509b") @@ -93,6 +88,7 @@ ("spinner" . "fa117f0893788f3fe24673715a6b83bb34d238dd") ("straight.el" . "88e574ae75344e39b436f863ef0344135c7b6517") ("tablist" . "fcd37147121fabdf003a70279cf86fbe08cfac6f") + ("track-changes" . "76b59473e80aa365484712ba7bd04d327b7703a3") ("transient" . "47960efddd27004c71f72cde630450fb8ae35605") ("treepy.el" . "75fe3ec37e6f9b2bdfd6d0584efd984d0c00a43e") ("tuareg" . "1d53723e39f22ab4ab76d31f2b188a2879305092")