Permalink
Browse files

vim: yep, sure haven't committed in a while'

--HG--
rename : vim/bundle/vim-peepopen/README.md => vim/bundle/peepopen/README.md
rename : vim/bundle/vim-peepopen/plugin/peepopen.vim => vim/bundle/peepopen/plugin/peepopen.vim
  • Loading branch information...
1 parent 528efcf commit b22af5664526e06a99185b534c29d32b1b7ff2c5 @sjl committed Jul 11, 2010
Showing with 1,650 additions and 3,799 deletions.
  1. +2 −2 .hgrc
  2. +3 −1 .zshrc
  3. +5 −3 vim/.gvimrc
  4. +41 −15 vim/.vimrc
  5. +6 −0 vim/bundle/arpeggio/.mduem/cache/Makefile.variables
  6. +13 −0 vim/bundle/arpeggio/Makefile
  7. +43 −0 vim/bundle/arpeggio/after/syntax/vim/arpeggio.vim
  8. +439 −0 vim/bundle/arpeggio/autoload/arpeggio.vim
  9. +332 −0 vim/bundle/arpeggio/doc/arpeggio.txt
  10. +431 −0 vim/bundle/arpeggio/mduem/Makefile
  11. +96 −0 vim/bundle/arpeggio/plugin/arpeggio.vim
  12. +10 −0 vim/bundle/arpeggio/test/ui.expected
  13. +46 −0 vim/bundle/arpeggio/test/ui.input
  14. +72 −0 vim/bundle/makegreen/README.md
  15. +80 −0 vim/bundle/makegreen/plugin/makegreen.vim
  16. 0 vim/bundle/{vim-peepopen → peepopen}/README.md
  17. 0 vim/bundle/{vim-peepopen → peepopen}/plugin/peepopen.vim
  18. +0 −215 vim/bundle/space/doc/space.txt
  19. +0 −396 vim/bundle/space/plugin/space.vim
  20. +0 −181 vim/bundle/space/test/tests.txt
  21. +0 −52 vim/doc/textile.txt
  22. +0 −1 vim/ftdetect/kata.vim
  23. +0 −1 vim/ftplugin/kata.vim
  24. +0 −51 vim/ftplugin/textile.vim
  25. +0 −7 vim/notreallybundles/vimkata/INSTALL
  26. +0 −51 vim/notreallybundles/vimkata/README
  27. +0 −500 vim/notreallybundles/vimkata/chatlogs/VimKata_freenode_chat_20100523.log
  28. +0 −278 vim/notreallybundles/vimkata/duane.kata
  29. +0 −5 vim/notreallybundles/vimkata/ftdetect/kata.vim
  30. +0 −164 vim/notreallybundles/vimkata/ftplugin/kata.vim
  31. +0 −37 vim/notreallybundles/vimkata/resources/vim_sites.txt
  32. +0 −29 vim/notreallybundles/vimkata/syntax/kata.vim
  33. +0 −917 vim/notreallybundles/vimkata/vim_1_white.kata
  34. +0 −771 vim/notreallybundles/vimkata/vim_1_white.master
  35. +0 −29 vim/notreallybundles/vimkata/vim_1_white.steps
  36. +31 −0 vim/plugin/slime.vim
  37. +0 −5 vim/plugin/textile.vim
  38. +0 −1 vim/syntax/kata.vim
  39. +0 −87 vim/syntax/textile.vim
