From 8a70a505efc78d0844493be394b164b7e0382dcd Mon Sep 17 00:00:00 2001 From: Ahmad Ansori Palembani Date: Wed, 22 Jun 2022 10:58:37 +0700 Subject: [PATCH] + Local script for macOS --- .config/zsh/.zshenv | 14 +++++++++----- .config/zsh/.zshrc | 9 +++++++++ 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.config/zsh/.zshenv b/.config/zsh/.zshenv index de5c417..75707fe 100644 --- a/.config/zsh/.zshenv +++ b/.config/zsh/.zshenv @@ -1,18 +1,22 @@ #!/bin/zsh -export JAVA_HOME="/usr/lib/jvm/java-11-openjdk" +if [[ "$OSTYPE" == "darwin"* ]]; then + export JAVA_HOME="$HOME/.sdkman/candidates/java/current" +else + export JAVA_HOME="/usr/lib/jvm/java-11-openjdk" +fi export ANDROID_SDK_ROOT="${XDG_CONFIG_HOME:-$HOME/.config}/android/Android/Sdk" export ANDROID_PREFS_ROOT="${XDG_CONFIG_HOME:-$HOME/.config}/android/Android/Sdk" export ANDROID_HOME="${XDG_CONFIG_HOME:-$HOME/.config}/android/Android/Sdk" export ANDROID_AVD_HOME="${XDG_CONFIG_HOME:-$HOME/.config}/android/.android/avd" # -- Path -# PATH="$(du "$HOME/.local/bin/" | cut -f2 | paste -sd ':')${PATH:+:${PATH}}" if [[ "$OSTYPE" == "darwin"* ]]; then - PATH="$HOME/.local/share/go/bin:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_AVD_HOME:$HOME/.local/share/npm/bin:$HOME/.local/share/cargo/bin:${PATH:+:${PATH}}" -else - PATH="$HOME/.local/share/go/bin:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_AVD_HOME:$HOME/.local/share/npm/bin:$HOME/.local/share/cargo/bin:$(du "$HOME/.local/bin/" | cut -f2 | paste -sd ':')${PATH:+:${PATH}}" + LOCAL_PATH=$(du "$HOME/.local/bin/" | cut -f2 > /tmp/path && paste -sd ':' /tmp/path) +elif [[ "$OSTYPE" == "linux-gnu" ]]; then + LOCAL_PATH="$(du "$HOME/.local/bin/" | cut -f2 | paste -sd ':')${PATH:+:${PATH}}" fi +PATH="$HOME/.local/share/go/bin:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_AVD_HOME:$HOME/.local/share/npm/bin:$HOME/.local/share/cargo/bin:$LOCAL_PATH${PATH:+:${PATH}}" # export RUST_SRC_PATH=$(rustc --print sysroot)/lib/rustlib/src/rust/library # -- IBus stuff (IME) diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index cf1426b..04f7bcc 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -49,3 +49,12 @@ source $ZSH_PLUGINS/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh source $ZSH_PLUGINS/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh 2>/dev/null #source $ZSH_CUSTOM/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh 2>/dev/null #source $ZSH_CUSTOM/plugins/fsh/fast-syntax-highlighting.plugin.zsh + +if [[ "$OSTYPE" == "darwin"* ]]; then + test -e "${ZDOTDIR}/.iterm2_shell_integration.zsh" && source "${ZDOTDIR}/.iterm2_shell_integration.zsh" + + + #THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!! + export SDKMAN_DIR="$HOME/.sdkman" + [[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && source "$HOME/.sdkman/bin/sdkman-init.sh" +fi