From 76af1973c6377d068620a7f80cd8589ed4982fc8 Mon Sep 17 00:00:00 2001 From: Xuyuan Pang Date: Fri, 24 Jan 2014 16:55:03 +0800 Subject: [PATCH 1/5] custom robbysussel theme --- themes/my-robbyrussel.zsh-theme | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 themes/my-robbyrussel.zsh-theme diff --git a/themes/my-robbyrussel.zsh-theme b/themes/my-robbyrussel.zsh-theme new file mode 100644 index 000000000..9c4ad941a --- /dev/null +++ b/themes/my-robbyrussel.zsh-theme @@ -0,0 +1,17 @@ +#!/usr/bin/env zsh + +local ret_status="%(?:%{$fg_bold[green]%}➜ :%{$fg_bold[red]%}➜ %s)" +local user_prompt="%(#:#:$)" +PROMPT='${ret_status}%{$fg_bold[green]%} %{$fg[cyan]%}%. %{$fg_bold[blue]%}$(git_prompt_info)$(git_prompt_status)%{$fg_bold[blue]%}%{$fg[magenta]%}${user_prompt} > %{$reset_color%}' + +ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%})%{$fg[yellow]%} %{$reset_color%}" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})%{$fg[green]%} ✔ %{$reset_color%}" + +ZSH_THEME_GIT_PROMPT_ADDED="%{$FG[082]%}✚%{$reset_color%} " +ZSH_THEME_GIT_PROMPT_MODIFIED="%{$FG[166]%}✹%{$reset_color%} " +ZSH_THEME_GIT_PROMPT_DELETED="%{$FG[160]%}✖%{$reset_color%} " +ZSH_THEME_GIT_PROMPT_RENAMED="%{$FG[220]%}➜%{$reset_color%} " +ZSH_THEME_GIT_PROMPT_UNMERGED="%{$FG[082]%}═%{$reset_color%} " +ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$FG[190]%}✭%{$reset_color%} " From 9cc65004411e35ebec1af6e881fa35bcf8329447 Mon Sep 17 00:00:00 2001 From: Xuyuan Pang Date: Fri, 24 Jan 2014 16:58:59 +0800 Subject: [PATCH 2/5] fish like syntax highlighted --- .gitignore | 3 --- custom/plugins/zsh-syntax-highlighting | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) create mode 160000 custom/plugins/zsh-syntax-highlighting diff --git a/.gitignore b/.gitignore index 51a5ee6c3..010447c73 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,6 @@ locals.zsh log/.zsh_history projects.zsh -custom/* -!custom/example -!custom/example.zsh *.swp !custom/example.zshcache cache/ diff --git a/custom/plugins/zsh-syntax-highlighting b/custom/plugins/zsh-syntax-highlighting new file mode 160000 index 000000000..5320f1e18 --- /dev/null +++ b/custom/plugins/zsh-syntax-highlighting @@ -0,0 +1 @@ +Subproject commit 5320f1e18d5782e29a6637937e37a3aecf9327bb From 12e45d7b483f8d8f3c769596e5c86851cd471e06 Mon Sep 17 00:00:00 2001 From: Xuyuan Pang Date: Fri, 24 Jan 2014 17:09:43 +0800 Subject: [PATCH 3/5] rename --- themes/{my-robbyrussel.zsh-theme => my-robbyrussell.zsh-theme} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename themes/{my-robbyrussel.zsh-theme => my-robbyrussell.zsh-theme} (100%) diff --git a/themes/my-robbyrussel.zsh-theme b/themes/my-robbyrussell.zsh-theme similarity index 100% rename from themes/my-robbyrussel.zsh-theme rename to themes/my-robbyrussell.zsh-theme From 43d71e56cd6a18df5591014aa85ae9166a0697ee Mon Sep 17 00:00:00 2001 From: Xuyuan Pang Date: Fri, 24 Jan 2014 17:13:14 +0800 Subject: [PATCH 4/5] backup zshrc --- zshrc | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 zshrc diff --git a/zshrc b/zshrc new file mode 100644 index 000000000..301c90c7d --- /dev/null +++ b/zshrc @@ -0,0 +1,89 @@ +# Path to your oh-my-zsh configuration. +ZSH=~/.oh-my-zsh + +# 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="my-robbyrussell" + +# Example aliases +# alias zshconfig="mate ~/.zshrc" +# alias ohmyzsh="mate ~/.oh-my-zsh" + +# Set to this to use case-sensitive completion +# CASE_SENSITIVE="true" + +# Uncomment this to disable bi-weekly auto-update checks +# DISABLE_AUTO_UPDATE="true" + +# Uncomment to change how often before auto-updates occur? (in days) +# export UPDATE_ZSH_DAYS=13 + +# Uncomment following line if you want to disable colors in ls +# DISABLE_LS_COLORS="true" + +# Uncomment following line if you want to disable autosetting terminal title. +# DISABLE_AUTO_TITLE="true" + +# Uncomment following line if you want to disable command autocorrection +# DISABLE_CORRECTION="true" + +# Uncomment following line if you want red dots to be displayed while waiting for completion +# COMPLETION_WAITING_DOTS="true" + +# Uncomment 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 following line if you want to shown in the command execution time stamp +# in the history command output. The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"| +# yyyy-mm-dd +# HIST_STAMPS="mm/dd/yyyy" + +# 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) +plugins=(git git-extras go redis-cli xcode autojump osx brew custom-aliases encode64 gem mercurial sublime web-search taskwarrior zsh-syntax-highlighting) + +source $ZSH/oh-my-zsh.sh + +# User configuration + +export PATH="/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin" +# export MANPATH="/usr/local/man:$MANPATH" + +[[ -s ~/.shared_profile.sh ]] && . ~/.shared_profile.sh + +# # 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" + +export LC_ALL=en_US.UTF-8 +export LANG_ALL=en_US.UTF-8 + +[[ -s /usr/local/etc/autojump.sh ]] && . /usr/local/etc/autojump.sh + +if [[ -s ~/.zsh-autosuggestions/autosuggestions.zsh ]]; then + source ~/.zsh-autosuggestions/autosuggestions.zsh + + zle-line-init() { + zle autosuggest-start + } + + zle -N zle-line-init + + bindkey '^T' autosuggest-toggle +fi + +[[ -s ~/.zsh-history-substring-search/zsh-history-substring-search.zsh ]] && source ~/.zsh-history-substring-search/zsh-history-substring-search.zsh From 38868e82b0670bf395136c91ef3c667704f92d12 Mon Sep 17 00:00:00 2001 From: Xuyuan Pang Date: Tue, 28 Jan 2014 21:51:40 +0800 Subject: [PATCH 5/5] remove autosuggestion key binding --- zshrc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/zshrc b/zshrc index 301c90c7d..7fdbb4157 100644 --- a/zshrc +++ b/zshrc @@ -45,7 +45,14 @@ ZSH_THEME="my-robbyrussell" # 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) -plugins=(git git-extras go redis-cli xcode autojump osx brew custom-aliases encode64 gem mercurial sublime web-search taskwarrior zsh-syntax-highlighting) +case `uname` in + Darwin) + plugins=(brew autojump osx xcode sublime git git-extras go redis-cli custom-aliases encode64 gem mercurial web-search zsh-syntax-highlighting);; + Linux) + plugins=(command-not-found archlinux git git-extras go redis-cli custom-aliases encode64 gem mercurial web-search zsh-syntax-highlighting);; + *) + plugins=(git git-extras go redis-cli custom-aliases encode64 gem mercurial web-search zsh-syntax-highlighting) +esac source $ZSH/oh-my-zsh.sh @@ -82,8 +89,6 @@ if [[ -s ~/.zsh-autosuggestions/autosuggestions.zsh ]]; then } zle -N zle-line-init - - bindkey '^T' autosuggest-toggle fi [[ -s ~/.zsh-history-substring-search/zsh-history-substring-search.zsh ]] && source ~/.zsh-history-substring-search/zsh-history-substring-search.zsh