diff --git a/vim/colors/adam.vim b/vim/colors/adam.vim index 98b4bca..ae34993 100644 --- a/vim/colors/adam.vim +++ b/vim/colors/adam.vim @@ -23,21 +23,26 @@ let g:colors_name="adam" " Last Change: 2013 May 24 set background=dark -hi Normal ctermfg=lightgrey +hi Normal ctermfg=lightgrey start=[0m stop=[0m "hi NonText ctermfg=yellow ctermbg=grey -hi comment ctermfg=green -hi constant ctermfg=magenta cterm=bold +"hi comment ctermfg=green +hi constant ctermfg=magenta term=none start=[95m stop=[0m +"hi constant ctermfg=magenta cterm=bold "hi identifier ctermfg=cyan cterm=NONE -hi statement ctermfg=yellow cterm=NONE -hi preproc ctermfg=blue -hi type ctermfg=green cterm=bold +hi statement ctermfg=yellow cterm=NONE term=none start=[93m stop=[0m +hi preproc ctermfg=blue term=none start=[94m stop=[0m +hi type ctermfg=green term=none start=[92m stop=[0m +"hi type ctermfg=green cterm=bold "hi special ctermfg=yellow -hi ErrorMsg ctermfg=White ctermbg=Red +hi Special ctermfg=Blue guifg=Blue term=none start=[94m stop=[0m +hi ErrorMsg ctermfg=White ctermbg=Red term=none start=[97;101m stop=[0m hi WarningMsg ctermfg=Black ctermbg=Green -hi Error ctermbg=Red -hi Todo ctermfg=Black ctermbg=yellow -hi Cursor ctermfg=blue -hi Directory ctermfg=Blue +"hi Error ctermbg=Red +" Highlight for TODO XXX FIXME, etc. +hi Todo ctermfg=Black ctermbg=yellow term=none start=[103;90m stop=[0m + +hi Cursor ctermfg=blue term=none start=[94m stop=[0m +hi Directory ctermfg=Blue term=none start=[94m stop=[0m " Directory thru netrw @@ -58,21 +63,21 @@ hi ShowMarksHL ctermbg=yellow ctermfg=black cterm=bold hi CursorLine ctermbg=yellow ctermfg=black cterm=bold "hi StatusLineNC cterm=NONE ctermfg=lightblue ctermbg=darkblue "hi StatusLine cterm=bold ctermfg=cyan ctermbg=blue -hi label ctermfg=yellow -hi operator ctermfg=yellow +hi label ctermfg=yellow term=none start=[93m stop=[0m +hi operator ctermfg=yellow term=none start=[93m stop=[0m hi clear Visual hi Visual cterm=reverse term=reverse -hi DiffChange ctermfg=darkgreen -hi DiffFile ctermfg=green -hi DiffSubname ctermfg=cyan -hi DiffIndexLine ctermfg=cyan -hi diffAdded ctermfg=blue -hi diffRemoved ctermfg=red -hi DiffLine ctermfg=yellow +hi DiffChange ctermfg=darkgreen term=none start=[32m stop=[0m +hi DiffFile ctermfg=green term=none start=[92m stop=[0m +hi DiffSubname ctermfg=cyan term=none start=[96m stop=[0m +hi DiffIndexLine ctermfg=cyan term=none start=[96m stop=[0m +hi diffAdded ctermfg=blue term=none start=[94m stop=[0m +hi diffRemoved ctermfg=red term=none start=[91m stop=[0m +hi DiffLine ctermfg=yellow term=none start=[93m stop=[0m "hi DiffLine ctermfg=magenta hi Folded ctermbg=darkgrey hi FoldColumn ctermbg=darkgrey ctermfg=white -hi cIf0 ctermfg=gray +hi cIf0 ctermfg=gray term=none start=[38;2;100;100;100m stop=[0m "hi diffOnly ctermfg=red cterm=bold " End of ron above. @@ -82,53 +87,55 @@ hi cIf0 ctermfg=gray "hi StatusUnwrap ctermfg=brown ctermbg=none cterm=none "hi StatusUnwrap ctermfg=236 ctermbg=none cterm=none hi StatusUnwrap ctermfg=58 ctermbg=none cterm=none -hi Comment ctermfg=darkgrey cterm=bold -hi Identifier ctermfg=cyan -hi Object ctermfg=red -hi Exception ctermfg=brown -hi Service ctermfg=green -hi Error ctermbg=red ctermfg=white cterm=bold -hi Caller ctermfg=cyan +hi Comment ctermfg=darkgrey cterm=none term=NONE term=none start=[38;5;242m stop=[0m +hi Identifier ctermfg=cyan cterm=none term=none start=[96m stop=[0m +hi Object ctermfg=red term=none start=[91m stop=[0m +hi Exception ctermfg=brown term=none start=[38;5;130m stop=[0m +hi Service ctermfg=green start=[32m stop=[0m +hi Error ctermbg=red ctermfg=white cterm=none term=none start=[101;97m stop=[0m +hi Caller ctermfg=cyan term=NONE start=[96m stop=[0m hi Target ctermfg=green ctermbg=red hi Sync ctermfg=green ctermbg=red hi Debug ctermfg=darkgreen hi MetaFunction ctermfg=darkcyan -hi Dangerous ctermfg=red ctermbg=white cterm=bold,underline,italic +hi Dangerous term=none start=[1;7;97;101;3;4;6m stop=[0m ctermfg=white ctermbg=red cterm=reverse,bold,underline,italic +"hi Dangerous ctermfg=red ctermbg=white cterm=bold,underline,italic start=[31;47;1;5m stop=[0m "hi Type ctermfg=lightgreen -hi CommentSpecial ctermfg=Magenta guifg=Magenta -hi SpecialComment ctermfg=Magenta guifg=Magenta + +hi CommentSpecial ctermfg=Magenta guifg=Magenta term=none start=[35m stop=[0m +hi SpecialComment ctermfg=Magenta guifg=Magenta term=none start=[35m stop=[0m " Seems to doc "@" in comments -hi doxygenSpecial ctermfg=Magenta guifg=Magenta +hi doxygenSpecial ctermfg=Magenta guifg=Magenta term=none start=[35m stop=[0m -hi doxygenCommentSpecial ctermfg=Magenta guifg=Magenta -hi doxygenBriefSpecial ctermfg=Magenta guifg=Magenta +hi doxygenCommentSpecial ctermfg=Magenta guifg=Magenta term=none start=[35m stop=[0m +hi doxygenBriefSpecial ctermfg=Magenta guifg=Magenta term=none start=[35m stop=[0m " Brief text -hi doxygenBrief ctermfg=cyan cterm=bold,underline +hi doxygenBrief ctermfg=cyan cterm=bold,underline term=none start=[36;1;4m stop=[0m -hi doxygenComment ctermfg=Blue guifg=Blue +hi doxygenComment ctermfg=Blue guifg=Blue term=none start=[94m stop=[0m "hi doxygenSpecialTypeOnelineDesc cterm=bold ctermfg=LightMagenta guifg=firebrick3 gui=bold -hi doxygenParam ctermfg=Magenta cterm=bold +hi doxygenParam ctermfg=Magenta cterm=bold term=none start=[95m stop=[0m -hi doxygenParamName ctermfg=darkblue cterm=bold,underline +hi doxygenParamName ctermfg=darkblue cterm=bold,underline term=none start=[34;1;4m stop=[0m "@note, @return, etc TODO: split these out, probably by forking doxygen.vim -hi doxygenOther ctermfg=darkyellow cterm=underline +hi doxygenOther ctermfg=darkyellow cterm=underline term=none start=[33;4m stop=[0m "non-brief body -hi doxygenBody ctermfg=lightcyan +hi doxygenBody ctermfg=lightcyan term=none start=[96m stop=[0m -hi doxygenSpecialMultilineDesc ctermfg=cyan +hi doxygenSpecialMultilineDesc ctermfg=cyan term=none start=[36m stop=[0m -hi NamedConstant ctermfg=blue +hi NamedConstant ctermfg=blue term=none start=[94m stop=[0m "hi Example ctermfg=white "hi DocNotes ctermfg=yellow @@ -147,15 +154,18 @@ hi NamedConstant ctermfg=blue " This is from vimrc.colors -- I may reintegrate it back together. "hi User0 ctermfg=green ctermbg=green term=bold -hi statusline ctermfg=white ctermbg=black -hi User1 ctermfg=red ctermbg=white term=standout -hi User2 ctermfg=darkmagenta ctermbg=white term=standout -hi User3 ctermfg=blue ctermbg=white term=standout -hi User4 ctermfg=cyan ctermbg=white term=standout -hi User5 ctermfg=brown ctermbg=white term=standout -hi User6 ctermfg=darkgreen ctermbg=white term=standout -hi User8 ctermfg=magenta ctermbg=black term=bold -hi User9 ctermfg=white ctermbg=black term=bold +hi statusline ctermfg=white ctermbg=black term=none start=[107;30m stop=[0m +hi User1 ctermfg=red ctermbg=white term=standout term=none start=[91;107m stop=[0m +hi User2 ctermfg=darkmagenta ctermbg=white term=standout term=none start=[35;107m stop=[0m +hi User3 ctermfg=blue ctermbg=white term=standout term=none start=[34;107m stop=[0m +hi User4 ctermfg=cyan ctermbg=white term=standout term=none start=[36;107m stop=[0m +hi User5 ctermfg=brown ctermbg=white term=standout term=none start=[33;107m stop=[0m +hi User6 ctermfg=darkgreen ctermbg=white term=standout term=none start=[32;107m stop=[0m +hi User8 ctermfg=magenta ctermbg=black term=bold term=none start=[95;40m stop=[0m +hi User9 ctermfg=white ctermbg=black term=bold term=none start=[97;40m stop=[0m + +hi NonText ctermfg=blue term=none start=[94m stop=[0m +hi EndOfBuffer ctermfg=blue term=none start=[94m stop=[0m " The vim colorscheme does everything, and some of the non-status-bar colors affect non-source bits. " I may have to maintain everything in this combined form diff --git a/vim/vimrc b/vim/vimrc index 8db06a8..12b0d5e 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -24,3 +24,4 @@ source ~/.vim/vimrc.fileprefs source ~/.vim/vimrc.statusline set shell=/bin/tcsh +set t_Co=1