Browse files

Simplify VIM. Pathogen -> Vundle.

  • Loading branch information...
1 parent 5114bd8 commit 96868cf03fdabca74b7f5b61aaa826bde1b4c3d1 @stephencelis committed Dec 21, 2011
Showing with 47 additions and 793 deletions.
  1. +1 −0 .gitignore
  2. +3 −141 .gitmodules
  3. +0 −2 bundle/config
  4. +0 −1 vim/autoload
  5. +0 −1 vim/bundle/Color-Sampler-Pack
  6. +0 −1 vim/bundle/NERD_commenter
  7. +0 −1 vim/bundle/NERD_tree
  8. +0 −1 vim/bundle/abolish
  9. +0 −1 vim/bundle/ack
  10. +0 −1 vim/bundle/actionscript
  11. +0 −1 vim/bundle/afterimage
  12. +0 −1 vim/bundle/cocoa
  13. +0 −1 vim/bundle/coffee-script
  14. +1 −1 vim/bundle/command-t
  15. +0 −1 vim/bundle/conque
  16. +0 −1 vim/bundle/cucumber
  17. +0 −1 vim/bundle/detectindent
  18. +0 −1 vim/bundle/endwise
  19. +0 −1 vim/bundle/flatfoot
  20. +0 −1 vim/bundle/fugitive
  21. +0 −1 vim/bundle/gist
  22. +0 −1 vim/bundle/git
  23. +0 −1 vim/bundle/git-motemen
  24. +0 −1 vim/bundle/gundo
  25. +0 −1 vim/bundle/haml
  26. +0 −1 vim/bundle/irblack
  27. +0 −1 vim/bundle/jade
  28. +0 −1 vim/bundle/javascript
  29. +0 −1 vim/bundle/liquid
  30. +0 −1 vim/bundle/markdown
  31. +0 −1 vim/bundle/objj
  32. +0 −1 vim/bundle/pastie
  33. +0 −1 vim/bundle/ragtag
  34. +0 −1 vim/bundle/rails
  35. +0 −1 vim/bundle/repeat
  36. +0 −1 vim/bundle/ruby
  37. +0 −110 vim/bundle/scratch/plugin/scratch.vim
  38. +0 −1 vim/bundle/slim
  39. +0 −1 vim/bundle/snipMate
  40. +0 −1 vim/bundle/speeddating
  41. +0 −1 vim/bundle/stylus
  42. +0 −1 vim/bundle/supertab
  43. +0 −1 vim/bundle/surround
  44. +0 −1 vim/bundle/syntastic
  45. +0 −1 vim/bundle/tagbar
  46. +0 −6 vim/bundle/tailminusf/doc/tags
  47. +0 −69 vim/bundle/tailminusf/doc/tailminusf.txt
  48. +0 −146 vim/bundle/tailminusf/plugin/tailminusf.vim
  49. +0 −1 vim/bundle/unimpaired
  50. +0 −1 vim/bundle/vim-colors-solarized
  51. +1 −1 vim/bundle/vim-javascript
  52. +0 −1 vim/bundle/vividchalk
  53. +1 −0 vim/bundle/vundle
  54. +0 −1 vim/pathogen
  55. +38 −266 vimrc
  56. +2 −7 zsh/aliases
