Merge branch 'master' of gitosis@majnematic.com:davesdots

bash/alias

@@ -0,0 +1,2 @@
+alias :q='exit'
+alias :wq='exit'

bash/title_prompt

@@ -14,7 +14,11 @@ function do_prompt ()
     local TITLEBAR
     case $TERM in
        xterm*|*rxvt*|cygwin|interix|Eterm|mlterm|kterm|aterm|putty*)
+            if [ "${STY}" ] ; then
+                TITLEBAR='\[\033k\u@\h:\w\033\134\]'
+            else
                 TITLEBAR='\[\033]1;\u@\h:\w\007\033]2;\u@\h:\w\007\]'
+            fi
         ;;
         screen*)
             TITLEBAR='\[\033k\u@\h:\w\033\134\]'

commonsh/10_alias

@@ -2,7 +2,7 @@
 # colors
 for dircolors in gdircolors dircolors ; do
 	if ( command -v $dircolors >/dev/null 2>&1)  ; then
-		[ -f "${HOME}/.dir_colors" ] && eval `$dircolors -b "${HOME}/.dir_colors"` && break
+		[ -f "${HOME}/.$dircolors" ] && eval `$dircolors -b "${HOME}/.$dircolors"` && break
 		[ -f /etc/DIR_COLORS ] && eval `$dircolors -b /etc/DIR_COLORS` && break
 		eval `$dircolors -b` && break
 	fi
@@ -20,8 +20,6 @@ export FCEDIT
 
 # aliases
 alias cd..='cd ..'
-alias :q='exit'
-alias :wq='exit'
 
 # handles per OS aliases, fixes a few terms
 case `uname -s` in
@@ -35,7 +33,7 @@ case `uname -s` in
 		elif ( ls --version 2>/dev/null | grep GNU >/dev/null 2>&1 ) ; then
 			alias ls="ls -h --color=auto"
 		else
-			LSCOLORS=ExGxFxDxCxDxDxHbaDacec
+			LSCOLORS="ExGxFxDxCxDxDxHbaDEaEa"
 			export LSCOLORS
 			alias ls="ls -Gh"
 		fi

dircolors

@@ -72,9 +72,9 @@ CHR 40;33;01 # character device driver
 ORPHAN 40;31;01 # symlink to nonexistent file, or non-stat'able file
 # SETUID 37;41 # file that is setuid (u+s)
 # SETGID 30;43 # file that is setgid (g+s)
-# STICKY_OTHER_WRITABLE 30;42 # dir that is sticky and other-writable (+t,o+w)
-# OTHER_WRITABLE 34;42 # dir that is other-writable (o+w) and not sticky
-# STICKY 37;44 # dir with the sticky bit set (+t) and not other-writable
+STICKY_OTHER_WRITABLE 01;04;34;40 # dir that is sticky and other-writable (+t,o+w)
+OTHER_WRITABLE 01;34;40 # dir that is other-writable (o+w) and not sticky
+# STICKY 01;37;44 # dir with the sticky bit set (+t) and not other-writable
 # This is for files with execute permission:
 EXEC 01;32
 # List any file extensions like '.gz' or '.tar' that you would like ls

gdircolors

