go configuration

1 files changed, 21 insertions, 6 deletions

diff --git a/config.org b/config.org
index 19b1529..cd6bd0b 100644
--- a/config.org
+++ b/config.org
@@ -561,10 +561,14 @@ Installation:
 (add-hook 'racer-mode-hook #'company-mode)
 #+END_SRC
 ** Go
-#+BEGIN_SRC emacs-lisp
-(use-package go-mode
-  :ensure t
-  :commands (go-mode))
+The golang setup requires some additional packages:
+#+BEGIN_SRC bash
+# Code complete
+go get -u github.com/nsf/gocode
+# Finds symbols in the code
+go get -u github.com/rogpeppe/godef
+# Updates imports adding missing ones and removing unused ones
+go get -u golang.org/x/tools/cmd/goimports
 #+END_SRC
 
 #+BEGIN_SRC emacs-lisp
@@ -574,9 +578,20 @@ Installation:
   ;;(go-eldoc-setup)
   (add-hook 'before-save-hook 'gofmt-before-save)
   (local-set-key (kbd "M-.") 'godef-jump)
-  (local-set-key (kbd "M-*") 'pop-tag-mark))
+  (local-set-key (kbd "M-*") 'pop-tag-mark)
+  (local-set-key (kbd "C-c /") 'comment-or-uncomment-region))
 
-(add-hook 'go-mode-hook 'my-golang-setup)
+(use-package go-mode
+  :ensure t
+  :commands (go-mode)
+  :config
+  (add-hook 'go-mode-hook 'my-golang-setup))
+
+(use-package company-go
+  :ensure t
+  :config
+  (add-hook 'go-mode-hook 'company-mode)
+  (add-to-list 'company-backends 'company-go))
 #+END_SRC
 ** Javascript/JSON
 #+BEGIN_SRC emacs-lisp