diff --git a/dotfiles/emacs.d/init.el b/dotfiles/emacs.d/init.el index f6ddbe3..b3ad9b1 100644 --- a/dotfiles/emacs.d/init.el +++ b/dotfiles/emacs.d/init.el @@ -199,8 +199,22 @@ There are two things you can do about this warning: (add-hook 'after-init-hook #'global-flycheck-mode) ;; LSP +(use-package lsp-mode + :ensure t + :config + (setq lsp-print-io nil) + + (use-package lsp-ui + :ensure t + :config + (setq lsp-ui-sideline-ignore-duplicate t) + (add-hook 'lsp-mode-hook 'lsp-ui-mode)) + + (use-package company-lsp + :ensure t + :config + (push 'company-lsp company-backends))) -(require 'lsp-mode) ;;;;; PYTHON ;;;;;;;;;;;;;;;;;; ;; @@ -260,7 +274,9 @@ There are two things you can do about this warning: (add-hook 'python-mode-hook (lambda () (add-to-list 'company-backends 'company-jedi))) + ;; Use microsoft's python language server +(add-hook 'python-mode-hook (lambda () (lsp-python-enable))) (require 'lsp-python-ms) (use-package lsp-python-ms :ensure t @@ -333,6 +349,8 @@ There are two things you can do about this warning: (define-key counsel-gtags-mode-map (kbd "M-s") 'counsel-gtags-find-symbol) (define-key counsel-gtags-mode-map (kbd "M-,") 'counsel-gtags-go-backward)) + + ;;-------------------------------------------------------------------------------------- ;; Install and load Packages ;;-------------------------------------------------------------------------------------- @@ -348,7 +366,7 @@ There are two things you can do about this warning: '(lisp-indent-function (quote common-lisp-indent-function)) '(package-selected-packages (quote - (projectile smex grizzl flycheck-pos-tip flycheck material-theme expand-region wrap-region rainbow-delimiters powerline linum-relative golden-ratio fill-column-indicator autopair exec-path-from-shell ws-butler yaml-mode python-mode protobuf-mode paredit nasm-mode meson-mode markdown-mode magit gradle-mode gitignore-mode feature-mode counsel company-jedi jedi-core company-emacs-eclim company-irony company ag)))) + (company-lsp projectile smex grizzl flycheck-pos-tip flycheck material-theme expand-region wrap-region rainbow-delimiters powerline linum-relative golden-ratio fill-column-indicator autopair exec-path-from-shell ws-butler yaml-mode python-mode protobuf-mode paredit nasm-mode meson-mode markdown-mode magit gradle-mode gitignore-mode feature-mode counsel company-jedi jedi-core company-emacs-eclim company-irony company ag)))) (custom-set-faces ;; custom-set-faces was added by Custom.