From 8e7455549064786b3b7dbef567b2bb1af7768489 Mon Sep 17 00:00:00 2001 From: Brett Langdon Date: Mon, 18 Dec 2023 13:39:21 -0500 Subject: [PATCH] update lsp settings --- emacs.d/init.el | 28 +++++++++++----------------- emacs.d/layers/python/init.el | 20 +------------------- 2 files changed, 12 insertions(+), 36 deletions(-) diff --git a/emacs.d/init.el b/emacs.d/init.el index 08c1542..1ab27e6 100644 --- a/emacs.d/init.el +++ b/emacs.d/init.el @@ -303,11 +303,6 @@ (use-package lsp-mode - :defer t - :hook (( - python-mode ; pyright - ) . lsp-deferred) - :commands lsp :config (setq lsp-enable-file-watchers nil) (setq lsp-auto-guess-root t) @@ -329,13 +324,13 @@ (setq lsp-idle-delay 0.5)) (use-package lsp-ui - :defer t - :commands lsp-ui-mode :config - (setq lsp-ui-doc-enable nil) + (setq lsp-ui-doc-enable t) (setq lsp-ui-doc-header t) + (setq lsp-ui-doc-show-with-cursor t) (setq lsp-ui-doc-include-signature t) (setq lsp-ui-doc-border (face-foreground 'default)) + (setq lsp-ui-sideline-enable t) (setq lsp-ui-sideline-show-code-actions t) (setq lsp-ui-sideline-delay 0.05)) @@ -343,19 +338,18 @@ :defer t :commands helm-lsp-workspace-symbol) + (use-package wgrep-ag) + (use-package quelpa) + (use-package quelpa-use-package) + (use-package copilot :quelpa (copilot :fetcher github :repo "zerolfx/copilot.el" :branch "main" - :files ("dist" "*.el"))) - - ;; dap-mode - ;; (use-package dap-mode - ;; :defer t - ;; :ensure t :after lsp-mode - ;; :config - ;; (dap-mode t) - ;; (dap-ui-mode t)) + :files ("dist" "*.el")) + :config + (define-key copilot-completion-map (kbd "") 'copilot-accept-completion) + (define-key copilot-completion-map (kbd "TAB") 'copilot-accept-completion)) ;; ;; Turn `C-]' into a sticky "super" modifier. (define-key local-function-key-map [?\C-\]] 'event-apply-super-modifier) diff --git a/emacs.d/layers/python/init.el b/emacs.d/layers/python/init.el index a9308d8..89f8ad4 100644 --- a/emacs.d/layers/python/init.el +++ b/emacs.d/layers/python/init.el @@ -25,23 +25,5 @@ :hook (python-mode . sphinx-doc-mode) :commands sphinx-docs-mode) -;; Enable `black`ing files -;; https://github.com/wbolster/emacs-python-black -(use-package python-black - :defer t - :demand t - :after python - :hook (python-mode . python-black-on-save-mode)) - -;; Enable `isort`ing files -;; https://github.com/paetzke/py-isort.el -(use-package py-isort - :defer t - :demand t - :after python - :hook (before-save . py-isort-before-save)) - -;; Enable Flycheck for python -;; (enable-flycheck 'python-mode-hook) -;; (require 'dap-python) +(add-hook 'before-save-hook 'lsp-format-buffer)