Cleaning up visual mode and key bindings in vimrc

1 files changed, 18 insertions, 129 deletions

diff --git a/.vimrc b/.vimrc
index b129a60..1a5543c 100644
--- a/.vimrc
+++ b/.vimrc
@@ -49,6 +49,10 @@ autocmd BufNewFile,BufRead,BufReadPost *.pd
 autocmd BufNewFile,BufRead,BufReadPost /*apache*
     \ set syntax=apache
 
+" JAD (Java Decompiled) Files
+autocmd BufNewFile,BufRead,BufReadPost *.jad
+    \ set syntax=java
+
 " Jinja2 Templates
 autocmd BufNewFile,BufRead,BufReadPost *.tmpl
     \ set syntax=jinja
@@ -58,7 +62,7 @@ autocmd BufNewFile,BufRead *.py
     \ setlocal foldmarker=#{,#}
 
 autocmd Filetype html,xml,xsl
-    \ source ~/.vim/scripts/scripts/closetag.vim
+    \ source ~/.vim/scripts/closetag.vim
 " }}}
 " General Settings {{{
 set backspace=indent,eol,start
@@ -72,6 +76,7 @@ set nojoinspaces
 set backup
 set directory=~/.vim/tmp,~/.tmp,~/tmp,/var/tmp,/tmp
 set backupdir=~/.vim/tmp,~/.tmp,~/tmp,/var/tmp,/tmp
+set listchars=tab:▸\ ,eol:¬
 set vb t_vb=
 let mapleader=","
 " }}}
@@ -118,12 +123,16 @@ let g:explVertical=1
 
 " Set closing tag style for closetag.vim
 let g:closetag_html=1
+
+" Some sane defaults for the explorer
+let g:explHideFiles='^\.,.*\.sw[po]$,.*\.pyc$'
+let g:explDetailedHelp=0
 " }}}
 " Custom Commands {{{
 " Cleanup windows crap from line endings
 command TrimSpaces %s/\s\+$//e
 command FixLineEnd %s/
//gi
-command PEP8 call IsPEP8()
+command ReIndent !reindent %
 command W write
 " }}}
 " Folding Settings {{{
@@ -136,14 +145,6 @@ let python_highlight_all=1
 
 autocmd FileType python 
     \ set omnifunc=pythoncomplete#Complete
-
-function! CheckIt()
-    if executable("pylint")
-        !pylint %
-    elseif executable("agi-pep8.py")
-        !agi-pep8.py %
-    endif
-endfunction
 " }}}
 " Line and Column Highlighting {{{
 "autocmd BufEnter * call SetColumnHighlighting(1)
@@ -178,123 +179,7 @@ function! DoTextMode()
     call SetColumnHighlighting(0)
 endfunction
 " }}}
-" Invisibles Display {{{
-function! Cream_listchars_init()
-    set listchars=
-
-    " tab
-    if v:version < 603
-        " greaterthan, followed by space
-        execute "set listchars+=tab:" . nr2char(62) . '\ '
-    elseif strlen(substitute(strtrans(nr2char(187)), ".", "x", "g")) == 1
-        " right angle quote, guillemotright followed by space (digraph >>)
-        execute "set listchars+=tab:" . nr2char(187) . '\ '
-    else
-        " greaterthan, followed by space
-        execute "set listchars+=tab:" . nr2char(62) . '\ '
-    endif
-
-    " eol
-    if v:version < 603
-        " dollar sign
-        execute "set listchars+=eol:" . nr2char(36)
-    elseif strlen(substitute(strtrans(nr2char(182)), ".", "x", "g")) == 1
-        " paragrah symbol (digraph PI)
-        execute "set listchars+=eol:" . nr2char(182)
-    else
-        " dollar sign
-        execute "set listchars+=eol:" . nr2char(36)
-    endif
-
-    " trail
-    if v:version < 603
-        " period
-        execute "set listchars+=trail:" . nr2char(46)
-    elseif strlen(substitute(strtrans(nr2char(183)), ".", "x", "g")) == 1
-        " others digraphs: 0U 0M/M0 sB .M 0m/m0 RO
-        " middle dot (digraph .M)
-        execute "set listchars+=trail:" . nr2char(183)
-    else
-        " period
-        execute "set listchars+=trail:" . nr2char(46)
-    endif
-
-    " precedes
-    if v:version < 603
-        " underscore
-        execute "set listchars+=precedes:" . nr2char(95)
-    elseif strlen(substitute(strtrans(nr2char(133)), ".", "x", "g")) == 1
-        " ellipses
-        execute "set listchars+=precedes:" . nr2char(133)
-    elseif strlen(substitute(strtrans(nr2char(8230)), ".", "x", "g")) == 1
-        " ellipses (2nd try)
-        execute "set listchars+=precedes:" . nr2char(8230)
-    elseif strlen(substitute(strtrans(nr2char(8249)), ".", "x", "g")) == 1
-    \&& v:lang != "C"
-        " mathematical lessthan (digraph <1)
-        execute "set listchars+=precedes:" . nr2char(8249)
-    elseif strlen(substitute(strtrans(nr2char(8592)), ".", "x", "g")) == 1
-        " left arrow  (digraph <-)
-        execute "set listchars+=precedes:" . nr2char(8592)
-    else
-        " underscore
-        execute "set listchars+=precedes:" . nr2char(95)
-    endif
-
-    " extends
-    if v:version < 603
-        " underscore
-        execute "set listchars+=extends:" . nr2char(95)
-    elseif strlen(substitute(strtrans(nr2char(133)), ".", "x", "g")) == 1
-        " ellipses
-        execute "set listchars+=extends:" . nr2char(133)
-    elseif strlen(substitute(strtrans(nr2char(8230)), ".", "x", "g")) == 1
-        " ellipses (2nd try)
-        execute "set listchars+=extends:" . nr2char(8230)
-    elseif strlen(substitute(strtrans(nr2char(8250)), ".", "x", "g")) == 1
-    \&& v:lang != "C"
-        " mathematical greaterthan (digraph >1)
-        execute "set listchars+=extends:" . nr2char(8250)
-    elseif strlen(substitute(strtrans(nr2char(8594)), ".", "x", "g")) == 1
-        " right arrow (digraph ->)
-        execute "set listchars+=extends:" . nr2char(8594)
-    else
-        " underscore
-        execute "set listchars+=extends:" . nr2char(95)
-    endif
-
-endfunction
-call Cream_listchars_init()
-" }}}
-" {{{ Mercurial Support
-nnoremap <leader>qs :!hg qseries
-nnoremap <leader>qS :!hg status
-
-function! HGNewPatch()
-    let dirty_copy = system(join(["hg st", "wc -l", "awk '{print $1}'"], '|')) > 0
-
-    let patch_name = input('Patch name: ')
-    let commit_message = input('Commit message: ')
-
-    if dirty_copy && input('Force create patch (y/n)? ') == 'y'
-        let messages = system("hg qnew -f -m '".commit_message."' ".patch_name)
-    else
-        let messages = system("hg qnew -m '".commit_message."' ".patch_name)
-    endif
-    
-    if v:shell_error != 0
-        hi RedBar ctermfg=white ctermbg=red guibg=red
-        echohl RedBar
-        echo messages
-        echohl
-    else
-        echo
-    endif
-endfunction
-" }}}
 " Key Bindings {{{
-set pastetoggle=<F12>
-
 " Tab Key Bindings
 map nt :tabnew<CR>
 map tm :tabmove<CR>
@@ -308,6 +193,12 @@ map <C-h> :bprev!<CR>
 map bn :bnext<CR>
 map bp :bprev<CR>
 
+" Window Key Bindings
+map wj <C-w>j<CR>
+map wk <C-w>k<CR>
+map wh <C-w>h<CR>
+map wl <C-w>l<CR>
+
 " Paging Key Bindings
 map df <C-f>
 map fd <C-b>
@@ -317,13 +208,11 @@ map <unique> <leader>tl :TlistToggle<CR>
 map <unique> <leader>fe :Vexplore<CR>
 
 nmap \ih :call InsertTemplate("header", 1)<CR>
-map <silent><F6> :call SVNDiff()<CR>
 
 " Convenience Key Bindings
 " cs: clears search buffer
 map cs :let @/=""<CR>
 map sp :set spell!<CR>
-map txt :set filetype=text<CR>
 
 " GUI-style Saving!
 map <C-s> :w<CR>
@@ -332,7 +221,7 @@ map <C-s> :w<CR>
 vnoremap <leader>dc :s/\v\C(([a-z]+)([A-Z]))/\2_\l\3/g<CR>
 
 " Run python scripts and display the output
-nnoremap <leader>lp :!python %:p<CR>
+nnoremap <leader>p :!python %:p<CR>
 " }}}
 " {{{ Workarounds For Broken Shit
 " Without this fix you can't write a Mac OS X crontab file