linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-01-02 02:19:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 396755f044 into 1120f97305

Browse source
This commit is contained in:
GitHub Merge Button 2012-03-10 03:26:13 -08:00
commit 4c11102a9b
6 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored Normal file
View file

@ -0,0 +1,3 @@
[submodule "plugins/zsh-syntax-highlighting"]
path = plugins/zsh-syntax-highlighting
url = https://github.com/zsh-users/zsh-syntax-highlighting.git

2
lib/theme-and-appearance.zsh
View file

@ -1,6 +1,6 @@
# ls colors
autoload colors; colors;
export LSCOLORS="Gxfxcxdxbxegedabagacad"
#export LSCOLORS="Gxfxcxdxbxegedabagacad"
#export LS_COLORS
# Enable ls colors

1
plugins/ls_colors Submodule

@ -0,0 +1 @@
Subproject commit 0937975751f0a957228c3fbb4d6b4a181d40f073

12
plugins/svn/svn.plugin.zsh
View file

@ -1,22 +1,22 @@
function svn_prompt_info {
if [ $(in_svn) ]; then
echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\
$ZSH_THEME_REPO_NAME_COLOR$(svn_get_repo_name)$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(svn_dirty)$ZSH_PROMPT_BASE_COLOR"
$ZSH_THEME_REPO_NAME_COLOR$(svn_get_branch_name):$(svn_get_rev_nr)$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(svn_dirty)$ZSH_PROMPT_BASE_COLOR"
fi
}
function in_svn() {
if [[ -d .svn ]]; then
info=$(svn info 2> /dev/null) || return
if [ $info ]; then
echo 1
fi
}
function svn_get_repo_name {
function svn_get_branch_name {
if [ $(in_svn) ]; then
svn info | sed -n 's/Repository\ Root:\ .*\///p' | read SVN_ROOT
svn info | sed -n "s/URL:\ .*$SVN_ROOT\///p" | sed "s/\/.*$//"
svn info | grep '^URL:' | egrep -o '(tags|branches)/[^/]+|trunk' | egrep -o '[^/]+$' | read SVN_URL
echo $SVN_URL
fi
}

1
plugins/zsh-syntax-highlighting Submodule

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

7
themes/maran.zsh-theme
View file

@ -1,6 +1,11 @@
# Theme with full path names and hostname
# Handy if you work on different servers all the time;
PROMPT='%{$fg[cyan]%}%n%{$reset_color%}@%{$fg[yellow]%}%M:%{$fg[green]%}%/%{$reset_color%} $(git_prompt_info) %(!.#.$) '
PROMPT='%{$fg[cyan]%}%n%{$reset_color%}@%{$fg[yellow]%}%M:%{$fg[green]%}%/%{$reset_color%}%{$fg[cyan]%}$(svn_prompt_info)%{$reset_color%}$(git_prompt_info)%(!.#.%{$fg[yellow]%}$%{$reset_color%}) '
ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[cyan]%}git:("
ZSH_THEME_GIT_PROMPT_SUFFIX=")%{$reset_color%}"
ZSH_THEME_SVN_PROMPT_PREFIX=" svn:("
ZSH_THEME_SVN_PROMPT_SUFFIX=")"
ZSH_THEME_SVN_PROMPT_DIRTY="%{$fg[red]%}!%{$reset_color%}"
ZSH_THEME_SVN_PROMPT_CLEAN=""