Merge branch 'master' of git://github.com/dustinswan/dotfiles

13 years ago · dd3cca7369
parent 54b60832d9 281d5f576a
commit dd3cca7369
16 changed files with 21 additions and 13 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -79,3 +79,6 @@
 [submodule "vim/bundle/ctrlp"]
 	path = vim/bundle/ctrlp
 	url = git://github.com/kien/ctrlp.vim
+[submodule "vim/bundle/vim-powerline"]
+	path = vim/bundle/vim-powerline
+	url = https://github.com/Lokaltog/vim-powerline
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 7c36ef7faa65441f8eec27589f24ba9f18f8d66c
+Subproject commit 7a41498b0d4f68c537d494b5f849913361315fde
--- a/vim/bundle/ctrlp
+++ b/vim/bundle/ctrlp
@ -1 +1 @@
-Subproject commit bf03741650aae253b9fbfdb5526d6a7b818a060d
+Subproject commit 420174fc537ba986a716964db7af0bd189252944
--- a/vim/bundle/gundo
+++ b/vim/bundle/gundo
@ -1 +1 @@
-Subproject commit 12b6f67aeb892519385529b2b5cdda55cc428d9d
+Subproject commit 50092711ff831742cece76f3322674858863e3f3
--- a/vim/bundle/nerdcommenter
+++ b/vim/bundle/nerdcommenter
@ -1 +1 @@
-Subproject commit 0fe4938d22ae6bbfca054820909c9f176fbf3644
+Subproject commit f4d9f99f67189aa5725fdfc4c13fd33089446ccc
--- a/vim/bundle/nerdtree
+++ b/vim/bundle/nerdtree
@ -1 +1 @@
-Subproject commit 30f6bcc30caf76bc1213f5c3d4001ba5d5fbe7fc
+Subproject commit eced5f98a0724cd6498b70024b3edec1e7b29b2e
--- a/vim/bundle/snipmate
+++ b/vim/bundle/snipmate
@ -1 +1 @@
-Subproject commit 7d11d000019f202bae7905bda838517849b1dd3b
+Subproject commit 4cef3fca6969155698cda224acfb0843c2d6c6b4
--- a/vim/bundle/snipmate-snippets
+++ b/vim/bundle/snipmate-snippets
@ -1 +1 @@
-Subproject commit 5a37c7e75299f34b8a93deb867032c7668724572
+Subproject commit 57daa7bfa737a12c7157cbdd828b669faf885925
--- a/vim/bundle/supertab
+++ b/vim/bundle/supertab
@ -1 +1 @@
-Subproject commit 688b5d706c21fbc6b2db6499f3cfbdeb35309b5a
+Subproject commit ac395b57fec47f034cba151d01669d134ac7041b
--- a/vim/bundle/syntastic
+++ b/vim/bundle/syntastic
@ -1 +1 @@
-Subproject commit d14b53e903e34b967a3fc8a5f72251c02ade4e7e
+Subproject commit 2616623bb9208c4bf2559b6aa5c1eff53644a0f7
--- a/vim/bundle/tagbar
+++ b/vim/bundle/tagbar
@ -1 +1 @@
-Subproject commit f3973b1817ef4be3062e2c268755a63bec68740c
+Subproject commit 81cfb3f9038ca6de5716dc170212e29dfb0bf94f
--- a/vim/bundle/tlib
+++ b/vim/bundle/tlib
@ -1 +1 @@
-Subproject commit d66948917ce7153e4a961aa5d57e1b0918e20495
+Subproject commit d6c56d4bae4f1e8908b64bc6bf0cbd6480081f49
--- a/vim/bundle/vim-addon-mw-utils
+++ b/vim/bundle/vim-addon-mw-utils
@ -1 +1 @@
-Subproject commit 392315d7c5a1ee9e08a089908a3da9627fe2c6d4
+Subproject commit a2676b4225b8a370b9e7046c5fc2f5ad1155e590
--- a/vim/bundle/vim-powerline
+++ b/vim/bundle/vim-powerline
@ -0,0 +1 @@
+Subproject commit 90c17556d79689697c43df5c94ae9e00dbc73fdf
--- a/2
+++ b/2
@ -123,5 +123,7 @@ set list listchars=tab:»·,trail:·,eol:↪
 " fine I'll try it
 inoremap jk <Esc>
 inoremap kj <Esc>
+
 " stop hitting Esc or c-[!
 inoremap <Esc> <nop>
+nnoremap <Esc> :noh<CR><Esc>
--- a/4
+++ b/4
@ -25,7 +25,7 @@ COMPLETION_WAITING_DOTS="true"

 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git archlinux npm vi-mode node osx ruby rails3 gem)
+plugins=(git archlinux npm node osx ruby rails3 gem)

 source $ZSH/oh-my-zsh.sh

@ -33,3 +33,5 @@ source $ZSH/oh-my-zsh.sh
 alias vi=vim
 export TERM="screen-256color"
 export EDITOR=vim
+
+export PATH="/usr/local/bin:$PATH"
				`@ -0,0 +1 @@`
				`Subproject commit 90c17556d79689697c43df5c94ae9e00dbc73fdf`