Permalink
Browse files

More.

  • Loading branch information...
1 parent 72c76f1 commit 93bccc7a69ae90a632e68d1367e7bfc0be456d52 @rainerborene committed Apr 8, 2012
Showing with 25 additions and 10 deletions.
  1. +6 −0 .gitmodules
  2. +1 −1 vim/bundle/fugitive
  3. +1 −0 vim/bundle/orgmode
  4. +1 −1 vim/bundle/rails
  5. +1 −0 vim/bundle/speeddating
  6. +15 −8 vimrc
View
6 .gitmodules
@@ -121,3 +121,9 @@
[submodule "vim/bundle/ruby-sinatra"]
path = vim/bundle/ruby-sinatra
url = git://github.com/hallison/vim-ruby-sinatra.git
+[submodule "vim/bundle/orgmode"]
+ path = vim/bundle/orgmode
+ url = git://github.com/jceb/vim-orgmode.git
+[submodule "vim/bundle/speeddating"]
+ path = vim/bundle/speeddating
+ url = git://github.com/tpope/vim-speeddating.git
2 vim/bundle/fugitive
@@ -1 +1 @@
-Subproject commit 859f7eaa709401b384c36d2e6c2ee2e3043dd7a1
+Subproject commit dfba6a17f6c88f9c81576fc6cc9dd477cd3e749e
1 vim/bundle/orgmode
@@ -0,0 +1 @@
+Subproject commit c2a2e21338f61ba71c879839dc9828c89c9fdd46
2 vim/bundle/rails
@@ -1 +1 @@
-Subproject commit fa327c31818ef71cb041bedc606aa0afd1e5c0ac
+Subproject commit 098801aefa4f0b27d437fe7234d606974d7fd46f
1 vim/bundle/speeddating
@@ -0,0 +1 @@
+Subproject commit e5995ffe63381151dd2956703df560abefa4f020
View
23 vimrc
@@ -146,12 +146,18 @@ au BufNewFile,BufRead {Rakefile,Vagrantfile,Guardfile,Capfile,Thorfile,Gemfile,p
au BufReadPost fugitive://* set bufhidden=delete
au BufWritePost .vimrc source $MYVIMRC
+augroup ft_org
+ au!
+ au FileType org normal! zM
+ au FileType org setlocal formatoptions+=t
+augroup END
+
augroup ft_markdown
au!
au BufNewFile,BufRead *.m*down setlocal filetype=markdown
- au Filetype markdown nnoremap <buffer> <localleader>1 yypVr=
- au Filetype markdown nnoremap <buffer> <localleader>2 yypVr-
- au Filetype markdown nnoremap <buffer> <localleader>3 I### <ESC>
+ au FileType markdown nnoremap <buffer> <localleader>1 yypVr=
+ au FileType markdown nnoremap <buffer> <localleader>2 yypVr-
+ au FileType markdown nnoremap <buffer> <localleader>3 I### <ESC>
augroup END
augroup ft_vim
@@ -451,11 +457,11 @@ nnoremap <silent> <leader><tab> :ScratchToggle<cr>
" }}}
" Quick editing {{{
-nnoremap <silent> <leader>et :e ~/tasks.txt<CR>
-nnoremap <silent> <leader>ez :e ~/.zshrc<CR>
-nnoremap <silent> <leader>ex :e ~/.tmux.conf<CR>
-nnoremap <silent> <leader>es :e ~/.vim/snippets/<CR>
-nnoremap <silent> <leader>ev :e $MYVIMRC<CR>
+nnoremap <silent> <leader>ez :vsplit ~/.zshrc<CR>
+nnoremap <silent> <leader>ex :vsplit ~/.tmux.conf<CR>
+nnoremap <silent> <leader>es :vsplit ~/.vim/snippets/<CR>
+nnoremap <silent> <leader>eo :vsplit ~/Dropbox/outline.org<CR>
+nnoremap <silent> <leader>ev :vsplit $MYVIMRC<CR>
nnoremap <silent> <leader>rv :so $MYVIMRC<CR>
" }}}
@@ -486,6 +492,7 @@ let g:syntastic_auto_loc_list = 2
let g:syntastic_disabled_filetypes = ['html']
let g:SuperTabDefaultCompletionType = "<c-n>"
let g:SuperTabLongestHighlight = 1
+let g:org_plugins = ['ShowHide', '|', 'Navigator', 'EditStructure', '|', 'Todo', 'Date', 'Misc']
if filereadable(expand("~/.vimrc.local"))
source ~/.vimrc.local

0 comments on commit 93bccc7

Please sign in to comment.