From 872b349d0693b07267c8b3ff8f5cd61be3434611 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Sun, 6 May 2018 22:52:32 +0100
Subject: [PATCH] Install golang via homebrew instead of gvm (Go Version
 Manager)

---
 bin/bootstrap-homebrew |  1 +
 install.sh             |  7 -------
 shell/golang.sh        | 15 +++------------
 3 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/bin/bootstrap-homebrew b/bin/bootstrap-homebrew
index 8a0f23c..b0cbbdd 100755
--- a/bin/bootstrap-homebrew
+++ b/bin/bootstrap-homebrew
@@ -46,6 +46,7 @@ main() {
     git
     git-crypt
     git-standup
+    go
     heroku
     htop
     httpie
diff --git a/install.sh b/install.sh
index 9680ab0..1c44f85 100755
--- a/install.sh
+++ b/install.sh
@@ -102,10 +102,6 @@ install_nvm () {
   git_clone 'https://github.com/creationix/nvm.git' "$TARGET/.nvm"
 }
 
-install_gvm () {
-  git_clone 'https://github.com/moovweb/gvm.git' "$TARGET/.gvm"
-}
-
 install_rustup () {
   curl https://sh.rustup.rs -sSf | sh
 }
@@ -161,9 +157,6 @@ case "$1" in
   nvm)
     install_nvm
     ;;
-  gvm)
-    install_gvm
-    ;;
   rustup)
     install_rustup
     ;;
diff --git a/shell/golang.sh b/shell/golang.sh
index d2a8ed8..30fb6e4 100755
--- a/shell/golang.sh
+++ b/shell/golang.sh
@@ -2,21 +2,12 @@
 # Go (golang) environment setup.
 #
 
-export MYGOPATH="$HOME/Projects/Go"
-
-# load gvm
-[[ -s "$HOME/.gvm/scripts/gvm" ]] && source "$HOME/.gvm/scripts/gvm"
-
-# setup GOPATH after loading gvm
-export GOPATH="$GOPATH:$MYGOPATH"
-path_prepend "$MYGOPATH/bin"
+export GOPATH="$HOME/.go:$HOME/Projects/Go"
+path_prepend "$HOME/.go/bin"
+path_prepend "$HOME/Projects/Go"
 
 # aliases
 alias gv="govendor"
-gvm-use() {
-  gvm use "$@"
-  export GOPATH="$GOPATH:$MYGOPATH"
-}
 
 install_go_global_packages () {
   local packages=(