Merge branch 'main' of ssh://git.zander.im/Zander671/emacs-config

init.el

@@ -2066,12 +2066,10 @@ This is :around advice, so OLDFUN is the real function
   :hook (go-mode . my/eglot-if-trusted)
   :config
   (my/setup-c-style-newline-keys go-mode-map))
-;; (use-package go-ts-mode
-;;   :ensure nil
-;;   :hook (go-ts-mode . my/eglot-if-trusted)
-;;   :custom (go-ts-mode-indent-offset 4)
-;;   :config
-;;   (my/setup-c-style-newline-keys go-ts-mode-map))
+(use-package go-ts-mode
+  :ensure nil
+  :hook (go-ts-mode . my/eglot-if-trusted)
+  :custom (go-ts-mode-indent-offset 4))
 
 ;; rust
 (use-package rust-mode)