From bf1f111ad7efb83c39fa381027612d6d851e3fc9 Mon Sep 17 00:00:00 2001 From: Shuangjiang Li Date: Wed, 31 Dec 2014 01:50:48 -0500 Subject: [PATCH 1/5] my updates --- oh-my-zsh.sh | 3 +++ themes/robbyrussell.zsh-theme | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh index d0e89f31b..21e5509ad 100644 --- a/oh-my-zsh.sh +++ b/oh-my-zsh.sh @@ -88,3 +88,6 @@ else fi fi fi + +source ~/.bash_profile +source ~/.bash_rc diff --git a/themes/robbyrussell.zsh-theme b/themes/robbyrussell.zsh-theme index 24e1e8c52..ad9a0f085 100644 --- a/themes/robbyrussell.zsh-theme +++ b/themes/robbyrussell.zsh-theme @@ -1,5 +1,5 @@ local ret_status="%(?:%{$fg_bold[green]%}➜ :%{$fg_bold[red]%}➜ %s)" -PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}' +PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$fg[cyan]%}%2d %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}> ' ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}" ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" From 7c722d9c6709a292619dc6a03e0f5ecfd0633692 Mon Sep 17 00:00:00 2001 From: Shuangjiang Li Date: Tue, 13 Jan 2015 22:33:31 -0800 Subject: [PATCH 2/5] add .zshrc file --- .zshrc | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 .zshrc diff --git a/.zshrc b/.zshrc new file mode 100644 index 000000000..bb5a0b3f0 --- /dev/null +++ b/.zshrc @@ -0,0 +1,84 @@ +source ~/.bash_profile +# Path to your oh-my-zsh installation. +export ZSH=$HOME/.oh-my-zsh + +# show sys. info +archey -c + +# 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" + +# Uncomment the following line to use case-sensitive completion. +# CASE_SENSITIVE="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="true" + +# 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) + +source $ZSH/oh-my-zsh.sh + +# User configuration + +export PATH="/Users/sli/.rvm/gems/ruby-2.1.0/bin:/Users/sli/.rvm/gems/ruby-2.1.0@global/bin:/Users/sli/.rvm/rubies/ruby-2.1.0/bin:/Users/sli/bin:/usr/local/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:/usr/local/git/bin:/usr/texbin:/Users/sli/.rvm/bin" +# 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" + +# 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" From c680fb7ad8dfbb17120aad2b5d32ad82e3b4e82b Mon Sep 17 00:00:00 2001 From: Shuangjiang Li Date: Tue, 13 Jan 2015 22:35:59 -0800 Subject: [PATCH 3/5] added my bash_profile --- .bash_profile | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 .bash_profile diff --git a/.bash_profile b/.bash_profile new file mode 100644 index 000000000..0f06f1c43 --- /dev/null +++ b/.bash_profile @@ -0,0 +1,73 @@ +# call .bashrc file +if [ -f ~/.bashrc ]; then +. ~/.bashrc +fi + +## +export DYLD_LIBRARY_PATH=/usr/lib/:$DYLD_LIBRARY_PATH +# MacPorts Installer addition on 2014-03-23_at_23:01:41: adding an appropriate PATH variable for use with MacPorts. +export PATH=/usr/local/bin:PATH:/opt/local/bin:/opt/local/sbin:$PATH +GRADLE_HOME=/Users/sli/Documents/gradle-2.0 +export PATH=$PATH:$GRADLE_HOME/bin +# Finished adapting your PATH environment variable for use with MacPorts. + +# change prompt display style + +# grep +alias grep='grep --color=always' + +# so that git log could support Chinese +export LESSCHARSET=utf-8 + +# system alias tweek +# alias agi='sudo apt-get install' +alias vim="/Applications/MacVim.app/Contents/MacOS/vim" +alias l="ls -l" +alias ll="ls -al" +alias ls="ls -l" +alias c="clear" +alias cl="clear" + +alias d="cd ~/Desktop" +alias wr="cd ~/Dropbox/UTK/Papers" +alias p="cd ~/Dropbox/Projects/mousepotato.github.io/_posts/" +alias na="cd ~/Dropbox/Projects/narcissus/" +alias aq="cd ~/Dropbox/Projects/Aqoin_project/sli-whs/" +alias di="cd ~/Dropbox/UTK/Papers/dissertation/" + +alias e="exit" +alias eb='vim ~/.bash_profile' +alias sb='source $HOME/.bash_profile 1>/dev/null' +alias clear='printf "\ec"' #clear terminal and empty scrollback +alias myip='curl ifconfig\.me/ip' +alias ssh11='ssh sli22@hydra11.eecs.utk.edu' +alias sshaq='ssh -p 8822 root@fhs.im' + +alias gc="git clone" +alias gpm="git push origin master" +alias ga="git add ." +alias gs="git status" +# use function to pass argument for git commit -m +alias gm="git commit -m $1" +function gm(){ + git commit -m $1; +} + +# for jekyll + +alias jb="jekyll build" +alias js="jekyll server" + +# start mongoDB + +alias mos="mongod --dbpath ~/Documents/mongoDB/data" +alias mg="mongo" + + +# for gradle +alias gb='gradle build' +alias ge='gradle eclipse' + +alias vrc="vim ~/.dotfiles/vim/vim_runtime/my_configs.vim" + +[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function* From 595fac3556ac20098e4c1b76eafcec78dbaeaaf0 Mon Sep 17 00:00:00 2001 From: Shuangjiang Li Date: Tue, 13 Jan 2015 22:37:50 -0800 Subject: [PATCH 4/5] update bash_profile --- .bash_profile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bash_profile b/.bash_profile index 0f06f1c43..6d2cedd8e 100644 --- a/.bash_profile +++ b/.bash_profile @@ -24,7 +24,7 @@ export LESSCHARSET=utf-8 alias vim="/Applications/MacVim.app/Contents/MacOS/vim" alias l="ls -l" alias ll="ls -al" -alias ls="ls -l" +alias ls="ls -lart" alias c="clear" alias cl="clear" From c0d30df0ce1e024a631f419a867ebeee62f8783e Mon Sep 17 00:00:00 2001 From: Shuangjiang Li Date: Wed, 14 Jan 2015 08:19:58 -0800 Subject: [PATCH 5/5] update .zshrc --- .zshrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.zshrc b/.zshrc index bb5a0b3f0..230d97aa1 100644 --- a/.zshrc +++ b/.zshrc @@ -3,6 +3,7 @@ source ~/.bash_profile export ZSH=$HOME/.oh-my-zsh # show sys. info +# brew install archey archey -c # Set name of the theme to load.