From 0bd3a93a3dc67a1d3d0a305fb32d3b5e18300295 Mon Sep 17 00:00:00 2001 From: rostyhn Date: Fri, 24 Sep 2021 09:40:19 -0700 Subject: [PATCH] Eglot and elpy fixes. --- emacs | 8 ++++++-- emacs_home.el | 7 +++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/emacs b/emacs index f7e2e43..60eb6a0 100644 --- a/emacs +++ b/emacs @@ -59,6 +59,7 @@ Return a list of installed packages or nil for every skipped package." (use-package eglot :ensure t) (add-hook 'c++-mode-hook 'eglot-ensure) (add-hook 'c-mode-hook 'eglot-ensure) +(add-hook 'js-mode-hook 'eglot-ensure) (use-package centaur-tabs :init (setq centaur-tabs-enable-key-bindings t @@ -104,7 +105,10 @@ Return a list of installed packages or nil for every skipped package." :ensure t :defer t :init - (advice-add 'python-mode :before 'elpy-enable)) + (advice-add 'python-mode :before 'elpy-enable) + :config + (setq elpy-modules (delq 'elpy-module-flymake elpy-modules)) + (add-hook 'elpy-mode-hook 'flycheck-mode)) (use-package ivy :ensure t :diminish ivy-mode @@ -140,7 +144,6 @@ Return a list of installed packages or nil for every skipped package." (("C-s" . swiper))) (setq search-default-mode #'char-fold-to-regexp) - (use-package projectile :ensure t :init @@ -163,6 +166,7 @@ Return a list of installed packages or nil for every skipped package." (setq org-agenda-skip-deadline-if-done t) (add-hook 'diary-list-entries-hook 'diary-sort-entries t) +(add-hook 'text-mode-hook 'turn-on-visual-line-mode) (cond ((file-exists-p "~/.emacs_home.el") (load "~/.emacs_home.el"))) (cond ((file-exists-p "~/.emacs_work.el") (load "~/.emacs_work.el"))) diff --git a/emacs_home.el b/emacs_home.el index 8208f61..9a10dfc 100644 --- a/emacs_home.el +++ b/emacs_home.el @@ -4,6 +4,13 @@ "~/Documents/home-org-mode/personal.org")) (set-frame-font "Iosevka:size=16") +(ensure-package-installed 'rustic) + +(use-package rustic) +(setq rustic-lsp-client 'eglot) + +(add-to-list 'eglot-server-programs '((c++-mode c-mode) "clangd")) + (use-package all-the-icons) (use-package org-roam