From 4b91d7b67a1f81fb3b387155a6f8dd81b40904c7 Mon Sep 17 00:00:00 2001
From: Nicole Tietz-Sokolskaya <me@ntietz.com>
Date: Mon, 27 Jun 2011 20:00:15 -0400
Subject: [PATCH] Updated vimrc and  bashrc.

---
 profile | 15 +++++++++++++++
 vimrc   |  4 ++++
 2 files changed, 19 insertions(+)

diff --git a/profile b/profile
index 601868a..344b214 100644
--- a/profile
+++ b/profile
@@ -23,5 +23,20 @@ set_prompt() {
     PS1="${TITLEBAR}$BLUE[\t]\`$FAILURE_COLOR\` \u@\h> $NO_COLOR"
 }
 
+#sets the PS1 prompt
 set_prompt
 
+# makes ls print pretty
+alias ls="ls --color=auto"
+
+# something with keyword completion
+. /etc/bash_completion
+
+# default editor
+export EDITOR=vim
+
+# set history
+export HISTSIZE=1000
+export HISTFILESIZE=1000
+export HISTCONTROL=ignoredups
+
diff --git a/vimrc b/vimrc
index 6c434bd..18f5fce 100644
--- a/vimrc
+++ b/vimrc
@@ -10,6 +10,10 @@ set winminwidth=20
 set winwidth=100
 set winheight=20
 
+" Syntax highlighting
+syntax on
+
+" Wrapping settings
 set nowrap " nowrap makes the lines not wrap
 " set wrap " wrap makes the lines wrap
 set linebreak