diff --git a/Makefile b/Makefile index 4135a95..d06733a 100644 --- a/Makefile +++ b/Makefile @@ -9,9 +9,10 @@ help: ## Show help. del: ## Delete your development environment. @echo "Deleting all dotfiles, applications, and folders..." - @stow --dotfiles -D git ssh brew + @stow --dotfiles -D git ssh brew zsh @rm -rf ~/Projects @rm -rf ~/.ssh/id_ed25519 ~/.ssh/id_ed25519.pub + @rm -rf ~/.oh-my-zsh @brew uninstall --force $(shell brew list) ssh: ## Copy the SSH public key to your clipboard. diff --git a/README.md b/README.md index 04dabf7..6d60f77 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,7 @@ All my command-line tools, applications, and their configurations. Have fun 😎 - SSH key generation - Create a Projects folder - A bunch of productivity apps. See [Brewfile](/brew/Brewfile) for more information. +- Oh My Zsh #### Helper diff --git a/install.sh b/install.sh index d48e32d..c503a7b 100644 --- a/install.sh +++ b/install.sh @@ -3,7 +3,7 @@ # Tells the shell script to exit if it encounters an error set -e -TOTAL_STEPS=6 +TOTAL_STEPS=7 STEP=1 function step_msg { echo "[$STEP/$TOTAL_STEPS] $1..."; @@ -36,6 +36,13 @@ stow --dotfiles git ssh brew step_msg "Installing the productivity apps" brew bundle install --file=~/Brewfile +# -- Oh My Zsh ----------------------------------------------------------------- +step_msg "Installing the Oh My Zsh" +# chsh -s $(which zsh) +sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended +rm -rf ~/.zshrc +stow --dotfiles zsh + # -- Git ----------------------------------------------------------------------- step_msg "Configuring Git" git config --global user.email $GIT_EMAIL diff --git a/zsh/.zshrc b/zsh/.zshrc new file mode 100644 index 0000000..e562570 --- /dev/null +++ b/zsh/.zshrc @@ -0,0 +1,178 @@ +# 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" + +# Set name of the theme to load --- if set to "random", it will +# load a random theme each time oh-my-zsh is loaded, in which case, +# to know which specific one was loaded, run: echo $RANDOM_THEME +# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes +ZSH_THEME="spaceship" + +# Set list of themes to pick from when loading at random +# Setting this variable when ZSH_THEME=random will cause zsh to load +# a theme from this variable instead of looking in $ZSH/themes/ +# If set to an empty array, this variable will have no effect. +# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" ) + +# Uncomment the following line to use case-sensitive completion. +# CASE_SENSITIVE="true" + +# Uncomment the following line to use hyphen-insensitive completion. +# Case-sensitive completion must be off. _ and - will be interchangeable. +# HYPHEN_INSENSITIVE="true" + +# Uncomment one of the following lines to change the auto-update behavior +# zstyle ':omz:update' mode disabled # disable automatic updates +# zstyle ':omz:update' mode auto # update automatically without asking +# zstyle ':omz:update' mode reminder # just remind me to update when it's time + +# Uncomment the following line to change how often to auto-update (in days). +# zstyle ':omz:update' frequency 13 + +# Uncomment the following line if pasting URLs and other text is messed up. +# DISABLE_MAGIC_FUNCTIONS="true" + +# Uncomment the following line to disable colors in ls. +# DISABLE_LS_COLORS="true" + +# Uncomment the following line to disable auto-setting terminal title. +# DISABLE_AUTO_TITLE="true" + +# Uncomment the following line to enable command auto-correction. +# ENABLE_CORRECTION="true" + +# Uncomment the following line to display red dots whilst waiting for completion. +# You can also set it to another string to have that shown instead of the default red dots. +# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f" +# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765) +# COMPLETION_WAITING_DOTS="true" + +# Uncomment the following line if you want to disable marking untracked files +# under VCS as dirty. This makes repository status check for large repositories +# much, much faster. +# DISABLE_UNTRACKED_FILES_DIRTY="true" + +# Uncomment the following line if you want to change the command execution time +# stamp shown in the history command output. +# You can set one of the optional three formats: +# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" +# or set a custom format using the strftime function format specifications, +# see 'man strftime' for details. +# HIST_STAMPS="mm/dd/yyyy" + +# Would you like to use another custom folder than $ZSH/custom? +# ZSH_CUSTOM=/path/to/new-custom-folder + +# Which plugins would you like to load? +# Standard plugins can be found in $ZSH/plugins/ +# Custom plugins may be added to $ZSH_CUSTOM/plugins/ +# Example format: plugins=(rails git textmate ruby lighthouse) +# Add wisely, as too many plugins slow down shell startup. +plugins=(git zsh-z web-search) + +source $ZSH/oh-my-zsh.sh + + +# User configuration + +# export MANPATH="/usr/local/man:$MANPATH" + +# You may need to manually set your language environment +# export LANG=en_US.UTF-8 + +# Preferred editor for local and remote sessions +# if [[ -n $SSH_CONNECTION ]]; then +# export EDITOR='vim' +# else +# export EDITOR='mvim' +# fi + +# Compilation flags +# export ARCHFLAGS="-arch x86_64" + +# Set personal aliases, overriding those provided by oh-my-zsh libs, +# plugins, and themes. Aliases can be placed here, though oh-my-zsh +# users are encouraged to define aliases within the ZSH_CUSTOM folder. +# For a full list of active aliases, run `alias`. +# +# Example aliases +# alias zshconfig="mate ~/.zshrc" +# alias ohmyzsh="mate ~/.oh-my-zsh" + + +### Added by Zinit's installer +if [[ ! -f $HOME/.local/share/zinit/zinit.git/zinit.zsh ]]; then + print -P "%F{33} %F{220}Installing %F{33}ZDHARMA-CONTINUUM%F{220} Initiative Plugin Manager (%F{33}zdharma-continuum/zinit%F{220})…%f" + command mkdir -p "$HOME/.local/share/zinit" && command chmod g-rwX "$HOME/.local/share/zinit" + command git clone https://github.com/zdharma-continuum/zinit "$HOME/.local/share/zinit/zinit.git" && \ + print -P "%F{33} %F{34}Installation successful.%f%b" || \ + print -P "%F{160} The clone has failed.%f%b" +fi + +source "$HOME/.local/share/zinit/zinit.git/zinit.zsh" +autoload -Uz _zinit +(( ${+_comps} )) && _comps[zinit]=_zinit + +# Load a few important annexes, without Turbo +# (this is currently required for annexes) +zinit light-mode for \ + zdharma-continuum/zinit-annex-as-monitor \ + zdharma-continuum/zinit-annex-bin-gem-node \ + zdharma-continuum/zinit-annex-patch-dl \ + zdharma-continuum/zinit-annex-rust + + +### End of Zinit's installer chunk + +zinit light zdharma/fast-syntax-highlighting +zinit light zsh-users/zsh-autosuggestions +zinit light zsh-users/zsh-completions +zplugin light buonomo/yarn-completion +zplugin light zsh-users/zsh-history-substring-search + + +### nvm configuration + +export NVM_DIR="$HOME/.nvm" + [ -s "/opt/homebrew/opt/nvm/nvm.sh" ] && \. "/opt/homebrew/opt/nvm/nvm.sh" # This loads nvm + [ -s "/opt/homebrew/opt/nvm/etc/bash_completion.d/nvm" ] && \. "/opt/homebrew/opt/nvm/etc/bash_completion.d/nvm" # This loads nvm bash_completion + + +### Theme configuration + +SPACESHIP_PROMPT_ORDER=( + dir # Current directory section + host # Hostname section + git # Git section (git_branch + git_status) + exec_time # Execution time + line_sep # Line break + vi_mode # Vi-mode indicator + jobs # Background jobs indicator + exit_code # Exit code section + char # Prompt character +) +SPACESHIP_PROMPT_ADD_NEWLINE=false +SPACESHIP_CHAR_SYMBOL="❯" +SPACESHIP_CHAR_SUFFIX=" " + + +### Git via brew configuration + +export PATH="/usr/local/bin:$PATH" + + +### Pyenv configuration + +eval "$(pyenv init -)" +eval "$(pyenv virtualenv-init -)" + +export PYENV_VERSION=pypy-2.2.1 +export PIP_VERSION=21.2.4 + + +### Poetry configuration + +export PATH="$HOME/.poetry/bin:$PATH" +source $HOME/.poetry/env