From 23e8ed4aced0ecb49e9497fa9b52fa7982a7bef4 Mon Sep 17 00:00:00 2001 From: Fabio Scotto di Santolo Date: Fri, 8 Aug 2025 23:54:11 +0200 Subject: [PATCH] Fix exported environment variables --- zsh/.zshenv | 30 +++++++++++++++++++++++------- zsh/.zshrc | 4 ++-- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/zsh/.zshenv b/zsh/.zshenv index f916912..f4f5822 100644 --- a/zsh/.zshenv +++ b/zsh/.zshenv @@ -1,5 +1,10 @@ export DOTFILES="$HOME/.dotfiles" +export MANPAGER="nvim +Man!" export EDITOR=nvim +export HELPDIR=/usr/share/zsh/"${ZSH_VERSION}"/help +export MISE_HOME=$HOME/.local/share/mise/installs + +# fzf export FZF_DEFAULT_COMMAND="fd --hidden --type file --strip-cwd-prefix --exclude .git" export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" export FZF_ALT_C_COMMAND="fd --hidden --type directory --strip-cwd-prefix --exclude .git" @@ -13,12 +18,23 @@ export FZF_DEFAULT_OPTS=" \ --color=border:#313244,label:#CDD6F4" export FZF_TMUX_OPTS=" -p90%,70%" export FZF_CTRL_T_OPTS="--preview 'bat --color=always -n --line-range :500 {}'" -export FZF_ALT_C_OPTS="--preview 'eza --treee --color=always {} | head -200'" -export GOPATH="$HOME/.local/share/Go" -export GOBIN=$GOPATH/bin -export GRAALVM_HOME="${HOME}/.local/share/mise/installs/java/graalvm-community-23.0.1" -export JAVA_HOME="${HOME}/.local/share/mise/installs/java/23.0.1" -export HELPDIR=/usr/share/zsh/"${ZSH_VERSION}"/help -export JMETER_HOME="$(which jmeter)" +export FZF_ALT_C_OPTS="--preview 'eza --tree --color=always {} | head -200'" + +# Golang +if command -v go >/dev/null 2>&1; then + export GOPATH="$HOME/.local/share/Go" + export GOBIN="$GOPATH/bin" +fi + +# Java +if command -v java >/dev/null 2>&1; then + export JAVA_HOME="$(dirname $(mise bin-paths | grep -i java))" +fi + +if command -v jmeter >/dev/null 2>&1; then + export JMETER_HOME="$(which jmeter)" +fi + +# Python export VIRTUAL_ENV_DISABLE_PROMPT=1 diff --git a/zsh/.zshrc b/zsh/.zshrc index 91df853..6323ea4 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -4,8 +4,6 @@ # Path to your oh-my-zsh installation. export ZSH="$HOME/.oh-my-zsh" -[[ ! -f ~/.zshenv ]] || source ~/.zshenv - # Set name of the theme to load --- if set to "random", it will # load a random theme each time oh-my-zsh is loaded, in which case, # to know which specific one was loaded, run: echo $RANDOM_THEME @@ -89,6 +87,8 @@ source $ZSH/oh-my-zsh.sh # User configuration +[[ ! -f ~/.zshenv ]] || source ~/.zshenv + # export MANPATH="/usr/local/man:$MANPATH" # You may need to manually set your language environment