From 39f3902a6c557caf80aaba3a38952f418fb5cb0d Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@nil.im>
Date: Mon, 22 Oct 2012 08:17:15 +0000
Subject: [PATCH] Update zshrc.

---
 zshrc | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/zshrc b/zshrc
index 1137027..09dea04 100644
--- a/zshrc
+++ b/zshrc
@@ -1,15 +1,14 @@
 AUDIO_PLAYER="open"
 VIDEO_PLAYER="open"
-ARCHIVE_FORMATS=(7z bz2 gz tar tbz tbz2 tgz tar.gz tar.bz2 tar.xz rar xz zip)
+ARCHIVE_FORMATS=(7z bz2 gz xz tar tbz tbz2 tgz txz tar.gz tar.bz2 tar.xz rar zip)
 AUDIO_PLAYER_FORMATS=(aac flac it m4a mod mp3 mpc ogg sid spc wma wv xm)
 VIDEO_PLAYER_FORMATS=(avi divx flv mkv mov mpeg mp4 mpg ogm wmv)
-EDITOR="/usr/local/bin/vim"
+EDITOR="vim"
 PAGER="less"
 GREP=""
 GREP_COLOUR="auto"
 FGREP=""
-FGREP_COLOUR="auto"
-LS="gls"
+LS="ls"
 LS_COLOUR="auto"
 LS_ON_CD="yes"
 LS_ON_INIT="no"
@@ -37,11 +36,11 @@ if [ "$GREP" -o "$GREP_COLOUR" ]; then
 	alias grep="$GREP $GREP_COLOUR"
 fi
 
-if [ "$FGREP" -o "$FGREP_COLOUR" ]; then
+if [ "$FGREP" -o "$GREP_COLOUR" ]; then
 	[ -z "$FGREP" ] && FGREP="fgrep"
-	[ ! -z "$FGREP_COLOUR" -a "$FGREP_COLOUR[1]" != "-" ] && \
-		FGREP_COLOUR="--colour=$FGREP_COLOUR"
-	alias fgrep="$FGREP $FGREP_COLOUR"
+	[ ! -z "$GREP_COLOUR" -a "$GREP_COLOUR[1]" != "-" ] && \
+		GREP_COLOUR="--colour=$GREP_COLOUR"
+	alias fgrep="$FGREP $GREP_COLOUR"
 fi
 
 if [ "$LS" -o "$LS_COLOUR" ]; then
@@ -125,8 +124,6 @@ case $TERM in
 		;;
 esac
 
-alias vi="vim"
-
 extr() {
 	for i in $@; do
 		case $i in
@@ -140,7 +137,7 @@ extr() {
 				bzcat $i | tar xfv -
 				;;
 			*.tgz | *.tar.gz)
-				gzcat $i | tar xfv -
+				zcat $i | tar xfv -
 				;;
 			*.txz | *.tar.xz)
 				xzcat $i | tar xfv -
@@ -158,6 +155,9 @@ extr() {
 			*.gz)
 				gunzip $i
 				;;
+			*.xz)
+				unxz $i
+				;;
 			*)
 				echo "$i: Unknown file type"
 				false
@@ -177,12 +177,6 @@ sprunge() {
 	curl -F "sprunge=<-" http://sprunge.us
 }
 
-mencoder-iphone() {
-	for i in "$@"; do
-		mencoder -vf scale=480:-10,harddup -oac faac -faacopts mpeg=4:object=2:raw:br=128 -of lavf -lavfopts format=mp4 -ovc x264 -x264encopts nocabac:level_idc=30:bframes=0:global_header:threads=auto:subq=5:frameref=6:partitions=all:bitrate=800 -o "${i%.*}.iphone.m4v" "$i"
-	done
-}
-
 for ext in $ARCHIVE_FORMATS; do alias -s $ext=extr; done
 
 [ "$AUDIO_PLAYER" ] && \
@@ -198,4 +192,4 @@ alias -s app=open
 
 unset AUDIO_PLAYER VIDEO_PLAYER
 unset ARCHIVE_FORMATS AUDIO_PLAYER_FORMATS VIDEO_PLAYER_FORMATS
-unset FGREP FGREP_COLOUR GREP GREP_COLOUR LS LS_COLOUR LS_ON_CD LS_ON_INIT
+unset FGREP GREP GREP_COLOUR LS LS_COLOUR LS_ON_CD LS_ON_INIT