Browse Source

Tradition dictates that options are uppercase.

master
Sorin Ionescu 13 years ago
parent
commit
9d27df2050
  1. 4
      alias.zsh
  2. 20
      completion.zsh
  3. 22
      directory.zsh
  4. 16
      environment.zsh
  5. 28
      history.zsh
  6. 2
      keyboard.zsh
  7. 4
      plugins/git/info.zsh
  8. 4
      plugins/history-substring-search/history-substring-search.zsh
  9. 2
      plugins/ruby/init.zsh
  10. 2
      terminal.zsh
  11. 4
      themes/minimal/prompt_minimal_setup
  12. 2
      themes/nicoulaj/prompt_nicoulaj_setup
  13. 4
      themes/sorin/prompt_sorin_setup
  14. 2
      themes/steeef/prompt_steeef_setup

4
alias.zsh

@ -1,5 +1,5 @@
setopt correct # Correct commands. setopt CORRECT # Correct commands.
setopt correct_all # Correct all arguments. setopt CORRECT_ALL # Correct all arguments.
# The 'ls' Family # The 'ls' Family
if check-bool "$COLOR"; then if check-bool "$COLOR"; then

20
completion.zsh

@ -3,14 +3,14 @@ if [[ "$TERM" == 'dumb' ]]; then
return return
fi fi
setopt complete_in_word # Complete from both ends of a word. setopt COMPLETE_IN_WORD # Complete from both ends of a word.
setopt always_to_end # Move cursor to the end of a completed word. setopt ALWAYS_TO_END # Move cursor to the end of a completed word.
setopt path_dirs # Perform path search even on command names with slashes. setopt PATH_DIRS # Perform path search even on command names with slashes.
setopt auto_menu # Show completion menu on a succesive tab press. setopt AUTO_MENU # Show completion menu on a succesive tab press.
setopt auto_list # Automatically list choices on ambiguous completion. setopt AUTO_LIST # Automatically list choices on ambiguous completion.
setopt auto_param_slash # If completed parameter is a directory, add a trailing slash. setopt AUTO_PARAM_SLASH # If completed parameter is a directory, add a trailing slash.
unsetopt menu_complete # Do not autoselect the first completion entry. unsetopt MENU_COMPLETE # Do not autoselect the first completion entry.
unsetopt flow_control # Disable start/stop characters in shell editor. unsetopt FLOW_CONTROL # Disable start/stop characters in shell editor.
# Treat these characters as part of a word. # Treat these characters as part of a word.
WORDCHARS='*?_-.[]~&;!#$%^(){}<>' WORDCHARS='*?_-.[]~&;!#$%^(){}<>'
@ -22,10 +22,10 @@ zstyle ':completion::complete:*' cache-path "$HOME/.zcache"
# Case-insensitive (all), partial-word, and then substring completion. # Case-insensitive (all), partial-word, and then substring completion.
if check-bool "$CASE_SENSITIVE"; then if check-bool "$CASE_SENSITIVE"; then
zstyle ':completion:*' matcher-list 'r:|[._-]=* r:|=*' 'l:|=* r:|=*' zstyle ':completion:*' matcher-list 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
setopt case_glob setopt CASE_GLOB
else else
zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*' zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
unsetopt case_glob unsetopt CASE_GLOB
fi fi
# Group matches and describe. # Group matches and describe.

22
directory.zsh

@ -1,14 +1,14 @@
setopt auto_cd # Auto cd to a directory without typing cd. setopt AUTO_CD # Auto cd to a directory without typing cd.
setopt auto_pushd # Push the old directory onto the stack on cd. setopt AUTO_PUSHD # Push the old directory onto the stack on cd.
setopt pushd_ignore_dups # Don't store duplicates in the stack. setopt PUSHD_IGNORE_DUPS # Don't store duplicates in the stack.
setopt pushd_silent # Do not print the directory stack after pushd or popd. setopt PUSHD_SILENT # Do not print the directory stack after pushd or popd.
setopt pushd_to_home # Push to home directory when no argument is given. setopt PUSHD_TO_HOME # Push to home directory when no argument is given.
setopt pushd_minus # Use +/-n to specify a directory in the stack. setopt PUSHD_MINUS # Use +/-n to specify a directory in the stack.
setopt cdable_vars # Change directory to a path stored in a variable. setopt CDABLE_VARS # Change directory to a path stored in a variable.
setopt auto_name_dirs # Auto add variable-stored paths to ~ list. setopt AUTO_NAME_DIRS # Auto add variable-stored paths to ~ list.
setopt multios # Write to multiple descriptors. setopt MULTIOS # Write to multiple descriptors.
setopt extended_glob # Use extended globbing syntax. setopt EXTENDED_GLOB # Use extended globbing syntax.
unsetopt clobber # Don't overwrite existing files with > and >>. unsetopt CLOBBER # Don't overwrite existing files with > and >>.
# Use >! and >>! to bypass. # Use >! and >>! to bypass.
alias 1='cd -' alias 1='cd -'

