[zsh] fix java and some other stuff
This commit is contained in:
parent
5c3304bebf
commit
2bff5edc9e
3 changed files with 19 additions and 34 deletions
|
@ -15,22 +15,10 @@ setopt HIST_VERIFY
|
||||||
export EDITOR=nvim
|
export EDITOR=nvim
|
||||||
export READER=mupdf
|
export READER=mupdf
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#if [ "$(arch)" = "arm64" ]; then
|
|
||||||
eval "$(/opt/homebrew/bin/brew shellenv)"
|
|
||||||
#else
|
|
||||||
# eval "$(/usr/local/bin/brew shellenv)"
|
|
||||||
#fi
|
|
||||||
|
|
||||||
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
|
|
||||||
|
|
||||||
# bun
|
|
||||||
export BUN_INSTALL="$HOME/.bun"
|
|
||||||
export PATH="$BUN_INSTALL/bin:$PATH"
|
|
||||||
enable-fzf-tab
|
enable-fzf-tab
|
||||||
|
|
||||||
# opam configuration
|
# opam configuration
|
||||||
source $HOME/.opam/opam-init/init.zsh > /dev/null 2>&1 || true
|
source $HOME/.opam/opam-init/init.zsh > /dev/null 2>&1 || true
|
||||||
|
|
||||||
eval "$(direnv hook zsh)"
|
eval "$(direnv hook zsh)"
|
||||||
|
eval "$(/opt/homebrew/bin/brew shellenv)"
|
||||||
|
|
15
.zshenv
15
.zshenv
|
@ -4,19 +4,4 @@ TRAPUSR1() {
|
||||||
exec "${SHELL}"
|
exec "${SHELL}"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# Add paths
|
|
||||||
export PATH="$HOME/.local/share/nvim/mason/bin:$PATH"
|
|
||||||
export PATH="/Users/afonso/.local/bin:$PATH"
|
|
||||||
export PATH="/opt/homebrew/bin:$PATH"
|
|
||||||
export PATH="/opt/homebrew/opt/openjdk@17/bin:$PATH"
|
|
||||||
export PATH="$HOME/go/bin:$PATH"
|
|
||||||
export PATH="$HOME/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/bin:$PATH"
|
|
||||||
export PATH="$HOME/.cargo/bin:$PATH"
|
|
||||||
export PATH="$HOME/.ghcup/bin:$PATH"
|
|
||||||
export DYLD_LIBRARY_PATH="/opt/homebrew/lib:$DYLD_LIBRARY_PATH"
|
|
||||||
export JAVA_HOME="/opt/homebrew/opt/openjdk@17/libexec/openjdk.jdk/Contents/Home"
|
export JAVA_HOME="/opt/homebrew/opt/openjdk@17/libexec/openjdk.jdk/Contents/Home"
|
||||||
export PATH="$HOME/.miniforge3/bin:$PATH"
|
|
||||||
export PATH="/opt/homebrew/opt/texlive/bin/:$PATH"
|
|
||||||
eval "$(/opt/homebrew/bin/brew shellenv)"
|
|
||||||
|
|
||||||
|
|
24
.zshrc
24
.zshrc
|
@ -1,5 +1,17 @@
|
||||||
# If you come from bash you might have to change your $PATH.
|
# Add paths
|
||||||
# export PATH=$HOME/bin:/usr/local/bin:$PATH
|
export PATH="/usr/sbin:/sbin:$PATH"
|
||||||
|
export PATH="$HOME/.local/share/nvim/mason/bin:$PATH"
|
||||||
|
export PATH="/Users/afonso/.local/bin:$PATH"
|
||||||
|
export PATH="/opt/homebrew/bin:$PATH"
|
||||||
|
export PATH="$HOME/go/bin:$PATH"
|
||||||
|
export PATH="$HOME/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/bin:$PATH"
|
||||||
|
export PATH="$HOME/.cargo/bin:$PATH"
|
||||||
|
export PATH="$HOME/.ghcup/bin:$PATH"
|
||||||
|
export PATH="$HOME/.miniforge3/bin:$PATH"
|
||||||
|
export PATH="/opt/homebrew/opt/openjdk@17/bin:$PATH"
|
||||||
|
|
||||||
|
export GOPATH=$HOME/.go
|
||||||
|
export PATH=$PATH:$GOPATH/bin
|
||||||
|
|
||||||
# Path to your oh-my-zsh installation.
|
# Path to your oh-my-zsh installation.
|
||||||
export ZSH="$HOME/.oh-my-zsh"
|
export ZSH="$HOME/.oh-my-zsh"
|
||||||
|
@ -76,6 +88,7 @@ ZSH_CUSTOM=/Users/afonso/.config/zsh
|
||||||
source $HOME/.config/zsh/themes/gruvbox_dark.zsh
|
source $HOME/.config/zsh/themes/gruvbox_dark.zsh
|
||||||
source $HOME/.config/zsh/overrides.zsh
|
source $HOME/.config/zsh/overrides.zsh
|
||||||
|
|
||||||
|
zvm_after_init_commands+=('[ -f $HOME/.fzf.zsh ] && source $HOME/.fzf.zsh')
|
||||||
plugins=(zsh-vi-mode git sudo macos tmux command-not-found web-search zsh-autosuggestions zsh-history-substring-search zsh-syntax-highlighting fzf-tab)
|
plugins=(zsh-vi-mode git sudo macos tmux command-not-found web-search zsh-autosuggestions zsh-history-substring-search zsh-syntax-highlighting fzf-tab)
|
||||||
|
|
||||||
|
|
||||||
|
@ -129,11 +142,10 @@ else
|
||||||
else
|
else
|
||||||
export PATH="/Users/afonso/.miniforge3/bin:$PATH"
|
export PATH="/Users/afonso/.miniforge3/bin:$PATH"
|
||||||
fi
|
fi
|
||||||
|
if [ -f "/Users/afonso/.miniforge3/etc/profile.d/mamba.sh" ]; then
|
||||||
|
. "/Users/afonso/.miniforge3/etc/profile.d/mamba.sh"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
unset __conda_setup
|
unset __conda_setup
|
||||||
|
|
||||||
if [ -f "/Users/afonso/.miniforge3/etc/profile.d/mamba.sh" ]; then
|
|
||||||
. "/Users/afonso/.miniforge3/etc/profile.d/mamba.sh"
|
|
||||||
fi
|
|
||||||
# <<< conda initialize <<<
|
# <<< conda initialize <<<
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue