From e914794ff2741872aa02b13c83cd6c4d1a4eadd6 Mon Sep 17 00:00:00 2001
From: ViViDboarder <ViViDboarder@gmail.com>
Date: Tue, 25 Jul 2017 14:03:44 -0700
Subject: [PATCH] fish: Clean up paths and env

---
 assets/default/fish/init.fish       |  1 +
 assets/default/fish/init/env.fish   |  9 +++++++++
 assets/default/fish/init/paths.fish | 22 ++--------------------
 3 files changed, 12 insertions(+), 20 deletions(-)
 create mode 100644 assets/default/fish/init/env.fish

diff --git a/assets/default/fish/init.fish b/assets/default/fish/init.fish
index b2028f2..551cb5c 100644
--- a/assets/default/fish/init.fish
+++ b/assets/default/fish/init.fish
@@ -2,4 +2,5 @@ set -gx fish_function_path "$fish_synced_dir/functions" $fish_function_path
 set -gx fish_complete_path "$fish_synced_dir/completions" $fish_complete_path
 
 source_synced 'init/alias'
+source_synced 'init/env'
 source_synced 'init/paths'
diff --git a/assets/default/fish/init/env.fish b/assets/default/fish/init/env.fish
new file mode 100644
index 0000000..72f4a9b
--- /dev/null
+++ b/assets/default/fish/init/env.fish
@@ -0,0 +1,9 @@
+# Increase memory sizes for java using Ant
+set -gx ANT_OPTS "-Xmx2048m -Xms512m"
+
+# FZF
+set -gx FZF_DEFAULT_COMMAND 'ag -g ""'
+set -gx FZF_CTRL_T_COMMAND "$FZF_DEFAULT_COMMAND \$dir"
+
+# Vim Colors so that they can be set by env
+set -q VIM_COLOR; or set -gx VIM_COLOR wombat256mod
diff --git a/assets/default/fish/init/paths.fish b/assets/default/fish/init/paths.fish
index 98ac7f8..422e1d8 100644
--- a/assets/default/fish/init/paths.fish
+++ b/assets/default/fish/init/paths.fish
@@ -20,8 +20,7 @@ else if [ $det_os = "mac" ]
     set android_sdk $HOME/workspace/android-sdk-macosx
 
     # Set go paths
-    set goroot /opt/local/lib/go
-    set gopath $HOME/workspace/go_path
+    set -gx GOPATH $HOME/workspace/go_path
 
     # set PATH $HOME/Library/Python/2.7/bin $PATH
     # Fix Python path on OSX to avoid considering System extras over newer versions
@@ -29,12 +28,7 @@ else if [ $det_os = "mac" ]
 end
 
 # Google GO
-if [ -d "$goroot" ]
-    set -gx GOROOT $goroot
-    set -gx PATH $PATH $GOROOT/bin
-end
-if [ -d "$gopath" ]
-    set -gx GOPATH $gopath
+if [ -d "$GOPATH" ]
     set -gx PATH $PATH $GOPATH/bin
 end
 
@@ -46,15 +40,3 @@ end
 
 # Home path
 set -gx  PATH $HOME/bin $PATH
-
-#[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
-
-# Increase memory sizes for java using Ant
-set -gx ANT_OPTS "-Xmx2048m -Xms512m"
-
-# FZF
-set -gx FZF_DEFAULT_COMMAND 'ag -g ""'
-set -gx FZF_CTRL_T_COMMAND "$FZF_DEFAULT_COMMAND \$dir"
-
-# Vim Colors so that they can be set by env
-set -q VIM_COLOR; or set -gx VIM_COLOR wombat256mod