Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds New Plugins #10

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,9 @@
[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
[submodule "bundle/vim-airline"]
path = bundle/vim-airline
url = https://github.com/bling/vim-airline.git
22 changes: 4 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,30 +1,16 @@
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://github.com/Laeryn/vimfiles.git ~/.vim`

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`
Expand Down
2 changes: 1 addition & 1 deletion bundle/MatchTag
Submodule MatchTag updated 2 files
+25 −12 ftplugin/html.vim
+13 −0 test.html
2 changes: 1 addition & 1 deletion bundle/ack
2 changes: 1 addition & 1 deletion bundle/bufexplorer
2 changes: 1 addition & 1 deletion bundle/command-t
Submodule command-t updated 76 files
+1 −0 .gitattributes
+2 −0 .gitignore
+5 −2 .gitmodules
+3 −0 .mailmap
+4 −2 Gemfile
+38 −16 Gemfile.lock
+1 −1 LICENSE
+1 −1 Makefile
+10 −48 Rakefile
+12 −0 appstream/vim-command-t.metainfo.xml
+180 −0 autoload/commandt.vim
+0 −2 bin/.gitignore
+33 −0 bin/benchmarks/matcher.rb
+76 −0 bin/benchmarks/watchman.rb
+10 −11 command-t.gemspec
+0 −10 compile-test.sh
+471,581 −0 data/benchmark.yml
+741 −108 doc/command-t.txt
+0 −25 multi-spec.sh
+11 −170 plugin/command-t.vim
+17 −0 ruby/command-t.rb
+178 −96 ruby/command-t/controller.rb
+3 −23 ruby/command-t/depend
+17 −42 ruby/command-t/ext.c
+6 −25 ruby/command-t/ext.h
+41 −28 ruby/command-t/extconf.rb
+14 −32 ruby/command-t/finder.rb
+10 −32 ruby/command-t/finder/buffer_finder.rb
+27 −33 ruby/command-t/finder/file_finder.rb
+10 −32 ruby/command-t/finder/jump_finder.rb
+28 −0 ruby/command-t/finder/mru_buffer_finder.rb
+20 −38 ruby/command-t/finder/tag_finder.rb
+106 −122 ruby/command-t/match.c
+14 −26 ruby/command-t/match.h
+118 −122 ruby/command-t/match_window.rb
+182 −114 ruby/command-t/matcher.c
+3 −26 ruby/command-t/matcher.h
+43 −0 ruby/command-t/mru.rb
+17 −0 ruby/command-t/path_utilities.rb
+37 −41 ruby/command-t/prompt.rb
+2 −22 ruby/command-t/ruby_compat.h
+9 −25 ruby/command-t/scanner.rb
+16 −38 ruby/command-t/scanner/buffer_scanner.rb
+79 −87 ruby/command-t/scanner/file_scanner.rb
+10 −0 ruby/command-t/scanner/file_scanner/file_limit_exceeded.rb
+50 −0 ruby/command-t/scanner/file_scanner/find_file_scanner.rb
+34 −0 ruby/command-t/scanner/file_scanner/git_file_scanner.rb
+55 −0 ruby/command-t/scanner/file_scanner/ruby_file_scanner.rb
+55 −0 ruby/command-t/scanner/file_scanner/watchman_file_scanner.rb
+24 −46 ruby/command-t/scanner/jump_scanner.rb
+27 −0 ruby/command-t/scanner/mru_buffer_scanner.rb
+26 −42 ruby/command-t/scanner/tag_scanner.rb
+22 −0 ruby/command-t/scm_utilities.rb
+76 −56 ruby/command-t/settings.rb
+14 −25 ruby/command-t/stub.rb
+94 −0 ruby/command-t/util.rb
+60 −48 ruby/command-t/vim.rb
+0 −40 ruby/command-t/vim/path_utilities.rb
+6 −24 ruby/command-t/vim/screen.rb
+13 −31 ruby/command-t/vim/window.rb
+660 −0 ruby/command-t/watchman.c
+32 −0 ruby/command-t/watchman.h
+14 −28 spec/command-t/controller_spec.rb
+5 −28 spec/command-t/finder/buffer_finder_spec.rb
+5 −29 spec/command-t/finder/file_finder_spec.rb
+0 −236 spec/command-t/match_spec.rb
+188 −48 spec/command-t/matcher_spec.rb
+5 −30 spec/command-t/scanner/buffer_scanner_spec.rb
+65 −0 spec/command-t/scanner/file_scanner/ruby_file_scanner_spec.rb
+7 −72 spec/command-t/scanner/file_scanner_spec.rb
+14 −0 spec/command-t/vim_spec.rb
+416 −0 spec/command-t/watchman/utils_spec.rb
+13 −22 spec/spec_helper.rb
+0 −41 spec/vim_formatter.rb
+1 −1 vendor/vimscriptuploader
+1 −0 vendor/vroom
1 change: 1 addition & 0 deletions bundle/ctrlp
Submodule ctrlp added at b5d3fe
2 changes: 1 addition & 1 deletion bundle/endwise
2 changes: 1 addition & 1 deletion bundle/fugitive
2 changes: 1 addition & 1 deletion bundle/gundo
2 changes: 1 addition & 1 deletion bundle/markdown-runtime
2 changes: 1 addition & 1 deletion bundle/nerdcommenter
2 changes: 1 addition & 1 deletion bundle/nerdtree
2 changes: 1 addition & 1 deletion bundle/ragtag
2 changes: 1 addition & 1 deletion bundle/rails
2 changes: 1 addition & 1 deletion bundle/repeat
Submodule repeat updated 1 files
+15 −9 autoload/repeat.vim
2 changes: 1 addition & 1 deletion bundle/surround
2 changes: 1 addition & 1 deletion bundle/syntastic
2 changes: 1 addition & 1 deletion bundle/tabular
2 changes: 1 addition & 1 deletion bundle/tagbar
Submodule tagbar updated from eab0e6 to f9c5f2
2 changes: 1 addition & 1 deletion bundle/ultisnips
Submodule ultisnips updated 144 files
2 changes: 1 addition & 1 deletion bundle/unimpaired
1 change: 1 addition & 0 deletions bundle/vim-airline
Submodule vim-airline added at 4a2208
2 changes: 1 addition & 1 deletion bundle/yankring
Submodule yankring updated 3 files
+1 −1 README
+141 −57 doc/yankring.txt
+571 −419 plugin/yankring.vim
7 changes: 6 additions & 1 deletion vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -246,6 +248,9 @@ endfunction
let g:NERDTreeMouseMode = 2
let g:NERDTreeWinSize = 40

"ctrlp settings
let g:ctrlp_map = '<c-f>'

"explorer mappings
nnoremap <f1> :BufExplorer<cr>
nnoremap <f2> :NERDTreeToggle<cr>
Expand Down