feat(zsh): add conditional logic for mac
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -16,7 +16,7 @@ zsh/*
|
|||||||
!zsh/.zshrc
|
!zsh/.zshrc
|
||||||
!zsh/.zshenv
|
!zsh/.zshenv
|
||||||
!zsh/.zprofile
|
!zsh/.zprofile
|
||||||
!zsh/.zsh_plugins.txt
|
!zsh/.zsh_plugins*.txt
|
||||||
!zsh/scripts.zsh
|
!zsh/scripts.zsh
|
||||||
!zsh/aliases.zsh
|
!zsh/aliases.zsh
|
||||||
!zsh/completions/.keep
|
!zsh/completions/.keep
|
||||||
|
|||||||
@@ -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
|
|
||||||
|
|||||||
1
zsh/.zsh_plugins_darwin.txt
Normal file
1
zsh/.zsh_plugins_darwin.txt
Normal file
@@ -0,0 +1 @@
|
|||||||
|
lukechilds/zsh-nvm
|
||||||
@@ -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)
|
||||||
|
|||||||
15
zsh/.zshrc
15
zsh/.zshrc
@@ -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 load ${ZDOTDIR:-~}/.zsh_plugins_darwin.txt
|
||||||
|
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)"
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -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)
|
||||||
|
|||||||
Reference in New Issue
Block a user