From adf2d67d99da969fa29efd1ba7c67f2c7bb37a91 Mon Sep 17 00:00:00 2001
From: Aaron Gutierrez <gutierrez.aaron.m@gmail.com>
Date: Tue, 30 Jan 2018 20:32:27 -0800
Subject: [PATCH 1/3] Remove easytags

---
 .gitmodules              | 6 ------
 .vim/bundle/vim-easytags | 1 -
 .vim/bundle/vim-misc     | 1 -
 3 files changed, 8 deletions(-)
 delete mode 160000 .vim/bundle/vim-easytags
 delete mode 160000 .vim/bundle/vim-misc

diff --git a/.gitmodules b/.gitmodules
index af375c8..53a7f2e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,12 +19,6 @@
 [submodule ".vim/bundle/vim-ispc"]
 	path = .vim/bundle/vim-ispc
 	url = git@github.com:jez/vim-ispc
-[submodule ".vim/bundle/vim-easytags"]
-	path = .vim/bundle/vim-easytags
-	url = git@github.com:xolox/vim-easytags.git
-[submodule ".vim/bundle/vim-misc"]
-	path = .vim/bundle/vim-misc
-	url = git@github.com:xolox/vim-misc.git
 [submodule ".vim/bundle/vim-airline"]
 	path = .vim/bundle/vim-airline
 	url = git@github.com:vim-airline/vim-airline.git
diff --git a/.vim/bundle/vim-easytags b/.vim/bundle/vim-easytags
deleted file mode 160000
index 72a8753..0000000
--- a/.vim/bundle/vim-easytags
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 72a8753b5d0a951e547c51b13633f680a95b5483
diff --git a/.vim/bundle/vim-misc b/.vim/bundle/vim-misc
deleted file mode 160000
index 3e6b8fb..0000000
--- a/.vim/bundle/vim-misc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3e6b8fb6f03f13434543ce1f5d24f6a5d3f34f0b

From df676ccb770b12ea03516378c656069fbae62526 Mon Sep 17 00:00:00 2001
From: Aaron Gutierrez <gutierrez.aaron.m@gmail.com>
Date: Tue, 30 Jan 2018 20:33:15 -0800
Subject: [PATCH 2/3] Add mail settings

---
 .vim/ftplugin/mail.vim | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .vim/ftplugin/mail.vim

diff --git a/.vim/ftplugin/mail.vim b/.vim/ftplugin/mail.vim
new file mode 100644
index 0000000..973b0f3
--- /dev/null
+++ b/.vim/ftplugin/mail.vim
@@ -0,0 +1,6 @@
+set wrap
+set linebreak
+set nolist
+set textwidth=0
+set wrapmargin=0
+set spell

From bddf77b0b545e76883f2a783bb6bc0a38b8965a0 Mon Sep 17 00:00:00 2001
From: Aaron Gutierrez <gutierrez.aaron.m@gmail.com>
Date: Tue, 30 Jan 2018 20:58:05 -0800
Subject: [PATCH 3/3] Add username@hostname back to PS1

---
 .zshrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.zshrc b/.zshrc
index 2be15a5..1a414f9 100644
--- a/.zshrc
+++ b/.zshrc
@@ -26,7 +26,7 @@ export GIT_PS1_SHOWSTASHSTATE=1
 export GIT_PS1_SHOWUPSTREAM="auto"
 export GIT_PS1_SHOWCOLORHINTS=1
 
-PS1=$'\n╭%{$fg[yellow]%}$(__git_ps1 "(%s)")%{$fg[green]%}[%~]%{$reset_color%}\n╰%# '
+PS1=$'\n╭%{$fg[yellow]%}$(__git_ps1 "(%s)")%{$fg[green]%}[%~]%{$reset_color%}\n╰%{$fg[cyan]%}%n%{$fg[yellow]%}@%{%F{214}%}%m%f%{$reset_color%}%# '
 
 # set window title to working directory
 precmd () { print -Pn "\e]0;%~\a" }