updated settings

.bashrc

@@ -1,17 +1,13 @@
-if [ -f ~/.git-completion.sh ]; then
-    source ~/.git-completion.sh
-fi
-
-if [ -f ~/.git-prompt.sh ]; then
-    source ~/.git-prompt.sh
-fi
-
 if [ -f /etc/bash_completion ]; then
     source /etc/bash_completion
 fi
 
+awsAutocomplete=$(which aws_completer)
+if [ -n "${awsAutocomplete}" ]; then
+    complete -C "${awsAutocomplete}" aws
+fi
+
 export EDITOR=vim
-export WEBIDE_JDK=/usr/lib/jvm/java-1.7.0-openjdk-amd64
 
 GIT_PS1_SHOWDIRTYSTATE=1
 GIT_PS1_SHOWUNTRACKEDFILES=1
@@ -26,12 +22,23 @@ YELLOW="\[\033[1;33m\]"
 RESET="\[\033[0m\]"
 
 function set_bash_prompt() {
-    PS1="$GREEN\u@\h$RESET:$BLUE\w$MAGENTA$(__git_ps1 " (%s)")$YELLOW ⚡$RESET "
+    PS1="$GREEN\u@\h$RESET:$BLUE\w$MAGENTA$(__git_ps1 " (%s)")$RESET "
 }
 
-PROMPT_COMMAND=set_bash_prompt
+if [ "$(type -t __git_ps1)" = "function" ]; then
+    PROMPT_COMMAND=set_bash_prompt
+else
+    PS1="$GREEN\u@\h$RESET:$BLUE\w$RESET "
+fi
 
 alias ls='ls --color=auto'
 alias grep='grep --color=auto'
 alias egrep='egrep --color=auto'
 alias fgrep='fgrep --color=auto'
+
+# override for Debian's new idiotic quoting style in ls
+export QUOTING_STYLE=literal
+
+# override executable directories weird blue on green color scheme
+eval "$(dircolors)"
+export LS_COLORS="${LS_COLORS}:ow=1;4;33"