diff --git a/.emacs b/.emacs
index c77d366..50ea691 100755
--- a/.emacs
+++ b/.emacs
@@ -56,6 +56,10 @@
 (unless (package-installed-p 'lsp-mode)
   (package-install 'lsp-mode))
 
+(unless (package-installed-p 'go-mode)
+  (package-refresh-contents)
+  (package-install 'go-mode))
+
 (use-package lsp-mode
   :init
   :config
@@ -76,6 +80,7 @@
   :hook (;; replace XXX-mode with concrete major-mode(e. g. python-mode)
          (c-mode . lsp)
          (c++-mode . lsp)
+         (go-mode . lsp)
          (haskell-mode . lsp)
          (python-mode . lsp))
   :commands lsp)
@@ -192,8 +197,7 @@
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
  '(inhibit-startup-screen t)
- '(package-selected-packages
-   '(lsp-haskell benchmark-init company simpleclip rust-mode org-cliplink neotree magit gruber-darker-theme go-mode evil dash-functional all-the-icons)))
+ '(package-selected-packages nil))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/.gitconfig b/.gitconfig
index c8a495b..5ea8248 100755
--- a/.gitconfig
+++ b/.gitconfig
@@ -18,3 +18,5 @@
 	helper = !/usr/bin/gh auth git-credential
 [credential]
 	helper = store
+[core]
+	editor = emacs