diff --git a/.bashrc b/.bashrc
index 5dd1317..7e4328d 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,25 +1,24 @@
 # If not running interactively, don't do anything
-case $- in
-    *i*) ;;
-      *) return;;
-esac
+[[ $- != *i* ]] && return
 
 if [ -d "/usr$HOME" ] ; then export HOME=/usr$HOME ; cd ; fi
 if [ -x /usr/bin/resizewin ] ; then /usr/bin/resizewin -z ; fi
 
-test -f /etc/bashrc && . /etc/bashrc || true
-test -f /etc/bash.bashrc && . /etc/bash.bashrc || true
-test -f /etc/bash_completion && . /etc/bash_completion || true
+[[ -f /etc/bashrc ]] && . /etc/bashrc || true
+[[ -f /etc/bash.bashrc ]] && . /etc/bash.bashrc || true
+[[ -f /etc/bash_completion ]] && . /etc/bash_completion || true
+[[ -r /etc/bash/bashrc ]] && . /etc/bash/bashrc || true
 [[ -r "/usr/local/etc/profile.d/bash_completion.sh" ]] && . "/usr/local/etc/profile.d/bash_completion.sh"
-test -f $HOME/.cargo/env && . $HOME/.cargo/env || true
-if [ -e $HOME/.nix-profile/etc/profile.d/nix.sh ]; then . $HOME/.nix-profile/etc/profile.d/nix.sh; fi
+[[ -r "/usr/share/bash-completion/bash_completion" ]] && . "/usr/share/bash-completion/bash_completion"
+[[ -e $HOME/.nix-profile/etc/profile.d/nix.sh ]] && . $HOME/.nix-profile/etc/profile.d/nix.sh || true
+[[ -e $HOME/.local/bin/git-prompt.sh ]] && . $HOME/.local/bin/git-prompt.sh || true
+[[ -e $HOME/.bash.local ]] && . $HOME/.bash.local || true
 
 alias dotfiles='git --git-dir=$HOME/dotfiles.git/ --work-tree=$HOME'
 
 EDITOR=vim; export EDITOR
 PAGER=less; export PAGER
-PATH=$PATH:$HOME/.local/bin:$HOME/bin
-GIT_MERGE_AUTOEDIT=no
+PATH=$HOME/.local/bin:$HOME/bin:$HOME/.cargo/bin:$HOME/go/bin:$PATH
 
 # don't put duplicate lines or lines starting with space in the history.
 # See bash(1) for more options
@@ -32,16 +31,6 @@ stty -ixon
 # update the values of LINES and COLUMNS.
 shopt -s checkwinsize
 
-# enable color support of ls and also add handy aliases
-if [ -x /usr/bin/dircolors ]; then
-    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
-    alias ls='ls --color=auto'
-
-    alias grep='grep --color=auto'
-    alias fgrep='fgrep --color=auto'
-    alias egrep='egrep --color=auto'
-fi
-
 ##
 ## history: http://mywiki.wooledge.org/BashFAQ/088
 ##
@@ -59,26 +48,97 @@ PROMPT_COMMAND="history -a"
 # that multiple logins do not overwrite each other's history
 shopt -s histappend
 
+use_color=true
+
 function _update_ps1() {
-  PS1="$(powerline-go -colorize-hostname -static-prompt-indicator -max-width 100 -modules "user,host,ssh,cwd,perms,git,jobs,exit" -modules-right "dotenv,kube" -newline -error $?)"
+  PS1="$(powerline-go -colorize-hostname -modules "user,host,ssh,cwd,perms,git,jobs,exit" -error $?)"
 }
-if [[ $(which powerline-go 2>/dev/null) && "$TERM" != "linux" && "$TERM_PROGRAM" != "vscode" ]]; then
-  PROMPT_COMMAND="_update_ps1; $PROMPT_COMMAND"
-else
-  PS1='[\[\033[01;32m\]\u@\h\[\033[00m\] \[\033[01;34m\]\w$(__git_ps1 " (%s)")\[\033[00m\]]\$ '
-fi
 
