dominic
/
prezto
1
0
Fork 0
Code Releases Activity

Merged custom/ and lib/.

Browse Source 
Conflicts:

	custom/aliases.zsh
	custom/functions.zsh
	custom/grep.zsh
pull/4/head
Sorin Ionescu 14 years ago
parent 9a3b68d655
commit ec4f279445
9 changed files with 128 additions and 160 deletions
Show Stats Download Patch File Download Diff File

75
custom/aliases.zsh
Unescape View File

@ -1,75 +0,0 @@
# The 'ls' family
# ------------------------------------------------------------------------------
[[ "$DISABLE_COLOR" != 'true' ]] && {
[[ -x "${commands[gdircolors]}" ]] && use_color_gnu='true' || use_color_bsd='true'
}
[[ "$use_color_gnu" == 'true' && -e "$HOME/.dir_colors" ]] && eval $(gdircolors $HOME/.dir_colors)
[[ "$use_color_bsd" == 'true' ]] && export CLICOLOR=1
[[ "$use_color_bsd" == 'true' ]] && export LSCOLORS="exfxcxdxbxegedabagacad"
# add colors for filetype recognition
[[ "$use_color_gnu" == 'true' ]] && alias ls='ls -hF --group-directories-first --color=auto'
[[ "$use_color_bsd" == 'true' ]] && alias ls='ls -G -F'
alias la='ls -Ahl' # show hidden files
alias lx='ls -lhXB' # sort by extension
alias lk='ls -lhSr' # sort by size, biggest last
alias lc='ls -lhtcr' # sort by and show change time, most recent last
alias lu='ls -lhtur' # sort by and show access time, most recent last
alias lt='ls -lhtr' # sort by date, most recent last
alias lm='ls -ahl | more' # pipe through 'more'
alias lr='ls -lhR' # recursive ls
alias l='ls -lha'
alias ll='ls -lh'
# General
# ------------------------------------------------------------------------------
alias rm='nocorrect rm -i'
alias cp='nocorrect cp -i'
alias mv='nocorrect mv -i'
alias ln='nocorrect ln -i'
alias mkdir='nocorrect mkdir -p'
alias du='du -kh'
alias df='df -kh'
alias e="$EDITOR"
alias get='curl -C - -O'
alias q='exit'
alias ssh='ssh -X'
alias h='history'
alias j='jobs -l'
alias f='fg'
alias gr='grep -r'
alias type='type -a'
alias print-path='echo -e ${PATH//:/\\n}'
alias print-libpath='echo -e ${LD_LIBRARY_PATH//:/\\n}'
alias lsbom='lsbom -f -l -s -pf'
alias t="$HOME/.local/bin/t --task-dir ~/.tasks --list todo.txt --delete-if-empty"
if [[ -x "${commands[htop]}" ]]; then
alias top=htop
else
alias topm='top -o vsize'
alias topc='top -o cpu'
fi
[[ "$DISABLE_COLOR" != 'true' ]] && {
[[ -x "${commands[colordiff]}" ]] && alias diff='colordiff'
[[ -x "${commands[colormake]}" ]] && alias make='colormake'
}
# Screen
# ------------------------------------------------------------------------------
[[ "$TERM" == 'xterm-color' && -e "$HOME/.screenrc" ]] && screenrc="-c '$HOME/.screenrc'"
[[ "$TERM" == 'xterm-256color' && -e "$HOME/.screenrc256" ]] && screenrc="-c '$HOME/.screenrc256'"
alias screen="screen $screenrc"
alias sl="screen $screenrc -list"
alias sr="screen $screenrc -a -A -U -D -R"
alias S="screen $screenrc -U -S"
# TMUX
# ------------------------------------------------------------------------------
[[ "$TERM" == 'xterm-color' && -e "$HOME/.tmux.conf" ]] && tmuxconf="-f '$HOME/.tmux.conf'"
[[ "$TERM" == 'xterm-256color' && -e "$HOME/.tmux256.conf" ]] && tmuxconf="-f '$HOME/.tmux256.conf'"
alias tmux="tmux $tmuxconf"
alias tls="tmux list-sessions"

1
custom/directories.zsh
Unescape View File

@ -1 +0,0 @@
unsetopt auto_pushd

46
custom/functions.zsh
Unescape View File

@ -1,46 +0,0 @@
function cdll() {
if [[ -n "$1" ]]; then
builtin cd "$1"
ls -lFhA
else
ls -lFhA
fi
}
function pushdll() {
if [[ -n "$1" ]]; then
builtin pushd "$1"
ls -lFhA
else
ls -lFhA
fi
}
function popdll() {
builtin popd
ls -lFhA
}
function grab() {
sudo chown -R ${USER} ${1:-.}
}
function reload() {
source "$HOME/.zshrc"
}
function calc() {
echo "scale=4; $@" | bc -l
}
function pmine() {
ps $@ -u $USER -o pid,%cpu,%mem,command
}
function findexec() {
find . -type f -iname '*'${1:-}'*' -exec ${2:-file} {} \;
}
function httpserve() {
python -m SimpleHTTPServer
}

7
custom/grep.zsh
Unescape View File

@ -1,7 +0,0 @@
if [[ "$DISABLE_COLOR" != "true" ]]; then
export GREP_OPTIONS='--color=auto'
export GREP_COLOR='37;45'
else
export GREP_OPTIONS='--color=none'
export GREP_COLOR=''
fi

5
custom/shortcuts.zsh
Unescape View File

@ -1,5 +0,0 @@
# Add yourself some shortcuts to projects you often work on
# Example:
#
# brainstormr=/Users/robbyrussell/Projects/development/planetargon/brainstormr
#

89
lib/aliases.zsh
Unescape View File

@ -1,24 +1,83 @@
# Push and pop directories on directory stack
alias pu='pushd'
alias po='popd'
# The 'ls' family
# ------------------------------------------------------------------------------
[[ "$DISABLE_COLOR" != 'true' ]] && {
[[ -x "${commands[gdircolors]}" ]] && use_color_gnu='true' || use_color_bsd='true'
}
[[ "$use_color_gnu" == 'true' && -e "$HOME/.dir_colors" ]] && eval $(gdircolors $HOME/.dir_colors)
[[ "$use_color_bsd" == 'true' ]] && export CLICOLOR=1
[[ "$use_color_bsd" == 'true' ]] && export LSCOLORS="exfxcxdxbxegedabagacad"
# Basic directory operations
# add colors for filetype recognition
[[ "$use_color_gnu" == 'true' ]] && alias ls='ls -hF --group-directories-first --color=auto'
[[ "$use_color_bsd" == 'true' ]] && alias ls='ls -G -F'
alias ll='ls -lh' # show human readable
alias la='ls -lhA' # show hidden files
alias lx='ls -lhXB' # sort by extension
alias lk='ls -lhSr' # sort by size, biggest last
alias lc='ls -lhtcr' # sort by and show change time, most recent last
alias lu='ls -lhtur' # sort by and show access time, most recent last
alias lt='ls -lhtr' # sort by date, most recent last
alias lm='ls -lha | more' # pipe through 'more'
alias lr='ls -lhR' # recursive ls
alias sl='ls' # often screw this up
# General
# ------------------------------------------------------------------------------
alias ...='cd ../..'
alias -- -='cd -'
# Super user
alias rm='nocorrect rm -i'
alias cp='nocorrect cp -i'
alias mv='nocorrect mv -i'
alias ln='nocorrect ln -i'
alias mkdir='nocorrect mkdir -p'
alias du='du -kh'
alias df='df -kh'
alias pu='pushd'
alias po='popd'
alias _='sudo'
alias e="$EDITOR"
alias q='exit'
alias history='fc -l 1'
alias h='history'
alias j='jobs -l'
alias f='fg'
alias gr='grep -r'
alias get='curl -C - -O'
alias afind='ack-grep -il'
alias type='type -a'
alias ssh='ssh -X'
alias print-path='echo -e ${PATH//:/\\n}'
alias print-libpath='echo -e ${LD_LIBRARY_PATH//:/\\n}'
alias lsbom='lsbom -f -l -s -pf'
alias t="$HOME/.local/bin/t --task-dir ~/.tasks --list todo.txt --delete-if-empty"
#alias g='grep -in'
if [[ -x "${commands[htop]}" ]]; then
alias top=htop
else
alias topm='top -o vsize'
alias topc='top -o cpu'
fi
# Show history
alias history='fc -l 1'
[[ "$DISABLE_COLOR" != 'true' ]] && {
[[ -x "${commands[colordiff]}" ]] && alias diff='colordiff'
[[ -x "${commands[colormake]}" ]] && alias make='colormake'
}
# List direcory contents
alias lsa='ls -lah'
alias l='ls -la'
alias ll='ls -l'
alias sl=ls # often screw this up
# Screen
# ------------------------------------------------------------------------------
[[ "$TERM" == 'xterm-color' && -e "$HOME/.screenrc" ]] && screenrc="-c '$HOME/.screenrc'"
[[ "$TERM" == 'xterm-256color' && -e "$HOME/.screenrc256" ]] && screenrc="-c '$HOME/.screenrc256'"
alias screen="screen $screenrc"
alias sl="screen $screenrc -list"
alias sr="screen $screenrc -a -A -U -D -R"
alias S="screen $screenrc -U -S"
alias afind='ack-grep -il'
# TMUX
# ------------------------------------------------------------------------------
[[ "$TERM" == 'xterm-color' && -e "$HOME/.tmux.conf" ]] && tmuxconf="-f '$HOME/.tmux.conf'"
[[ "$TERM" == 'xterm-256color' && -e "$HOME/.tmux256.conf" ]] && tmuxconf="-f '$HOME/.tmux256.conf'"
alias tmux="tmux $tmuxconf"
alias tls="tmux list-sessions"

