aselimov/SelimovDE
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update command separations for mac and linux setups

Browse source
This commit is contained in:
Alex Selimov 2025-09-09 13:34:20 -04:00
parent a1a000db62
commit d8783c14a0
No known key found for this signature in database
GPG key ID: BC03C17FF5CFFFD2
2 changed files with 25 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

44
home/.zshrc
View file

@ -23,17 +23,15 @@ compinit
export OMPI_MCA_rmaps_base_oversubscribe=1
export CLICOLOR=1
export LSCOLORS=ExGxBxDxCxEgEdxbxgxcxd
alias vi="nvim"
alias vim="nvim"
alias mergepdf="gs -dBATCH -dNOPAUSE -dQUIET -sDEVICE=pdfwrite -sOutputFile=output.pdf"
alias ddg="w3m ddg.gg"
alias cal="khal calendar"
#alias sxiv="sxiv-rifle"
alias clip2png="xclip -selection clipboard -target image/png -out"
function addbin(){
ln -s $PWD/$1 /home/aselimov/bin
load_env() {
set -a
. "$1"
set +a
}
alias clip2png="xclip -selection clipboard -target image/png -out"
export XKB_DEFAULT_OPTIONS="caps:escape"
export PASSWORD_STORE_CHARACTER_SET='a-zA-Z0-9+\-$!*_='
@ -49,16 +47,10 @@ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/cuda-12.8/lib64"
[ -f "/home/aselimov/.ghcup/env" ] && . "/home/aselimov/.ghcup/env" # ghcup-env
export PYENV_ROOT="$HOME/.pyenv"
[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
eval "$(pyenv init - zsh)"
# Settings that need to swap between Mac and Linux
if [ "$(uname)" = "Darwin" ]; then
export PATH="$PATH:/opt/homebrew/bin"
alias ls="gls --classify --group-directories-first --color"
else
alias ls="ls --classify --group-directories-first --color"
if [ $(which pyenv 2>&1 1>/dev/null) ]; then
export PYENV_ROOT="$HOME/.pyenv"
[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
eval "$(pyenv init - zsh)"
fi
eval "$(starship init zsh)"
@ -73,3 +65,17 @@ source "$HOME/.config/zsh/zsh-history-substring-search/zsh-history-substring-sea
bindkey '^[[A' history-substring-search-up
bindkey '^[[B' history-substring-search-down
# Settings that need to swap between Mac and Linux
if [ "$(uname)" = "Darwin" ]; then
export PATH="$PATH:/opt/homebrew/bin"
alias ls="gls --classify --group-directories-first --color"
alias gemini="(source ~/.gemini_project && gemini)"
export NVIM_JDTLS_JAVA_HOME="/Library/Java/JavaVirtualMachines/temurin-21.jdk/Contents/Home/"
# I only start tmux by default on Mac because of dwm+swallow patch
if [[ -z "$TMUX" ]] && [[ -n "$PS1" ]]; then
tmux attach -t dev || tmux new -s dev
fi
else
alias ls="ls --classify --group-directories-first --color"
fi