Many changes. too lazy to commit them individually

This commit is contained in:
madmaurice 2015-11-01 22:41:10 +01:00
parent 8b45bc339b
commit 4610e74af8
2 changed files with 38 additions and 14 deletions

View file

@ -24,7 +24,7 @@ let g:colors_name="madtheme"
" color terminal definitions
hi SpecialKey ctermfg=darkblue
hi StatusLine cterm=none
hi StatusLineNC cterm=reverse
hi StatusLineNC cterm=none ctermbg=darkgray ctermfg=white
hi NonText cterm=bold ctermfg=gray
hi Directory ctermfg=blue
hi ErrorMsg cterm=bold ctermfg=white ctermbg=red
@ -58,5 +58,25 @@ hi Ignore cterm=bold ctermfg=darkgrey
hi Error cterm=bold ctermbg=red
hi Todo cterm=bold,underline ctermbg=none ctermfg=darkgrey
" EasyMotion
hi EasyMotionTarget cterm=none ctermbg=darkblue ctermfg=black
hi EasyMotionShade cterm=none ctermbg=none ctermfg=grey
hi EasyMotionMoveHL cterm=none ctermbg=none ctermfg=darkblue
hi EasyMotionTarget2First ctermbg=none ctermfg=red
hi EasyMotionTarget2Second ctermbg=none ctermfg=lightred
" MBE
hi MBENormal cterm=none ctermfg=grey ctermbg=none
hi MBEChanged cterm=none ctermfg=white ctermbg=none
hi MBEVisibleNormal cterm=none ctermfg=blue ctermbg=none
hi MBEVisibleChanged cterm=none ctermfg=blue ctermbg=none
hi MBEVisibleActiveNormal cterm=none ctermfg=lightblue ctermbg=none
hi MBEVisibleActiveChanged cterm=none ctermfg=lightblue ctermbg=none
" ModeLine
hi ModeLineNormal cterm=none ctermbg=none ctermfg=none
hi ModeLineReplace cterm=none ctermbg=red ctermfg=none
hi ModeLineInsert cterm=none ctermbg=green ctermfg=none
hi ModeLineInsertPaste cterm=none ctermbg=blue ctermfg=none
"vim: sw=4

View file

@ -11,7 +11,7 @@ Plugin 'VundleVim/Vundle.vim'
" --- My plugins
Plugin 'scrooloose/nerdtree' " FileBrowser on the left side
Plugin 'ervandew/supertab' "Auto completion
Plugin 'jeetsukumaran/vim-buffergator' "Easy buffer switching
" Plugin 'jeetsukumaran/vim-buffergator' "Easy buffer switching
Plugin 'ap/vim-templates' "File templates
Plugin 'godlygeek/tabular' "Tabularize
Plugin 'MarcWeber/vim-addon-mw-utils' " Dependency for snipmate
@ -23,6 +23,7 @@ Plugin 'kana/vim-textobj-indent' "Indent based text objects
Plugin 'benmills/vimux' "Tmux integration
Plugin 'vim-scripts/argtextobj.vim' "function argument textobj
Plugin 'rstacruz/sparkup' "quick html writing
Plugin 'fholgado/minibufexpl.vim' "Top bar for buffers
" --- End init vundle
call vundle#end()
@ -47,20 +48,21 @@ set novisualbell
set t_vb=
set tm=500
set encoding=utf8 "Always use utf8
set ffs=unix,dos,mac
set nowb
set ffs=unix,dos,mac " Auto use EOL according to file
set noswapfile
set expandtab "Tabbing
set smarttab
set smarttab " Deleting and creating spaces representing tabs
set ai "auto indent
set si "smart indent
set wrap "wrap lines
set shiftwidth=4
set tabstop=4
set lbr
set lbr " Smart line breaking
set tw=500
set t_Co=256
set hidden
syntax enable "Syntax highlighting
colorscheme madtheme "Colorscheme
" Backups in different folder
set backup
@ -69,10 +71,8 @@ set backupdir=~/.vim/backup//
set directory=~/.vim/backup//
" Abbreviations
iab __DATE__ <C-R>=strftime("%A, %d. %B %Y %H:%M")<CR>
iab _DATE <C-R>=strftime("%A, %d. %B %Y %H:%M")<CR>
syntax enable
colorscheme madtheme
" Autoload when saving vimrc
au! BufWritePost .vimrc source ~/.vimrc
@ -100,14 +100,14 @@ endfunction
function! ModeColor(mode)
if a:mode == 'i'
if &paste
hi ModeLine ctermbg=blue
hi link ModeLine ModeLineInsertPaste
else
hi ModeLine ctermbg=green
hi link ModeLine ModeLineInsert
endif
elseif a:mode == 'r'
hi ModeLine ctermbg=red
hi link ModeLine ModeLineReplace
else
hi ModeLine ctermbg=none
hi link ModeLine ModeLineNormal
endif
endfunction
@ -118,8 +118,9 @@ call ModeColor('n')
" --- Bindings
let mapleader = ","
" Close buffers
" Close and write buffers
nnoremap <silent> <leader>q :bd<cr>
nnoremap <silent> <leader>w :w<cr>
" Insert empty line before and after
nnoremap <silent> <C-o> o<ESC>k
" Goto next emptyline
@ -144,6 +145,9 @@ nnoremap <silent> ; :call AddSemicolon()<cr>
nnoremap <silent> <leader>todo :g/TODO/<cr>
" 0 should find first non blank
nmap 0 ^
" Easy buffer switching
nnoremap <silent> <leader>b :MBEFocus<cr>
nnoremap <silent> <Tab> :bnext<cr>
" Moving through windows
nnoremap <C-l> <C-w>l
nnoremap <C-h> <C-w>h