@@ -0,0 +1,172 @@
+# Configuration file for dircolors, a utility to help you set the
+# LS_COLORS environment variable used by GNU ls with the --color option.
+# Copyright (C) 1996, 1999-2008
+# Free Software Foundation, Inc.
+# Copying and distribution of this file, with or without modification,
+# are permitted provided the copyright notice and this notice are preserved.
+# The keywords COLOR, OPTIONS, and EIGHTBIT (honored by the
+# slackware version of dircolors) are recognized but ignored.
+# Below, there should be one TERM entry for each termtype that is colorizable
+TERM Eterm
+TERM ansi
+TERM color-xterm
+TERM con132x25
+TERM con132x30
+TERM con132x43
+TERM con132x60
+TERM con80x25
+TERM con80x28
+TERM con80x30
+TERM con80x43
+TERM con80x50
+TERM con80x60
+TERM cons25
+TERM console
+TERM cygwin
+TERM dtterm
+TERM eterm-color
+TERM gnome
+TERM gnome-256color
+TERM jfbterm
+TERM konsole
+TERM kterm
+TERM linux
+TERM linux-c
+TERM mach-color
+TERM mlterm
+TERM putty
+TERM rxvt
+TERM rxvt-cygwin
+TERM rxvt-cygwin-native
+TERM rxvt-unicode
+TERM screen
+TERM screen-256color
+TERM screen-bce
+TERM screen-w
+TERM screen.linux
+TERM vt100
+TERM xterm
+TERM xterm-16color
+TERM xterm-256color
+TERM xterm-88color
+TERM xterm-color
+TERM xterm-debian
+# Below are the color init strings for the basic file types. A color init
+# string consists of one or more of the following numeric codes:
+# Attribute codes:
+# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed
+# Text color codes:
+# 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white
+# Background color codes:
+# 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white
+NORMAL 00 # global default, although everything should be something.
+FILE 00 # normal file
+DIR 01;34 # directory
+LINK 01;36 # symbolic link. (If you set this to 'target' instead of a
+ # numerical value, the color is as for the file pointed to.)
+FIFO 40;33 # pipe
+SOCK 01;35 # socket
+DOOR 01;35 # door
+BLK 40;33;01 # block device driver
+CHR 40;33;01 # character device driver
+ORPHAN 40;31;01 # symlink to nonexistent file, or non-stat'able file
+# SETUID 37;41 # file that is setuid (u+s)
+# SETGID 30;43 # file that is setgid (g+s)
+# STICKY_OTHER_WRITABLE 01;04;34;40 # dir that is sticky and other-writable (+t,o+w)
+# OTHER_WRITABLE 01;34;40 # dir that is other-writable (o+w) and not sticky
+# STICKY 01;37;44 # dir with the sticky bit set (+t) and not other-writable
+# This is for files with execute permission:
+EXEC 01;32
+# List any file extensions like '.gz' or '.tar' that you would like ls
+# to colorize below. Put the extension, a space, and the color init string.
+# (and any comments you want to add after a '#')
+# If you use DOS-style suffixes, you may want to uncomment the following:
+.cmd 01;32 # executables (bright green)
+.exe 01;32
+.com 01;32
+.btm 01;32
+.bat 01;32
+# Or if you want to colorize scripts even if they do not have the
+# executable bit actually set.
+#.sh 01;32
+#.csh 01;32
+ # archives or compressed (bright red)
+.tar 01;31
+.tgz 01;31
+.arj 01;31
+.taz 01;31
+.lzh 01;31
+.lzma 01;31
+.zip 01;31
+.z 01;31
+.Z 01;31
+.dz 01;31
+.gz 01;31
+.bz2 01;31
+.bz 01;31
+.tbz2 01;31
+.tz 01;31
+.deb 01;31
+.rpm 01;31
+.jar 01;31
+.rar 01;31
+.ace 01;31
+.zoo 01;31
+.cpio 01;31
+.7z 01;31
+.rz 01;31
+# image formats
+.jpg 01;35
+.jpeg 01;35
+.gif 01;35
+.bmp 01;35
+.pbm 01;35
+.pgm 01;35
+.ppm 01;35
+.tga 01;35
+.xbm 01;35
+.xpm 01;35
+.tif 01;35
+.tiff 01;35
+.png 01;35
+.svg 01;35
+.svgz 01;35
+.mng 01;35
+.pcx 01;35
+.mov 01;35
+.mpg 01;35
+.mpeg 01;35
+.m2v 01;35
+.mkv 01;35
+.ogm 01;35
+.mp4 01;35
+.m4v 01;35
+.mp4v 01;35
+.vob 01;35
+.qt 01;35
+.nuv 01;35
+.wmv 01;35
+.asf 01;35
+.rm 01;35
+.rmvb 01;35
+.flc 01;35
+.avi 01;35
+.fli 01;35
+.flv 01;35
+.gl 01;35
+.dl 01;35
+.xcf 01;35
+.xwd 01;35
+.yuv 01;35
+# audio formats
+.aac 00;36
+.au 00;36
+.flac 00;36
+.mid 00;36
+.midi 00;36
+.mka 00;36
+.mp3 00;36
+.mpc 00;36
+.ogg 00;36
+.ra 00;36
+.wav 00;36

install.pl

@@ -39,7 +39,8 @@ unless(eval {symlink('', ''); 1;}) {
 my %links = (
 	screenrc   => '.screenrc',
 	toprc      => '.toprc',
-	dir_colors => '.dir_colors',
+	dircolors  => '.dircolors',
+	gdircolors => '.gdircolors',
 	lessfilter => '.lessfilter',
 
 	vim      => '.vim',

ksh/title_prompt

@@ -10,7 +10,11 @@ fi
 
 case $TERM in
 	xterm*|*rxvt*|cygwin|interix|Eterm|mlterm|kterm|aterm|putty*)
+		if [ "${STY}" ] ; then
+			TITLE='k${USER}:${PWD}\\'
+		else
 			TITLE=']1;${USER}:${PWD}]2;${USER}:${PWD}'
+		fi
 	;;
 	screen*)
 		TITLE='k${USER}:${PWD}\\'

zsh/alias

@@ -2,3 +2,5 @@ alias cp='nocorrect cp'
 alias mv='nocorrect mv'
 alias rm='nocorrect rm -ir'
 alias mkdir='nocorrect mkdir'
+alias :q='exit'
+alias :wq='exit'

zsh/bindkey

@@ -7,7 +7,7 @@ bindkey ' ' magic-space
 bindkey -M emacs '\ee' edit-command-line
 
 case $TERM in
-	screen|xterm*|putty)
+	screen|xterm*|putty*)
 		bindkey '\e[H' beginning-of-line
 		bindkey '\e[F' end-of-line
 		bindkey '\eOH' beginning-of-line

zsh/title

@@ -64,10 +64,14 @@ function title
 			print -nR $'\e]0;'$@$'\a'
 		;;
 		xterm*|*rxvt*|cygwin|Eterm|mlterm|kterm|aterm|putty*)
+			if [ "${STY}" ] ; then
+				print -nR $'\ek'$2$'\e'"\\"
+			else
 				# Use this one instead for everybody else:
 				shift
 				print -nR $'\e]1;'$@$'\a'
 				print -nR $'\e]2;'$@$'\a'
+			fi
 		;;
 	esac
 }

zshrc

@@ -3,10 +3,10 @@
 # Trivial modifications: David Majnemer
 # vim:set nowrap:
 
-autoload -U compinit; compinit -d "${HOME}/.zsh/.zcompdump"
+autoload compinit; compinit -d "${HOME}/.zsh/.zcompdump"
 
-autoload -U age
-autoload -U zmv
+autoload age
+autoload zmv
 
 if [ ${ZSH_VERSION//.} -gt 420 ] ; then
 	autoload -U url-quote-magic