X-Git-Url: https://git.madduck.net/etc/zsh.git/blobdiff_plain/89d7a758cffa51693257dd2a60f57cdd2ec5a591..a0644f815aaeffc9ffa5c3411f2c3c3d70914586:/.zsh/zshrc/30_aliases

diff --git a/.zsh/zshrc/30_aliases b/.zsh/zshrc/30_aliases
index 19fdb7c..7acf460 100644
--- a/.zsh/zshrc/30_aliases
+++ b/.zsh/zshrc/30_aliases
@@ -8,6 +8,8 @@
 # Source repository: git://git.madduck.net/etc/zsh.git
 #
 
+function trace() { eval "set -x; $@" }
+
 alias mv='nocorrect mv'
 alias cp='nocorrect cp'
 alias ln='nocorrect ln'
@@ -32,7 +34,7 @@ command ls --group-directories-first >/dev/null 2>&1 \
 # I prefer POSIX collation for ls
 alias ls="LC_COLLATE=POSIX ls $_ls_opts"
 
-alias l='ls --time-style=+%Y%m%d.%H%M -gG'
+alias l='ls --time-style=+%Y-%m-%d-%H:%M -gG'
 alias ll='ls -l'
 alias la='ls -a'
 alias lla='ls -la'
@@ -43,7 +45,7 @@ alias lart='ls -lart'
 # List only directories and symbolic links that point to directories
 alias lsd='ll -d *(-/DN)'
 
-alias lscontext=l
+alias lscontext=ls
 cd () { __CHPWD_RUN_FIRST=lscontext && builtin cd "$@" && unset __CHPWD_RUN_FIRST }
 #_cd_l() { ll }
 #chpwd_functions+=_cd_l
