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

Merge remote-tracking branch 'cadusk/master'

Browse source 
Conflicts:
	README.textile
	lib/aliases.zsh
	templates/zshrc-linux.zsh
	templates/zshrc-mac.zsh
	templates/zshrc.zsh-template
This commit is contained in:
Gaetan Semet 2014-10-07 11:53:12 +02:00
commit cf1c065d71
5 changed files with 54 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.textile
View file

@ -191,6 +191,6 @@ We have enough themes for the time being. Please fork the project and add on in
h2. Contributors
This project wouldn't exist without all of our awesome users and contributors: "view our growing list of contributors":https://github.com/robbyrussell/oh-my-zsh/contributors
This project wouldn't exist without all of our awesome users and contributors: "view our growing list of contributors":https://github.com/stibbons/oh-my-zsh/contributors
Thank you so much!

9
lib/aliases.zsh
View file

@ -50,11 +50,4 @@ alias l='ls -lah'
alias ll='ls -lh'
alias la='ls -lAh'
alias gita='git add -A'
alias gitl='git l'
alias gitw='git who'
alias gitt='git tags'
# Aliases
alias ta='tmux attach -t'
alias tl='tmux list-session'
alias ts='tmux new-session'
alias afind='ack-grep -il'

13
templates/zshrc-linux.zsh
View file

@ -57,13 +57,13 @@ ZSH_HIGHLIGHT_STYLES[globbing]='none'
zstyle ':completion:*:descriptions' format '%B%d%b'
# Customize to your needs...
if [ -z "$LC_ALL" ]; then export LC_ALL=en_US.UTF-8; fi
if [ -z "$LANG" ]; then export LANG=en_US.UTF-8; fi
if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi
if [ -e $HOME/.local/bin ]; then export PATH="$HOME/.local/bin:$PATH"; fi
if [ -e $HOME/appengine ]; then export PATH="$HOME/appengine:$PATH"; fi
if [ -e $HOME/.cabal/bin ]; then export PATH="$HOME/.cabal/bin:$PATH"; fi
#
if [ -z "$LC_ALL" ]; then export LC_ALL=en_US.UTF-8; fi
if [ -z "$LANG" ]; then export LANG=en_US.UTF-8; fi
# source .profile is any (proxy settings,...)
[ -f $HOME/.profile ] && source $HOME/.profile
@ -71,4 +71,9 @@ if [ -e $HOME/.cabal/bin ]; then export PATH="$HOME/.cabal/bin:$PATH"; fi
[ "$TERM" = "xterm" ] && TERM="xterm-256color"
source $ZSH/oh-my-zsh.sh
# Enviroment variables overwrite
export EDITOR='vim'
export LESS='-RX'
unsetopt correctall

8
templates/zshrc-mac.zsh
View file

@ -46,13 +46,15 @@ zstyle ':completion:*:descriptions' format '%B%d%b'
if [ -z "$LC_ALL" ]; then export LC_ALL=en_US.UTF-8; fi
if [ -z "$LANG" ]; then export LANG=en_US.UTF-8; fi
# Compilation flags
# export ARCHFLAGS="-arch x86_64"
# MacOSX specific aliases
alias bu='brew update && brew upgrade'
source $ZSH/oh-my-zsh.sh
# Enviroment variables overwrite
export EDITOR='vim'
export LESS='-RX'
unsetopt correctall
if [ -e ~/.profile ]; then source ~/.profile; fi

38
themes/cadusk.zsh-theme Normal file
View file

@ -0,0 +1,38 @@
# cadusk ZSH Theme - customized on top of avit theme
PROMPT='
[$(_user_host) ${_current_dir}] $(git_prompt_info)
$ '
PROMPT2='%{$fg[white]%}$%{$reset_color%} '
RPROMPT='%{$(echotc UP 1)%} $(git_prompt_status) ${_return_status}%{$(echotc DO 1)%}'
local _current_dir="%F{208}%3~%f%{$reset_color%}"
local _return_status="%{$fg[red]%}%(?..⍉)%{$reset_color%}"
local _hist_no="%{$fg_bold[red]%}%h%{$reset_color%}"
function _user_host() {
me="%{$fg_bold[white]%}%n"
if [[ -n $SSH_CONNECTION ]]; then
me="$me%{$fg_bold[black]%}@%m"
fi
echo "$me%b%{$reset_color%}"
}
if [[ $USER == "root" ]]; then
CARETCOLOR="red"
else
CARETCOLOR="white"
fi
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[black]%}["
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg_bold[black]%}]%{$reset_color%}"
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}!%{$reset_color%}"
ZSH_THEME_GIT_PROMPT_CLEAN=""
# LS colors, made with http://geoff.greer.fm/lscolors/
export LSCOLORS="Gxfxcxdxbxegedabagacad"
export LS_COLORS='di=36;40:ln=35;40:so=32;40:pi=33;40:ex=31;40:bd=34;46:cd=34;43:su=0;41:sg=0;46:tw=0;42:ow=0;43:'
export GREP_COLOR='1;33'