diff options
Diffstat (limited to '')
| -rw-r--r-- | config/init-completion.el | 13 | ||||
| -rw-r--r-- | config/init-lsp.el | 7 |
2 files changed, 5 insertions, 15 deletions
diff --git a/config/init-completion.el b/config/init-completion.el index e5ec83b..fc65e3d 100644 --- a/config/init-completion.el +++ b/config/init-completion.el @@ -24,24 +24,13 @@ :ensure t :custom (corfu-auto t) - (corfu-auto-prefix 2) - (corfu-preview-current nil) - (corfu-auto-delay 0.2) - (corfu-popupinfo-delay '(0.4 . 0.2)) - :config - (setq tab-always-indent 'complete) - :custom-face - (corfu-border ((t (:inherit region :background unspecified)))) :bind ("M-/" . completion-at-point) :hook ((after-init . global-corfu-mode) (global-corfu-mode . corfu-popupinfo-mode))) (use-package cape :demand t - :ensure t - :init - (add-to-list 'completion-at-point-functions #'cape-file) - (advice-add 'eglot-completion-at-point :around #'cape-wrap-buster)) + :ensure t) (use-package marginalia :hook (after-init . marginalia-mode)) diff --git a/config/init-lsp.el b/config/init-lsp.el index bad227d..9ad6f40 100644 --- a/config/init-lsp.el +++ b/config/init-lsp.el @@ -8,19 +8,20 @@ ;;; Code: (use-package eglot - :ensure t :after yasnippet :bind (:map eglot-mode-map ("C-c l a" . eglot-code-actions) - ("C-c l r" . eglot-rename)) + ("C-c l r" . eglot-rename) + ("C-c l f" . eglot-format)) :config + (setq eglot-autoshutdown t) (setq-default eglot-workspace-configuration '((gopls (usePlaceholders . t) (staticcheck . t) (completeUnimported . t)))) - ;; uses https://github.com/oxalica/nil for the LSP server instead of rnix + ;; uses https://github.com/nix-community/nixd for the LSP server instead of rnix (add-to-list 'eglot-server-programs '(nix-mode . ("nixd")))) (provide 'init-lsp) |