diff --git a/dot_zshenv_darwin b/dot_zshenv_darwin index 5223a95..9ce2316 100644 --- a/dot_zshenv_darwin +++ b/dot_zshenv_darwin @@ -1,3 +1,4 @@ . "$HOME/.cargo/env" - -ssh-add --apple-use-keychain ~/.ssh/id\_ed25519 2>/dev/null +. "$HOME/.tokens" +export THEOS=~/theos +# ssh-add --apple-use-keychain ~/.ssh/id\_ed25519 2>/dev/null diff --git a/dot_zshrc_darwin b/dot_zshrc_darwin index 4ed7f8e..756fd46 100644 --- a/dot_zshrc_darwin +++ b/dot_zshrc_darwin @@ -1,23 +1,12 @@ zstyle ':znap:*' repos-dir ~/znap source ~/repos/zsh-snap/znap.zsh -typeset -g POWERLEVEL9K_INSTANT_PROMPT=off -# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc. -# Initialization code that may require console input (password prompts, [y/n] -# confirmations, etc.) must go above this block; everything else may go below. -if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then - source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" -fi - -# If you come from bash you might have to change your $PATH. -# export PATH=$HOME/bin:/usr/local/bin:$PATH - -# Path to your oh-my-zsh installation. -export ZSH="$HOME/.oh-my-zsh" - -ZSH_THEME="powerlevel10k/powerlevel10k" - # plugins +# starship +export SPACESHIP_PROMPT_ASYNC=FALSE +#znap eval starship 'starship init zsh --print-full-init' +#znap prompt + znap source marlonrichert/zsh-autocomplete zstyle ':autocomplete:*' min-input 1 @@ -25,9 +14,6 @@ zstyle ':autocomplete:*' min-input 1 znap source zsh-users/zsh-autosuggestions znap source zsh-users/zsh-completions -plugins=(git) - -source $ZSH/oh-my-zsh.sh # User configuration @@ -40,7 +26,7 @@ source $ZSH/oh-my-zsh.sh if [[ -n $SSH_CONNECTION ]]; then export EDITOR='vim' else - export EDITOR='mvim' + export EDITOR='nvim' fi # Compilation flags @@ -58,12 +44,13 @@ alias vim="nvim" alias vi="nvim" # codium to code -alias code="codium" +alias code="code-insiders" +alias c="code-insiders" +alias cn="code-insiders ." # cd to z alias cd="z" -# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. -[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh + export VOLTA_HOME="$HOME/.volta" export PATH="$VOLTA_HOME/bin:$PATH" @@ -80,3 +67,20 @@ export PATH="$BUN_INSTALL/bin:$PATH" # zoxide eval "$(zoxide init zsh)" + +eval "$(starship init zsh)" + +if [[ $TERM_PROGRAM != "WarpTerminal" ]]; then + test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh" +fi + +( +if ! ssh-add -l >/dev/null 2>&1; then + ssh-add --apple-load-keychain >/dev/null 2>&1 +fi & +) + +#znap function _sshadd ssh 'eval "$(ssh-add --apple-load-keychain)"' +# compctl -K _sshadd ssh + +source /Users/riley/.docker/init-zsh.sh || true # Added by Docker Desktop