summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--emacs.d/custom/fcuny-prog.el22
1 files changed, 8 insertions, 14 deletions
diff --git a/emacs.d/custom/fcuny-prog.el b/emacs.d/custom/fcuny-prog.el
index 76b65a9..8987496 100644
--- a/emacs.d/custom/fcuny-prog.el
+++ b/emacs.d/custom/fcuny-prog.el
@@ -16,18 +16,17 @@
(company-tooltip-limit 12)
(company-idle-delay 1))
-(use-package company-posframe
- :ensure t
- :diminish company-posframe-mode
- :hook (company-mode . company-posframe-mode))
-
(use-package lsp-mode
:ensure t
- :hook ((go-mode . lsp-deferred))
+ :hook ((go-mode . lsp-deferred)
+ (lsp-mode . lsp-enable-which-key-integration))
:commands (lsp lsp-deferred)
:custom
(lsp-session-file (expand-file-name "lsp-session-v1" fcuny/path-emacs-var))
- (lsp-enable-snippet nil)
+ (lsp-enable-snippet t)
+ (lsp-prefer-capf t)
+ (lsp-enable-completion-at-point t)
+ (lsp-enable-indentation t)
(lsp-prefer-flymake nil))
(use-package lsp-ui
@@ -42,14 +41,9 @@
(lsp-ui-imenu-enable t)
(lsp-ui-flycheck-enable t))
-(use-package company-lsp
+(use-package lsp-ivy
:ensure t
- :commands company-lsp
- :config
- (push 'company-lsp company-backends)
- :custom
- (company-lsp-enable-snippet t)
- (company-lsp-cache-candidates t))
+ :commands lsp-ivy-workspace-symbol)
(use-package sh-script
:mode ("bashrc" . sh-mode)