Permalink
Browse files

Add slimv, vim-clojure

  • Loading branch information...
1 parent 3eae83c commit c0564c960e3af69a2f91cea610e93d2d34876432 @philc committed Aug 21, 2012
Showing with 35 additions and 9 deletions.
  1. +6 −0 .gitmodules
  2. +1 −0 bundle/slimv
  3. +1 −0 bundle/vim-clojure
  4. +10 −6 gvimrc
  5. +17 −3 vimrc
View
@@ -16,3 +16,9 @@
[submodule "bundle/snipmate"]
path = bundle/snipmate
url = https://github.com/msanders/snipmate.vim.git
+[submodule "bundle/vim-clojure"]
+ path = bundle/vim-clojure
+ url = git://github.com/vim-scripts/VimClojure.git
+[submodule "bundle/slimv"]
+ path = bundle/slimv
+ url = https://github.com/vim-scripts/slimv.vim
Submodule slimv added at e64fe4
Submodule vim-clojure added at ab5086
View
16 gvimrc
@@ -9,11 +9,15 @@ if has("gui_macvim")
endif
" Window splits
-noremap <D-D> <C-W>v
-noremap <D-S-D> <C-W>s
-noremap <D-J> <C-W>j
-noremap <D-K> <C-W>k
-noremap <D-H> <C-W>h
-noremap <D-L> <C-W>l
+noremap <D-j> <C-w>j
+noremap <D-k> <C-w>k
+noremap <D-h> <C-w>h
+noremap <D-l> <C-w>l
+imap <D-j> <esc><D-j>
+imap <D-k> <esc><D-k>
+imap <D-h> <esc><D-h>
+imap <D-l> <esc><D-l>
+
+
View
20 vimrc
@@ -68,8 +68,9 @@ set shiftround " use multiples of shiftwidth when indenting with <
set autoindent
set copyindent
filetype plugin indent on
-map <C-J> :join!
+map <Leader>j :join<CR>
set clipboard=unnamed " Use the OSX clipboard, not vim's own
+imap <C-d> <Del>
" Textmate-style invisible char markers
" note: setting list breaks the linebreak option.
@@ -127,8 +128,8 @@ noremap J gT
noremap K gt
" Window splits
-noremap <D-d> <C-w>v
-noremap <D-D> <C-w>s
+noremap <D-d> <C-w>s
+noremap <D-D> <C-w>v
noremap <D-j> <C-w>j
noremap <D-k> <C-w>k
noremap <D-h> <C-w>h
@@ -167,3 +168,16 @@ autocmd BufWinEnter * match ExtraWhitespace /\s\+$/
autocmd InsertEnter * match ExtraWhitespace /\s\+\%#\@<!$/
autocmd InsertLeave * match ExtraWhitespace /\s\+$/
autocmd BufWinLeave * call clearmatches()
+
+" VimClojure
+let g:vimclojure#HighlightBuiltins = 1
+let g:vimclojure#ParenRainbow = 1
+" let vimclojure#WantNailgun = 1
+
+" Slimv
+let g:slimv_leader = ','
+" Eval the most recent command.
+nmap ,r :call SlimvEval([g:slimv_cmdhistory[-1]])<CR>
+vmap ,r :call SlimvEval([g:slimv_cmdhistory[-1]])<CR>
+let g:paredit_mode = 0 " turn this off for now.
+

0 comments on commit c0564c9

Please sign in to comment.