From c6ccc5feb3c81a7071416152e85d519ba642a4ca Mon Sep 17 00:00:00 2001 From: bao3 Date: Sun, 23 Aug 2015 14:27:54 +0800 Subject: [PATCH] ln --- .zshrc | 89 ------------------------------------ templates/zshrc.zsh-template | 23 ++++++---- 2 files changed, 14 insertions(+), 98 deletions(-) delete mode 100644 .zshrc diff --git a/.zshrc b/.zshrc deleted file mode 100644 index 528b0006f..000000000 --- a/.zshrc +++ /dev/null @@ -1,89 +0,0 @@ -DISABLE_UPDATE_PROMPT=true -[[ -n "$SSH_CLIENT" ]] || export DEFAULT_USER="bao3" -#DEFAULT_USER = bao3@cocoMBP -# Path to your oh-my-zsh installation. -export ZSH=/Users/bao3/.oh-my-zsh -if brew command command-not-found-init > /dev/null; then eval "$(brew command-not-found-init)"; fi - -# Set name of the theme to load. -# Look in ~/.oh-my-zsh/themes/ -# Optionally, if you set this to "random", it'll load a random theme each -# time that oh-my-zsh is loaded. -ZSH_THEME="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 change how often to auto-update (in days). -# export UPDATE_ZSH_DAYS=13 - -# 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="false" - -# Uncomment the following line to display red dots whilst waiting for completion. -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. -# The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" -# 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? (plugins can be found in ~/.oh-my-zsh/plugins/*) -# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ -# Example format: plugins=(rails git textmate ruby lighthouse) -# Add wisely, as too many plugins slow down shell startup. -plugins=(git osx vi-mode) - -# User configuration - -export PATH="/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" -# export MANPATH="/usr/local/man:$MANPATH" - -source $ZSH/oh-my-zsh.sh - -# You may need to manually set your language environment -export LANG=en_US.UTF-8 -export LC_ALL=en_US.UTF-8 - -# Preferred editor for local and remote sessions -# if [[ -n $SSH_CONNECTION ]]; then -# export EDITOR='vi' -# else -# export EDITOR='mvim' -# fi - -# Compilation flags -# export ARCHFLAGS="-arch x86_64" - -# ssh -# export SSH_KEY_PATH="~/.ssh/dsa_id" - -# 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" diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template index 44e8b0d1b..528b0006f 100644 --- a/templates/zshrc.zsh-template +++ b/templates/zshrc.zsh-template @@ -1,11 +1,15 @@ +DISABLE_UPDATE_PROMPT=true +[[ -n "$SSH_CLIENT" ]] || export DEFAULT_USER="bao3" +#DEFAULT_USER = bao3@cocoMBP # Path to your oh-my-zsh installation. -export ZSH=$HOME/.oh-my-zsh +export ZSH=/Users/bao3/.oh-my-zsh +if brew command command-not-found-init > /dev/null; then eval "$(brew command-not-found-init)"; fi # Set name of the theme to load. # Look in ~/.oh-my-zsh/themes/ # Optionally, if you set this to "random", it'll load a random theme each # time that oh-my-zsh is loaded. -ZSH_THEME="robbyrussell" +ZSH_THEME="agnoster" # Uncomment the following line to use case-sensitive completion. # CASE_SENSITIVE="true" @@ -15,7 +19,7 @@ ZSH_THEME="robbyrussell" # HYPHEN_INSENSITIVE="true" # Uncomment the following line to disable bi-weekly auto-update checks. -# DISABLE_AUTO_UPDATE="true" + DISABLE_AUTO_UPDATE="true" # Uncomment the following line to change how often to auto-update (in days). # export UPDATE_ZSH_DAYS=13 @@ -27,10 +31,10 @@ ZSH_THEME="robbyrussell" # DISABLE_AUTO_TITLE="true" # Uncomment the following line to enable command auto-correction. -# ENABLE_CORRECTION="true" +ENABLE_CORRECTION="false" # Uncomment the following line to display red dots whilst waiting for completion. -# COMPLETION_WAITING_DOTS="true" +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 @@ -49,21 +53,22 @@ ZSH_THEME="robbyrussell" # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ # Example format: plugins=(rails git textmate ruby lighthouse) # Add wisely, as too many plugins slow down shell startup. -plugins=(git) +plugins=(git osx vi-mode) # User configuration -export PATH=$HOME/bin:/usr/local/bin:$PATH +export PATH="/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" # export MANPATH="/usr/local/man:$MANPATH" source $ZSH/oh-my-zsh.sh # You may need to manually set your language environment -# export LANG=en_US.UTF-8 +export LANG=en_US.UTF-8 +export LC_ALL=en_US.UTF-8 # Preferred editor for local and remote sessions # if [[ -n $SSH_CONNECTION ]]; then -# export EDITOR='vim' +# export EDITOR='vi' # else # export EDITOR='mvim' # fi