From 405f4612c2a5a8ab59486b2954f3352d7cf2c983 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Mon, 11 Jul 2016 14:21:13 +0100
Subject: [PATCH] Update config for go-mode

---
 modules/siren-go.el | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/modules/siren-go.el b/modules/siren-go.el
index 5458df5..5c0ec95 100644
--- a/modules/siren-go.el
+++ b/modules/siren-go.el
@@ -8,7 +8,14 @@
 
 (require 'siren-programming)
 (siren-require-packages
- '(go-mode company-go go-eldoc go-projectile gotest flycheck-gometalinter))
+ '(go-mode
+   company-go
+   go-eldoc
+   go-projectile
+   gotest
+   go-guru
+   go-rename
+   flycheck-gometalinter))
 
 (when (memq window-system '(mac ns))
   (exec-path-from-shell-copy-env "GOPATH"))
@@ -28,6 +35,8 @@
 (eval-after-load 'go-mode
   '(progn
      (require 'go-projectile)
+     (require 'go-guru)
+     (require 'go-rename)
      (require 'company-go)
 
      (defun siren-go-mode-defaults ()
@@ -40,6 +49,8 @@
          (define-key map (kbd "C-c m") 'go-test-current-file)
          (define-key map (kbd "C-c .") 'go-test-current-test)
          (define-key map (kbd "C-c b") 'go-run)
+         (define-key map (kbd "C-c d") 'godef-jump)
+         (define-key map (kbd "C-c C-j") 'avy-goto-word-or-subword-1)
          (define-key map (kbd "C-h f") 'godoc-at-point))
 
        ;; Prefer goimports to gofmt if installed
@@ -60,6 +71,10 @@
        ;; enable hide/show
        (hs-minor-mode 1)
 
+       ;; go-guru
+       (go-guru-hl-identifier-mode 1)
+       (setq go-guru-hl-identifier-idle-time 0.1)
+
        ;; stop whitespace being highlighted
        (whitespace-toggle-options '(tabs))