Merge branch 'master' into hjp

This commit is contained in:
Peter J. Holzer 2023-10-13 19:33:46 +02:00 committed by Peter J. Holzer
commit dc2529a485
4 changed files with 5 additions and 1 deletions

View File

@ -22,3 +22,5 @@
commit = blue white commit = blue white
[pull] [pull]
rebase = false rebase = false
[init]
defaultBranch = master

View File

@ -22,7 +22,7 @@ hi MatchParen ctermbg=yellow
hi Normal guifg=black guibg=white hi Normal guifg=black guibg=white
hi PreProc term=underline ctermfg=Magenta ctermbg=0 guifg=Purple hi PreProc term=underline ctermfg=Magenta ctermbg=0 guifg=Purple
hi Search term=reverse cterm=NONE ctermfg=White ctermbg=19 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=Yellow ctermbg=NONE guifg=Magenta
hi Statement term=bold ctermfg=105 gui=NONE guifg=Brown hi Statement term=bold ctermfg=105 gui=NONE guifg=Brown
hi Underlined term=underline cterm=underline ctermfg=163 gui=underline guifg=SlateBlue hi Underlined term=underline cterm=underline ctermfg=163 gui=underline guifg=SlateBlue

1
.vimrc
View File

@ -31,6 +31,7 @@ if $BG == "light"
syntax on syntax on
elseif $BG == "dark" elseif $BG == "dark"
set bg=dark set bg=dark
colorscheme hjp-dark
syntax on syntax on
endif endif

View File

@ -9,6 +9,7 @@ ALLSRC = \
.gitconfig \ .gitconfig \
.psqlrc \ .psqlrc \
.vim/colors/hjp.vim \ .vim/colors/hjp.vim \
.vim/colors/hjp-dark.vim \
.vimrc \ .vimrc \