zsh/khal: clean up zshrc/zshenv and drop brew khal for uv

This commit is contained in:
Matthew Ryan Dillon 2025-12-16 17:59:26 -05:00
parent 9752eccd64
commit 2d7cb605d3
3 changed files with 11 additions and 16 deletions

View file

@ -83,8 +83,17 @@ done
export -U PATH export -U PATH
export NVM_DIR="$HOME/.nvm"
export XDG_CONFIG_HOME=$HOME/.config export XDG_CONFIG_HOME=$HOME/.config
export JJ_CONFIG=$XDG_CONFIG_HOME/jj/config.toml export JJ_CONFIG=$XDG_CONFIG_HOME/jj/config.toml
export OLLAMA_API_BASE=http://127.0.0.1:11434
export RIPGREP_CONFIG_PATH=$HOME/.ripgreprc export RIPGREP_CONFIG_PATH=$HOME/.ripgreprc
export FZF_DEFAULT_COMMAND="rg --files --hidden"
export FZF_DEFAULT_OPTS=" \
--color=bg+:#313244,bg:#1e1e2e,spinner:#f5e0dc,hl:#f38ba8 \
--color=fg:#cdd6f4,header:#f38ba8,info:#cba6f7,pointer:#f5e0dc \
--color=marker:#b4befe,fg+:#cdd6f4,prompt:#cba6f7,hl+:#f38ba8 \
--color=selected-bg:#45475a \
--color=border:#313244,label:#cdd6f4"
alias devlog="cd ~/projects/personal/devlog && hx logs/$(date '+%Y-%m-%d').gmi && cd -"
alias khal='uvx khal "$@"'

View file

@ -42,21 +42,10 @@ for fp in $srcs; do
fi fi
done done
alias devlog="cd ~/projects/personal/devlog && hx logs/$(date '+%Y-%m-%d').gmi && cd -"
eval "$(/opt/homebrew/bin/brew shellenv)" eval "$(/opt/homebrew/bin/brew shellenv)"
eval "$(direnv hook zsh)" eval "$(direnv hook zsh)"
eval "$(jj util completion zsh)" eval "$(jj util completion zsh)"
export NVM_DIR="$HOME/.nvm"
[ -s "/opt/homebrew/opt/nvm/nvm.sh" ] && \. "/opt/homebrew/opt/nvm/nvm.sh" [ -s "/opt/homebrew/opt/nvm/nvm.sh" ] && \. "/opt/homebrew/opt/nvm/nvm.sh"
[ -s "/opt/homebrew/opt/nvm/etc/bash_completion.d/nvm" ] && \. "/opt/homebrew/opt/nvm/etc/bash_completion.d/nvm" [ -s "/opt/homebrew/opt/nvm/etc/bash_completion.d/nvm" ] && \. "/opt/homebrew/opt/nvm/etc/bash_completion.d/nvm"
[ "$TERM" = "xterm-kitty" ] && alias ssh="TERM=xterm ssh" [ "$TERM" = "xterm-kitty" ] && alias ssh="TERM=xterm ssh"
export FZF_DEFAULT_COMMAND="rg --files --hidden"
export FZF_DEFAULT_OPTS=" \
--color=bg+:#313244,bg:#1e1e2e,spinner:#f5e0dc,hl:#f38ba8 \
--color=fg:#cdd6f4,header:#f38ba8,info:#cba6f7,pointer:#f5e0dc \
--color=marker:#b4befe,fg+:#cdd6f4,prompt:#cba6f7,hl+:#f38ba8 \
--color=selected-bg:#45475a \
--color=border:#313244,label:#cdd6f4"

View file

@ -22,7 +22,6 @@ brew install \
inlyne \ inlyne \
jj \ jj \
just \ just \
khal \
lua-language-server \ lua-language-server \
luarocks \ luarocks \
marksman \ marksman \
@ -38,8 +37,6 @@ brew install \
xz \ xz \
zlib zlib
brew services start vdirsyncer
export NVM_DIR="$HOME/.nvm" export NVM_DIR="$HOME/.nvm"
[ -s "/opt/homebrew/opt/nvm/nvm.sh" ] && \. "/opt/homebrew/opt/nvm/nvm.sh" [ -s "/opt/homebrew/opt/nvm/nvm.sh" ] && \. "/opt/homebrew/opt/nvm/nvm.sh"
nvm install 22 nvm install 22