From afe5befad78f1f40bdbb686bcb3ae2293256730b Mon Sep 17 00:00:00 2001 From: Dustin Swan Date: Tue, 3 Jan 2012 11:05:56 -0500 Subject: [PATCH 1/2] Took out vi-mode from zsh, updated vim plugins --- oh-my-zsh | 2 +- vim/bundle/ctrlp | 2 +- vim/bundle/gundo | 2 +- vim/bundle/nerdcommenter | 2 +- vim/bundle/nerdtree | 2 +- vim/bundle/snipmate | 2 +- vim/bundle/snipmate-snippets | 2 +- vim/bundle/supertab | 2 +- vim/bundle/syntastic | 2 +- vim/bundle/tagbar | 2 +- vim/bundle/tlib | 2 +- vimrc | 2 ++ zshrc | 2 +- 13 files changed, 14 insertions(+), 12 deletions(-) diff --git a/oh-my-zsh b/oh-my-zsh index 7c36ef7..8c45b73 160000 --- a/oh-my-zsh +++ b/oh-my-zsh @@ -1 +1 @@ -Subproject commit 7c36ef7faa65441f8eec27589f24ba9f18f8d66c +Subproject commit 8c45b739181ba58e91e2dceaa53b08161c46b03f diff --git a/vim/bundle/ctrlp b/vim/bundle/ctrlp index bf03741..93637ea 160000 --- a/vim/bundle/ctrlp +++ b/vim/bundle/ctrlp @@ -1 +1 @@ -Subproject commit bf03741650aae253b9fbfdb5526d6a7b818a060d +Subproject commit 93637eade600d8e0b15aa00641ea9ca328aca995 diff --git a/vim/bundle/gundo b/vim/bundle/gundo index 12b6f67..5009271 160000 --- a/vim/bundle/gundo +++ b/vim/bundle/gundo @@ -1 +1 @@ -Subproject commit 12b6f67aeb892519385529b2b5cdda55cc428d9d +Subproject commit 50092711ff831742cece76f3322674858863e3f3 diff --git a/vim/bundle/nerdcommenter b/vim/bundle/nerdcommenter index 0fe4938..8f2af9a 160000 --- a/vim/bundle/nerdcommenter +++ b/vim/bundle/nerdcommenter @@ -1 +1 @@ -Subproject commit 0fe4938d22ae6bbfca054820909c9f176fbf3644 +Subproject commit 8f2af9a6d765066c5f41158beb70235245040ac7 diff --git a/vim/bundle/nerdtree b/vim/bundle/nerdtree index 30f6bcc..205367a 160000 --- a/vim/bundle/nerdtree +++ b/vim/bundle/nerdtree @@ -1 +1 @@ -Subproject commit 30f6bcc30caf76bc1213f5c3d4001ba5d5fbe7fc +Subproject commit 205367ab3f46dcc88b6ebb819a276e793a21e995 diff --git a/vim/bundle/snipmate b/vim/bundle/snipmate index 7d11d00..7dee28b 160000 --- a/vim/bundle/snipmate +++ b/vim/bundle/snipmate @@ -1 +1 @@ -Subproject commit 7d11d000019f202bae7905bda838517849b1dd3b +Subproject commit 7dee28bec1aa9eb248069d1d294cc31ec7214680 diff --git a/vim/bundle/snipmate-snippets b/vim/bundle/snipmate-snippets index 5a37c7e..e981832 160000 --- a/vim/bundle/snipmate-snippets +++ b/vim/bundle/snipmate-snippets @@ -1 +1 @@ -Subproject commit 5a37c7e75299f34b8a93deb867032c7668724572 +Subproject commit e98183247638d20e195b2cd58ab2a79eefac3c24 diff --git a/vim/bundle/supertab b/vim/bundle/supertab index 688b5d7..ac395b5 160000 --- a/vim/bundle/supertab +++ b/vim/bundle/supertab @@ -1 +1 @@ -Subproject commit 688b5d706c21fbc6b2db6499f3cfbdeb35309b5a +Subproject commit ac395b57fec47f034cba151d01669d134ac7041b diff --git a/vim/bundle/syntastic b/vim/bundle/syntastic index d14b53e..c8dc739 160000 --- a/vim/bundle/syntastic +++ b/vim/bundle/syntastic @@ -1 +1 @@ -Subproject commit d14b53e903e34b967a3fc8a5f72251c02ade4e7e +Subproject commit c8dc739e555f416ac65eab52b0bed4919ad818bb diff --git a/vim/bundle/tagbar b/vim/bundle/tagbar index f3973b1..81cfb3f 160000 --- a/vim/bundle/tagbar +++ b/vim/bundle/tagbar @@ -1 +1 @@ -Subproject commit f3973b1817ef4be3062e2c268755a63bec68740c +Subproject commit 81cfb3f9038ca6de5716dc170212e29dfb0bf94f diff --git a/vim/bundle/tlib b/vim/bundle/tlib index d669489..d6c56d4 160000 --- a/vim/bundle/tlib +++ b/vim/bundle/tlib @@ -1 +1 @@ -Subproject commit d66948917ce7153e4a961aa5d57e1b0918e20495 +Subproject commit d6c56d4bae4f1e8908b64bc6bf0cbd6480081f49 diff --git a/vimrc b/vimrc index 7673bf0..6bef45a 100644 --- a/vimrc +++ b/vimrc @@ -123,5 +123,7 @@ set list listchars=tab:»·,trail:·,eol:↪ " fine I'll try it inoremap jk inoremap kj + " stop hitting Esc or c-[! inoremap +nnoremap :noh diff --git a/zshrc b/zshrc index a081e1d..a28e263 100644 --- a/zshrc +++ b/zshrc @@ -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 From 281d5f576a2d7f499cf17cf44ebc4f29699aecd8 Mon Sep 17 00:00:00 2001 From: Dustin Swan Date: Fri, 13 Jan 2012 13:04:52 -0500 Subject: [PATCH 2/2] Added vim-powerline. Updated vim submodules --- .gitmodules | 3 +++ oh-my-zsh | 2 +- vim/bundle/ctrlp | 2 +- vim/bundle/nerdcommenter | 2 +- vim/bundle/nerdtree | 2 +- vim/bundle/snipmate | 2 +- vim/bundle/snipmate-snippets | 2 +- vim/bundle/syntastic | 2 +- vim/bundle/vim-addon-mw-utils | 2 +- vim/bundle/vim-powerline | 1 + zshrc | 2 ++ 11 files changed, 14 insertions(+), 8 deletions(-) create mode 160000 vim/bundle/vim-powerline diff --git a/.gitmodules b/.gitmodules index 6b5d69d..8d4516d 100644 --- 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 diff --git a/oh-my-zsh b/oh-my-zsh index 8c45b73..7a41498 160000 --- a/oh-my-zsh +++ b/oh-my-zsh @@ -1 +1 @@ -Subproject commit 8c45b739181ba58e91e2dceaa53b08161c46b03f +Subproject commit 7a41498b0d4f68c537d494b5f849913361315fde diff --git a/vim/bundle/ctrlp b/vim/bundle/ctrlp index 93637ea..420174f 160000 --- a/vim/bundle/ctrlp +++ b/vim/bundle/ctrlp @@ -1 +1 @@ -Subproject commit 93637eade600d8e0b15aa00641ea9ca328aca995 +Subproject commit 420174fc537ba986a716964db7af0bd189252944 diff --git a/vim/bundle/nerdcommenter b/vim/bundle/nerdcommenter index 8f2af9a..f4d9f99 160000 --- a/vim/bundle/nerdcommenter +++ b/vim/bundle/nerdcommenter @@ -1 +1 @@ -Subproject commit 8f2af9a6d765066c5f41158beb70235245040ac7 +Subproject commit f4d9f99f67189aa5725fdfc4c13fd33089446ccc diff --git a/vim/bundle/nerdtree b/vim/bundle/nerdtree index 205367a..eced5f9 160000 --- a/vim/bundle/nerdtree +++ b/vim/bundle/nerdtree @@ -1 +1 @@ -Subproject commit 205367ab3f46dcc88b6ebb819a276e793a21e995 +Subproject commit eced5f98a0724cd6498b70024b3edec1e7b29b2e diff --git a/vim/bundle/snipmate b/vim/bundle/snipmate index 7dee28b..4cef3fc 160000 --- a/vim/bundle/snipmate +++ b/vim/bundle/snipmate @@ -1 +1 @@ -Subproject commit 7dee28bec1aa9eb248069d1d294cc31ec7214680 +Subproject commit 4cef3fca6969155698cda224acfb0843c2d6c6b4 diff --git a/vim/bundle/snipmate-snippets b/vim/bundle/snipmate-snippets index e981832..57daa7b 160000 --- a/vim/bundle/snipmate-snippets +++ b/vim/bundle/snipmate-snippets @@ -1 +1 @@ -Subproject commit e98183247638d20e195b2cd58ab2a79eefac3c24 +Subproject commit 57daa7bfa737a12c7157cbdd828b669faf885925 diff --git a/vim/bundle/syntastic b/vim/bundle/syntastic index c8dc739..2616623 160000 --- a/vim/bundle/syntastic +++ b/vim/bundle/syntastic @@ -1 +1 @@ -Subproject commit c8dc739e555f416ac65eab52b0bed4919ad818bb +Subproject commit 2616623bb9208c4bf2559b6aa5c1eff53644a0f7 diff --git a/vim/bundle/vim-addon-mw-utils b/vim/bundle/vim-addon-mw-utils index 392315d..a2676b4 160000 --- a/vim/bundle/vim-addon-mw-utils +++ b/vim/bundle/vim-addon-mw-utils @@ -1 +1 @@ -Subproject commit 392315d7c5a1ee9e08a089908a3da9627fe2c6d4 +Subproject commit a2676b4225b8a370b9e7046c5fc2f5ad1155e590 diff --git a/vim/bundle/vim-powerline b/vim/bundle/vim-powerline new file mode 160000 index 0000000..90c1755 --- /dev/null +++ b/vim/bundle/vim-powerline @@ -0,0 +1 @@ +Subproject commit 90c17556d79689697c43df5c94ae9e00dbc73fdf diff --git a/zshrc b/zshrc index a28e263..d7bb271 100644 --- a/zshrc +++ b/zshrc @@ -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"