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

Merge remote-tracking branch 'cadusk/master'

Browse source 
Conflicts:
	templates/zshrc-linux.zsh
	templates/zshrc-mac.zsh
	templates/zshrc.zsh-template
This commit is contained in:
Gaetan Semet 2013-06-13 17:13:13 +02:00
commit 60f4ae1bed
4 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/aliases.zsh
View file

@ -36,6 +36,7 @@ alias lsa='ls -lah'
#alias l='ls -la' #alias l='ls -la'
alias ll='ls -l' alias ll='ls -l'
alias la='ls -lA' alias la='ls -lA'
alias l=la
alias sl=ls # often screw this up alias sl=ls # often screw this up
alias afind='ack-grep -il' alias afind='ack-grep -il'

6
plugins/vim-override/vim-override.plugin.zsh
View file

@ -1,7 +1,7 @@
# try to replace OSX's default vim by MacVim's version # try to replace OSX's default vim by MacVim's version
RECENTVIM=`test -e /usr/local/Cellar/macvim && find /usr/local/Cellar/macvim -name Vim` MACVIM="/usr/local/bin/mvim"
# if mode indicator wasn't setup by theme, define default # if mode indicator wasn't setup by theme, define default
if [[ "$OSTYPE" == darwin* && -e $RECENTVIM ]]; then if [[ "$OSTYPE" == darwin* && -e $MACVIM ]]; then
alias vim="$RECENTVIM" alias vim="$MACVIM -v"
fi fi

9
templates/zshrc-linux.zsh
View file

@ -32,12 +32,17 @@ DISABLE_VENV_CD="true"
# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*) # 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/ # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
# Example format: plugins=(rails git textmate ruby lighthouse) # Example format: plugins=(rails git textmate ruby lighthouse)
plugins=(git python repo cp buildbot rsync git-remote-branch command-not-found debian dircycle encode64 lol extract common-aliases) plugins=(git python cp rsync git-remote-branch command-not-found debian dircycle encode64 lol extract common-aliases)
source $ZSH/oh-my-zsh.sh source $ZSH/oh-my-zsh.sh
# source `which virtualenvwrapper.sh`
# Customize to your needs... # Customize to your needs...
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
if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi
unsetopt correctall unsetopt correctall
[ "$TERM" = "xterm" ] && TERM="xterm-256color"

8
templates/zshrc.zsh-template
View file

@ -27,7 +27,7 @@ DISABLE_AUTO_UPDATE="true"
# DISABLE_AUTO_TITLE="true" # DISABLE_AUTO_TITLE="true"
# Uncomment following line if you want to disable command autocorrection # Uncomment following line if you want to disable command autocorrection
# DISABLE_CORRECTION="true" DISABLE_CORRECTION="true"
# Uncomment following line if you want red dots to be displayed while waiting for completion # Uncomment following line if you want red dots to be displayed while waiting for completion
# COMPLETION_WAITING_DOTS="true" # COMPLETION_WAITING_DOTS="true"
@ -40,10 +40,9 @@ DISABLE_AUTO_UPDATE="true"
# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*) # 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/ # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
# Example format: plugins=(rails git textmate ruby lighthouse) # Example format: plugins=(rails git textmate ruby lighthouse)
plugins=(git python pythonbrew repo cp buildbot rsync git-remote-branch command-not-found debian dircycle encode64 lol extract launch_trial common-aliases vim-scp) plugins=(git)
source $ZSH/oh-my-zsh.sh source $ZSH/oh-my-zsh.sh
source `which virtualenvwrapper.sh`
zstyle ':completion:*:descriptions' format '%B%d%b' zstyle ':completion:*:descriptions' format '%B%d%b'
@ -53,6 +52,3 @@ 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/bin ]; then export PATH="$HOME/bin:$PATH"; fi
unsetopt correctall unsetopt correctall
# Themes override ls alias from aliases.zsh
alias tmux='tmux -u2'