From 26f7f7856993e5307a836ac3571a63c160f50526 Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Tue, 8 Mar 2016 10:00:08 -0800
Subject: [PATCH 1/3] Add venv prompt support.

---
 dotfiles/zsh_custom/themes/matir.zsh-theme | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dotfiles/zsh_custom/themes/matir.zsh-theme b/dotfiles/zsh_custom/themes/matir.zsh-theme
index c684ef6..831b132 100644
--- a/dotfiles/zsh_custom/themes/matir.zsh-theme
+++ b/dotfiles/zsh_custom/themes/matir.zsh-theme
@@ -1,3 +1,7 @@
-PROMPT='%{$fg[black]%}[%{$fg[yellow]%}%h%{$fg[black]%}] %{%(!.$fg[red].$fg[green])%}%8>..>%n%>>%{$fg[white]%}@%{$fg[blue]%}%12>..>%m%>>%{$fg[white]%}:%{$fg[green]%}%32<...<%~%<<%{$fg[blue]%}$(git_prompt_info)%{$fg[white]%}%#%{$reset_color%} '
+PROMPT='%{$fg[black]%}[%{$fg[yellow]%}%h%{$fg[black]%}] %{%(!.$fg[red].$fg[green])%}%8>..>%n%>>%{$fg[white]%}@%{$fg[blue]%}%12>..>%m%>>%{$fg[white]%}:%{$fg[green]%}%32<...<%~%<<%{$fg[magenta]%}$(virtualenv_prompt_info)%{$fg[blue]%}$(git_prompt_info)%{$fg[white]%}%#%{$reset_color%} '
 ZSH_THEME_GIT_PROMPT_PREFIX=" ("
 ZSH_THEME_GIT_PROMPT_SUFFIX=")"
+ZSH_THEME_VIRTUALENV_PREFIX=" (py:"
+ZSH_THEME_VIRTUALENV_SUFFIX=")"
+
+# vim: set textwidth=0 wrapmargin=0

From 87a42121f996d628acc41567980a0de1b191f6e2 Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Wed, 9 Mar 2016 11:18:45 -0800
Subject: [PATCH 2/3] Use nasm syntax by default.

---
 dotfiles/vimrc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dotfiles/vimrc b/dotfiles/vimrc
index 3472089..846bf08 100644
--- a/dotfiles/vimrc
+++ b/dotfiles/vimrc
@@ -62,6 +62,8 @@ endif
 silent! colorscheme solarized
 " Enable filetype support
 filetype plugin indent on
+" Default ASM syntax for ft support
+let asmsyntax="nasm"
 " Allow file modelines
 set modeline
 " Automatically re-read changed files

From 0949c61bc3dbee1a29c0ed013d2a9b53eee9abf6 Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Wed, 9 Mar 2016 11:26:02 -0800
Subject: [PATCH 3/3] Properly fix modeline by adding trailing colon.

---
 dotfiles/zsh_custom/themes/matir.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dotfiles/zsh_custom/themes/matir.zsh-theme b/dotfiles/zsh_custom/themes/matir.zsh-theme
index 831b132..684c5ea 100644
--- a/dotfiles/zsh_custom/themes/matir.zsh-theme
+++ b/dotfiles/zsh_custom/themes/matir.zsh-theme
@@ -4,4 +4,4 @@ ZSH_THEME_GIT_PROMPT_SUFFIX=")"
 ZSH_THEME_VIRTUALENV_PREFIX=" (py:"
 ZSH_THEME_VIRTUALENV_SUFFIX=")"
 
-# vim: set textwidth=0 wrapmargin=0
+# vim: set textwidth=0 wrapmargin=0: