From 185c1eeda0d6292c2525557e63d4ac7f50f8596a Mon Sep 17 00:00:00 2001
From: George Rawlinson <george@rawlinson.net.nz>
Date: Mon, 8 Oct 2018 15:41:12 +1300
Subject: [PATCH] refactor(zsh): update android/java env vars

---
 zsh/.config/oh-my-zsh/custom/android.zsh | 7 +++++++
 zsh/.config/oh-my-zsh/custom/go.zsh      | 3 ---
 zsh/.zshrc                               | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 zsh/.config/oh-my-zsh/custom/android.zsh

diff --git a/zsh/.config/oh-my-zsh/custom/android.zsh b/zsh/.config/oh-my-zsh/custom/android.zsh
new file mode 100644
index 0000000..abc4ebf
--- /dev/null
+++ b/zsh/.config/oh-my-zsh/custom/android.zsh
@@ -0,0 +1,7 @@
+export JAVA_HOME=/usr/lib/jvm/default
+export ANDROID_HOME=$XDG_DATA_HOME/android/sdk
+export PATH=$PATH:$ANDROID_HOME/tools
+export PATH=$PATH:$ANDROID_HOME/tools/bin
+export PATH=$PATH:$ANDROID_HOME/platform-tools
+export PATH=$PATH:$ANDROID_HOME/emulator
+export ANDROID_SDK_HOME=$XDG_CONFIG_HOME/android
diff --git a/zsh/.config/oh-my-zsh/custom/go.zsh b/zsh/.config/oh-my-zsh/custom/go.zsh
index 7900b0c..b19362f 100644
--- a/zsh/.config/oh-my-zsh/custom/go.zsh
+++ b/zsh/.config/oh-my-zsh/custom/go.zsh
@@ -1,8 +1,5 @@
 # Export $GOPATH
 export GOPATH=$HOME/go
 
-# Always use Go modules, even inside GOPATH
-export GO111MODULE=on
-
 # Add Go binary directory to $PATH
 export PATH="$PATH:$GOPATH/bin"
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 68aa89a..19f1196 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -45,3 +45,4 @@ export TZ=:/etc/localtime
 # ensure system is aware of browser/editor preference
 export BROWSER="firefox-nightly"
 export EDITOR="nvim"
+