X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;ds=sidebyside;f=zsh%2Frc;h=18c66952e56b0599fc8a481b046bb775358e065b;hb=24ec064a7aa54ae8e5714b3f717f7ab5e40f20f3;hp=908896121d042ad4f7123c04a9367b7a9c48ae1a;hpb=1fca0311a9b2f77e4f48e7dfaec3bee82e13ec97;p=config%2Fdotfiles.git
diff --git a/zsh/rc b/zsh/rc
index 9088961..18c6695 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -1,6 +1,6 @@
# Zsh configuration file.
-# Copyright (C) 2011-2013 Simon Ruderich
+# Copyright (C) 2011-2014 Simon Ruderich
#
# This file is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -16,9 +16,6 @@
# along with this file. If not, see .
-source_debug '. ~/.zsh/rc'
-
-
# Warn when creating global variables from inside a function. Needs to be set
# before declaring a function.
setopt warn_create_global
@@ -38,12 +35,12 @@ zshrc_resolve_fg_to_resumed_job_name() {
# Replace fg with the resumed job name.
if [[ $1 == fg ]]; then
- REPLY="${jobtexts[%+]}"
+ REPLY=${jobtexts[%+]}
elif [[ $1 == fg\ * ]]; then
- REPLY="${jobtexts[${1#fg }]}"
+ REPLY=${jobtexts[${1#fg }]}
# Normal program, return as is.
else
- REPLY="$1"
+ REPLY=$1
fi
}
@@ -78,6 +75,9 @@ setopt extendedglob
# pressing twice).
setopt ignoreeof
+# Also display PID when suspending a process.
+setopt longlistjobs
+
# KEY BINDINGS
@@ -205,7 +205,7 @@ setopt pushdminus
# PROMPT SETTINGS
# Use colorized output, necessary for prompts and completions.
-autoload -Uz colors && colors
+autoload -Uz colors; colors
# Necessary for $EPOCHSECONDS, the UNIX time.
zmodload zsh/datetime
@@ -276,7 +276,7 @@ if [[ $ZSH_VERSION == (4.3.<9->*|4.<4->*|<5->*) ||
+vi-pre-get-data() {
# Only Git and Mercurial support and need caching. Abort if any other
# VCS is used.
- [[ "$vcs" != git && "$vcs" != hg ]] && return
+ [[ $vcs != git && $vcs != hg ]] && return
# If the shell just started up or we changed directories (or for other
# custom reasons) we must run vcs_info.
@@ -289,7 +289,7 @@ if [[ $ZSH_VERSION == (4.3.<9->*|4.<4->*|<5->*) ||
ret=1
# If a git/hg command was run then run vcs_info as the status might
# need to be updated.
- case "$(fc -ln $(($HISTCMD-1)))" in
+ case $(fc -ln $(($HISTCMD-1))) in
git* | g\ *)
ret=0
;;
@@ -336,12 +336,12 @@ zshrc_longrun_data=()
# Display runtime in seconds for long running programs (> 60 seconds) and send
# a bell to notify me.
zshrc_longrun_preexec() {
- local program="$3"
+ local program=$3
# Handle fg.
local REPLY
- zshrc_resolve_fg_to_resumed_job_name "$program"
- program="$REPLY"
+ zshrc_resolve_fg_to_resumed_job_name $program
+ program=$REPLY
# Don't track the time for certain (possible) long running processes which
# need no automatic notification.
@@ -354,7 +354,7 @@ zshrc_longrun_preexec() {
esac
done
- zshrc_longrun_data=("$program" $EPOCHSECONDS)
+ zshrc_longrun_data=($program $EPOCHSECONDS)
}
zshrc_longrun_precmd() {
# No previous timestamp available or disabled for this command, ignore.
@@ -410,10 +410,10 @@ zshrc_prompt_precmd() {
local directory="${yellow}%WIDTH<..<%~%<<${default}"
# Minimal information about the VCS, only displayed if there are
# unstaged/staged changes.
- local vcs_staged="${vcs_info_msg_1_}"
+ local vcs_staged=${vcs_info_msg_1_}
# Information about the VCS in this directory.
- local vcs="${vcs_info_msg_0_}"
+ local vcs=${vcs_info_msg_0_}
# Current time (seconds since epoch) in Hex in bright blue.
local seconds="${blue}%B0x$(([##16] EPOCHSECONDS))%b${default}"
@@ -439,7 +439,7 @@ zshrc_prompt_precmd() {
# Combine them to create the prompt.
- local top_left="${vcs_staged}"
+ local top_left=${vcs_staged}
local top_right="${vcs}(${seconds})"
local width_top_prefix=${#${(S%%)top_prefix//$~zero/}}
@@ -508,8 +508,8 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
# Handle fg.
local REPLY
- zshrc_resolve_fg_to_resumed_job_name "$program_name"
- program_name="$REPLY"
+ zshrc_resolve_fg_to_resumed_job_name $program_name
+ program_name=$REPLY
# Remove all arguments from the program name.
program_name=${program_name%% *}
@@ -528,11 +528,17 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
program_name=git
;;
m)
- program_name=mutt
+ program_name=make
+ ;;
+ p)
+ program_name=less
;;
v)
program_name=vim
;;
+ mu)
+ program_name=mutt
+ ;;
esac
# Add an exclamation mark at the beginning if running with sudo or if
@@ -557,7 +563,7 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
fi
# Set the window name to the currently running program.
- zshrc_window_title "$program_name"
+ zshrc_window_title $program_name
# Tell precmd() to reset the window name when the program stops.
zshrc_window_reset=yes
@@ -623,16 +629,32 @@ zmodload zsh/complist
# cluttering of ~/. $fpath must be set before calling this. Thanks to Adlai in
# #zsh on Freenode (2009-08-07 21:05 CEST) for reminding me of the $fpath
# problem.
-autoload -Uz compinit && compinit -d ~/.zsh/cache/zcompdump
+autoload -Uz compinit; compinit -d ~/.zsh/cache/zcompdump
# Use cache to speed up some slow completions (dpkg, perl modules, etc.).
zstyle ':completion:*' use-cache yes
zstyle ':completion:*' cache-path ~/.zsh/cache
+# List all files in the current directory when pressing tab on an empty input,
+# behave like complete-word otherwise. Thanks to John Eikenberry [1] for the
+# code, read on 2014-03-15.
+#
+# [1]: http://unix.stackexchange.com/a/32426
+complete-word-or-complete-list-of-files() {
+ if [[ $#BUFFER == 0 ]]; then
+ BUFFER='ls '
+ CURSOR=3
+ zle list-choices
+ zle backward-kill-word
+ else
+ zle complete-word
+ fi
+}
+zle -N complete-word-or-complete-list-of-files
# Let the completion system handle all completions, including expanding of
# shell wildcards (which is handled by other shell mechanisms if the default
# expand-or-complete is used).
-bindkey '^I' complete-word
+bindkey '^I' complete-word-or-complete-list-of-files
# If there are multiple matches after pressing always display them
# immediately without requiring another . a completes to aa and
# lists aaa, aab, aac as possible completions if the directory contains aaa,
@@ -643,8 +665,21 @@ setopt nolistambiguous
# the _prefix completer.
setopt completeinword
+# Force a reload of the completion system if nothing matched; this fixes
+# installing a program and then trying to tab-complete its name. Thanks to
+# Alex Munroe [1] for the code, read on 2014-03-03.
+#
+# [1]: https://github.com/eevee/rc/blob/master/.zshrc
+_force_rehash() {
+ if (( CURRENT == 1 )); then
+ rehash
+ fi
+ # We didn't really complete anything.
+ return 1
+}
+
zstyle ':completion:::::' completer \
- _expand _complete _prefix _ignored _approximate
+ _force_rehash _expand _complete _prefix _ignored _approximate
# Match specification to be tried when completing items. Each group ('...') is
# tried after another if no matches were found, once matches are found no
@@ -705,6 +740,14 @@ zle_highlight=(suffix:none)
# Ignore completion functions.
zstyle ':completion:*:functions' ignored-patterns '_*'
+
+# When offering typo corrections, do not propose anything which starts with an
+# underscore (such as many of Zsh's shell functions). Thanks to paradigm [1]
+# for the idea (read on 2013-04-07).
+#
+# [1]: https://github.com/paradigm/dotfiles/blob/master/.zshrc
+CORRECT_IGNORE='_*'
+
# Ignore parent directory.
zstyle ':completion:*:(cd|mv|cp):*' ignore-parents parent pwd
# Always complete file names only once in the current line. This makes it easy
@@ -734,6 +777,12 @@ zle -C complete-files complete-word _generic
zstyle ':completion:complete-files:*' completer _files
bindkey '^F' complete-files
+# Completion for my wrapper scripts
+compdef slocate=locate
+compdef srsync=rsync
+compdef srsync-incremental=rsync
+compdef svalgrind=valgrind
+
# CUSTOM ALIASES AND FUNCTIONS
@@ -749,7 +798,7 @@ bindkey '^F' complete-files
TRAPINT() {
# Don't store this line in history if histignorespace is enabled and the
# line starts with a space.
- if [[ -o histignorespace && ${BUFFER[1]} = " " ]]; then
+ if [[ -o histignorespace && ${BUFFER[1]} = ' ' ]]; then
return $1
fi
@@ -777,6 +826,9 @@ alias -g LS='2>&1 | less -S' # -S prevents wrapping of long lines
alias -g D='2>&1 | colordiff | less'
# Global aliases for often used commands.
alias -g A='| awk'
+alias -g A1="| awk '{ print \$1 }'"
+alias -g A2="| awk '{ print \$2 }'"
+alias -g A3="| awk '{ print \$3 }'"
alias -g G='| grep'
alias -g H='| head'
alias -g P='| perl'
@@ -813,11 +865,6 @@ fi
command tig --max-count=200 --branches --remotes --tags "$@"
}
-# Pipe output through less.
-(( $+commands[tree] )) && tree() {
- command tree -C "$@" | less
-}
-
# Choose the "best" PDF viewer available: xpdf, then zathura (in the past
# zathura was preferred, but recent versions are completely broken: still no
# working search and no page-wise scrolling anymore). Also setup completion
@@ -827,21 +874,16 @@ if (( $+commands[xpdf] )); then
command xpdf "$@" 2>/dev/null &
disown %command
}
- compdef _xpdf pdf
+ compdef pdf=xpdf
elif (( $+commands[zathura] )); then
pdf() {
command zathura "$@" 2>/dev/null &
disown %command
}
# No completion for zathura yet.
- compdef _xpdf pdf
+ compdef pdf=xpdf
fi
-# Better viewer for info pages .. just pipe everything into less.
-info() {
- command info "$@" 2>/dev/null | less
-}
-
# OS SPECIFIC SETTINGS
@@ -1016,7 +1058,4 @@ zshrc_restart_precmd() {
}
precmd_functions+=(zshrc_restart_precmd)
-
-source_debug '. ~/.zsh/rc (done)'
-
# vim: ft=zsh