walkah/dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

switch from using my own fork to using $ZSH_CUSTOM

Browse Source
This commit is contained in:
James Walker 2012-05-07 16:21:28 -04:00
parent 104d97a9bd
commit cc75852687
6 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -1,9 +1,6 @@
[submodule "emacs.d"]
path = emacs.d
url = https://github.com/walkah/emacs.d.git
[submodule "oh-my-zsh"]
path = oh-my-zsh
url = https://github.com/walkah/oh-my-zsh.git
[submodule "nvm"]
path = nvm
url = https://github.com/walkah/nvm.git

1
oh-my-zsh

@ -1 +0,0 @@
Subproject commit e6ccc428bd476c99b66aca3fdfcf2d77a9bf47e8

6
zsh/custom/plugins/drush/_drush Normal file
View File

@ -0,0 +1,6 @@
#compdef drush
#autoload
local -a drush_commands
drush_commands=($(drush --early=includes/complete.inc $words[*] ))
_describe -t commands 'drush commands' drush_commands

1
zsh/custom/walkah.zsh Normal file
View File

@ -0,0 +1 @@
# oh-my-zsh complains without a .zsh file in here

15
zsh/custom/walkah.zsh-theme Normal file
View File

@ -0,0 +1,15 @@
# walkah ZSH Theme
if [ -z $SSH_CONNECTION ]; then HCOLOR="green"; else HCOLOR="blue"; fi
local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
PROMPT='%{$fg[$HCOLOR]%}%m%{$reset_color%}:%c \
$(git_prompt_info)%{$fg[red]%}%(!.#.»)%{$reset_color%} '
PROMPT2='%{$fg[red]%}\ %{$reset_color%}'
RPS1='${return_code}'
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}±%{$fg[yellow]%}"
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
ZSH_THEME_GIT_PROMPT_CLEAN=""
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}✗%{$reset_color%}"

14
zshrc
View File

@ -5,6 +5,9 @@ export ZSH=$HOME/.oh-my-zsh
# Look in ~/.oh-my-zsh/themes/
export ZSH_THEME="walkah"
# My custom directory
export ZSH_CUSTOM=$HOME/.zsh/custom
# Set to this to use case-sensitive completion
# export CASE_SENSITIVE="true"
@ -18,8 +21,19 @@ export ZSH_THEME="walkah"
# Example format: plugins=(rails git textmate ruby lighthouse)
plugins=(git github svn ruby rails3 bundler rvm heroku pip django osx brew deb ssh-agent npm drush vagrant knife)
# TODO: remove this when bug is fixed in oh-my-zsh
# Workaround for loading theme from $ZSH_CUSTOM
# Github issue: https://github.com/robbyrussell/oh-my-zsh/pull/1107
MY_ZSH_THEME=$ZSH_THEME; ZSH_THEME=''
# OH MY ZSH!
source $ZSH/oh-my-zsh.sh
# TODO: remove this when bug is fixed in oh-my-zsh
# Workaround for loading theme from $ZSH_CUSTOM
# Github issue: https://github.com/robbyrussell/oh-my-zsh/pull/1107
source "$ZSH_CUSTOM/$MY_ZSH_THEME.zsh-theme"
# Ruby / rvm
if [ -f "$HOME/.rvm/scripts/rvm" ]; then
source "$HOME/.rvm/scripts/rvm"