From 68f3854364d1b24a4f1750954bb42f603c5d2895 Mon Sep 17 00:00:00 2001
From: Barak Michener <me@barakmich.com>
Date: Thu, 25 Apr 2013 19:15:40 -0400
Subject: [PATCH] some things

---
 .bash_aliases            | 1 +
 .config/fish/config.fish | 1 +
 .xinitrc                 | 2 +-
 .zshrc                   | 3 ++-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.bash_aliases b/.bash_aliases
index b7344fb..562c507 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -37,6 +37,7 @@ esac
 
 	
 
+alias ls='ls -F --color=auto'
 # some more ls aliases
 alias ll='ls -lF'
 #alias la='ls -A'
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 4948de8..5bfc59a 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -1,3 +1,4 @@
 set PATH ~/bin /bin /sbin /usr/local/bin /usr/local/sbin /usr/bin /usr/sbin ~/.cabal/bin /usr/lib/go/bin ~/.gem/ruby/1.9.1/bin $PATH
 
+set fish_greeting ""
 . ~/.bash_aliases
diff --git a/.xinitrc b/.xinitrc
index a594aff..253ba65 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 xrdb -merge .Xdefaults &
 
diff --git a/.zshrc b/.zshrc
index 76a0ead..f8fc2ee 100644
--- a/.zshrc
+++ b/.zshrc
@@ -73,7 +73,8 @@ export DISTCC_HOSTS='hyades01 hyades02 hyades03 hyades04'
           #$SCREENME true || echo -ne "\ekzsh\e\\"
     #}
 
-	PROMPT='$PR_STITLE$PR_LIGHT_BLUE($PR_LIGHT_YELLOW%D{%H:%M}|%!$PR_BLUE%)[%(!.$PR_RED.$PR_GREEN)%n@%m$PR_LIGHT_CYAN %~$PR_BLUE]$PR_NO_COLOUR%(!.#.$) '
+	PROMPT='$PR_STITLE$PR_LIGHT_BLUE($PR_LIGHT_YELLOW%D{%H:%M}|%!$PR_BLUE%)[%(!.$PR_RED.$PR_GREEN)%n@%m$PR_LIGHT_CYAN %~$PR_BLUE]$PR_NO_COLOUR
+%(!.#.$) '
 	#source .zshprompt
 
 #source ~/.zsh_profile