View
1 .gitignore
@@ -3,3 +3,4 @@ gem
gitconfig
irssi/config
vim/.netrwhist
+vim/bundle
View
144 .gitmodules
@@ -1,144 +1,6 @@
-[submodule "vim/autoload"]
- path = vim/autoload
- url = git://github.com/tpope/vim-pathogen.git
-[submodule "vim/bundle/fugitive"]
- path = vim/bundle/fugitive
- url = git://github.com/tpope/vim-fugitive.git
-[submodule "vim/bundle/git"]
- path = vim/bundle/git
- url = git://github.com/tpope/vim-git.git
-[submodule "vim/bundle/rails"]
- path = vim/bundle/rails
- url = git://github.com/tpope/vim-rails.git
-[submodule "vim/bundle/cucumber"]
- path = vim/bundle/cucumber
- url = git://github.com/tpope/vim-cucumber.git
-[submodule "vim/bundle/markdown"]
- path = vim/bundle/markdown
- url = git://github.com/tpope/vim-markdown.git
-[submodule "vim/bundle/vividchalk"]
- path = vim/bundle/vividchalk
- url = git://github.com/tpope/vim-vividchalk.git
-[submodule "vim/bundle/speeddating"]
- path = vim/bundle/speeddating
- url = git://github.com/tpope/vim-speeddating.git
-[submodule "vim/bundle/surround"]
- path = vim/bundle/surround
- url = git://github.com/tpope/vim-surround.git
-[submodule "vim/bundle/unimpaired"]
- path = vim/bundle/unimpaired
- url = git://github.com/tpope/vim-unimpaired.git
-[submodule "vim/bundle/liquid"]
- path = vim/bundle/liquid
- url = git://github.com/tpope/vim-liquid.git
-[submodule "vim/bundle/abolish"]
- path = vim/bundle/abolish
- url = git://github.com/tpope/vim-abolish.git
-[submodule "vim/bundle/pastie"]
- path = vim/bundle/pastie
- url = git://github.com/tpope/vim-pastie.git
-[submodule "vim/bundle/haml"]
- path = vim/bundle/haml
- url = git://github.com/tpope/vim-haml.git
-[submodule "vim/bundle/flatfoot"]
- path = vim/bundle/flatfoot
- url = git://github.com/tpope/vim-flatfoot.git
-[submodule "vim/bundle/endwise"]
- path = vim/bundle/endwise
- url = git://github.com/tpope/vim-endwise.git
-[submodule "vim/bundle/repeat"]
- path = vim/bundle/repeat
- url = git://github.com/tpope/vim-repeat.git
-[submodule "vim/bundle/ack"]
- path = vim/bundle/ack
- url = git://github.com/mileszs/ack.vim.git
-[submodule "vim/bundle/gist"]
- path = vim/bundle/gist
- url = git://github.com/mattn/gist-vim.git
-[submodule "vim/bundle/snipMate"]
- path = vim/bundle/snipMate
- url = git://github.com/msanders/snipmate.vim.git
-[submodule "vim/bundle/ruby"]
- path = vim/bundle/ruby
- url = git://github.com/vim-ruby/vim-ruby.git
-[submodule "vim/bundle/javascript"]
- path = vim/bundle/javascript
- url = git://github.com/pangloss/vim-javascript.git
-[submodule "vim/bundle/cocoa"]
- path = vim/bundle/cocoa
- url = git://github.com/msanders/cocoa.vim.git
-[submodule "vim/bundle/ragtag"]
- path = vim/bundle/ragtag
- url = git://github.com/tpope/vim-ragtag.git
-[submodule "vim/bundle/irblack"]
- path = vim/bundle/irblack
- url = git://github.com/wgibbs/vim-irblack.git
-[submodule "vim/bundle/coffee-script"]
- path = vim/bundle/coffee-script
- url = git://github.com/kchmck/vim-coffee-script.git
-[submodule "vim/bundle/objj"]
- path = vim/bundle/objj
- url = git://github.com/nanki/vim-objj.git
-[submodule "vim/bundle/detectindent"]
- path = vim/bundle/detectindent
- url = git://github.com/ciaranm/detectindent.git
-[submodule "vim/bundle/syntastic"]
- path = vim/bundle/syntastic
- url = git://github.com/scrooloose/syntastic.git
-[submodule "vim/bundle/NERD_commenter"]
- path = vim/bundle/NERD_commenter
- url = git://github.com/scrooloose/nerdcommenter.git
-[submodule "vim/bundle/NERD_tree"]
- path = vim/bundle/NERD_tree
- url = git://github.com/scrooloose/nerdtree.git
[submodule "irssi/scripts/irssi-growl"]
path = irssi/scripts/irssi-growl
url = git://github.com/jashmenn/irssi-growl.git
-[submodule "vim/bundle/conque"]
- path = vim/bundle/conque
- url = git://github.com/rson/vim-conque.git
-[submodule "vim/bundle/gundo"]
- path = vim/bundle/gundo
- url = git://github.com/sjl/gundo.vim.git
-[submodule "vim/bundle/file-line"]
- path = vim/bundle/file-line
- url = git://github.com/vim-scripts/file-line.git
-[submodule "vim/bundle/supertab"]
- path = vim/bundle/supertab
- url = git://github.com/ervandew/supertab.git
-[submodule "vim/bundle/command-t"]
- path = vim/bundle/command-t
- url = git://github.com/wincent/Command-T.git
-[submodule "vim/bundle/git-motemen"]
- path = vim/bundle/git-motemen
- url = git://github.com/motemen/git-vim.git
-[submodule "vim/bundle/Color-Sampler-Pack"]
- path = vim/bundle/Color-Sampler-Pack
- url = git://github.com/vim-scripts/Color-Sampler-Pack.git
-[submodule "vim/pathogen"]
- path = vim/pathogen
- url = git://github.com/tpope/vim-pathogen.git
-[submodule "vim/bundle/actionscript"]
- path = vim/bundle/actionscript
- url = git://github.com/vim-scripts/actionscript.vim--Cuss.git
-[submodule "vim/bundle/delimitMate"]
- path = vim/bundle/delimitMate
- url = git://github.com/Raimondi/delimitMate.git
-[submodule "vim/bundle/tagbar"]
- path = vim/bundle/tagbar
- url = git://github.com/majutsushi/tagbar.git
-[submodule "vim/bundle/afterimage"]
- path = vim/bundle/afterimage
- url = git://github.com/tpope/vim-afterimage.git
-[submodule "vim/bundle/slim"]
- path = vim/bundle/slim
- url = git://github.com/bbommarito/vim-slim.git
-[submodule "vim/bundle/stylus"]
- path = vim/bundle/stylus
- url = git://github.com/wavded/vim-stylus.git
-[submodule "vim/bundle/jade"]
- path = vim/bundle/jade
- url = git://github.com/digitaltoad/vim-jade.git
-[submodule "vim/bundle/vim-javascript"]
- path = vim/bundle/vim-javascript
- url = git://github.com/serverhorror/javascript.vim.git
+[submodule "vim/bundle/vundle"]
+ path = vim/bundle/vundle
+ url = git://github.com/gmarik/vundle.git
View
2 bundle/config
@@ -1,2 +0,0 @@
----
-BUNDLE_PATH: vendor/bundle
View
1 vim/autoload
1 vim/bundle/Color-Sampler-Pack
@@ -1 +0,0 @@
-Subproject commit 681ed9e94b7d498810be7a3ac0f048bcca8fd46d
1 vim/bundle/NERD_commenter
@@ -1 +0,0 @@
-Subproject commit b28e7be63235982501ab7dd30c03ea7feef7b095
1 vim/bundle/NERD_tree
@@ -1 +0,0 @@
-Subproject commit 12f692f4369526f408e724fa74a0da527ebe2f2f
1 vim/bundle/abolish
@@ -1 +0,0 @@
-Subproject commit fb950d49172189a70c07016e61db56a93017b7bc
1 vim/bundle/ack
@@ -1 +0,0 @@
-Subproject commit a41d5d52c39a31128e969e69acf800b198cb07f9
1 vim/bundle/actionscript
@@ -1 +0,0 @@
-Subproject commit d8de5460a5dd875cc2e7e676a4be7e8487fd8bd6
1 vim/bundle/afterimage
@@ -1 +0,0 @@
-Subproject commit 6d5527d2fe337324c4b125a2d3b45e20df16f94d
1 vim/bundle/cocoa
@@ -1 +0,0 @@
-Subproject commit ca6f2544c1f4ef9e5fbd8a040c1ed94fbac67351
1 vim/bundle/coffee-script
@@ -1 +0,0 @@
-Subproject commit 36cb8655c29b330fda6604dccc5e9c0c2e6c4d59
2 vim/bundle/command-t
@@ -1 +1 @@
-Subproject commit 3c0dc0a392fbea847ac97efe25f774cf1f2dcda0
+Subproject commit 18686a82a2e4d015b877bf0b6867a269aa8a284f
1 vim/bundle/conque
@@ -1 +0,0 @@
-Subproject commit 19aa7c8bee402faf821d0f119c75dccfefb42713
1 vim/bundle/cucumber
@@ -1 +0,0 @@
-Subproject commit 2ef3e5a4876a4cd5ea83a0dcbf17f5c3edbf9de3
1 vim/bundle/detectindent
@@ -1 +0,0 @@
-Subproject commit c6f6e7bab6696d9f95220e723cef78fbb110c639
1 vim/bundle/endwise
@@ -1 +0,0 @@
-Subproject commit 86e1d4ab9192245ae83831f073c0452f3b7baba8
1 vim/bundle/flatfoot
@@ -1 +0,0 @@
-Subproject commit 9dd4d6650335f9aadbd20c8b65ab37ddc6aaada2
1 vim/bundle/fugitive
@@ -1 +0,0 @@
-Subproject commit 8993abb9f12f76a220336cbb94acb30a07cc5e3f
1 vim/bundle/gist
@@ -1 +0,0 @@
-Subproject commit 96dcf857ceb4397711a03bce346d8f3c262de119
1 vim/bundle/git
@@ -1 +0,0 @@
-Subproject commit ca001e529f3d02675d66f9dd8b7253ab4f284ee1
1 vim/bundle/git-motemen
@@ -1 +0,0 @@
-Subproject commit 74d01ae026092bc2fbf041227812e2a47c2ca7d8
1 vim/bundle/gundo
@@ -1 +0,0 @@
-Subproject commit 240efe741554246823723525a67ea0c39ba3ddfe
1 vim/bundle/haml
@@ -1 +0,0 @@
-Subproject commit de3e72a384c9b1cc8707c9bc37cefc24d8484ebf
1 vim/bundle/irblack
@@ -1 +0,0 @@
-Subproject commit 59622caff32a7925181ab139701fad3eee54ae51
1 vim/bundle/jade
@@ -1 +0,0 @@
-Subproject commit 940d04f459601b79ab26345ba846c3ad73cf160b
1 vim/bundle/javascript
@@ -1 +0,0 @@
-Subproject commit 9990a767695c78a44611ce33fb2dbc25c83d8827
1 vim/bundle/liquid
@@ -1 +0,0 @@
-Subproject commit 0363d0b3e3936158d105772bdda484f5df15a7e0
1 vim/bundle/markdown
@@ -1 +0,0 @@
-Subproject commit 34e28b3f6f6d702ff2963b8196eccae9344ed4bc
1 vim/bundle/objj
@@ -1 +0,0 @@
-Subproject commit 8880826f4d6dd7c43b526805cb1cfe5ff977f311
1 vim/bundle/pastie
@@ -1 +0,0 @@
-Subproject commit 0b70a88a1e5043126cbc2c4fb4b599549b7fd6a9
1 vim/bundle/ragtag
@@ -1 +0,0 @@
-Subproject commit 476e61be4ce3054a3481ef9a9226f44cfa6fcb82
1 vim/bundle/rails
@@ -1 +0,0 @@
-Subproject commit 38b54e3a192197b0d4383e3783ff93e0de2b3d41
1 vim/bundle/repeat
@@ -1 +0,0 @@
-Subproject commit c4101c205ef9e06bdfeff571a7dbba2576f08974
1 vim/bundle/ruby
@@ -1 +0,0 @@
-Subproject commit 7bee8d01ebc3b182253b8141abb791f7b664ba08
View
110 vim/bundle/scratch/plugin/scratch.vim
@@ -1,110 +0,0 @@
-" File: scratch.vim
-" Author: Yegappan Lakshmanan (yegappan AT yahoo DOT com)
-" Version: 1.0
-" Last Modified: June 3, 2003
-"
-" Overview
-" --------
-" You can use the scratch plugin to create a temporary scratch buffer to store
-" and edit text that will be discarded when you quit/exit vim. The contents
-" of the scratch buffer are not saved/stored in a file.
-"
-" Installation
-" ------------
-" 1. Copy the scratch.vim plugin to the $HOME/.vim/plugin directory. Refer to
-" the following Vim help topics for more information about Vim plugins:
-"
-" :help add-plugin
-" :help add-global-plugin
-" :help runtimepath
-"
-" 2. Restart Vim.
-"
-" Usage
-" -----
-" You can use the following command to open/edit the scratch buffer:
-"
-" :Scratch
-"
-" To open the scratch buffer in a new split window, use the following command:
-"
-" :Sscratch
-"
-" When you close the scratch buffer window, the buffer will retain the
-" contents. You can again edit the scratch buffer by openeing it using one of
-" the above commands. There is no need to save the scatch buffer.
-"
-" When you quit/exit Vim, the contents of the scratch buffer will be lost.
-" You will not be prompted to save the contents of the modified scratch
-" buffer.
-"
-" You can have only one scratch buffer open in a single Vim instance. If the
-" current buffer has unsaved modifications, then the scratch buffer will be
-" opened in a new window
-"
-" ****************** Do not modify after this line ************************
-if exists('loaded_scratch') || &cp
- finish
-endif
-let loaded_scratch=1
-
-" Scratch buffer name
-let ScratchBufferName = "__Scratch__"
-
-" ScratchBufferOpen
-" Open the scratch buffer
-function! s:ScratchBufferOpen(new_win)
- let split_win = a:new_win
-
- " If the current buffer is modified then open the scratch buffer in a new
- " window
- if !split_win && &modified
- let split_win = 1
- endif
-
- " Check whether the scratch buffer is already created
- let scr_bufnum = bufnr(g:ScratchBufferName)
- if scr_bufnum == -1
- " open a new scratch buffer
- if split_win
- exe "new " . g:ScratchBufferName
- else
- exe "edit " . g:ScratchBufferName
- endif
- else
- " Scratch buffer is already created. Check whether it is open
- " in one of the windows
- let scr_winnum = bufwinnr(scr_bufnum)
- if scr_winnum != -1
- " Jump to the window which has the scratch buffer if we are not
- " already in that window
- if winnr() != scr_winnum
- exe scr_winnum . "wincmd w"
- endif
- else
- " Create a new scratch buffer
- if split_win
- exe "split +buffer" . scr_bufnum
- else
- exe "buffer " . scr_bufnum
- endif
- endif
- endif
-endfunction
-
-" ScratchMarkBuffer
-" Mark a buffer as scratch
-function! s:ScratchMarkBuffer()
- setlocal buftype=nofile
- setlocal bufhidden=hide
- setlocal noswapfile
- setlocal buflisted
-endfunction
-
-autocmd BufNewFile __Scratch__ call s:ScratchMarkBuffer()
-
-" Command to edit the scratch buffer in the current window
-command! -nargs=0 Scratch call s:ScratchBufferOpen(0)
-" Command to open the scratch buffer in a new split window
-command! -nargs=0 Sscratch call s:ScratchBufferOpen(1)
-
1 vim/bundle/slim
@@ -1 +0,0 @@
-Subproject commit f770045eac740d4d5ffbc1f329dc20cf67a0ce99
1 vim/bundle/snipMate
@@ -1 +0,0 @@
-Subproject commit f5a75d075d3c005ebe69e3f5e56cf99516e8aa3b
1 vim/bundle/speeddating
@@ -1 +0,0 @@
-Subproject commit b0ee6ec2153c5f30827d67db1668f37a975a1005
1 vim/bundle/stylus
@@ -1 +0,0 @@
-Subproject commit d6d18d70e2edf21de3f54e03e4efd8312e06385d
1 vim/bundle/supertab
@@ -1 +0,0 @@
-Subproject commit 80ec6539e4139a2e0281a0f1e36d5038d55ad980
1 vim/bundle/surround
@@ -1 +0,0 @@
-Subproject commit d9e6bfdd902fc661c8fd58ede248ccfc3b3039d7
1 vim/bundle/syntastic
@@ -1 +0,0 @@
-Subproject commit 88dbca87c80de9b7852672907f6fc9fb935f531c
1 vim/bundle/tagbar
@@ -1 +0,0 @@
-Subproject commit 3c075654d424c6e3c20521bd4567b517a2410593
View
6 vim/bundle/tailminusf/doc/tags
@@ -1,6 +0,0 @@
-'TailMinusF_Height' tailminusf.txt /*'TailMinusF_Height'*
-:Tail tailminusf.txt /*:Tail*
-TailMinusF.txt tailminusf.txt /*TailMinusF.txt*
-tailminusf-about tailminusf.txt /*tailminusf-about*
-tailminusf-commands tailminusf.txt /*tailminusf-commands*
-tailminusf-configure tailminusf.txt /*tailminusf-configure*
View
69 vim/bundle/tailminusf/doc/tailminusf.txt
@@ -1,69 +0,0 @@
-*TailMinusF.txt* Watch the contents of a file in real time
-
-Author: Jason Heddings (jason@heddings.com)
-For Vim version 6.0 and above
-Last change: 05 October, 2005
-
-1. Overview |tailminusf-about|
-2. Commands |tailminusf-commands|
-3. Configuration |tailminusf-configure|
-
-==============================================================================
- *tailminusf-about*
-1. Overview~
-
-TailMinusF allows you to view the contents of a file in real time. When a
-change in the file is detected, the window displaying the file is updated and
-repositioned to the last line.
-
-The update is not exactly real time, but usually updates within a few seconds
-of the file change. The update interval of the output is determined by the
-|updatetime| parameter, along with continued usage of Vim. This means that if
-you are not doing any editing or motion commands, the preview window will not
-be updated. See |CursorHold| for more information.
-
-Because this window becomes the preview window, it will accept all related
-commands. For more information, see |preview-window|.
-
-==============================================================================
- *tailminusf-commands*
-2. Commands~
-
-The TailMinusF plugin does not create any automatic mappings, but provides the
-following commands:
-
-|:Tail| begin watching the specified file
-
- *:Tail*
-:Tail <filename>
- Begin watching the specified file in the preview window. This will
- cause any existing preview windows to be closed. If the file is
- already open in another buffer, that buffer will be wiped out.
-
-Once open, the window accepts all preview window commands. For example, to
-close the preview window, use |:pclose|.
-
-==============================================================================
- *tailminusf-configure*
-2. Configuration~
-
-TailMinusF may be customized using variables set by the |let| command in your
-.vimrc file. The default values for the options are shown in square brackets.
-
-|'TailMinusF_Height'| Specify the height of the preview window [10]
-|'TailMinusF_Center_Win'| Center the output in the preview window [0]
-
- *'TailMinusF_Height'*
-TailMinusF_Height~
- Using this setting, you can alter the height of the preview window that is
- created when |:Tail| is called for a file. >
- let g:TailMinusF_Height = 12
-<
-TailMinusF_Center_Win~
- When set to true, this will cause the last line of the output to be centered
- in the preview window. By default, the last line of output will be on the
- last line of the window >
- let g:TailMinusF_Center_Win = 1
-<
-==============================================================================
-vim:textwidth=78:tabstop=8:noexpandtab:filetype=help
View
146 vim/bundle/tailminusf/plugin/tailminusf.vim
@@ -1,146 +0,0 @@
-" File: tailminusf.vim
-" Author: Jason Heddings (vim at heddway dot com)
-" Version: 1.1
-" Last Modified: 05 October, 2005
-"
-" See ':help tailminusf' for more information.
-"
-if exists('g:TailMinusF_Loaded')
- finish
-endif
-let g:TailMinusF_Loaded = 1
-
-
-" set the default options for the plugin
-if !exists("g:TailMinusF_Height")
- let g:TailMinusF_Height = 10
-endif
-if !exists("g:TailMinusF_Center_Win")
- let g:TailMinusF_Center_Win = 0
-endif
-
-
-" command exports
-command -nargs=1 -complete=file Tail call TailMinusF(<q-args>)
-
-
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" sets up the preview window to watch the specified file for changes
-function! TailMinusF(file)
- let g:TailMinusF_status = "|"
- let l:file = substitute(expand(a:file), "\\", "/", "g")
-
- if !filereadable(l:file)
- echohl ErrorMsg | echo "Cannot open for reading: " . l:file | echohl None
- return
- endif
-
- " if the buffer is already open, kill it
- pclose " in case there is a preview window already, also removes autocmd's
- if bufexists(bufnr(l:file))
- execute ':' . bufnr(l:file) . 'bwipeout'
- endif
-
- " set it up to be watched closely
- augroup TailMinusF
- " monitor calls -- try to catch the update as much as possible
- autocmd CursorHold * call TailMinusF_Monitor()
- autocmd FocusLost * call TailMinusF_Monitor()
- autocmd FocusGained * call TailMinusF_Monitor()
-
- " utility calls
- execute "autocmd BufWinEnter " . l:file . " call TailMinusF_Setup()"
- execute "autocmd BufWinLeave " . l:file . " call TailMinusF_Stop()"
- execute "autocmd FileChangedShell " . l:file . " :call TailMinusF_Refresh()"
- augroup END
-
- " set up the new window with minimal functionality
- silent execute g:TailMinusF_Height . "new " . l:file
-endfunction
-
-
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" used by TailMinusF to check the file status
-function! TailMinusF_Monitor()
- " do our file change checks
- checktime " the easy check
-
- " update the status indicator
- if g:TailMinusF_status == "|"
- let g:TailMinusF_status = "/"
- elseif g:TailMinusF_status == "/"
- let g:TailMinusF_status = "-"
- elseif g:TailMinusF_status == "-"
- let g:TailMinusF_status = "\\"
- elseif g:TailMinusF_status == "\\"
- let g:TailMinusF_status = "|"
- endif
- return g:TailMinusF_status
-endfunction
-
-
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" used by TailMinusF to set up the preview window settings
-function! TailMinusF_Setup()
- setlocal noswapfile
- setlocal noshowcmd
- setlocal bufhidden=delete
- setlocal nobuflisted
- setlocal nomodifiable
- setlocal nowrap
- setlocal nonumber
- setlocal previewwindow
- "setlocal statusline=%F\ %{TailMinusF_Monitor()}
-
- call TailMinusF_SetCursor()
-endfunction
-
-
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" used by TailMinusF to refresh the window contents & position
-" use this instead of autoread for silent reloading and better control
-function! TailMinusF_Refresh()
- if &previewwindow
- " if the cursor is on the last line, we'll move it with the update
- if line(".") != line("$")
- let l:update_cursor = 0
- else
- let l:update_cursor = 1
- endif
-
- " do all the necessary updates
- silent execute "edit!"
- if l:update_cursor
- call TailMinusF_SetCursor()
- endif
- else
- " jump to the preview window to reload
- wincmd P
-
- " do all the necessary updates
- silent execute "edit!"
- call TailMinusF_SetCursor()
-
- " jump back
- wincmd p
- endif
-endfunction
-
-
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" used by TailMinusF to set the cursor position in the preview window
-" assumes that the correct window has already been selected
-function! TailMinusF_SetCursor()
- normal G
- if g:TailMinusF_Center_Win
- normal zz
- endif
-endfunction
-
-
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" used by TailMinusF to stop watching the file and clean up
-function! TailMinusF_Stop()
- autocmd! TailMinusF
- augroup! TailMinusF
-endfunction
1 vim/bundle/unimpaired
@@ -1 +0,0 @@
-Subproject commit 5b7a9c3addc98684ce4739e22840866aa0726537
1 vim/bundle/vim-colors-solarized
@@ -1 +0,0 @@
-Subproject commit 528a59f26d12278698bb946f8fb82a63711eec21
2 vim/bundle/vim-javascript
@@ -1 +1 @@
-Subproject commit 7b4c668289f4f4cbe25835d799211a6ee7288000
+Subproject commit e66f9019b4eca05d7f5dfe38c742cf42e641e98d
1 vim/bundle/vividchalk
@@ -1 +0,0 @@
-Subproject commit c824c2a5c1d96a7d2ec2df6baf7231dcee621130
1 vim/bundle/vundle
@@ -0,0 +1 @@
+Subproject commit 67640fc68b29aed700afd35f38a1f05b280e01b8
1 vim/pathogen
@@ -1 +0,0 @@
-Subproject commit fb16afe7382f8460c3a6f5318ed882319081330a
View
304 vimrc
@@ -1,279 +1,51 @@
-" * General Settings
-"
-" Use zsh.
-set shell=zsh
+set runtimepath+=~/.vim/bundle/vundle
+if exists('vundle#rc')
+ call vundle#rc()
+ Bundle 'actionscript.vim'
+ Bundle 'file-line'
+ Bundle 'kchmck/vim-coffee-script'
+ Bundle 'mileszs/ack.vim'
+ Bundle 'pangloss/vim-javascript'
+ Bundle 'Raimondi/delimitMate'
+ Bundle 'sjl/gundo.vim'
+ " Bundle 'tpope/vim-bundler'
+ Bundle 'tpope/vim-commentary'
+ Bundle 'tpope/vim-cucumber'
+ Bundle 'tpope/vim-endwise'
+ Bundle 'tpope/vim-fugitive'
+ Bundle 'tpope/vim-haml'
+ Bundle 'tpope/vim-markdown'
+ Bundle 'tpope/vim-markdown'
+ Bundle 'tpope/vim-rails'
+ Bundle 'tpope/vim-rake'
+ Bundle 'tpope/vim-surround'
+ Bundle 'tpope/vim-vividchalk'
+ Bundle 'vim-ruby/vim-ruby'
+ Bundle 'wgibbs/vim-irblack'
+ Bundle 'wincent/Command-T'
+endif
+
+filetype indent plugin on
+syntax enable
-" Fast TTY
-set ttyfast
-
-" Use UTF-8.
-scriptencoding utf-8
-
-" Detect filetypes, indent files.
-filetype plugin indent on
-
-" Syntax highlighting.
-set nocompatible
-syntax on
-
-" No modelines
-set modelines=0
-
-" Highlight matching parentheses.
-set showmatch
-
-" Use the tab complete menu.
-set wildmenu
-set wildmode=list:longest,full
-
-" Disable bell.
-set vb t_vb=
-
-" Enable error files & error jumping.
-set cf
-
-" Write on make/shell commands.
-set autowrite
-
-" Read external modifications.
-set autoread
-
-" * Text Formatting
-"
-" Don't wrap.
-set nowrap
+set title
+set visualbell t_vb=
+set laststatus=2
+set ruler
-" Indent with 2 spaces.
+set shiftwidth=2 tabstop=2
set expandtab
-set tabstop=2
-set softtabstop=2
-set shiftwidth=2
set autoindent
-" Line numbers.
-" set number
-" set numberwidth=3
-
-" Enable backspace in insert mode.
-set backspace=indent,eol,start
-
-" Don't use Ex mode, use Q for formatting.
-map Q gq
-
-set colorcolumn=81
-
-" * Window Splits
-"
-" Open new horizontal windows below.
-set splitbelow
-
-" Open new vertical windows to the right.
-set splitright
-
-" Speed.
-nnoremap <C-h> <C-w>h
-nnoremap <C-j> <C-w>j
-nnoremap <C-k> <C-w>k
-nnoremap <C-l> <C-w>l
-
-" Agility.
-imap <C-h> <C-o>h
-imap <C-j> <C-o>j
-imap <C-k> <C-o>k
-imap <C-l> <C-o>a
-
-" * Quick Keybindings
-"
-" Quick, jump out of insert mode while no one is looking.
-imap jj <Esc>
-
-" Avoid ESC => F1 slips.
-nmap <F1> <Esc>
-map! <F1> <Esc>
-
-" Emacs-like movement in insert mode.
-map! <C-A> <Home>
-map! <C-E> <End>
-
-" * Commands
-"
-" Semi-.
-nnoremap ; :
-
-" Atomic writes.
-command W w !sudo tee % >/dev/null
-
-" * Search
-"
-" Show matches while typing.
-set incsearch
+set showmatch
-" Highlight search results once found.
set hlsearch
-highlight Search ctermfg=gray ctermbg=red cterm=none
-
-" Ignore case.
+set incsearch
set ignorecase
-
-" Smart about case matching.
set smartcase
-" * Display
-"
-" Always show status
-set laststatus=2
-
-" Show tabs and trailing whitespace.
-" set list
-
-" Use the same symbols as TextMate for tabstops and EOLs
-set listchars=tab:\ ,eol:¬
-" set listchars=tab:··,trail:·
-
-" Show cursor position.
-set ruler
-
-" 5 lines of context.
-set scrolloff=5
-
-" Scroll 5 lines at a time.
-nnoremap <C-e> 5<C-e>
-nnoremap <C-y> 5<C-y>
-
-" Short messages.
-set shortmess="at1" " aOstT
-
-" Show incomplete commands.
-set showcmd
-
-" Set title.
-set title
-
-" * Buffers
-"
-" Hideable buffers.
-set hidden
-
-" * Nostalgia
-"
-" Backup, to tmp.
-set backup
-set backupdir=/var/tmp
-set backupskip=/tmp/*,/private/tmp/*
-
-" Swap to tmp.
-set directory=/var/tmp
-
-" History.
-set history=100
-
-" Undo.
set undofile
set undodir=/var/tmp
-" Clippy.
-set clipboard=unnamed
-
-" Mouse?
-" if has("mouse")
- " set mouse=a
- " set mousehide
-" endif
-
-" * Miscellanea
-"
-" Take me to your leader.
-let mapleader = ","
-
-" Gsub by default.
-set gdefault
-
-" Tabracketing.
-nnoremap <Tab> %
-vnoremap <Tab> %
-
-autocmd BufRead,BufNewFile Guardfile setfiletype ruby
-
-" Omnicomplete.
-autocmd FileType ruby,eruby set omnifunc=rubycomplete#Complete
-autocmd FileType ruby,eruby let g:rubycomplete_buffer_loading = 1
-autocmd FileType ruby,eruby let g:rubycomplete_rails = 1
-autocmd FileType ruby,eruby let g:rubycomplete_classes_in_global = 1
-autocmd FileType ruby nmap <leader>r :w !ruby<CR>
-
-" Oh, man.
-runtime ftplugin/man.vim
-
-" Self-discipline:
-nnoremap <leader>ev :tabe $MYVIMRC<CR>
-
-nnoremap <leader>w :%s/\s\+$//e<CR>:retab<CR>
-
-" Start augroup.
-augroup vimrcEx
- autocmd!
-
- autocmd BufRead,BufNewFile *.txt setfiletype text
- autocmd FileType markdown,text set wrap
- autocmd FileType markdown,text set linebreak
- autocmd FileType markdown,text set nolist
- autocmd FileType markdown,text set textwidth=78
-
- " Always jump to the last known cursor position.
- autocmd BufReadPost *
- \ if line("'\"") > 0 && line("'\"") <= line("$") |
- \ exe "normal! g`\"" |
- \ endif
-
-augroup END
-
-" * Plugins
-"
-" Pathogen: github.com/tpope/vim-pathogen
-filetype off
-call pathogen#runtime_append_all_bundles()
-filetype plugin indent on
-
-" Ack: leader.
-nnoremap <leader>a :Ack<Space>
-
-" ActionScript: script.
-au BufNewFile,BufRead *.as set filetype=actionscript
-
-" Conque: shell.
-nnoremap <leader>sh :ConqueTermSplit zsh<CR>
-nnoremap <leader>vsh :ConqueTermVSplit zsh<CR>
-
-" Coffee: script.
-au BufNewFile,BufRead *.coffee set filetype=coffee
-
-" Gundo: shortcut.
-nnoremap <F5> :GundoToggle<CR>
-
-" NERD_commenter: whitespace-friendly.
-let NERDSpaceDelims=1
-
-" NERD_tree: don't hijack netrw.
-let NERDTreeHijackNetrw=0
-
-" Rails: Navi.
-autocmd User Rails Rnavcommand job app/jobs -glob=**/* -suffix=_job.rb
-" autocmd User Rails Rnavcommand stylesheet app/assets/stylesheets -glob=**/* -suffix=.sass
-
-" RDoc: set filetype.
-au BufNewFile,BufRead *.rdoc set filetype=rdoc
-
-" Scratch: leader.
-nnoremap <leader><Tab> :Sscratch<CR>
-
-" Supertab: stop.
-let g:SuperTabCrMapping = 0
-
-" Tagbar: tag-browsing.
-nnoremap <leader>l :TagbarToggle<CR><C-w>l
-
-" YankRing: a hidden history.
-let g:yankring_history_file = '.yankring_history'
-
-" Yank from the cursor to the end of the line.
-nnoremap Y y$
+set wildmenu
+set wildmode=list:longest,full
View
9 zsh/aliases
@@ -10,10 +10,5 @@ alias -s log="tail -200f"
# * Show all with which
alias which="builtin which -a"
-# * less.vim
-alias vess="/usr/share/vim/vim72/macros/less.sh"
-
-# dietrb
-# function irb {
-# [[ -x `which dietrb` ]] && [[ `ruby -v` =~ 1.9 ]] && dietrb $@ || irb $@
-# }
+# * Bundler
+alias b="bundle exec"

0 comments on commit 96868cf

Please sign in to comment.