zsh: use ~/.local/bin instead of ~/.bin and checks for android sdk and fzf

1 files changed, 11 insertions, 3 deletions

diff --git a/zsh/.zprofile b/zsh/.zprofile
index 200d6a8..0980794 100755
--- a/zsh/.zprofile
+++ b/zsh/.zprofile
@@ -20,10 +20,13 @@ export MTP_NO_PROBE="1"
 
 export XDG_CONFIG_HOME="$HOME/.config"
 
+export PATH="$HOME/.local/bin:$PATH"
 
 # Android SDK
-export ANDROID_HOME="$HOME/.local/share/android-sdk"
-export PATH="$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_HOME/tools/bin:$PATH"
+if [ -d "$HOME/.local/share/android-sdk" ]; then
+  export ANDROID_HOME="$HOME/.local/share/android-sdk"
+  export PATH="$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_HOME/tools/bin:$PATH"
+fi
 
 # bin
 export PATH="$HOME/.bin:$PATH"
@@ -36,7 +39,7 @@ fi
 
 # Rust
 if type "rustc" > /dev/null; then
-  export PATH="$HOME/.cargo/bin:$HOME/.local/bin:$PATH"
+  export PATH="$HOME/.cargo/bin:$PATH"
   export RUST_SRC_PATH="$(rustc --print sysroot)/lib/rustlib/src/rust/src"
 fi
 
@@ -51,6 +54,11 @@ if type "ruby" > /dev/null; then
   export PATH="$PATH:$(ruby -e 'puts Gem.user_dir')/bin"
 fi
 
+# fzf
+if type "fzf" > /dev/null && type "rg" > /dev/null; then
+  export FZF_DEFAULT_COMMAND="rg --hidden --follow --ignore-vcs --files --iglob '\!.git'"
+fi
+
 # Aliases
 alias open=xdg-open