diff --git a/.gitmodules b/.gitmodules
index f8b84c5..876d407 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "vim/bundle/ultisnips"]
 	path = vim/bundle/ultisnips
 	url = https://github.com/SirVer/ultisnips.git
+[submodule "git-aware-prompt"]
+	path = git-aware-prompt
+	url = https://github.com/jimeh/git-aware-prompt.git
diff --git a/bash_aliases.sh b/bash_aliases.sh
index 7d07b27..fb292df 100644
--- a/bash_aliases.sh
+++ b/bash_aliases.sh
@@ -98,8 +98,13 @@ function help ()
   builtin help -m "$@" 2>/dev/null || command man "$@" 2>/dev/null || builtin help -m "$@"
 }
 
-PS1='\[\e[1;31m\]${debian_chroot:+($debian_chroot)}\[\e[0;36m\]\u\[\e[0;33m\]@\[\e[34m\]\h\[\e[0m\]:\[\e[1;32m\]\w\[\e[0m\]\n\$ '
+# This is, almost without fail, the right value.
+export DISPLAY="${DISPLAY:-:0.0}"
 
-. "$( dirname "$(realpath -e "${BASH_SOURCE[0]}")" )"/bash_tmux.sh
-. "$( dirname "$(realpath -e "${BASH_SOURCE[0]}")" )"/ssh-find-agent/ssh-find-agent.sh
+COMMON_CONFIGS_PATH="$( dirname "$(realpath -e "${BASH_SOURCE[0]}")" )"
+
+. "$COMMON_CONFIGS_PATH"/bash_tmux.sh
+. "$COMMON_CONFIGS_PATH"/ssh-find-agent/ssh-find-agent.sh
+. "$COMMON_CONFIGS_PATH"/git-aware-prompt/main.sh
 ssh_find_agent -a || eval $(ssh-agent) > /dev/null
+PS1='\[$bldred\]${debian_chroot:+($debian_chroot)}\[$txtcyn\]\u\[$txtylw\]@\[$txtblu\]\h\[$txtrst\]:\[$bldgrn\]\w\[$txtrst\] \[$txtcyn\]\$git_branch\[$txtred\]\$git_dirty\[$txtrst\]\n\$ "
diff --git a/git-aware-prompt b/git-aware-prompt
new file mode 160000
index 0000000..b032b41
--- /dev/null
+++ b/git-aware-prompt
@@ -0,0 +1 @@
+Subproject commit b032b4156241182a69c2bce36bddb97469194336
diff --git a/per-host/mari-wovn/.ssh/config b/per-host/mari-wovn/.ssh/config
index 0d04e94..67c10f1 100644
--- a/per-host/mari-wovn/.ssh/config
+++ b/per-host/mari-wovn/.ssh/config
@@ -1 +1,4 @@
 Include .config-common
+Host *
+    AddKeysToAgent yes
+    IdentityFile ~/.ssh/id_ed25519
diff --git a/ssh/known_hosts b/ssh/known_hosts
index 37ae010..384ddf8 100644
--- a/ssh/known_hosts
+++ b/ssh/known_hosts
@@ -4,3 +4,4 @@
 |1|6vE9qtY7+79JNRXNKmShGdhR4CI=|IY3l2ol2zZvwzKrmqqUxkdAtuL4= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
 |1|lgopgk9yMzDu55z9JMUMtvvysQM=|Bvzyi3Tyd211wg5TjKrMDh0/c6Q= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
 |1|HHa5QarRbbAfdcjKRq9yhFzZ2O0=|4nMTOS2zuU89AzmzV7n4UIy4G+Q= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
+|1|124gnsMf+GsMul4pQmy+7E+khgc=|mA+cs/5D6x3N3j0j6iQWUNbPh2A= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
diff --git a/vim/.netrwhist b/vim/.netrwhist
new file mode 100644
index 0000000..c408880
--- /dev/null
+++ b/vim/.netrwhist
@@ -0,0 +1,3 @@
+let g:netrw_dirhistmax  =10
+let g:netrw_dirhistcnt =1
+let g:netrw_dirhist_1='/home/marissa/bundler-shellsplit-plugin/.git'