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

Conflicts:
	vimrc

diff --git a/bootstrap.sh b/bootstrap.sh
index b317dbaa19ed0bf8a388d3ac15b6a971e5c1f6fa..2b156d3ae6c6612fd06cc69d9e73eacbe3c1513a 100755 (executable)
--- 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 a7ee5c0f00e8c5618fb98dc60dbde059612433d3..3cd27978ead912402fd0b57832f7ed0b31bb3467 100644 (file)
--- 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 2d1558ac884d337d47786ef90db77e9fdb05a314..12bd9c14d46ce1696a5832238eb5f8f4ce088fa3 100644 (file)
--- 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