shell/aliases: move some commands from zsh/rc

[config/dotfiles.git] / zsh / rc

diff --git a/zsh/rc b/zsh/rc
index afc78b0039ffb68ad45c17b5a12b453d50296d0b..18c66952e56b0599fc8a481b046bb775358e065b 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
 
 
-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 <C-D> 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%% *}
@@ -563,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
@@ -629,7 +629,7 @@ 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
@@ -798,7 +798,7 @@ compdef svalgrind=valgrind
 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
 
@@ -826,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'
@@ -862,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
@@ -876,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
 
@@ -1065,7 +1058,4 @@ zshrc_restart_precmd() {
 }
 precmd_functions+=(zshrc_restart_precmd)
 
-
-source_debug '. ~/.zsh/rc (done)'
-
 # vim: ft=zsh