From b5c1323208d952f41d914d689af62c83c5ad9adb Mon Sep 17 00:00:00 2001 From: Laeryn Evans Date: Sun, 30 Nov 2014 19:08:09 -0800 Subject: [PATCH 1/7] Edits README.md --- README.md | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index c65b43cf5..0bf0a715b 100644 --- a/README.md +++ b/README.md @@ -1,26 +1,10 @@ -This is my ~/.vim dir and _this_, dear reader, is a horse: - - , - / \,,_ .'| - ,{{| /}}}}/_.' - }}}}` '{{' '. - {{{{{ _ ;, \ - ,}}}}}} /o`\ ` ;) - {{{{{{ / ( - }}}}}} | \ - {{{{{{{{ \ \ ,-------------------------------. - }}}}}}}}} '.__ _ | / HI \ - {{{{{{{{ /`._ (_\ / / / \ | - }}}}}}' | //___/ --= < VVVI HI-HI-HI | - jgs `{{{{` | '--' \ \ | - }}}` \ HIM-HIM-HIM!!! / - '--------------------------------' +Custom ~/.vim configuration. Forked from scrooloose/vimfiles. Installation ============ Clone the repo: -`git clone https://github.com/scrooloose/vimfiles.git ~/.vim` +`git clone https://laeryn@bitbucket.org/laeryn/vimfiles.git ~/.vim` Grab the plugin submodules: `cd ~/.vim && git submodule init && git submodule update` From 216781998ff901af1e60a33627aa382098421b01 Mon Sep 17 00:00:00 2001 From: Laeryn Evans Date: Sun, 30 Nov 2014 19:28:11 -0800 Subject: [PATCH 2/7] Adds CtrlP --- .gitmodules | 3 +++ bundle/ctrlp | 1 + vimrc | 3 +++ 3 files changed, 7 insertions(+) create mode 160000 bundle/ctrlp diff --git a/.gitmodules b/.gitmodules index d51ea759c..8afc1aa04 100644 --- a/.gitmodules +++ b/.gitmodules @@ -85,3 +85,6 @@ [submodule "bundle/yankring"] path = bundle/yankring url = https://github.com/vim-scripts/YankRing.vim.git +[submodule "bundle/ctrlp"] + path = bundle/ctrlp + url = https://github.com/kien/ctrlp.vim.git diff --git a/bundle/ctrlp b/bundle/ctrlp new file mode 160000 index 000000000..b5d3fe66a --- /dev/null +++ b/bundle/ctrlp @@ -0,0 +1 @@ +Subproject commit b5d3fe66a58a13d2ff8b6391f4387608496a030f diff --git a/vimrc b/vimrc index 676f0a861..2f7da3416 100644 --- a/vimrc +++ b/vimrc @@ -246,6 +246,9 @@ endfunction let g:NERDTreeMouseMode = 2 let g:NERDTreeWinSize = 40 +"ctrlp settings +let g:ctrlp_map = '' + "explorer mappings nnoremap :BufExplorer nnoremap :NERDTreeToggle From d2370a95f9803d4001e190077095066162041c76 Mon Sep 17 00:00:00 2001 From: Laeryn Evans Date: Sun, 30 Nov 2014 19:34:11 -0800 Subject: [PATCH 3/7] Adds Airline --- .gitmodules | 3 +++ bundle/vim-airline | 1 + 2 files changed, 4 insertions(+) create mode 160000 bundle/vim-airline diff --git a/.gitmodules b/.gitmodules index 8afc1aa04..c7c97496a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -88,3 +88,6 @@ [submodule "bundle/ctrlp"] path = bundle/ctrlp url = https://github.com/kien/ctrlp.vim.git +[submodule "bundle/vim-airline"] + path = bundle/vim-airline + url = https://github.com/bling/vim-airline.git diff --git a/bundle/vim-airline b/bundle/vim-airline new file mode 160000 index 000000000..4a2208821 --- /dev/null +++ b/bundle/vim-airline @@ -0,0 +1 @@ +Subproject commit 4a2208821e1d334c4d3cdf66cd1fd0968755e16a From c5c30cf5936a618e8cb6bfc47f2495b9efaa89af Mon Sep 17 00:00:00 2001 From: Laeryn Evans Date: Sun, 30 Nov 2014 19:42:12 -0800 Subject: [PATCH 4/7] Pulls latest of all submodules --- bundle/MatchTag | 2 +- bundle/ack | 2 +- bundle/bufexplorer | 2 +- bundle/command-t | 2 +- bundle/csapprox | 2 +- bundle/endwise | 2 +- bundle/fugitive | 2 +- bundle/git-runtime | 2 +- bundle/gundo | 2 +- bundle/markdown-runtime | 2 +- bundle/nerdcommenter | 2 +- bundle/nerdtree | 2 +- bundle/ragtag | 2 +- bundle/rails | 2 +- bundle/repeat | 2 +- bundle/surround | 2 +- bundle/syntastic | 2 +- bundle/tabular | 2 +- bundle/tagbar | 2 +- bundle/ultisnips | 2 +- bundle/unimpaired | 2 +- bundle/vim-coffee-script | 2 +- bundle/vim-ruby | 2 +- bundle/yankring | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/bundle/MatchTag b/bundle/MatchTag index c7702ab0d..6dfdab153 160000 --- a/bundle/MatchTag +++ b/bundle/MatchTag @@ -1 +1 @@ -Subproject commit c7702ab0d6eb5bf10dc7cd12004e9d3f693f0fd3 +Subproject commit 6dfdab1530d47b77a1839b9477f27c33a2f10b26 diff --git a/bundle/ack b/bundle/ack index 989528504..303bceff1 160000 --- a/bundle/ack +++ b/bundle/ack @@ -1 +1 @@ -Subproject commit 9895285042a2fd5691b2f6582aa979e4d1bdffea +Subproject commit 303bceff1c8ab1145d114083582b1aeac9de7a85 diff --git a/bundle/bufexplorer b/bundle/bufexplorer index 8c75e65b6..08b0100f5 160000 --- a/bundle/bufexplorer +++ b/bundle/bufexplorer @@ -1 +1 @@ -Subproject commit 8c75e65b647238febd0257658b150f717a136359 +Subproject commit 08b0100f5242e1de07bce40dc6376a4996791c33 diff --git a/bundle/command-t b/bundle/command-t index ca5566eb3..3d640a8ba 160000 --- a/bundle/command-t +++ b/bundle/command-t @@ -1 +1 @@ -Subproject commit ca5566eb312f57b9f4091023cfc03ad8e692bf29 +Subproject commit 3d640a8baa6d1934d2b5d5d0df059595413cdfaf diff --git a/bundle/csapprox b/bundle/csapprox index f98bf4ace..7981dac51 160000 --- a/bundle/csapprox +++ b/bundle/csapprox @@ -1 +1 @@ -Subproject commit f98bf4acef9d9aa5e7f5b42eba09e259908f639b +Subproject commit 7981dac51d8b6776985aa08cb7b5ee98ea7f2ddd diff --git a/bundle/endwise b/bundle/endwise index 74306aa18..96eb11755 160000 --- a/bundle/endwise +++ b/bundle/endwise @@ -1 +1 @@ -Subproject commit 74306aa18c03ee2fdb044609e6f0bc866872711d +Subproject commit 96eb11755bb2d1a5583d44e9bcd10481bca45693 diff --git a/bundle/fugitive b/bundle/fugitive index 4fe6e46a0..2c8461db0 160000 --- a/bundle/fugitive +++ b/bundle/fugitive @@ -1 +1 @@ -Subproject commit 4fe6e46a0ace8196aa1946b91cd02e853f8db9da +Subproject commit 2c8461db084d205903a792a23163faa546f143c9 diff --git a/bundle/git-runtime b/bundle/git-runtime index 75d48664e..297e7075a 160000 --- a/bundle/git-runtime +++ b/bundle/git-runtime @@ -1 +1 @@ -Subproject commit 75d48664e6564fc7639429357bda722f881db515 +Subproject commit 297e7075a1c6ecc4547e6543cda394e28c5b1c06 diff --git a/bundle/gundo b/bundle/gundo index 7198c51b5..3975ac871 160000 --- a/bundle/gundo +++ b/bundle/gundo @@ -1 +1 @@ -Subproject commit 7198c51b5d2b145b5ca4899fda8397e7f68efa77 +Subproject commit 3975ac871565115e3769dc69c06bc88ddc1369af diff --git a/bundle/markdown-runtime b/bundle/markdown-runtime index 3a9915747..409c37b20 160000 --- a/bundle/markdown-runtime +++ b/bundle/markdown-runtime @@ -1 +1 @@ -Subproject commit 3a99157473cb6508d1bc6f5980f928f27f52d65b +Subproject commit 409c37b205afa2f9d590e23de8171482d66770e2 diff --git a/bundle/nerdcommenter b/bundle/nerdcommenter index cb242a9cb..6549cfde4 160000 --- a/bundle/nerdcommenter +++ b/bundle/nerdcommenter @@ -1 +1 @@ -Subproject commit cb242a9cb41e9fc9884caa2235c67d18b18e9067 +Subproject commit 6549cfde45339bd4f711504196ff3e8b766ef5e6 diff --git a/bundle/nerdtree b/bundle/nerdtree index 2cb0fc78f..3b98a7fca 160000 --- a/bundle/nerdtree +++ b/bundle/nerdtree @@ -1 +1 @@ -Subproject commit 2cb0fc78fb4c7a1db5f51c042a447cc50f09983d +Subproject commit 3b98a7fcae8f9fff356907171f0406ff8cd28921 diff --git a/bundle/ragtag b/bundle/ragtag index 1b82b6726..12e379989 160000 --- a/bundle/ragtag +++ b/bundle/ragtag @@ -1 +1 @@ -Subproject commit 1b82b6726c9894acd37b70ec1cd451d412bdb0f7 +Subproject commit 12e379989e3258af0934e10173386235c7d69944 diff --git a/bundle/rails b/bundle/rails index 13b8bb5af..9ec44f4bc 160000 --- a/bundle/rails +++ b/bundle/rails @@ -1 +1 @@ -Subproject commit 13b8bb5afa7bc6c65c3d2401314bb1960f161f37 +Subproject commit 9ec44f4bcd63e29ba3f62266072ee12a2937e5e3 diff --git a/bundle/repeat b/bundle/repeat index 2914f11f7..2a3c5f8e3 160000 --- a/bundle/repeat +++ b/bundle/repeat @@ -1 +1 @@ -Subproject commit 2914f11f7494adefaaec1d8c817a301c464c94b2 +Subproject commit 2a3c5f8e3c26a57b8eb4cfc4be79615a1c508ef6 diff --git a/bundle/surround b/bundle/surround index 489a1e8c6..fa433e0b7 160000 --- a/bundle/surround +++ b/bundle/surround @@ -1 +1 @@ -Subproject commit 489a1e8c676ad47dd358dbf883bfaf492148d38b +Subproject commit fa433e0b7330753688f715f3be5d10dc480f20e5 diff --git a/bundle/syntastic b/bundle/syntastic index 4b61f4b2b..67ffe5881 160000 --- a/bundle/syntastic +++ b/bundle/syntastic @@ -1 +1 @@ -Subproject commit 4b61f4b2b9de642c054db9bcdbfa99480b2909aa +Subproject commit 67ffe58818930e95163ead541a2700cec41c13f7 diff --git a/bundle/tabular b/bundle/tabular index b7b4d8791..60f256488 160000 --- a/bundle/tabular +++ b/bundle/tabular @@ -1 +1 @@ -Subproject commit b7b4d8791a50013b56c2d68b6c5708c808203b54 +Subproject commit 60f25648814f0695eeb6c1040d97adca93c4e0bb diff --git a/bundle/tagbar b/bundle/tagbar index eab0e67d1..f9c5f2457 160000 --- a/bundle/tagbar +++ b/bundle/tagbar @@ -1 +1 @@ -Subproject commit eab0e67d1bb46884b7285cbe206f259fb2bade70 +Subproject commit f9c5f24576e82aae5ab8a5480f1ae48615354e40 diff --git a/bundle/ultisnips b/bundle/ultisnips index 2ddb5b726..6dd476750 160000 --- a/bundle/ultisnips +++ b/bundle/ultisnips @@ -1 +1 @@ -Subproject commit 2ddb5b72632e08c764eeeb2f17800e18401e7e32 +Subproject commit 6dd476750bbb936f12f70bcbb3d4fec89b5fce20 diff --git a/bundle/unimpaired b/bundle/unimpaired index e8013727a..3548479cc 160000 --- a/bundle/unimpaired +++ b/bundle/unimpaired @@ -1 +1 @@ -Subproject commit e8013727a008a68664a789fe0d2b5c2ab2ecf657 +Subproject commit 3548479cc154154cbdbb6737ca08a47937cc7113 diff --git a/bundle/vim-coffee-script b/bundle/vim-coffee-script index abac18889..827e4a38b 160000 --- a/bundle/vim-coffee-script +++ b/bundle/vim-coffee-script @@ -1 +1 @@ -Subproject commit abac188893e615b5cbb7137ada691abd597be975 +Subproject commit 827e4a38b07479433b619091469a7495a392df8a diff --git a/bundle/vim-ruby b/bundle/vim-ruby index 90f352333..9d95f296a 160000 --- a/bundle/vim-ruby +++ b/bundle/vim-ruby @@ -1 +1 @@ -Subproject commit 90f352333e15342940394c780d70087f5bd65390 +Subproject commit 9d95f296a7afde76361130217304d75004c0d8f9 diff --git a/bundle/yankring b/bundle/yankring index e42cac0d8..a884f3a16 160000 --- a/bundle/yankring +++ b/bundle/yankring @@ -1 +1 @@ -Subproject commit e42cac0d8d84be5602109f4e614caa0854470fc1 +Subproject commit a884f3a161fa3cd8c996eb53a3d1c68631f60c21 From 676933b9c98ee236b19080db56186e1a735df7c2 Mon Sep 17 00:00:00 2001 From: Laeryn Evans Date: Sun, 30 Nov 2014 19:46:38 -0800 Subject: [PATCH 5/7] Sets colorscheme to solarized dark --- vimrc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vimrc b/vimrc index 2f7da3416..07f3b6ed6 100644 --- a/vimrc +++ b/vimrc @@ -60,8 +60,10 @@ set sidescroll=1 filetype plugin on filetype indent on -"turn on syntax highlighting +"turn on syntax highlighting and set color scheme syntax on +set background=dark +colorscheme solarized "some stuff to get the mouse going in term set mouse=a From 83803f6b0f1d4d1b36421efdc71d7a45014b70d3 Mon Sep 17 00:00:00 2001 From: Laeryn Evans Date: Mon, 1 Dec 2014 14:46:10 -0800 Subject: [PATCH 6/7] Adds updating plugin instructions to README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 0bf0a715b..0d6193aac 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,8 @@ Clone the repo: Grab the plugin submodules: `cd ~/.vim && git submodule init && git submodule update` +Update plugins to latest version: +`cd ~/.vim && git submodule foreach git pull origin master` Make sure vim finds the vimrc file by either symlinking it: `ln -s ~/.vim/vimrc ~/.vimrc` From 6785a79241f91e36dffa49177be6e05bb2fa1092 Mon Sep 17 00:00:00 2001 From: Laeryn Date: Mon, 1 Dec 2014 14:49:00 -0800 Subject: [PATCH 7/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0d6193aac..d6b2cb7cb 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Installation ============ Clone the repo: -`git clone https://laeryn@bitbucket.org/laeryn/vimfiles.git ~/.vim` +`git clone https://github.com/Laeryn/vimfiles.git ~/.vim` Grab the plugin submodules: `cd ~/.vim && git submodule init && git submodule update`