linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-02-13 03:01: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-11-18 14:57:43 +01:00
commit 412a38a989
4 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/aliases.zsh
View file

@ -40,3 +40,7 @@ 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'
# Git aliases
alias gits='git st'
alias gitk='gitk --all &'

2
plugins/tmux/tmux.plugin.zsh
View file

@ -46,7 +46,7 @@ if which tmux &> /dev/null
fi fi
# Set the correct local config file to use. # Set the correct local config file to use.
if [[ "$ZSH_TMUX_ITERM2" == "false" ]] && [[ -f $HOME/.tmux.conf || -h $HOME/.tmux.conf ]] if [[ "$ZSH_TMUX_ITERM2" == "false" ]] && [[ -f $HOME/.tmux.conf ]]
then then
#use this when they have a ~/.tmux.conf #use this when they have a ~/.tmux.conf
export _ZSH_TMUX_FIXED_CONFIG="$zsh_tmux_plugin_path/tmux.extra.conf" export _ZSH_TMUX_FIXED_CONFIG="$zsh_tmux_plugin_path/tmux.extra.conf"

1
templates/zshrc-linux.zsh
View file

@ -43,6 +43,7 @@ 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 [ -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
if [ -e $HOME/.cabal/bin ]; then export PATH="$HOME/.cabal/bin:$PATH"; fi
unsetopt correctall unsetopt correctall
[ "$TERM" = "xterm" ] && TERM="xterm-256color" [ "$TERM" = "xterm" ] && TERM="xterm-256color"

2
templates/zshrc.zsh-template
View file

@ -14,7 +14,7 @@ ZSH_THEME="stibbons"
# Set to this to use case-sensitive completion # Set to this to use case-sensitive completion
# CASE_SENSITIVE="true" # CASE_SENSITIVE="true"
# Uncomment this to disable bi-weekly auto-update checks # Comment this out to disable weekly auto-update checks
DISABLE_AUTO_UPDATE="true" DISABLE_AUTO_UPDATE="true"
# Uncomment to change how often before auto-updates occur? (in days) # Uncomment to change how often before auto-updates occur? (in days)