Commit 8f1d8ca
Changed files (1)
vimrc
@@ -3,11 +3,31 @@ execute pathogen#infect('bundle/{}', '~/.vim/bundle/colors/{}', '~/.vim/bundle/l
"" Basic Setup
""
+color ir_black
+set completefunc=syntaxcomplete#Complete
set nocompatible " Use vim, no vi defaults
set number " Show line numbers
set ruler " Show line and column number
syntax enable " Turn on syntax highlighting allowing local overrides
set encoding=utf-8 " Set default encoding to UTF-8
+set modelines=0 " do not check file for set commands
+set scrolloff=3 " always show 3 lines above and below cursor
+set autoindent " copy indent from current line when starting a new one
+set gdefault " use global substitution by default
+set showmatch " show matching bracket.
+set showcmd " show last command in last line of screen.
+set showmode " display mode in last line (e.g VISUAL)
+set hidden " hide buffers instead of closing them.
+set cursorline " highlight current line
+set ttyfast " fast terminal connection
+set visualbell " use visual bell instead of beeping
+set exrc " enable per-directory .vimrc files
+set secure " disable unsafe commands in local .vimrc files
+set nobackup " do not make backup files
+set nowritebackup " do not write a backup
+if $TERM == "xterm-256color" || $TERM == "screen-256color" || $COLORTERM == "gnome-terminal"
+ set t_Co=256
+endif
""
"" Whitespace
@@ -113,12 +133,31 @@ if has("autocmd")
" see :help last-position-jump
au BufReadPost * if &filetype !~ '^git\c' && line("'\"") > 0 && line("'\"") <= line("$")
\| exe "normal! g`\"" | endif
+
+ au FocusLost * :w
+ autocmd BufNewFile *.rb :write
+ autocmd BufWritePre,BufRead *.html :normal gg=G
+ autocmd BufNewFile,BufRead *.html setlocal nowrap
+
+ " \c comment out line.
+ autocmd FileType javascript nnoremap <buffer> <localleader>c I//<esc>
+ autocmd FileType python nnoremap <buffer> <localleader>c I#<esc>
+ autocmd FileType ruby nnoremap <buffer> <localleader>c I#<esc>
+ autocmd FileType html nnoremap <buffer> <localleader>c I<!--<esc>A--><esc>
+
+ " turn on spell checker
+ autocmd FileType markdown nnoremap setlocal spell
+
+ autocmd FileType html :iabbrev <buffer> r' ’
endif
""
"" General Mappings (Normal, Visual, Operator-pending)
""
+let mapleader = ","
+let localleader = "\\"
+
" Toggle paste mode
nmap <silent> <F4> :set invpaste<CR>:set paste?<CR>
imap <silent> <F4> <ESC>:set invpaste<CR>:set paste?<CR>
@@ -169,6 +208,56 @@ nmap <leader>hs :set hlsearch! hlsearch?<CR>
" Adjust viewports to the same size
map <Leader>= <C-w>=
+nnoremap <leader>ev :vsplit $MYVIMRC<cr>
+nnoremap <leader>sv :source $MYVIMRC<cr>
+nnoremap <leader><space> :noh<cr>
+nnoremap <tab> %
+vnoremap <tab> %
+nnoremap ; :
+nnoremap <leader>W :%s/\s\+$//<cr>:let @/=''<CR>
+nnoremap <leader>v <C-w>v<C-w>l
+nnoremap <leader>h <C-w>s<C-w>l
+nnoremap <C-h> <C-w>h
+nnoremap <C-j> <C-w>j<C-w>_
+nnoremap <C-k> <C-w>k<C-w>_
+nnoremap <C-l> <C-w>l
+nnoremap <leader>p "+p
+nnoremap <leader>n :NERDTreeFind<cr>
+nnoremap <localleader>n :NERDTreeClose<cr>
+nnoremap <leader>t :!rspec %<cr>
+nnoremap <space> za
+vnoremap <space> zf
+" operator pending movement (cp -> change inside parens)
+onoremap p i(
+onoremap b /end<cr>
+" inside parens ie. cin(
+onoremap in( :<c-u>normal! f(vi(<cr>
+" inside last parens ie. cil(
+onoremap il( :<c-u>normal! F)vi(<cr>
+" inside markdown heading
+onoremap ih :<c-u>execute "normal! ?^==\\+$\r:nohlsearch\rkvg_"<cr>
+" around markdown heading
+onoremap ah :<c-u>execute "normal! ?^==\\+$\r:nohlsearch\rg_vk0"<cr>
+
+" surround with "
+nnoremap <leader>" viw<esc>a"<esc>hbi"<esc>lel
+nnoremap <leader>' viw<esc>a'<esc>hbi'<esc>lel
+" move to start of line
+nnoremap H ^
+" move to end of line
+nnoremap L $
+" escape
+inoremap jk <esc>
+" inoremap <esc> <nop>
+nnoremap <C-e> :e#<cr>
+nnoremap <localleader>f :Ack<space>
+" NERDComToggleComment
+nmap <localleader>/ <leader>c<space>
+vmap <localleader>/ <leader>c<space>
+
+" BufferGator
+nnoremap <localleader>b :BuffergatorOpen<cr>
+
if has("gui_macvim") && has("gui_running")
" Map command-[ and command-] to indenting or outdenting
" while keeping the original selection in visual mode
@@ -292,114 +381,22 @@ if has("statusline") && !&cp
set statusline+=[%b][0x%B]
endif
-" vimrc.after
-color ir_black
-
-set completefunc=syntaxcomplete#Complete
-
-set nocompatible
-set modelines=0
-set encoding=utf-8
-set scrolloff=3
-set incsearch
-set ignorecase smartcase
-set hlsearch
-set autoindent
-set gdefault
-set showmatch
-set ruler
-set laststatus=2
-set showcmd
-set showmode
-set hidden
-set cursorline
-set ttyfast
-set backspace=indent,eol,start
-set number
-set visualbell
-set exrc " enable per-directory .vimrc files
-set secure " disable unsafe commands in local .vimrc files
-"set backupdir=~/tmp
-set nobackup
-set nowritebackup
-if $TERM == "xterm-256color" || $TERM == "screen-256color" || $COLORTERM == "gnome-terminal"
- set t_Co=256
-endif
-
-let mapleader = ","
-let localleader = "\\"
-
-nnoremap <leader>ev :vsplit $MYVIMRC<cr>
-nnoremap <leader>sv :source $MYVIMRC<cr>
-nnoremap <leader><space> :noh<cr>
-nnoremap <tab> %
-vnoremap <tab> %
-nnoremap ; :
-nnoremap <leader>W :%s/\s\+$//<cr>:let @/=''<CR>
-nnoremap <leader>v <C-w>v<C-w>l
-nnoremap <leader>h <C-w>s<C-w>l
-nnoremap <C-h> <C-w>h
-nnoremap <C-j> <C-w>j<C-w>_
-nnoremap <C-k> <C-w>k<C-w>_
-nnoremap <C-l> <C-w>l
-nnoremap <leader>p "+p
-nnoremap <leader>n :NERDTreeFind<cr>
-nnoremap <localleader>n :NERDTreeClose<cr>
-nnoremap <leader>t :!rspec %<cr>
-nnoremap <space> za
-vnoremap <space> zf
-" operator pending movement (cp -> change inside parens)
-onoremap p i(
-onoremap b /end<cr>
-" inside parens ie. cin(
-onoremap in( :<c-u>normal! f(vi(<cr>
-" inside last parens ie. cil(
-onoremap il( :<c-u>normal! F)vi(<cr>
-" inside markdown heading
-onoremap ih :<c-u>execute "normal! ?^==\\+$\r:nohlsearch\rkvg_"<cr>
-" around markdown heading
-onoremap ah :<c-u>execute "normal! ?^==\\+$\r:nohlsearch\rg_vk0"<cr>
-
-" surround with "
-nnoremap <leader>" viw<esc>a"<esc>hbi"<esc>lel
-nnoremap <leader>' viw<esc>a'<esc>hbi'<esc>lel
-" move to start of line
-nnoremap H ^
-" move to end of line
-nnoremap L $
-" escape
-inoremap jk <esc>
-" inoremap <esc> <nop>
-nnoremap <C-e> :e#<cr>
-nnoremap <localleader>f :Ack<space>
-" NERDComToggleComment
-nmap <localleader>/ <leader>c<space>
-vmap <localleader>/ <leader>c<space>
-
-" BufferGator
-nnoremap <localleader>b :BuffergatorOpen<cr>
+""
+"" Abbreviations
+""
-" abbreviations
iabbrev adn and
iabbrev waht what
iabbrev teh the
iabbrev tehn then
iabbrev @@ mo@mokhan.ca
-au FocusLost * :w
-autocmd BufNewFile *.rb :write
-autocmd BufWritePre,BufRead *.html :normal gg=G
-autocmd BufNewFile,BufRead *.html setlocal nowrap
-" \c comment out line.
-autocmd FileType javascript nnoremap <buffer> <localleader>c I//<esc>
-autocmd FileType python nnoremap <buffer> <localleader>c I#<esc>
-autocmd FileType ruby nnoremap <buffer> <localleader>c I#<esc>
-autocmd FileType html nnoremap <buffer> <localleader>c I<!--<esc>A--><esc>
+""
+"" Plugin Configuration
+""
-" turn on spell checker
-autocmd FileType markdown nnoremap setlocal spell
-autocmd FileType html :iabbrev <buffer> r' ’
+" CTRLP
"let g:ctrlp_map = '<leader>t'
"let g:ctrlp_match_window_bottom = 0