Merge branch 'master' into wsr
This commit is contained in:
commit
b3734a861b
|
@ -22,3 +22,5 @@
|
||||||
commit = blue white
|
commit = blue white
|
||||||
[pull]
|
[pull]
|
||||||
rebase = false
|
rebase = false
|
||||||
|
[init]
|
||||||
|
defaultBranch = master
|
||||||
|
|
|
@ -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
1
.vimrc
|
@ -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
|
||||||
|
|
||||||
|
|
1
.zshrc
1
.zshrc
|
@ -6,7 +6,6 @@ REPORTTIME=2
|
||||||
alias amke=make
|
alias amke=make
|
||||||
alias a=alias
|
alias a=alias
|
||||||
alias h=history
|
alias h=history
|
||||||
alias j=jobs
|
|
||||||
alias v=vi
|
alias v=vi
|
||||||
alias lo=logout
|
alias lo=logout
|
||||||
alias md=mkdir
|
alias md=mkdir
|
||||||
|
|
|
@ -9,6 +9,7 @@ ALLSRC = \
|
||||||
.gitconfig \
|
.gitconfig \
|
||||||
.psqlrc \
|
.psqlrc \
|
||||||
.vim/colors/hjp.vim \
|
.vim/colors/hjp.vim \
|
||||||
|
.vim/colors/hjp-dark.vim \
|
||||||
.vimrc \
|
.vimrc \
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue