From 90da5fc874cb5da8354bbf77b04a883abc7a6c67 Mon Sep 17 00:00:00 2001 From: Sorin Ionescu Date: Thu, 28 Jul 2011 16:36:41 -0400 Subject: [PATCH] Merged zshenv into environment.zsh. --- README.md | 3 +- functions/environment.zsh | 106 ++++++++++++++++++++++++++++++++------ 2 files changed, 91 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index fab2f748..c22982a3 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,8 @@ minimum recommended version is 4.3.9. ### Problems? If you are not able to find certain commands after switching to *Oh My ZSH*, you need -to modify `PATH` in `~/.zshrc`. +to modify `PATH` in `~/.zshrc`, or better yet, in `~/functions/environment.zsh` (may +be subject to merge conflicts). ## Usage diff --git a/functions/environment.zsh b/functions/environment.zsh index bb4ff8a9..4909ea98 100644 --- a/functions/environment.zsh +++ b/functions/environment.zsh @@ -2,28 +2,100 @@ autoload -Uz url-quote-magic zle -N self-insert url-quote-magic +# General +setopt rc_quotes # Allow 'Henry''s Garage' instead of 'Henry'\''s Garage'. +unsetopt mail_warning # Don't print a warning message if a mail file has been accessed + # Jobs -setopt long_list_jobs +setopt long_list_jobs # List jobs in the long format by default. +setopt auto_resume # Attempt to resume existing job before creating a new process. +setopt notify # Report status of background jobs immediately. +unsetopt bg_nice # Don't run all background jobs at a lower priority. +unsetopt hup # Don't kill jobs on shell exit. +unsetopt check_jobs # Don't report on jobs when shell exit. + +# PATH +typeset -U path manpath cdpath fpath + +path=( + $HOME/.tilde/bin + $HOME/.tilde/opt/bin + /usr/local/bin + /usr/local/sbin + /usr/bin + /bin + /usr/sbin + /sbin +) + +for path_file in /etc/paths.d/*; do + path+=($(<$path_file)) +done + +manpath=( + $HOME/.tilde/share/man + $HOME/.tilde/opt/share/man + /usr/local/share/man + /usr/share/man +) -# Locale -[[ -z "$LANG" ]] && export LANG="en_US.UTF-8" -[[ -z "$LC_ALL" ]] && export LC_ALL="en_US.UTF_8" -[[ -z "$LC_COLLATE" ]] && export LC_COLLATE="en_US.UTF-8" -[[ -z "$LC_CTYPE" ]] && export LC_CTYPE="en_US.UTF-8" -[[ -z "$LC_MESSAGES" ]] && export LC_MESSAGES="en_US.UTF-8" -[[ -z "$LC_MONETARY" ]] && export LC_MONETARY="en_US.UTF-8" -[[ -z "$LC_NUMERIC" ]] && export LC_NUMERIC="en_US.UTF-8" -[[ -z "$LC_TIME" ]] && export LC_TIME="en_US.UTF-8" +for path_file in /etc/manpaths.d/*; do + manpath+=($(<$path_file)) +done -# Pager -[[ -z "$PAGER" ]] && export PAGER=less +cdpath=( + $HOME + $HOME/Developer +) + +# Language +export LANG="en_AU.UTF-8" +export LC_ALL="$LANG" +export LC_COLLATE="$LANG" +export LC_CTYPE="$LANG" +export LC_MESSAGES="$LANG" +export LC_MONETARY="$LANG" +export LC_NUMERIC="$LANG" +export LC_TIME="$LANG" + +# Editors +export EDITOR="vim" +export VISUAL="vim" +export PAGER='less' # Grep if [[ "$DISABLE_COLOR" != 'true' ]]; then - [[ -z "$GREP_OPTIONS" ]] && export GREP_OPTIONS='--color=auto' - [[ -z "$GREP_COLOR" ]] && export GREP_COLOR='37;45' -else - export GREP_OPTIONS='--color=none' - export GREP_COLOR='' + export GREP_COLOR='37;45' + export GREP_OPTIONS='--color=auto' +fi + +# Browser (Default) +if (( $+commands[xdg-open] )); then + export BROWSER='xdg-open' +fi + +if (( $+commands[open] )); then + export BROWSER='open' +fi + +# Less +export LESSCHARSET="UTF-8" +export LESSHISTFILE='-' +export LESSEDIT='vim ?lm+%lm. %f' +export LESS='-F -g -i -M -R -S -w -X -z-4' + +if (( $+commands[lesspipe.sh] )); then + export LESSOPEN='| /usr/bin/env lesspipe.sh %s 2>&-' +fi + +# Termcap +if [[ "$DISABLE_COLOR" != 'true' ]]; then + export LESS_TERMCAP_mb=$'\E[01;31m' # begin blinking + export LESS_TERMCAP_md=$'\E[01;31m' # begin bold + export LESS_TERMCAP_me=$'\E[0m' # end mode + export LESS_TERMCAP_se=$'\E[0m' # end standout-mode + export LESS_TERMCAP_so=$'\E[00;47;30m' # begin standout-mode + export LESS_TERMCAP_ue=$'\E[0m' # end underline + export LESS_TERMCAP_us=$'\E[01;32m' # begin underline fi