fish: Clean up paths and env

This commit is contained in:
ViViDboarder 2017-07-25 14:03:44 -07:00
parent ae71df8263
commit e914794ff2
3 changed files with 12 additions and 20 deletions

View File

@ -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 set -gx fish_complete_path "$fish_synced_dir/completions" $fish_complete_path
source_synced 'init/alias' source_synced 'init/alias'
source_synced 'init/env'
source_synced 'init/paths' source_synced 'init/paths'

View File

@ -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

View File

@ -20,8 +20,7 @@ else if [ $det_os = "mac" ]
set android_sdk $HOME/workspace/android-sdk-macosx set android_sdk $HOME/workspace/android-sdk-macosx
# Set go paths # Set go paths
set goroot /opt/local/lib/go set -gx GOPATH $HOME/workspace/go_path
set gopath $HOME/workspace/go_path
# set PATH $HOME/Library/Python/2.7/bin $PATH # set PATH $HOME/Library/Python/2.7/bin $PATH
# Fix Python path on OSX to avoid considering System extras over newer versions # Fix Python path on OSX to avoid considering System extras over newer versions
@ -29,12 +28,7 @@ else if [ $det_os = "mac" ]
end end
# Google GO # Google GO
if [ -d "$goroot" ] if [ -d "$GOPATH" ]
set -gx GOROOT $goroot
set -gx PATH $PATH $GOROOT/bin
end
if [ -d "$gopath" ]
set -gx GOPATH $gopath
set -gx PATH $PATH $GOPATH/bin set -gx PATH $PATH $GOPATH/bin
end end
@ -46,15 +40,3 @@ end
# Home path # Home path
set -gx PATH $HOME/bin $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