Merge branch 'master' into hjp

This commit is contained in:
Peter J. Holzer 2018-09-13 21:13:52 +02:00
commit 9b319aef09
2 changed files with 20 additions and 18 deletions

View File

@ -12,18 +12,19 @@ if exists("syntax_on")
endif endif
let g:colors_name = "hjp" let g:colors_name = "hjp"
hi Comment term=bold ctermfg=88 ctermbg=White guifg=Red hi Comment term=bold ctermfg=88 ctermbg=White guifg=Red
hi Constant term=underline ctermfg=90 guifg=Magenta hi Constant term=underline ctermfg=90 guifg=Magenta
hi Error term=reverse ctermfg=15 ctermbg=9 guifg=White guibg=Red hi Error term=reverse ctermfg=15 ctermbg=9 guifg=White guibg=Red
hi Identifier term=underline ctermfg=22 ctermbg=NONE guifg=Blue hi ErrorMsg term=standout cterm=NONE ctermfg=226 ctermbg=DarkRed gui=NONE guifg=Yellow guibg=DarkRed
hi LineNr term=bold cterm=NONE ctermfg=Gray ctermbg=Blue gui=NONE guifg=DarkGrey guibg=NONE hi Identifier term=underline ctermfg=22 ctermbg=NONE guifg=Blue
hi Underlined term=underline cterm=underline ctermfg=163 gui=underline guifg=SlateBlue hi LineNr term=bold cterm=NONE ctermfg=Gray ctermbg=Blue gui=NONE guifg=DarkGrey guibg=NONE
hi MatchParen ctermbg=yellow hi MatchParen ctermbg=yellow
hi Normal guifg=black guibg=white hi Normal guifg=black guibg=white
hi PreProc term=underline ctermfg=Magenta ctermbg=253 guifg=Purple hi PreProc term=underline ctermfg=Magenta ctermbg=253 guifg=Purple
hi Search term=reverse cterm=NONE ctermfg=White ctermbg=Cyan gui=NONE guifg=Black guibg=Cyan hi Search term=reverse cterm=NONE ctermfg=White ctermbg=19 gui=NONE guifg=Black guibg=Cyan
hi Special term=bold ctermfg=53 ctermbg=NONE guifg=Magenta hi Special term=bold ctermfg=53 ctermbg=NONE guifg=Magenta
hi Statement term=bold ctermfg=DarkBlue gui=NONE guifg=Brown hi Statement term=bold ctermfg=DarkBlue gui=NONE guifg=Brown
hi Underlined term=underline cterm=underline ctermfg=163 gui=underline guifg=SlateBlue
" Use color 226 (pale yellow) instead of the default yellow, because I refined " Use color 226 (pale yellow) instead of the default yellow, because I refined
" the default yellow to orange for better contrast against a light background " the default yellow to orange for better contrast against a light background
@ -31,12 +32,12 @@ hi Statement term=bold ctermfg=DarkBlue
" hilight stuff in yellow). " hilight stuff in yellow).
hi StatusLine term=bold,reverse cterm=NONE ctermfg=226 ctermbg=DarkGray gui=NONE guifg=Yellow guibg=DarkGray hi StatusLine term=bold,reverse cterm=NONE ctermfg=226 ctermbg=DarkGray gui=NONE guifg=Yellow guibg=DarkGray
hi String term=bold ctermfg=90 ctermbg=NONE guifg=Magenta hi String term=bold ctermfg=90 ctermbg=NONE guifg=Magenta
hi Tag term=bold ctermfg=DarkGreen guifg=DarkGreen hi Tag term=bold ctermfg=DarkGreen guifg=DarkGreen
hi Todo term=standout ctermbg=Yellow ctermfg=Black guifg=Blue guibg=Yellow hi Todo term=standout ctermfg=Black ctermbg=Yellow guifg=Blue guibg=Yellow
hi Type term=underline ctermfg=Blue gui=NONE guifg=Blue hi Type term=underline ctermfg=Blue gui=NONE guifg=Blue
hi Visual term=reverse ctermfg=Yellow ctermbg=Red gui=NONE guifg=Black guibg=Yellow hi Visual term=reverse ctermfg=White ctermbg=DarkBlue gui=NONE guifg=Black guibg=Yellow
hi Title ctermfg=black hi Title ctermfg=black
hi link Boolean Constant hi link Boolean Constant
hi link Character Constant hi link Character Constant
hi link Conditional Statement hi link Conditional Statement

View File

@ -57,6 +57,7 @@ then
PATH=`$preppath -c /usr/sbin:/sbin` PATH=`$preppath -c /usr/sbin:/sbin`
PATH=`$preppath -c /usr/local/sbin:/usr/local/bin` PATH=`$preppath -c /usr/local/sbin:/usr/local/bin`
`$preppath -c -e /usr/local/node-v8.9.4-linux-x86/bin` `$preppath -c -e /usr/local/node-v8.9.4-linux-x86/bin`
`$preppath -r /usr/lib/go-1.*/bin`
PATH=`$preppath -c $HOME/scripts` PATH=`$preppath -c $HOME/scripts`
PATH=`$preppath -c $HOME/bin/hosts:$HOME/bin` PATH=`$preppath -c $HOME/bin/hosts:$HOME/bin`