-for i in $HOME/bin/*.bash ; do
-  . $i
-done
+# Set colorful PS1 only on colorful terminals.
+# dircolors --print-database uses its own built-in database
+# instead of using /etc/DIR_COLORS.  Try to use the external file
+# first to take advantage of user additions.  Use internal bash
+# globbing instead of external grep binary.
+safe_term=${TERM//[^[:alnum:]]/?}   # sanitize TERM
+match_lhs=""
+[[ -f ~/.dir_colors   ]] && match_lhs="${match_lhs}$(<~/.dir_colors)"
+[[ -f /etc/DIR_COLORS ]] && match_lhs="${match_lhs}$(</etc/DIR_COLORS)"
+[[ -z ${match_lhs}    ]] \
+  && type -P dircolors >/dev/null \
+  && match_lhs=$(dircolors --print-database)
+[[ $'\n'${match_lhs} == *$'\n'"TERM "${safe_term}* ]] && use_color=true
 
-if which lsd > /dev/null 2>&1 ; then
-  if [ "$TERM" = "xterm-256color" ] ; then
+if ${use_color} ; then
+  # Enable colors for ls, etc.  Prefer ~/.dir_colors #64489
+  if type -P dircolors >/dev/null ; then
+    if [[ -f ~/.dir_colors ]] ; then
+      eval $(dircolors -b ~/.dir_colors)
+    elif [[ -f /etc/DIR_COLORS ]] ; then
+      eval $(dircolors -b /etc/DIR_COLORS)
+    fi
+  fi
+
+  if [[ ${EUID} == 0 ]] ; then
+    PS1='\[\033[01;31m\][\h\[\033[01;36m\] \W\[\033[01;31m\]]\$\[\033[00m\] '
+  else
+    if type __git_ps1 > /dev/null 2>&1 ; then
+      GIT_PS1_SHOWDIRTYSTATE=1
+      GIT_PS1_SHOWSTASHSTATE=1
+      GIT_PS1_SHOWUNTRACKEDFILES=1
+      GIT_PS1_SHOWUPSTREAM="auto"
+      GIT_PS1_SHOWCOLORHINTS=1
+      GIT_PS1_HIDE_IF_PWD_IGNORED=1
+      PROMPT_COMMAND='__git_ps1 "\[\033[01;32m\][\u@\h\[\033[01;34m\] \w\[\033[01;32m\]]\[\033[00m\]" "\\\$ "'
+    else
+      PS1='\[\033[01;32m\][\u@\h\[\033[01;34m\] \w\[\033[01;32m\]]\[\033[00m\]\$ '
+    fi
+  fi
+
+  if which lsd > /dev/null 2>&1 ; then
     alias ls="lsd"
   else
-    alias ls="lsd --icon=never"
+    alias ls="ls --color=auto"
+  fi
+  alias grep='grep --colour=auto'
+  alias egrep='egrep --colour=auto'
+  alias fgrep='fgrep --colour=auto'
+else
+  if [[ ${EUID} == 0 ]] ; then
+    # show root@ when we don't have colors
+    PS1='\u@\h \W \$ '
+  else
+    PS1='\u@\h \w \$ '
   fi
 fi
 
-# Set up direnv
-eval "$(direnv hook bash)"
+unset use_color safe_term match_lhs sh
+
+xhost +local:root > /dev/null 2>&1
+
+complete -cf sudo
+
+shopt -s expand_aliases
+
+# ex - archive extractor
+# usage: ex <file>
+ex ()
+{
+  if [ -f $1 ] ; then
+    case $1 in
+      *.tar.bz2)   tar xjf $1   ;;
+      *.tar.gz)    tar xzf $1   ;;
+      *.bz2)       bunzip2 $1   ;;
+      *.rar)       unrar x $1     ;;
+      *.gz)        gunzip $1    ;;
+      *.tar)       tar xf $1    ;;
+      *.tbz2)      tar xjf $1   ;;
+      *.tgz)       tar xzf $1   ;;
+      *.zip)       unzip $1     ;;
+      *.Z)         uncompress $1;;
+      *.7z)        7z x $1      ;;
+      *)           echo "'$1' cannot be extracted via ex()" ;;
+    esac
+  else
+    echo "'$1' is not a valid file"
+  fi
+}