Kevin Berridge avatar Kevin Berridge committed bd78ae0

cleaned up vimrc a bit, and stopped using function keys

Comments (0)

Files changed (1)

 source $VIMRUNTIME/mswin.vim
 behave mswin
 
-set diffexpr=MyDiff()
-function MyDiff()
-  let opt = '-a --binary '
-  if &diffopt =~ 'icase' | let opt = opt . '-i ' | endif
-  if &diffopt =~ 'iwhite' | let opt = opt . '-b ' | endif
-  let arg1 = v:fname_in
-  if arg1 =~ ' ' | let arg1 = '"' . arg1 . '"' | endif
-  let arg2 = v:fname_new
-  if arg2 =~ ' ' | let arg2 = '"' . arg2 . '"' | endif
-  let arg3 = v:fname_out
-  if arg3 =~ ' ' | let arg3 = '"' . arg3 . '"' | endif
-  if &sh =~ '\<cmd'
-    silent execute '!""C:\Program Files\Vim\vim70\diff" ' . opt . arg1 . ' ' . arg2 . ' > ' . arg3 . '"'
-  else
-    silent execute '!C:\Program" Files\Vim\vim70\diff" ' . opt . arg1 . ' ' . arg2 . ' > ' . arg3
-  endif
-endfunction
-
-let mapleader = ","
-
 " font
 set guifont=Consolas:h12:cANSI
 
 " moves cursor to matching open symbol when you type close symbol
 set showmatch
 
-" colorscheme ps_color
-" colorscheme zenburn
+filetype on
+filetype plugin on
+filetype indent on
+syntax on
+
 colorscheme moria
 
-" Vibrant Ink color scheme
-" highlight Normal guifg=White   guibg=Black
-" highlight Cursor guifg=Black   guibg=Yellow
-" highlight Keyword guifg=#FF6600 gui=NONE
-" highlight Define guifg=#FF6600 gui=NONE
-" highlight Comment guifg=#9933CC gui=NONE
-" highlight Type guifg=White gui=NONE
-" highlight csSymbol guifg=#339999 gui=NONE
-" highlight Identifier guifg=White gui=NONE
-" highlight csStringDelimiter guifg=#66FF00
-" highlight Constant guifg=#FFEE98 gui=NONE
-" highlight Function guifg=#FFCC00 gui=NONE
-" highlight Include guifg=#FFCC00 gui=NONE
-" highlight Statement guifg=#FF6600 gui=NONE
-" highlight String guifg=#66FF00 gui=NONE
-" highlight Search guibg=White
-
 " makes 0 go to first character on the line instead of start of line
 map 0 ^
 
 
 map [[ ?{<CR>w99[{
 
+let mapleader = ","
+
 " turns on spell checking
-map <F3> :setlocal spell! spelllang=en_us<cr>
-imap <F3> <ESC>:setlocal spell! spelllang=en_us<cr>i
+nmap <silent> <leader>sp :setlocal spell! spelllang=en_us<cr>
 
 " toggles NERDTree on and off
-map <F2> :NERDTreeToggle<cr>
-imap <F2> <ESC>:NERDTreeToggle<cr>i
+nmap <leader>nt :NERDTreeToggle<cr>
 
 " shortcut for alt-tabbing buffers
-map <M-`> :b#<cr>
-imap <M-`> :b#<cr>
+nmap <leader>sw :b#<cr>
+
+" fuzzy finder mappings
+noremap <Leader>f :FufCoverageFile<CR>
 
 " set any autocmds (make sure they are only set once)
 if !exists("autocommands_loaded")
   autocmd BufNewFile,BufRead *.cs set foldmethod=syntax
 endif
 
-" setup TFS integration
-function! Tfcheckout()
-  exe '!tf checkout "' expand('%:p') '"'
-endfunction
-command! Tfcheckout :call Tfcheckout()
-
-function! Tfcheckin()
-  exe '!tf checkin "' expand('%:p') '"'
-endfunction
-command! Tfcheckin :call Tfcheckin()
-
 " setup integrated help
 function! OnlineDoc()
   let s:wordUnderCursor = expand("<cword>")
 
 map <silent> <F1> :call OnlineDoc()<CR>
 imap <silent> <F1> <ESC>:call OnlineDoc()<CR>
- 
-" find file script
-function! Find(name)
-  let l:_name = substitute( a:name, "\\s", "*", "g" )
-
-  let l:files = system( "dir *".l:_name."* /B /S" )
-  let l:list = split( l:files, '\n' )
-  let l:len = len( l:list )
-
-  if l:len < 1
-    echo "'".a:name."' not found"
-    return
-  elseif l:len != 1
-    let l:i = 1
-    let l:cwd = substitute( getcwd(), '\\', '\\\\', "g" )
-
-    for line in l:list
-      echo l:i . ": " . substitute( l:line, l:cwd, "", "g" )
-      let l:i += 1
-    endfor
-
-    let l:input = input( "Which ? (<enter>=nothing)\n" )
-
-    if strlen( l:input ) == 0
-      return
-    elseif strlen( substitute( l:input, "[0-9]", "", "g" ) ) > 0
-      echo "Not a number"
-      return
-    elseif l:input < 1 || l:input > l:len
-      echo "Out of range"
-      return
-    endif
-
-    let l:line = l:list[l:input-1]
-  else
-    let l:line = l:list[0]
-  endif
-  let l:line = substitute( l:line, "^[^\t]*\t./", "", "" )
-  execute ":e " . l:line
-endfunction
-
-command! -nargs=1 Find :call Find("<args>")
-
-" fuzzy finder mappings
-noremap <Leader>f :FufCoverageFile<CR>
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.