Compare commits

...

3 Commits

Author SHA1 Message Date
Ein Verne 7b9b5a28d7 feat: update asdf config and mise 1 month ago
Ein Verne 6e298a08ae feat: use space not tab 1 month ago
Ein Verne fd4774b3cd feat: add mise to Brewfile 1 month ago
  1. 5
      .vimrc
  2. 55
      .zshrc
  3. 1
      Brewfile
  4. 8
      zsh/env.zsh
  5. 7
      zsh/osx.zsh

5
.vimrc

@ -161,7 +161,10 @@ set tabstop=4
set shiftwidth=4
" 将tab自动转为空格
" set expandtab
set expandtab
set softtabstop=4 " 在编辑时按 Tab 键时插入 4 个空格
set shiftwidth=4 " 自动缩进使用 4 个空格
set listchars=extends:>,precedes:<,tab:▸\ ,trail,eol,nbsp:_
set list

55
.zshrc

@ -89,24 +89,6 @@ zinit load voronkovich/gitignore.plugin.zsh
zinit load djui/alias-tips
export ASDF_DIR=$HOME/.asdf
# ASDF
if [ -d "$HOME/.asdf" ]; then
zinit ice wait lucid
zinit light asdf-vm/asdf
# OR
# load_asdf() {
# . $HOME/.asdf/asdf.sh
# }
#
# zinit light-mode wait lucid for \
# atload'load_asdf' \
# zdharma-continuum/null
fi
# zinit light denysdovhan/spaceship-prompt
zinit ice depth=1; zinit light romkatv/powerlevel10k
@ -142,11 +124,6 @@ fi
fpath=(${ASDF_DIR}/completions $fpath)
autoload -Uz compinit
if [ -d "$HOME/.asdf" ]; then
source $HOME/.asdf/asdf.sh
source $HOME/.asdf/completions/asdf.bash
fi
# if [ $(date +'%j') != $(stat -f '%Sm' -t '%j' ~/.zcompdump) ]; then
# compinit;
# else
@ -233,5 +210,37 @@ alias adbcap="adb shell screencap -p"
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
# Herd injected NVM configuration
export NVM_DIR="/Users/einverne/Library/Application Support/Herd/config/nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
[[ -f "/Applications/Herd.app/Contents/Resources/config/shell/zshrc.zsh" ]] && builtin source "/Applications/Herd.app/Contents/Resources/config/shell/zshrc.zsh"
# Herd injected PHP 8.3 configuration.
export HERD_PHP_83_INI_SCAN_DIR="/Users/einverne/Library/Application Support/Herd/config/php/83/"
# Herd injected PHP binary.
export PATH="/Users/einverne/Library/Application Support/Herd/bin/":$PATH
# Herd injected PHP 7.4 configuration.
export HERD_PHP_74_INI_SCAN_DIR="/Users/einverne/Library/Application Support/Herd/config/php/74/"
export PATH="/opt/homebrew/opt/[email protected]/bin:$PATH"
export PATH="/opt/homebrew/opt/[email protected]/sbin:$PATH"
# Herd injected PHP 8.1 configuration.
export HERD_PHP_81_INI_SCAN_DIR="/Users/einverne/Library/Application Support/Herd/config/php/81/"
# Added by Windsurf
export PATH="/Users/einverne/.codeium/windsurf/bin:$PATH"
# pnpm
export PNPM_HOME="/Users/einverne/Library/pnpm"
case ":$PATH:" in
*":$PNPM_HOME:"*) ;;
*) export PATH="$PNPM_HOME:$PATH" ;;
esac
# pnpm end

1
Brewfile

@ -36,6 +36,7 @@ brew "youtube-dl"
brew "ffmpeg"
brew "imagemagick"
brew "mas"
brew "mise"
brew "nmap"
brew "p7zip"
brew "dos2unix"

8
zsh/env.zsh

@ -32,6 +32,10 @@ export PATH="/usr/local/sbin:$PATH"
export PATH="$HOME/.local/bin:$PATH"
# eval "$(zoxide init zsh)"
if [[ -d $HOME/.asdf ]]; then
export ASDF_DATA_DIR="$HOME/.asdf"
export PATH="$ASDF_DATA_DIR/shims:$PATH"
fi
if [[ -d $HOME/.pyenv ]]; then
# pyenv
@ -58,6 +62,8 @@ if [[ -d $HOME/flutter ]]; then
export PATH="$PATH:$HOME/flutter/flutter_sdk/bin"
fi
export FLUTTER_ROOT=/Users/einverne/.asdf/installs/flutter/3.24.3-stable
# if [[ -d ~/.jenv ]]; then
# # jenv
# export PATH="$HOME/.jenv/bin:$PATH"
@ -210,4 +216,4 @@ export PATH="$HOME/.fly/bin:$PATH"
export LIBRARY_PATH=$LIBRARY_PATH:/opt/homebrew/lib/
export CPATH=$CPATH:/opt/homebrew/include/
eval "$(mise activate zsh)"

7
zsh/osx.zsh

@ -1,11 +1,6 @@
if [[ -d $HOME/.asdf/ ]]; then
. $HOME/.asdf/asdf.sh
. $HOME/.asdf/completions/asdf.bash
fi
if [[ -d "/usr/local/opt/gnu-getopt/bin" ]]; then
PATH="/usr/local/opt/gnu-getopt/bin:$PATH"
fi
[[ -s `brew --prefix`/etc/autojump.sh ]] && . `brew --prefix`/etc/autojump.sh
[[ -s `brew --prefix`/etc/autojump.sh ]] && . `brew --prefix`/etc/autojump.sh

Loading…
Cancel
Save