Compare commits

...

1 Commits

Author SHA1 Message Date
521d9b73a3 feat(zsh): add conditional logic for mac 2026-01-21 23:37:51 +01:00
5 changed files with 24 additions and 12 deletions

View File

@@ -9,6 +9,3 @@ ohmyzsh/ohmyzsh path:plugins/git
# popular fish-like plugins # popular fish-like plugins
zsh-users/zsh-autosuggestions zsh-users/zsh-autosuggestions
# nvm
lukechilds/zsh-nvm

View File

@@ -14,7 +14,9 @@ export PATH="/opt/homebrew/sbin:$PATH"
export LIBRARY_PATH="$LIBRARY_PATH:/opt/homebrew/lib" export LIBRARY_PATH="$LIBRARY_PATH:/opt/homebrew/lib"
# cargo # cargo
source "$HOME/.cargo/env" if [[ "$OSTYPE" == "darwin"* ]]; then
source "$HOME/.cargo/env"
fi
# language environment # language environment
export LANG=en_US.UTF-8 export LANG=en_US.UTF-8
@@ -46,7 +48,7 @@ export POETRY_HOME="$XDG_DATA_HOME/poetry"
command -v poetry >/dev/null || export PATH="$POETRY_HOME/bin:$PATH" command -v poetry >/dev/null || export PATH="$POETRY_HOME/bin:$PATH"
# gnupg # gnupg
export GPG_TTY=$TTY export GPG_TTY=$(tty)
# aflabs # aflabs
export USER_UID=$(id -u) export USER_UID=$(id -u)

View File

@@ -12,11 +12,20 @@ export ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=#ffffff,bg=cyan,bold,underline"
source $ZDOTDIR/.antidote/antidote.zsh source $ZDOTDIR/.antidote/antidote.zsh
antidote load antidote load
if [[ "$OSTYPE" == "darwin"* ]]; then
antidote bundle lukechilds/zsh-nvm
fi
unsetopt autocd unsetopt autocd
# pyenv if [[ "$OSTYPE" == "darwin"* ]]; then
eval "$(pyenv init - zsh)" eval "$(pyenv init - zsh)"
eval "$(pyenv virtualenv-init - zsh)" eval "$(pyenv virtualenv-init - zsh)"
fi
if [[ "$OSTYPE" == "darwin"* ]]; then
export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
fi
# ggman # ggman
eval "$(ggman shellrc)" eval "$(ggman shellrc)"

View File

@@ -1,7 +1,13 @@
alias z="exec zsh" alias z="exec zsh"
alias t=tmux_attach alias t=tmux_attach
alias n=nvim_ve
# alias vim=nvim_ve if [[ "$OSTYPE" == "darwin"* ]]; then
alias n=nvim_ve
alias vim=nvim_ve
elif [[ "$OSTYPE" == "linux"* ]]; then
alias n=nvim
fi
alias s="ssh-menu" alias s="ssh-menu"
# docker # docker

View File

@@ -8,8 +8,6 @@ function nvim_ve {
fi fi
} }
alias nvim=nvim_ve
function afm { function afm {
RES=$(curl -s "https://$1/api/monitoring/requirements") RES=$(curl -s "https://$1/api/monitoring/requirements")
COUNT=$(echo "$RES" | grep -c $2) COUNT=$(echo "$RES" | grep -c $2)