@@ -51,9 +53,12 @@ cd () { __CHPWD_RUN_FIRST=lscontext && builtin cd "$@" && unset __CHPWD_RUN_FIRS
 # #183394
 alias w='w|cat'
 
-alias egrep='egrep --color=auto -d skip'
-alias fgrep='fgrep --color=auto -d skip'
-alias grep='grep --color=auto -d skip'
+alias -g ND='*(/om[1])' # newest directory
+alias -g NF='*(.om[1])' # newest file
+
+alias egrep='egrep --color=auto -d skip -D skip'
+alias fgrep='fgrep --color=auto -d skip -D skip'
+alias grep='grep --color=auto -d skip -D skip'
 
 alias mmv='noglob zmv -W'
 alias zcp='zmv -C'
@@ -66,13 +71,26 @@ alias ftp=lftp
 alias mbug='bts show --mbox'
 alias bug='BROWSER=www-browser bts show'
 
-# handy documentation lookup on Debian
-# from http://www.michael-prokop.at/computer/config/.zshrc
-doc() { cd /usr/share/doc/$1 && ls }
-_doc() { _files -W /usr/share/doc -/ }
-compdef _doc doc
+edalias() {
+  [[ -z "$1" ]] && { echo "Usage: edalias <alias_to_edit>" ; return 1 } || vared aliases'[$1]' ;
+}
+compdef _aliases edalias
+
+edfunc() {
+  [[ -z "$1" ]] && { echo "Usage: edfunc <function_to_edit>" ; return 1 } || zed -f "$1" ;
+}
+compdef _functions edfunc
+
+doc() { cd /usr/share/doc/$1 }
+compdef '_files -W /usr/share/doc -/' doc
 
 alias giti='git init && git add . && git commit -minitial\ checkin && git tag orig'
+gbs() {
+  local branch; branch="$(git symbolic-ref -q HEAD)"; branch="${branch##*/}"
+  git config branch.${branch}.remote ${1:-origin}
+  git config branch.${branch}.merge refs/heads/${branch}
+  git config branch.${branch}.rebase true
+}
 
 if whence mtail >/dev/null; then
   alias t=mtail
@@ -81,20 +99,45 @@ elif whence tailf >/dev/null; then
 else
   alias t='tail -f'
 fi
-alias tsl='t /var/log/syslog'
-alias lsl='sensible-pager /var/log/syslog'
-alias tml='t /var/log/mail.log'
-alias lml='sensible-pager /var/log/mail.log'
-alias tal='t /var/log/auth.log'
-alias lal='sensible-pager /var/log/auth.log'
-alias tdl='t /var/log/daemon.log'
-alias ldl='sensible-pager /var/log/daemon.log'
-alias tkl='t /var/log/kern.log'
-alias lkl='sensible-pager /var/log/kern.log'
+compdef _files t
+
+function ltail() { t ~log/$1 }
+compdef '_files -W ~log' ltail
+
+function lless() { sensible-pager ~log/$1 }
+compdef '_files -W ~log' lless
+
+alias tsl='ltail syslog'
+alias lsl='lless syslog'
+alias tml='ltail mail.log'
+alias lml='lless mail.log'
+alias tal='ltail auth.log'
+alias lal='lless auth.log'
+alias tdl='ltail daemon.log'
+alias ldl='lless daemon.log'
+alias tkl='ltail kern.log'
+alias lkl='lless kern.log'
+
+function lgrep() {
+  local pattern="$1"; shift
+  eval egrep "'$pattern'" "~log/${(j: ~log/:)@}"
+}
 
 alias px='ps afux'
 alias mps='ps -ao user,pcpu,start,command'
 
+function of() { lsof -np "$1" }
+compdef _pids of
+
+function psgrep() { ps aux | grep "[${1[1]}]${1[2,-1]}" }
+
+alias rw-='chmod 600'
+alias rwx='chmod 700'
+alias r--='chmod 644'
+alias r-x='chmod 755'
+alias r-s='chmod 2755'
+alias rws='chmod 2775'
+
 alias bofh='fortune bofh-excuses'
 
 autoload -U baseconv
@@ -103,7 +146,9 @@ alias d2b='baseconv 10 2'
 alias d2h='baseconv 10 16'
 alias h2d='baseconv 16 10'
 alias d2o='baseconv 10 8'
-alias o2d='baseconv 8 10'
+alias d2o='baseconv 10 8'
+alias h2b='baseconv 16 2'
+alias b2h='baseconv 2 16'
 
 alias sendmail=/usr/sbin/sendmail
 
@@ -116,16 +161,16 @@ _LANGUAGES[de]=deu
 _LANGUAGES[es]=spa
 _LANGUAGES[fr]=fra
 _LANGUAGES[it]=ita
-_LANGUAGES[lt]=lat
+_LANGUAGES[tn]=lat
 for l0 in ${(k)_LANGUAGES}; do
   for l1 in ${(k)_LANGUAGES}; do
-    eval "_${l0}-${l1}() { _d -d fd-${_LANGUAGES[$l0]}-${_LANGUAGES[$l1]} \$* }"
-    eval "${l0}-${l1}() { d -d fd-${_LANGUAGES[$l0]}-${_LANGUAGES[$l1]} \$* }"
+    eval "function _${l0}-${l1}() { _d -d fd-${_LANGUAGES[$l0]}-${_LANGUAGES[$l1]} \$* }"
+    eval "function ${l0}-${l1}() { d -d fd-${_LANGUAGES[$l0]}-${_LANGUAGES[$l1]} \$* }"
   done
 done
 unset '_LANGUAGES[en]'
 for l in ${(k)_LANGUAGES}; do
-  eval "${l}() { (_${l}-en \$*; _en-${l} \$*) | more }"
+  eval "function ${l}() { (_${l}-en \$*; _en-${l} \$*) | more }"
 done
 unset _LANGUAGES
 
@@ -137,6 +182,8 @@ ptssub() { echo subscribe ${1:?E: no package name given.} | sendmail -f ${2:-$DE
 ptsunsub() { echo unsubscribe ${1:?E: no package name given.} | sendmail -f ${2:-$DEBEMAIL} pts@qa.debian.org }
 qasub() { echo subscribe ${1:?E: no package name given.} ${2:-unspecifed} | sendmail -f $DEBEMAIL ddpo@qa.debian.org }
 qaunsub() { echo unsubscribe ${1:?E: no package name given.} ${2:-unspecifed} | sendmail -f $DEBEMAIL ddpo@qa.debian.org }
+listsub() { echo Subject: subscribe | sendmail -f ${1%@*}=${1#*@}@mass.madduck.net ${1%@*}-request@${1#*@} }
+listunsub() { echo Subject: unsubscribe | sendmail -f ${1%@*}=${1#*@}@mass.madduck.net ${1%@*}-request@${1#*@} }
 
 uc() { unicode --max=0 --colour=off "$@" | sensible-pager }
 
@@ -146,14 +193,57 @@ alias ipl='ip l'
 
 alias btd='btdownloadheadless'
 
+function asc () { autossh -t "$@" 'screen -qxp= || screen -qdRR' }
+compdef asc=ssh
+
 alias mdtest='swaks -s localhost -t'
 
 if whence devtodo >/dev/null; then
-  _devtodo_on_chpwd() { 
+  _devtodo_on_chpwd() {
     local out; out="$(devtodo)"
     [[ -n $out ]] && print "todo:\n$out"
   }
-  chpwd_functions+=_devtodo_on_chpwd
+  [[ -z ${(M)chpwd_functions:#_devtodo_on_chpwd} ]] && chpwd_functions+=_devtodo_on_chpwd
 fi
 
+pdfextract() {
+  local i=$1
+  local o=$2
+  shift 2
+  pdftk "$i" cat "${@:-1-end}" output "${o%.pdf}.pdf"
+}
+compdef _files pdfextract
+
+gittestfile() {
+  local annex; annex=false
+  local file
+
+  case "$1" in
+    (-a) annex=true;;
+    (*)
+      if [ -n "$file" ]; then
+        echo >&2 "E: filename already given"
+        return 1
+      fi
+      file="$1";;
+  esac
+
+  if [ -z "$file" ]; then
+    file=$(TMPDIR=${PWD} tempfile -ptest. -s.txt)
+  fi
+
+  echo "Test file created $(date)" >| $file
+
+  case "$annex" in
+    true)
+      git annex add $file
+      git commit -m"Add test file $file to annex"
+      ;;
+    false)
+      git add $file
+      git commit -m"Add test file $file"
+      ;;
+  esac
+}
+
 # vim:ft=zsh