From 82c94b1792f31685595089f104092113f659b33f Mon Sep 17 00:00:00 2001 From: Ross Barnie Date: Mon, 23 May 2022 18:01:45 +0100 Subject: [PATCH] Move to oh-my-zsh Antigen is largely abandoned, unfortunately. See https://github.com/zsh-users/antigen/issues/725. --- zshrc | 172 ++++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 113 insertions(+), 59 deletions(-) diff --git a/zshrc b/zshrc index 3e436a5..39951d4 100644 --- a/zshrc +++ b/zshrc @@ -1,63 +1,117 @@ -source ~/antigen.zsh -if which fasd &>/dev/null ; then - eval "$(fasd --init auto)" -fi -# load rbenv if available -if which rbenv &>/dev/null ; then - eval "$(rbenv init - --no-rehash zsh)" +# 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="eastwood" + +# 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 the following line to disable bi-weekly auto-update checks. +# DISABLE_AUTO_UPDATE="true" + +# Uncomment the following line to automatically update without prompting. +# DISABLE_UPDATE_PROMPT="true" + +# Uncomment the following line to change how often to auto-update (in days). +# export UPDATE_ZSH_DAYS=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. +# Caution: this setting can cause issues with multiline prompts (zsh 5.7.1 and newer seem to work) +# See https://github.com/ohmyzsh/ohmyzsh/issues/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 kubectl docker-compose docker zsh-nvm alias-finder) + +export ZSH_ALIAS_FINDER_AUTOMATIC=true + +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 + +export EDITOR=vim +export VISUAL=vim + +# 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" + +if [ -d "$HOME/.bin" ]; then + export PATH="$PATH:$HOME/.bin" fi -# load secrets -if [[ -f ~/.zsh/secretenv ]]; then - source ~/.zsh/secretenv +if [ -f "$HOME/.zsh/secrets.zsh" ]; then + source $HOME/.zsh/secrets.zsh fi -_echoerr () { - echo $1 >&2 -} - -_find_project_dir () { - if [[ -z "$1" ]]; then - _echoerr "Must specify project name" - return 1 - fi - find ~/Websites -type d -maxdepth 2 -name $1 - return 0 -} - -cd_project () { - dir=$( _find_project_dir $1 ) - if [[ -d $dir ]]; then - cd $dir - else - _echoerr "Project not found" - return 1 - fi -} - -npx () { - if [[ -d ./node_modules ]]; then - ./node_modules/.bin/$@ - else - _echoerr "No node_modules dir found" - fi -} - -antigen use oh-my-zsh - -antigen theme eastwood - -antigen bundle git -antigen bundle bundler -antigen bundle zsh-users/zsh-syntax-highlighting -antigen bundle rails -antigen bundle djui/alias-tips -antigen bundle git-flow - -antigen apply - -alias vim='nvim' -alias shipit='bundle exec cap production deploy' -alias caprod='bundle exec cap production' -alias ws='which_server' -alias cdp='cd_project' +# Add RVM to PATH for scripting. Make sure this is the last PATH variable change. +export PATH="$PATH:$HOME/.rvm/bin" \ No newline at end of file