View
4 .hgrc
@@ -50,9 +50,9 @@ method = smtp
from = Steve Losh <steve@stevelosh.com>
[smtp]
-host = smtp.stevelosh.com
+host = smtp.gmail.com
port = 587
-username = sjl
+username = steve@stevelosh.com
tls = True
[color]
View
4 .zshrc
@@ -31,7 +31,9 @@ export RUBYOPT=rubygems
# Mercurial variables --------------------------------------------------------
export PATH="$HOME/lib/hg/hg-stable:$PATH"
-export PYTHONPATH="$HOME/lib/hg/hg-stable:/usr/local/lib/python2.6/site-packages:$PYTHONPATH"
+export PYTHONPATH="$HOME/lib/hg/hg-stable:$PYTHONPATH"
+export PYTHONPATH="/usr/local/lib/python2.6/site-packages:$PYTHONPATH"
+export PYTHONPATH="$PYTHONPATH:/usr/local/lib/python2.7/site-packages"
# Extra shell extensions like z and tab completion for Mercurial -------------
source ~/lib/z/z.sh
View
@@ -1,7 +1,12 @@
set guifont=Menlo:h12
colorscheme molokai
+set background=dark
set go-=T
+set go-=l
+set go-=L
+set go-=r
+set go-=R
if has("gui_macvim")
macmenu &File.New\ Tab key=<nop>
@@ -11,7 +16,4 @@ end
let g:sparkupExecuteMapping = '<D-e>'
highlight SpellBad term=underline gui=undercurl guisp=Orange
-highlight LongLine guibg=#343738
-" Long lines suck.
-match LongLine '\%>84v.\+'
View
@@ -10,6 +10,7 @@ set softtabstop=4
set expandtab
" Basic options
+set encoding=utf-8
set scrolloff=3
set autoindent
set smartindent
@@ -35,19 +36,24 @@ set backup " enable backups
let mapleader = ","
" FuzzyFinder
-map <Leader>t :FuzzyFinderTextMate<Enter>
-map <Leader>b :FuzzyFinderBuffer<Enter>
-let g:fuzzy_ignore = "*.pyc;log/**;.svn/**;.git/**;.hg/**;pip-log.txt;*.gif;*.jpg;*.jpeg;*.png;**media/admin/**;**media/ckeditor/**;**media/filebrowser/**;**media/pages/**;**src/**;**build/**;**_build/**;**media/cache/**"
-let g:fuzzy_matching_limit = 70
+if !has("gui_macvim")
+ map <Leader>t :FuzzyFinderTextMate<Enter>
+ map <Leader>b :FuzzyFinderBuffer<Enter>
+ let g:fuzzy_ignore = "*.pyc;log/**;.svn/**;.git/**;.hg/**;pip-log.txt;*.gif;*.jpg;*.jpeg;*.png;**media/admin/**;**media/ckeditor/**;**media/filebrowser/**;**media/pages/**;**src/**;**build/**;**_build/**;**media/cache/**"
+ let g:fuzzy_matching_limit = 70
+end
" Searching
+nnoremap / /\v
+vnoremap / /\v
set ignorecase
set smartcase
set incsearch
set showmatch
set hlsearch
set gdefault
-map <leader><space> :let @/=''<CR>
+map <leader><space> :let @/=''<cr>
+runtime macros/matchit.vim
" Soft/hard wrapping
set wrap
@@ -67,7 +73,7 @@ colorscheme delek
call pathogen#runtime_append_all_bundles()
" NERD Tree
-map <F2> :NERDTreeToggle<CR>
+map <F2> :NERDTreeToggle<cr>
let NERDTreeIgnore=['.vim$', '\~$', '.*\.pyc$', 'pip-log\.txt$']
" Use the damn hjkl keys
@@ -114,16 +120,16 @@ au BufNewFile,BufRead *.less set filetype=less
au BufNewFile,BufRead *.markdown set filetype=markdown
" Sort CSS
-map <leader>S ?{<CR>jV/^\s*\}\=$<CR>k:sort<CR>:let @/=''<CR>
+map <leader>S ?{<cr>jV/^\s*\}\=$<CR>k:sort<CR>:let @/=''<CR>
" Clean whitespace
-map <leader>W :%s/\s\+$//<CR>:let @/=''<CR>
+map <leader>W :%s/\s\+$//<cr>:let @/=''<CR>
" Exuberant ctags!
let Tlist_Ctags_Cmd = "/usr/local/bin/ctags"
let Tlist_WinWidth = 50
map <F4> :TlistToggle<cr>
-map <F5> :!/usr/local/bin/ctags -R --c++-kinds=+p --fields=+iaS --extra=+q --exclude='@.ctagsignore' .<CR>
+map <F5> :!/usr/local/bin/ctags -R --c++-kinds=+p --fields=+iaS --extra=+q --exclude='@.ctagsignore' .<cr>
" Ropevim
let $PYTHONPATH .= ":" . $HOME . "/lib/python/rope"
@@ -134,15 +140,35 @@ source ~/lib/dotfiles/vim/notreallybundles/ropevim/ropevim.vim
map <leader>a :Ack
" Yankring
-nnoremap <silent> <F3> :YRShow<CR>
+nnoremap <silent> <F3> :YRShow<cr>
nnoremap <silent> <leader>y :YRShow<cr>
" Formatting, TextMate-style
map <leader>q gqip
+" TESTING GOAT APPROVES OF THESE LINES
+au BufNewFile,BufRead test_*.py set makeprg=nosetests\ --machine-out\ --nocapture
+au BufNewFile,BufRead test_*.py set shellpipe=2>&1\ >/dev/null\ \|\ tee
+au BufNewFile,BufRead test_*.py set errorformat=%f:%l:\ %m
+au BufNewFile,BufRead test_*.py nmap <silent> <Leader>n <Plug>MakeGreen
+au BufNewFile,BufRead test_*.py nmap <Leader>N :make<cr>
+nmap <silent> <leader>ff :QFix<cr>
+nmap <leader>fn :cn<cr>
+nmap <leader>fp :cp<cr>
+
+command -bang -nargs=? QFix call QFixToggle(<bang>0)
+function! QFixToggle(forced)
+ if exists("g:qfix_win") && a:forced == 0
+ cclose
+ unlet g:qfix_win
+ else
+ copen 10
+ let g:qfix_win = bufnr("$")
+ endif
+endfunction
+
+
" TODO: Put this in filetype-specific files
-map <leader>n :!nosetests<CR>
-map <leader>N :!nosetests "%:p"<CR>
au BufNewFile,BufRead *.less set foldmethod=marker
au BufNewFile,BufRead *.less set foldmarker={,}
au BufNewFile,BufRead *.less set nocursorline
@@ -152,11 +178,11 @@ au BufNewFile,BufRead *.less map <leader>p o<ESC>pV`]>
map <leader>v V`]
" HTML tag closing
-imap <C-_> <Space><BS><Esc>:call InsertCloseTag()<CR>a
+imap <C-_> <Space><BS><Esc>:call InsertCloseTag()<cr>a
" Conque
-nmap <leader>sh :ConqueTermVSplit zsh<CR>
-nmap <leader>SH :ConqueTermSplit zsh<CR>
+nmap <leader>sh :ConqueTermVSplit zsh<cr>
+nmap <leader>SH :ConqueTermSplit zsh<cr>
nmap <leader>r :ConqueTermVSplit
nmap <leader>R :ConqueTermSplit
@@ -0,0 +1,6 @@
+all_files_in_repos := Makefile after/syntax/vim/arpeggio.vim autoload/arpeggio.vim doc/arpeggio.txt plugin/arpeggio.vim test/ui.expected test/ui.input
+current_branch := master
+origin_name := origin
+origin_uri := ../.
+repos_name := vim-arpeggio
+version := 0.0.6
@@ -0,0 +1,13 @@
+# Makefile for usual Vim plugin
+
+REPOS_TYPE := vim-script
+INSTALLATION_DIR := $(HOME)/.vim
+TARGETS_STATIC = $(filter %.vim %.txt,$(all_files_in_repos))
+TARGETS_ARCHIVED = $(all_files_in_repos) mduem/Makefile
+
+
+
+
+include mduem/Makefile
+
+# __END__
@@ -0,0 +1,43 @@
+" Vim additional syntax: vim/arpeggio - highlight :Arpeggio commands
+" Version: 0.0.6
+" Copyright (C) 2008-2010 kana <http://whileimautomaton.net/>
+" License: So-called MIT/X license {{{
+" Permission is hereby granted, free of charge, to any person obtaining
+" a copy of this software and associated documentation files (the
+" "Software"), to deal in the Software without restriction, including
+" without limitation the rights to use, copy, modify, merge, publish,
+" distribute, sublicense, and/or sell copies of the Software, and to
+" permit persons to whom the Software is furnished to do so, subject to
+" the following conditions:
+"
+" The above copyright notice and this permission notice shall be included
+" in all copies or substantial portions of the Software.
+"
+" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+" IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+" CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+" TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+" SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+" }}}
+
+syntax keyword vimArpeggioCommand
+\ Arpeggio
+\ skipwhite nextgroup=vimMap
+
+syntax match vimArpeggioCommand
+\ /\<Arpeggio[cilnosvx]\(\|nore\|un\)map\>/
+\ skipwhite nextgroup=vimMapBang,vimMapMod,vimMapLhs
+
+syntax match vimArpeggioCommand
+\ /\<Arpeggio\%(\|nore\|un\)map\>!\?/
+\ skipwhite nextgroup=vimMapMod,vimMapLhs
+
+
+
+
+highlight default link vimArpeggioCommand vimCommand
+
+" __END__
+" vim: foldmethod=marker
Oops, something went wrong.

0 comments on commit b22af56

Please sign in to comment.