From: Edward Delaporte <edthedev@gmail.com>
Date: Mon, 9 Mar 2015 21:36:51 +0000 (-0500)
Subject: Merge branch 'master' of https://github.com/edthedev/dotfiles
X-Git-Url: https://apps.delaporte.us/gitweb/dotfiles.git/commitdiff_plain/6ec9bafb8ea448b7a1dd4499994787e0df51f96b?hp=10db0ba7bf6659f2b5b2ffffa9a83a171bf73c7c

Merge branch 'master' of https://github.com/edthedev/dotfiles

Conflicts:
	vimrc
---

diff --git a/bootstrap.sh b/bootstrap.sh
index b317dba..2b156d3 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,4 +1,6 @@
 ln -s ~/dotfiles/zshrc ~/.zshrc
+cd ~/dotfiles/antigen;git submodule update --init
+
 ln -s ~/dotfiles/vimrc ~/.vimrc
 
 git clone https://github.com/gmarik/Vundle.vim.git ~/.vim/bundle/Vundle.vim
diff --git a/vimrc b/vimrc
index a7ee5c0..3cd2797 100644
--- a/vimrc
+++ b/vimrc
@@ -148,6 +148,7 @@ Plugin 'itchyny/thumbnail.vim'
 " Plugin 'farseer90718/vim-taskwarrior'
 " let g:task_rc_override = 'defaultwidth=0'
 " let g:task_report_name     = 'list'
+" let g:task_rc_override = 'defaultwidth=999'
 " Read up on it here:  https://github.com/farseer90718/vim-taskwarrior
 "
 
diff --git a/zshrc b/zshrc
index 2d1558a..12bd9c1 100644
--- a/zshrc
+++ b/zshrc
@@ -145,5 +145,8 @@ antigen bundle zsh-users/zsh-syntax-highlighting
 # Nice multiline git-aware prompt.
 antigen bundle sindresorhus/pure
 
+# Quickly create and fetch text files.
+antigen bundle edthedev/minion
+
 # # Tell antigen that you're done.
 antigen apply