diff --git a/zshrc b/zshrc index 188419e..09dbf76 100755 --- a/zshrc +++ b/zshrc @@ -1,10 +1,3 @@ -# 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 - # Path to your oh-my-zsh installation. export ZSH=$HOME/.oh-my-zsh @@ -14,24 +7,8 @@ export PATH=$PATH:/usr/local/go/bin GITSTATUS_LOG_LEVEL=DEBUG -ZSH_THEME="powerlevel10k/powerlevel10k" -POWERLEVEL9K_MODE="nerdfont-complete" DEFAULT_USER="bridgway" -# Battery colors -POWERLEVEL9K_BATTERY_CHARGING='107' -POWERLEVEL9K_BATTERY_CHARGED='red' -POWERLEVEL9K_BATTERY_LOW_THRESHOLD='25' -POWERLEVEL9K_BATTERY_LOW_COLOR='red' -POWERLEVEL9K_BATTERY_CHARGED_BACKGROUND='blue' -POWERLEVEL9K_BATTERY_CHARGED_FOREGROUND='white' -POWERLEVEL9K_BATTERY_CHARGING_BACKGROUND='107' -POWERLEVEL9K_BATTERY_CHARGING_FOREGROUND='white' -POWERLEVEL9K_BATTERY_LOW_BACKGROUND='red' -POWERLEVEL9K_BATTERY_LOW_FOREGROUND='white' -POWERLEVEL9K_BATTERY_DISCONNECTED_FOREGROUND='black' -POWERLEVEL9K_BATTERY_DISCONNECTED_BACKGROUND='218' - plugins=(git) # User configuration @@ -42,7 +19,7 @@ export PATH="$PATH:$HOME/.cabal/bin:/opt/cabal/1.22/bin:/opt/ghc/7.10.3/bin:$HOM source $ZSH/oh-my-zsh.sh source $HOME/dotfiles/aliases.zsh -# source $HOME/.cargo/env +source $HOME/.cargo/env eval "$(ssh-agent -s)" ssh-add -A 2>/dev/null; @@ -56,18 +33,4 @@ export CPLUS_INCLUDE_PATH=/usr/local/include [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh -test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh" - -function code { - if [[ $# = 0 ]] - then - open -a "Visual Studio Code" - else - local argPath="$1" - [[ $1 = /* ]] && argPath="$1" || argPath="$PWD/${1#./}" - open -a "Visual Studio Code" "$argPath" - fi - } - -# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. -[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh +eval "$(starship init zsh)"