diff --git a/dotfiles/install b/dotfiles/install index dd972c9..870c78f 100755 --- a/dotfiles/install +++ b/dotfiles/install @@ -12,20 +12,15 @@ git submodule update --recursive # Installs tilix sudo apt install tilix -# Check to see if Oh My ZSH is installed -if ! [ -d "$HOME/.oh-my-zsh/" ]; then - echo >&2 "oh-my-zsh is not installed, fixing that..."; - curl -L https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh | sh -fi +# Oh My ZSH is installer +sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" # Grab and configure powerlevel9k -# Powerlevel9k # git clone https://github.com/bhilburn/powerlevel9k.git ~/.oh-my-zsh/custom/themes/powerlevel9k -# Powerlevel10k +# POWERLEVEL10K git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k - # Grabs Nerd Font and configures it wget https://github.com/ryanoasis/nerd-fonts/raw/master/patched-fonts/Hack/Regular/complete/Hack%20Regular%20Nerd%20Font%20Complete.ttf mkdir -p ~/.local/share/fonts diff --git a/dotfiles/zshrc b/dotfiles/zshrc index b215509..9607919 100755 --- a/dotfiles/zshrc +++ b/dotfiles/zshrc @@ -1,3 +1,10 @@ +# 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,20 +21,6 @@ ZSH_THEME="powerlevel10k/powerlevel10k" POWERLEVEL9K_MODE="nerdfont-complete" DEFAULT_USER="bridgway" -POWERLEVEL9K_DISABLE_RPROMPT=true -POWERLEVEL9K_PROMPT_ON_NEWLINE=true -POWERLEVEL9K_MULTILINE_LAST_PROMPT_PREFIX="契" -POWERLEVEL9K_MULTILINE_FIRST_PROMPT_PREFIX="" - -POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(custom_linux_icon battery dir vcs) -POWERLEVEL9K_DIR_HOME_BACKGROUND='027' -POWERLEVEL9K_DIR_HOME_SUBFOLDER_BACKGROUND='027' -POWERLEVEL9K_DIR_ETC_BACKGROUND='027' -POWERLEVEL9K_DIR_DEFAULT_BACKGROUND='027' -POWERLEVEL9K_CUSTOM_LINUX_ICON="echo " -POWERLEVEL9K_CUSTOM_LINUX_ICON_BACKGROUND='069' -POWERLEVEL9K_CUSTOM_LINUX_ICON_FOREGROUND='232' - # Battery colors POWERLEVEL9K_BATTERY_CHARGING='107' POWERLEVEL9K_BATTERY_CHARGED='red' @@ -120,3 +113,6 @@ function code { export PATH="$HOME/.rbenv/bin:$PATH" eval "$(rbenv init -)" export PATH="$HOME/.rbenv/plugins/ruby-build/bin:$PATH" + +# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. +[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh