Permalink
Browse files

coffeescript, nerd tree

  • Loading branch information...
1 parent 254c1fb commit 665421dfa6e99642333ff7447b9dcaffb512b92d @philc committed Aug 14, 2012
Showing with 34 additions and 14 deletions.
  1. +6 −0 .gitmodules
  2. +1 −0 bundle/nerdtree
  3. +1 −0 bundle/vim-coffee-script
  4. +1 −1 gvimrc
  5. +25 −13 vimrc
View
@@ -7,3 +7,9 @@
[submodule "bundle/command-t"]
path = bundle/command-t
url = https://github.com/cespare/Command-T.git
+[submodule "bundle/nerdtree"]
+ path = bundle/nerdtree
+ url = https://github.com/scrooloose/nerdtree.git
+[submodule "bundle/vim-coffee-script"]
+ path = bundle/vim-coffee-script
+ url = https://github.com/kchmck/vim-coffee-script.git
Submodule nerdtree added at a1433c
Submodule vim-coffee-script added at d6dcb9
View
@@ -1,4 +1,4 @@
-set guifont=Menlo\ Regular:h16
+set guifont=Menlo\ Regular:h18
" Unmap some of macvim's CMD bindings.
if has("gui_macvim")
View
@@ -6,6 +6,7 @@ set nocompatible " Use smarter defaults than Vi's.
set nobackup " Don't write out backup files.
set noswapfile
set nowritebackup
+set undodir=~/.vim/tmp/undo/ " store persistent undo files here.
filetype plugin on
" Chrome
@@ -52,7 +53,9 @@ set smartcase " if you include an uppercase while searching, become case sensiti
set incsearch " show search matches as you type.
set gdefault " Apply substitutions globally on a line.
-" Make it easy to clear searches
+let mapleader=";"
+
+" Make it easy to clear searches
noremap <leader><space> :nohlsearch<cr>
" Basic editing
@@ -61,6 +64,7 @@ set shiftround " use multiples of shiftwidth when indenting with <
set autoindent
set copyindent
filetype plugin indent on
+map <C-J> :join!
" Textmate-style invisible char markers
set list
@@ -78,17 +82,17 @@ if has("gui_running")
set guioptions=egmrt
endif
-let mapleader=";"
-
" Edit and reload vim rc
nmap <silent> <leader>ev :e $MYVIMRC<CR>
nmap <silent> <leader>sv :so $MYVIMRC<CR>
" Make it easier to move around through blocks of text:
noremap j gj
noremap k gk
-noremap <C-u> 30k
-noremap <C-d> 30j
+noremap <C-u> 10k
+noremap <C-d> 10j
+noremap <C-J> 40j
+noremap <C-K> 40k
" Tab is easier than % for selecting matched pairs. TODO(philc): vet
nnoremap <tab> %
@@ -108,18 +112,26 @@ noremap <D-6> 6gt
noremap <D-7> 7gt
noremap <D-8> 8gt
noremap <D-9> 9gt
-noremap J gT
-noremap K gt
+nnoremap J gT
+nnoremap K gt
" 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-d> <C-W>v
+noremap <D-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
" commenting (provided by NERDCommenter
let NERDSpaceDelims=1 " Insert one space after comment characters.
map <D-/> <plug>NERDCommenterToggle
map <leader>/ <plug>NERDCommenterToggle
+
+" Command-T
+let g:CommandTMaxHeight=20
+let g:CommandTMinHeight=20 " This option doesn't seem to work as of Aug 13 2012.
+let g:CommandTMatchWindowAtTop=1
+
+" Nerd Tree
+nmap <leader>n :NERDTreeToggle<CR>

0 comments on commit 665421d

Please sign in to comment.