From d99d05740604131cf8fd502825afa9c24aaa70c4 Mon Sep 17 00:00:00 2001
From: Franck Cuny <fcuny@twitter.com>
Date: Sun, 6 Oct 2019 11:06:26 -0700
Subject: [emacs] clean up go's configuration.

The list of tools to install is move to an org file where I can
execute the block to install everything.

Remove extra new lines that make the file harder to read.
---
 emacs.d/custom/fcuny-go.el | 35 ++++++++---------------------------
 1 file changed, 8 insertions(+), 27 deletions(-)

(limited to 'emacs.d/custom')

diff --git a/emacs.d/custom/fcuny-go.el b/emacs.d/custom/fcuny-go.el
index f2e9443..9a83688 100644
--- a/emacs.d/custom/fcuny-go.el
+++ b/emacs.d/custom/fcuny-go.el
@@ -1,27 +1,8 @@
-;; go tools that are needed:
-;; go get -u github.com/mdempsky/gocode
-;; go get -u github.com/rogpeppe/godef
-;; go get -u golang.org/x/tools/cmd/gopls
-;; go get -u golang.org/x/tools/cmd/goimports
-;; go get -u golang.org/x/tools/cmd/gorename
-;; go get -u golang.org/x/tools/cmd/gotype
-;; go get -u golang.org/x/tools/cmd/godoc
-;; go get -u github.com/go-delve/delve/cmd/dlv
-;; go get -u github.com/josharian/impl
-;; go get -u github.com/cweill/gotests/...
-;; go get -u github.com/fatih/gomodifytags
-;; go get -u github.com/davidrjenni/reftools/cmd/fillstruct
-;; go get -u github.com/uudashr/gopkgs/cmd/gopkgs
-;; go get -u onnef.co/go/tools/...
-
 (use-package go-mode
   :ensure t
-
   :after (exec-path-from-shell flycheck flyspell company company-go hydra)
-
   :hook ((go-mode . fcuny/go-mode-setup)
          (go-mode . company-mode))
-
   :custom
   (godoc-use-completing-read t)
   (gofmt-command "goimports")
@@ -41,14 +22,14 @@
   (when (memq window-system '(mac ns))
     (exec-path-from-shell-copy-env "GOPATH"))
 
-  (defhydra hydra-go-menu (:columns 2)
+  (defhydra hydra-go-menu (:columns 2 :hint nil)
     "
 ^find       ^     ^goto    ^       ^test^
 ^-----------^     ^--------^       ^----^
 _r_: referrers    _d_: definition  _T_: test current test
 _i_: implements   _a_: arguments   _F_: test current file
 _D_: describe     _f_: function    _P_: test current package
-                _R_: return
+^ ^               _R_: return
 "
     ("r" go-guru-referrers)
     ("i" go-guru-implements)
@@ -67,28 +48,28 @@ _D_: describe     _f_: function    _P_: test current package
 (use-package go-guru
   :ensure t
   :after go-mode
-
   :commands (go-guru-describe go-guru-freevars go-guru-implements go-guru-peers
              go-guru-referrers go-guru-definition go-guru-pointsto
              go-guru-callstack go-guru-whicherrs go-guru-callers go-guru-callees
              go-guru-expand-region)
-
   :config
   (unless (executable-find "guru")
     (warn "go-mode: couldn't find guru, refactoring commands won't work"))
-
   (add-hook 'go-mode-hook #'go-guru-hl-identifier-mode))
 
 (use-package go-eldoc
   :ensure t
   :after go-mode
-
   :config
   (add-hook 'go-mode-hook 'go-eldoc-setup))
 
-(use-package godoctor :ensure t :after go-mode)
+(use-package godoctor
+  :ensure t
+  :after go-mode)
 
-(use-package gotest :ensure t :after go-mode)
+(use-package gotest
+  :ensure t
+  :after go-mode)
 
 (use-package company-go
   :ensure t
-- 
cgit 1.4.1