diff --git a/config/emacs/emacs.org b/config/emacs/emacs.org index 2a8de3f7..1d83c780 100644 --- a/config/emacs/emacs.org +++ b/config/emacs/emacs.org @@ -628,22 +628,26 @@ this should be useful later #+end_src ** Eglot (LSP) #+begin_src emacs-lisp -(use-package eglot - :bind (:map eglot-mode-map - ("C-c C-a" . eglot-code-actions) - ("C-c C-r" . eglot-rename)) - :config - (setq eglot-autoshutdown t - eglot-confirm-server-initiated-edits nil)) + (use-package eglot + :bind (:map eglot-mode-map + ("C-c C-a" . eglot-code-actions) + ("C-c C-r" . eglot-rename)) + :config + (setq eglot-autoshutdown t + eglot-confirm-server-initiated-edits nil)) -;; this'll make it so i don't have to use vscode every now and then -;; TODO:: WRITE NIX PACKAGE!!!!!!!!!!!!!! -(unless (eq system-type 'gnu/linux) - (use-package eglot-booster - :straight (eglot-booster :type git :host github :repo "jdtsmith/eglot-booster") - :after eglot - :config (eglot-booster-mode)) - ) + ;; this'll make it so i don't have to use vscode every now and then + ;; (when (eq system-type 'windows-nt) + ;; (use-package eglot-booster + ;; :straight (eglot-booster :type git :host github :repo "jdtsmith/eglot-booster") + ;; :after eglot + ;; :config (eglot-booster-mode)) + ;; ) + + (when (eq system-type 'gnu/linux) + (use-package eglot-booster + :ensure nil + :config (eglot-booster-mode))) #+end_src ** Magit #+begin_src emacs-lisp diff --git a/modules/dev/editors/emacs/default.nix b/modules/dev/editors/emacs/default.nix index 0d28fa18..363cdb5c 100644 --- a/modules/dev/editors/emacs/default.nix +++ b/modules/dev/editors/emacs/default.nix @@ -22,7 +22,24 @@ with lib; let # TODO make this check if EXWM is enabled or not epkgs.exwm # epkgs.sakomodules + epkgs.eglot-booster ]; + # add eglot-lsp-booster package + override = epkgs: epkgs // { + eglot-booster = epkgs.trivialBuild { + pname = "eglot-booster"; + version = "e19dd7ea81bada84c66e8bdd121408d9c0761fe6"; + + packageRequires = with pkgs; [ emacs-lsp-booster ]; + + src = pkgs.fetchFromGitHub { + owner = "jdtsmith"; + repo = "eglot-booster"; + rev = "e19dd7ea81bada84c66e8bdd121408d9c0761fe6"; + hash = "sha256-vF34ZoUUj8RENyH9OeKGSPk34G6KXZhEZozQKEcRNhs="; + }; + }; + }; # override for modules # override = epkgs: epkgs // { # sakomodules = epkgs.trivialBuild {