Skip to content

Commit

Permalink
Update vim crap
Browse files Browse the repository at this point in the history
  • Loading branch information
jlogsdon committed Mar 11, 2014
1 parent 71d1852 commit 4cc60b1
Showing 1 changed file with 14 additions and 11 deletions.
25 changes: 14 additions & 11 deletions vim/vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
" |+-- :write updates alternative file name
" +-- :read updates alternative file name
syntax on " syntax highlighting on
autocmd BufWritePre * :%s/\s\+$//e
" }

" Bundle {
Expand Down Expand Up @@ -78,8 +79,6 @@
set noautochdir " always switch to the current file directory
set backspace=indent,eol,start " make backspace a more flexible
set nobackup " make backup files
"set backupdir=~/.vim/backup " where to put backup files
"set clipboard+=unnamed " share windows clipboard
set directory=~/.vim/swap " directory to place swap files in
set fileformats=unix,dos,mac " support all three, in this order
set hidden " you can change buffers without saving
Expand Down Expand Up @@ -160,6 +159,9 @@
set ignorecase " case insensitive by default
set infercase " case inferred by default
set nowrap " do not wrap line
set textwidth=120
set colorcolumn=+1
highlight ColorColumn ctermbg=lightred guibg=lightred
set shiftround " when at 3 spaces, and I hit > ... go to 4, not 5
set smartcase " if there are caps, go case-sensitive
set shiftwidth=2 " auto-indent amount when using cindent,
Expand All @@ -174,7 +176,7 @@
set foldenable " Turn on folding
set foldmarker={,} " Fold C style code (only use this as default
" if you use a high foldlevel)
set foldmethod=marker " Fold on the marker
set foldmethod=syntax " Fold on the marker
set foldlevel=100 " Don't autofold anything (but I can still
" fold manually)
set foldopen=block,hor,mark,percent,quickfix,tag " what movements
Expand All @@ -188,8 +190,7 @@

" Plugin Settings {
let b:match_ignorecase = 1 " case is stupid
let perl_extended_vars=1 " highlight advanced perl vars
" inside strings
let perl_extended_vars=1 " highlight advanced perl vars inside strings

" Closetag Settings {
let b:unaryTagsStack="area base br dd dt hr img input link meta param"
Expand All @@ -210,13 +211,13 @@
" read my functions
" Language Specifics {
" just functions and classes please
let tlist_aspjscript_settings = 'asp;f:function;c:class'
let tlist_aspjscript_settings = 'asp;f:function;c:class'
" just functions and subs please
let tlist_aspvbs_settings = 'asp;f:function;s:sub'
let tlist_aspvbs_settings = 'asp;f:function;s:sub'
" don't show variables in freaking php
let tlist_php_settings = 'php;c:class;d:constant;f:function'
let tlist_php_settings = 'php;c:class;d:constant;f:function'
" just functions and classes please
let tlist_vb_settings = 'asp;f:function;c:class'
let tlist_vb_settings = 'asp;f:function;c:class'
" }
" }

Expand Down Expand Up @@ -250,6 +251,8 @@
nnoremap <C-p> :Unite file_rec/async<cr>
nnoremap <space>/ :Unite grep:.<cr>
nnoremap <space>s :Unite -quick-match buffer<cr>
let g:gitgutter_eager = 0
" }

" Mappings {
Expand All @@ -263,13 +266,13 @@
nnoremap <left> <nop>
nnoremap <right> <nop>
function! WinMove(key)
function! WinMove(key)
let t:curwin = winnr()
exec "wincmd ".a:key
if (t:curwin == winnr()) "we havent moved
if (match(a:key,'[jk]')) "were we going up/down
wincmd v
else
else
wincmd s
endif
exec "wincmd ".a:key
Expand Down

0 comments on commit 4cc60b1

Please sign in to comment.