47
lib/functions.zsh
Unescape View File

@ -15,3 +15,50 @@ function take() {
cd $1
}
function cdll() {
if [[ -n "$1" ]]; then
builtin cd "$1"
ls -lFhA
else
ls -lFhA
fi
}
function pushdll() {
if [[ -n "$1" ]]; then
builtin pushd "$1"
ls -lFhA
else
ls -lFhA
fi
}
function popdll() {
builtin popd
ls -lFhA
}
function grab() {
sudo chown -R ${USER} ${1:-.}
}
function reload() {
source "$HOME/.zshrc"
}
function calc() {
echo "scale=4; $@" | bc -l
}
function pmine() {
ps $@ -u $USER -o pid,%cpu,%mem,command
}
function findexec() {
find . -type f -iname '*'${1:-}'*' -exec ${2:-file} {} \;
}
function httpserve() {
python -m SimpleHTTPServer
}

8
lib/grep.zsh
Unescape View File

@ -1,4 +1,8 @@
if [[ "$DISABLE_COLOR" != "true" ]]; then
[[ -z "$GREP_OPTIONS" ]] && export GREP_OPTIONS='--color=auto'
[[ -z "$GREP_COLOR" ]] && export GREP_COLOR='1;32'
export GREP_OPTIONS='--color=auto'
export GREP_COLOR='37;45'
else
export GREP_OPTIONS='--color=none'
export GREP_COLOR=''
fi

10
oh-my-zsh.sh
Unescape View File

@ -11,9 +11,6 @@ if [ "$TERM" = "dumb" ]; then
DISABLE_COLOR="true"
fi
# add a function path
fpath=($ZSH/functions $ZSH/completions $fpath)
# Load all of the config files in ~/oh-my-zsh that end in .zsh
# TIP: Add files you don't want in git to .gitignore
for config_file ($ZSH/lib/*.zsh) source $config_file
@ -28,16 +25,11 @@ compinit -i
# Load all of the plugins that were defined in ~/.zshrc
for plugin ($plugins); do
if [ -f $ZSH/custom/plugins/$plugin/$plugin.plugin.zsh ]; then
source $ZSH/custom/plugins/$plugin/$plugin.plugin.zsh
elif [ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]; then
if [ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]; then
source $ZSH/plugins/$plugin/$plugin.plugin.zsh
fi
done
# Load all of your custom configurations from custom/
for config_file ($ZSH/custom/*.zsh) source $config_file
# Load the theme
if [ "$ZSH_THEME" = "random" ]
then

Write Preview
Loading…
Cancel
Save