diff --git a/.zimrc b/.zimrc index d600952..fdcf8ef 100644 --- a/.zimrc +++ b/.zimrc @@ -6,6 +6,7 @@ zmodule crater2150-zsh/chroma-z zmodule $ZDOTDIR/plugins/tmpsrc zmodule $ZDOTDIR/plugins/pyenv +zmodule $ZDOTDIR/plugins/cs-java-home zmodule $ZDOTDIR/plugins/highlight-config zmodule zsh-users/zsh-syntax-highlighting diff --git a/aliases/functions b/aliases/functions index 49ddeb3..9b27019 100644 --- a/aliases/functions +++ b/aliases/functions @@ -52,8 +52,8 @@ fork() { "$@" &>/dev/null &| } -alias en="dict.cc.py de en" -alias de="dict.cc.py en de" +alias en="pipx run dict.cc.py de en" +alias de="pipx run dict.cc.py en de" su() { if [[ -z "$@" ]]; then diff --git a/aliases/void b/aliases/void index 434c236..bd84e83 100644 --- a/aliases/void +++ b/aliases/void @@ -88,6 +88,12 @@ sv-manage() { s@run@\x1b[1;92mrun\x1b[0m@g s@down@\x1b[1;31mdown\x1b[0m@g " | column -t + ;; + status) + for service in ${SVDIR:-/var/service}/*/supervise; do + sv status ${service:h} + done + ;; esac } diff --git a/plugins/cs-java-home/cs-java-home.plugin.zsh b/plugins/cs-java-home/cs-java-home.plugin.zsh new file mode 100644 index 0000000..f64f84d --- /dev/null +++ b/plugins/cs-java-home/cs-java-home.plugin.zsh @@ -0,0 +1,41 @@ +typeset -a chpwd_functions __chromaz_extra_left + +SYSTEM_JAVA_HOME=${CS_FORMER_JAVA_HOME:-$JAVA_HOME} + +local cs_jvm_id +local cs_java_home + +remove-from-path() { + for elem in $@; do + path=("${(@)path:#$elem}") + done +} + +cs-set-java-home() { + local dir=${1:-${PWD:a}} + if [[ $dir == / ]]; then + export JAVA_HOME=${SYSTEM_JAVA_HOME} + remove-from-path $cs_java_home/bin + cs_jvm_id= + return + fi + if [[ -e $dir/.jvm ]]; then + cs_jvm_id=$(<$dir/.jvm) + #echo "Setting Java version to ${cs_jvm_id}" + cs_java_home=$(cs java-home --jvm ${cs_jvm_id}) + path=( $cs_java_home/bin $path ) + export JAVA_HOME=${cs_java_home} + else + cs-set-java-home ${dir:h} + fi + + # +} + +cs-current-java() { + echo ${cs_jvm_id:+JVM: }${cs_jvm_id} +} + +chpwd_functions+=cs-set-java-home +__chromaz_extra_left+=cs-current-java +cs-set-java-home