diff --git a/config/config-languages.el b/config/config-languages.el
index 99b5d5d..07f3342 100644
--- a/config/config-languages.el
+++ b/config/config-languages.el
@@ -7,9 +7,9 @@
     :commands (nix-ts-mode)
     :mode "\\.nix\\'")
 
-  (use-package rust-mode
+  (use-package rust-ts-mode
     :defer t
-    :commands (rust-mode)
+    :commands (rust-ts-mode)
     :mode "\\.rs\\'")
 
   (use-package qml-mode
@@ -50,6 +50,12 @@
   (use-package nim-mode
     :defer t
     :commands (nim-mode)
-    :mode "\\.nim\\'"))
+    :mode "\\.nim\\'")
+
+  (use-package go-ts-mode
+    :defer t
+    :commands (go-ts-mode go-mod-ts-mode)
+    :mode (("\\.go\\'" . go-ts-mode)
+	   ("go.mod\\'" . go-mod-ts-mode))))
 
 (provide 'config-languages)
diff --git a/lib.nix b/lib.nix
index 364e92c..a11bf7a 100644
--- a/lib.nix
+++ b/lib.nix
@@ -25,7 +25,6 @@ let
             swiper
             base16-theme
             nix-ts-mode
-            rust-mode
             haskell-mode
             qml-mode
             tuareg