16
environment.zsh

@ -3,16 +3,16 @@ autoload -Uz url-quote-magic
zle -N self-insert url-quote-magic zle -N self-insert url-quote-magic
# General # General
setopt rc_quotes # Allow 'Henry''s Garage' instead of 'Henry'\''s Garage'. 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 unsetopt MAIL_WARNING # Don't print a warning message if a mail file has been accessed
# Jobs # Jobs
setopt long_list_jobs # List jobs in the long format by default. 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 AUTO_RESUME # Attempt to resume existing job before creating a new process.
setopt notify # Report status of background jobs immediately. setopt NOTIFY # Report status of background jobs immediately.
unsetopt bg_nice # Don't run all background jobs at a lower priority. unsetopt BG_NICE # Don't run all background jobs at a lower priority.
unsetopt hup # Don't kill jobs on shell exit. unsetopt HUP # Don't kill jobs on shell exit.
unsetopt check_jobs # Don't report on jobs when shell exit. unsetopt CHECK_JOBS # Don't report on jobs when shell exit.
# PATH # PATH
typeset -U path manpath cdpath fpath typeset -U path manpath cdpath fpath

28
history.zsh

@ -2,18 +2,18 @@ HISTFILE="$HOME/.zhistory"
HISTSIZE=10000 HISTSIZE=10000
SAVEHIST=10000 SAVEHIST=10000
setopt bang_hist # Treat the '!' character specially during expansion. setopt BANG_HIST # Treat the '!' character specially during expansion.
setopt extended_history # Write the history file in the ":start:elapsed;command" format. setopt EXTENDED_HISTORY # Write the history file in the ":start:elapsed;command" format.
setopt append_history # Append to the history file, don't replace it. setopt APPEND_HISTORY # Append to the history file, don't replace it.
setopt inc_append_history # Write to the history file immediately, not when the shell exits. setopt INC_APPEND_HISTORY # Write to the history file immediately, not when the shell exits.
setopt share_history # Share history between all sessions. setopt SHARE_HISTORY # Share history between all sessions.
setopt hist_expire_dups_first # Expire duplicate entries first when trimming history. setopt HIST_EXPIRE_DUPS_FIRST # Expire duplicate entries first when trimming history.
setopt hist_ignore_dups # Don't record an entry that was just recorded again. setopt HIST_IGNORE_DUPS # Don't record an entry that was just recorded again.
setopt hist_ignore_all_dups # Delete old recorded entry if new entry is a duplicate. setopt HIST_IGNORE_ALL_DUPS # Delete old recorded entry if new entry is a duplicate.
setopt hist_find_no_dups # Do not display a line previously found. setopt HIST_FIND_NO_DUPS # Do not display a line previously found.
setopt hist_ignore_space # Don't record an entry starting with a space. setopt HIST_IGNORE_SPACE # Don't record an entry starting with a space.
setopt hist_save_no_dups # Don't write duplicate entries in the history file. setopt HIST_SAVE_NO_DUPS # Don't write duplicate entries in the history file.
setopt hist_reduce_blanks # Remove superfluous blanks before recording entry. setopt HIST_REDUCE_BLANKS # Remove superfluous blanks before recording entry.
setopt hist_verify # Don't execute immediately upon history expansion. setopt HIST_VERIFY # Don't execute immediately upon history expansion.
setopt hist_beep # Beep when accessing nonexistent history. setopt HIST_BEEP # Beep when accessing nonexistent history.

2
keyboard.zsh

@ -8,7 +8,7 @@ zstyle ':prompt:' vicmd '<<<' # Indicator to notify of vi command mode.
zstyle ':prompt:' completion "..." # Indicator to notify of generating completion. zstyle ':prompt:' completion "..." # Indicator to notify of generating completion.
# Beep on error in line editor. # Beep on error in line editor.
setopt beep setopt BEEP
# Reset to default key bindings. # Reset to default key bindings.
bindkey -d bindkey -d

4
plugins/git/info.zsh

@ -105,8 +105,8 @@ add-zsh-trap INT _git-info-abort
# Gets the Git status information. # Gets the Git status information.
function git-info() { function git-info() {
# Extended globbing is needed to parse repository status. # Extended globbing is needed to parse repository status.
setopt local_options setopt LOCAL_OPTIONS
setopt extended_glob setopt EXTENDED_GLOB
local action local action
local action_format local action_format

4
plugins/history-substring-search/history-substring-search.zsh

@ -186,7 +186,7 @@ if [[ $+functions[_zsh_highlight] -eq 0 ]]; then
fi fi
function _history-substring-search-begin() { function _history-substring-search-begin() {
setopt localoptions extendedglob setopt LOCAL_OPTIONS EXTENDED_GLOB
_history_substring_search_move_cursor_eol=false _history_substring_search_move_cursor_eol=false
_history_substring_search_query_highlight= _history_substring_search_query_highlight=
@ -254,7 +254,7 @@ function _history-substring-search-begin() {
} }
function _history-substring-search-end() { function _history-substring-search-end() {
setopt localoptions extendedglob setopt LOCAL_OPTIONS EXTENDED_GLOB
_history_substring_search_result=$BUFFER _history_substring_search_result=$BUFFER

2
plugins/ruby/init.zsh

@ -17,7 +17,7 @@ fi
# Loads RVM into the shell session. # Loads RVM into the shell session.
if [[ -s "$HOME/.rvm/scripts/rvm" ]]; then if [[ -s "$HOME/.rvm/scripts/rvm" ]]; then
# Auto adding variable-stored paths to ~ list conflicts with RVM. # Auto adding variable-stored paths to ~ list conflicts with RVM.
unsetopt auto_name_dirs unsetopt AUTO_NAME_DIRS
# Source RVM. # Source RVM.
source "$HOME/.rvm/scripts/rvm" source "$HOME/.rvm/scripts/rvm"

2
terminal.zsh

@ -34,7 +34,7 @@ function set-tab-title() {
# Sets the tab and window titles with the command name. # Sets the tab and window titles with the command name.
function set-title-by-command() { function set-title-by-command() {
emulate -L zsh emulate -L zsh
setopt localoptions extended_glob setopt LOCAL_OPTIONS EXTENDED_GLOB
# Get the command name that is under job control. # Get the command name that is under job control.
if [[ "${1[(w)1]}" == (fg|%*)(\;|) ]]; then if [[ "${1[(w)1]}" == (fg|%*)(\;|) ]]; then

4
themes/minimal/prompt_minimal_setup

@ -6,12 +6,12 @@ function +vi-git-status() {
} }
function prompt_minimal_precmd () { function prompt_minimal_precmd () {
setopt noxtrace noksharrays localoptions setopt NO_XTRACE NO_KSHARRAYS LOCAL_OPTIONS
vcs_info vcs_info
} }
function prompt_minimal_setup() { function prompt_minimal_setup() {
setopt noxtrace noksharrays localoptions setopt NO_XTRACE NO_KSHARRAYS LOCAL_OPTIONS
prompt_opts=(cr subst percent) prompt_opts=(cr subst percent)
autoload -Uz add-zsh-hook autoload -Uz add-zsh-hook

2
themes/nicoulaj/prompt_nicoulaj_setup

@ -11,7 +11,7 @@
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
function prompt_nicoulaj_setup() { function prompt_nicoulaj_setup() {
setopt noxtrace noksharrays localoptions setopt NO_XTRACE NO_KSHARRAYS LOCAL_OPTIONS
prompt_opts=(cr subst percent) prompt_opts=(cr subst percent)
# Load required modules. # Load required modules.

4
themes/sorin/prompt_sorin_setup

@ -6,7 +6,7 @@
# SCREENSHOT: http://i.imgur.com/aipDQ.png # SCREENSHOT: http://i.imgur.com/aipDQ.png
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
function prompt_sorin_precmd () { function prompt_sorin_precmd () {
setopt noxtrace noksharrays localoptions setopt NO_XTRACE NO_KSHARRAYS LOCAL_OPTIONS
if (( $+functions[git-info] )); then if (( $+functions[git-info] )); then
git-info git-info
@ -14,7 +14,7 @@ function prompt_sorin_precmd () {
} }
function prompt_sorin_setup() { function prompt_sorin_setup() {
setopt localoptions noxtrace noksharrays setopt NO_XTRACE NO_KSHARRAYS LOCAL_OPTIONS
prompt_opts=(cr subst percent) prompt_opts=(cr subst percent)
autoload -Uz add-zsh-hook autoload -Uz add-zsh-hook

2
themes/steeef/prompt_steeef_setup

@ -45,7 +45,7 @@ function prompt_steeef_chpwd() {
} }
function prompt_steeef_setup() { function prompt_steeef_setup() {
setopt localoptions noxtrace noksharrays setopt NO_XTRACE NO_KSHARRAYS LOCAL_OPTIONS
prompt_opts=(cr subst percent) prompt_opts=(cr subst percent)
autoload -Uz add-zsh-hook autoload -Uz add-zsh-hook

Loading…
Cancel
Save