summary refs log tree commit diff
path: root/emacs/custom/my-lang-go.el
diff options
context:
space:
mode:
Diffstat (limited to 'emacs/custom/my-lang-go.el')
-rw-r--r--emacs/custom/my-lang-go.el13
1 files changed, 3 insertions, 10 deletions
diff --git a/emacs/custom/my-lang-go.el b/emacs/custom/my-lang-go.el
index aa9f43b..fdfb8ee 100644
--- a/emacs/custom/my-lang-go.el
+++ b/emacs/custom/my-lang-go.el
@@ -7,23 +7,16 @@
 
 (require 'go-mode)
 (require 'gotest)
-(require 'lsp-mode)
-
-(add-hook 'go-mode-hook #'lsp-deferred)
-
-(defun my/lsp-go-install-save-hooks ()
-  "Set up before-save hooks to format buffer and add/delete imports."
-  (add-hook 'before-save-hook #'lsp-format-buffer t t)
-  (add-hook 'before-save-hook #'lsp-organize-imports t t))
+(require 'eglot)
 
 (defun my/go-mode-setup ()
   "Hooks for `go-mode'."
   (setq tab-width 4)
   (setq go-test-verbose t))
 
-(add-hook 'go-mode-hook #'my/lsp-go-install-save-hooks)
+(add-hook 'go-mode-hook 'eglot-ensure)
+(add-hook 'nix-mode-hook #'(lambda() (add-hook 'before-save-hook 'eglot-format-buffer nil t)))
 (add-hook 'go-mode-hook #'my/go-mode-setup)
-(add-hook 'go-mode-hook #'yas-minor-mode)
 
 (provide 'my-lang-go)