nojhan/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

harmonized inkpot/vimrc, +set textwidth=120, CursorLine in colorschemes instead of vimrc

Browse source
This commit is contained in:
nojhan 2011-10-28 15:40:52 +02:00
commit 7afce37a5f
3 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.vim/colors/inkpot.vim
View file

@ -86,7 +86,7 @@ if has("gui_running")
hi Underlined gui=BOLD guifg=#ffffcd guibg=NONE hi Underlined gui=BOLD guifg=#ffffcd guibg=NONE
hi TaglistTagName gui=BOLD guifg=#808bed guibg=NONE hi TaglistTagName gui=BOLD guifg=#808bed guibg=NONE
hi Pmenu gui=NONE guifg=white guibg=black hi Pmenu gui=NONE guifg=white guibg=black
hi ColorColumn guibg=#1a1a22
else else
exec "hi Normal cterm=NONE ctermfg=" . <SID>X("78") . " ctermbg=" . <SID>X(80) . "" exec "hi Normal cterm=NONE ctermfg=" . <SID>X("78") . " ctermbg=" . <SID>X(80) . ""
exec "hi IncSearch cterm=BOLD ctermfg=" . <SID>X("80") . " ctermbg=" . <SID>X(73) . "" exec "hi IncSearch cterm=BOLD ctermfg=" . <SID>X("80") . " ctermbg=" . <SID>X(73) . ""

2
.vim/colors/solarized.vim
View file

@ -553,7 +553,7 @@ exe "hi! String" .s:fmt_none .s:fg_blue .s:bg_none
exe "hi! Identifier" .s:fmt_none .s:fg_blue .s:bg_none exe "hi! Identifier" .s:fmt_none .s:fg_blue .s:bg_none
" *Identifier any variable name " *Identifier any variable name
" Function function name (also: methods for classes) " Function function name (also: methods for classes)
exe "hi! cppSTL" .s:fmt_none .s:fg_base1 .s:bg_none exe "hi! cppSTL" .s:fmt_ital .s:fg_base1 .s:bg_none
exe "hi! Statement" .s:fmt_none .s:fg_yellow .s:bg_none exe "hi! Statement" .s:fmt_none .s:fg_yellow .s:bg_none
" *Statement any statement " *Statement any statement

17
.vimrc
View file

@ -1,7 +1,9 @@
syntax on " syntax coloring by default syntax on " syntax coloring by default
color inkpot "color inkpot
color solarized
set background=dark
set textwidth=80 set textwidth=120
set wrap " auto wrap line view, but not text itself set wrap " auto wrap line view, but not text itself
filetype indent on " activates indenting for files filetype indent on " activates indenting for files
@ -33,8 +35,8 @@ set showcmd " show informations about selection while in visual mode
set guioptions-=T "remove toolbar set guioptions-=T "remove toolbar
set colorcolumn=80,120 " highligth the 80th and 120th column set colorcolumn=80,120 " highligth the 80th and 120th column
" dark bckgrd for inkpot
hi ColorColumn ctermbg=lightgrey guibg=#1a1a22 hi CursorLine cterm=NONE ctermbg=lightgrey ctermfg=NONE guibg=#2a2a32 guifg=NONE
let mapleader = "," " leader key is comma let mapleader = "," " leader key is comma
@ -139,9 +141,10 @@ map <F12> :MiniBufExplorer<cr>
" configure tags - add additional tags here or comment out not-used ones " configure tags - add additional tags here or comment out not-used ones
set tags+=~/.vim/tags/cpp set tags+=~/.vim/tags/cpp
"set tags+=~/.vim/tags/gl set tags+=~/.vim/tags/bmdd
"set tags+=~/.vim/tags/sdl set tags+=~/.vim/tags/bmddsolver
"set tags+=~/.vim/tags/qt4 set tags+=~/.vim/tags/dae
set tags+=~/.vim/tags/eodev
" build tags of your own project with CTRL+F12 " build tags of your own project with CTRL+F12
map <C-F12> :!ctags -R --c++-kinds=+p --fields=+iaS --extra=+q .<CR> map <C-F12> :!ctags -R --c++-kinds=+p --fields=+iaS --extra=+q .<CR>