diff --git a/configs/lang-go.el b/configs/lang-go.el
index 759784f..9cb0cd3 100644
--- a/configs/lang-go.el
+++ b/configs/lang-go.el
@@ -9,7 +9,15 @@
 
 ;;; Code:
 
-(use-package go-mode)
+(use-package go-ts-mode
+  :ensure nil
+  :hook
+  (go-ts-mode . (lambda ()
+                  (add-hook 'before-save-hook
+                            (lambda ()
+                              (ignore-errors (eglot-code-actions nil nil "source.organizeImports" t))
+                              (eglot-format-buffer))
+                            nil 'local))))
 
 (provide 'lang-go)
 ;;; lang-go.el ends here