# HG changeset patch
# User IBBoard <dev@ibboard.co.uk>
# Date 1407696958 -3600
# Node ID 483a45fc520cc431718cfe106c1924b6afc5767a
# Parent  281a9cb03796c1b355c1191c0c4a2418a28c4d2a# Parent  c88d17a35d61a6e169283028ce6591bf23af74c1
Fix multiple heads from forgotten changes on server

diff -r c88d17a35d61 -r 483a45fc520c dircolors
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dircolors	Sun Aug 10 19:55:58 2014 +0100
@@ -0,0 +1,207 @@
+# Configuration file for the color ls utility
+#
+# Modified by IBBoard as a combination of openSUSE, CentOS 6 and other inspiration
+#
+# This file goes in the /etc directory, and must be world readable.
+# You can copy this file to .dir_colors in your $HOME directory to override
+# the system defaults.
+
+# COLOR needs one of these arguments: 'tty' colorizes output to ttys, but not
+# pipes. 'all' adds color characters to all output. 'none' shuts colorization
+# off.
+COLOR tty
+
+# Extra command line options for ls go here.
+# Basically these ones are:
+#  -F = show '/' for dirs, '*' for executables, etc.
+#  -T 0 = don't trust tab spacing when formatting ls output.
+OPTIONS -F -T 0
+
+# Below, there should be one TERM entry for each termtype that is colorizable
+TERM linux
+TERM linux-c
+TERM console
+TERM con132x25
+TERM con132x30
+TERM con132x43
+TERM con132x60
+TERM con80x25
+TERM con80x28
+TERM con80x30
+TERM con80x43
+TERM con80x50
+TERM con80x60
+TERM gnome
+TERM mach-color
+TERM rxvt
+TERM rxvt-unicode
+TERM screen
+TERM screen-w
+TERM screen-256color
+TERM vt100
+TERM vt102
+TERM xterm
+TERM xterm-debian
+TERM xterm-256color
+TERM iterm
+
+# EIGHTBIT, followed by '1' for on, '0' for off. (8-bit output)
+EIGHTBIT 1
+
+# 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   00;36    # symbolic link
+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
+MISSING 01;05;33;41 # ... and the files they point to
+SETUID 37;41    # file that is setuid (u+s)
+SETGID 30;41    # file that is setgid (g+s)
+CAPABILITY 30;43        # file with capability
+STICKY_OTHER_WRITABLE 01;34;42 # dir that is sticky and other-writable (+t,o+w) - ala /tmp, and hence okay
+OTHER_WRITABLE 01;31;42 # dir that is other-writable (o+w) and not sticky - 777 is bad so use red
+STICKY 01;34;43    # dir with the sticky bit set (+t) and not other-writable
+
+
+# This is for files with execute permission:
+EXEC 00;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 '#')
+
+# executables (green)
+.cmd  00;32
+.exe  00;32
+.com  00;32
+.bat  00;32
+.btm  00;32
+.dll  00;32
+.sh  00;32
+
+# archives or compressed (red)
+.tar  00;31
+.tbz  00;31
+.tgz  00;31
+.rpm  00;31
+.deb  00;31
+.arj  00;31
+.taz  00;31
+.lzh  00;31
+.lzma 00;31
+.zip  00;31
+.zoo  00;31
+.z    00;31
+.Z    00;31
+.gz   00;31
+.bz2  00;31
+.tb2  00;31
+.tz2  00;31
+.tbz2 00;31
+.xz   00;31
+.7z   00;31
+.jar  00;31
+.iso  00;31
+
+# image formats (magenta)
+.avi  00;35
+.bmp  00;35
+.fli  00;35
+.gif  00;35
+.GIF  00;35
+.jpg  00;35
+.JPG  00;35
+.jpeg 00;35
+.mng  00;35
+.pcx  00;35
+.pbm  00;35
+.pgm  00;35
+.png  00;35
+.ppm  00;35
+.tga  00;35
+.tif  00;35
+.xbm  00;35
+.xpm  00;35
+.dl   00;35
+.gl   00;35
+.wmv  00;35
+.xcf  00;35
+.svg  00;35
+.svgz 00;35
+.psd  00;35
+.ico  00;35
+
+# sound and video formats (yellow)
+.aiff 00;33
+.au   00;33
+.mid  00;33
+.mp3  00;33
+.ogg  00;33
+.voc  00;33
+.wav  00;33
+.mov  00;33
+.mpg  00;33
+.mpg  00;33
+.mpeg 00;33
+.m2v  00;33
+.mkv  00;33
+.ogm  00;33
+.mp4  00;33
+.m4v  00;33
+.mp4v 00;33
+.vob  00;33
+.avi  00;33
+.webm 00;33
+.MP4  00;33
+.MPG  00;33
+.amr  00;33
+
+# Documents (normal blue)
+.html   00;34
+.doc    00;34
+.pdf    00;34
+.htm    00;34
+.docx   00;34
+.ppt    00;34
+.pptx   00;34
+.xsl    00;34
+.xslx   00;34
+.txt    00;34
+.epub   00;34
+.mobi   00;34
+.odt    00;34
+.csv    00;34
+
+# Code (not enough colours!)
+#.cs     00;34
+#.csproj 00;34
+#.java   00;34
+#.patch  00;34
+#.diff   00;34
+#.config 00;34
+#.xml    00;34
+#.js     00;34
+#.sql    00;34
+#.php    00;34
+#.css    00;34
+
+# backup files etc (white/grey - less obvious)
+*~    00;37
+.bak  00;37
+.pidb 00;37
+.mdb  00;37
+
diff -r c88d17a35d61 -r 483a45fc520c setup.sh
--- a/setup.sh	Wed Aug 06 19:34:53 2014 +0000
+++ b/setup.sh	Sun Aug 10 19:55:58 2014 +0100
@@ -30,4 +30,5 @@
 create_symlink bashrc ~/.bashrc
 create_symlink /usr/lib/python*/site-packages/hgext/hgview.py ~/.hgview.py
 create_symlink gitconfig ~/.gitconfig
+create_symlink dircolors ~/.dir_colors
 add_content "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2c3IUHY02FAJotQKs3x+uGZ+5XpuKbWUENevjTOF1bAGwGqKNSSg5SlsL5C9aHcu6O/eBKWJNpvUa0vcXXP18ddoILq1DvZfQHDylrweGbaRviSCpRZvSKiNREQd+yAQPwGnsfkpQe5RxXjRTsk7B0VKP2LFL5seDuQfQxtGc6AgjF0TMpBoKD3UkUlfqRX7Q0tQwfTgXTNxYyQOgG61bWeUsz0XSZelF1MHsXxLwUUFuZAigwiv9YUlBSAAEwWySyN8RdsJadunKYHbxr9cJfj4T5soKVeDi2n94AScFuokAyDf3MFvJ1PYZ0p4rFzNF2zrOK3rqvA3aGg4Bi+wx ssh@ibboard.co.uk" ~/.ssh/authorized_keys
\ No newline at end of file