hjp
/
dot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'wsr' of github.com:hjp/dot into wsr 

Conflicts:
	.gitconfig
This commit is contained in:
Peter J. Holzer 2018-01-09 14:48:24 +01:00
parent 15d203b27d dfabce5c14
commit cc05dd833e
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitconfig
View File

@ -12,6 +12,6 @@
[push] [push]
# 1.7.1: nothing, matching, tracking, current # 1.7.1: nothing, matching, tracking, current
# 2.11.0: nothing, matching, upstream, current, simple # 2.11.0: nothing, matching, upstream, current, simple
# nothing is inconvenietn, matching is dangerous. # nothing is inconvenient, matching is dangerous.
# current is only compatible remaining option. # current is only compatible remaining option.
default = current default = current

8
.vim/colors/hjp.vim
View File

@ -24,7 +24,13 @@ hi PreProc term=underline ctermfg=Magenta ctermbg=253
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=Cyan gui=NONE guifg=Black guibg=Cyan
hi Special term=bold ctermfg=DarkMagenta ctermbg=253 guifg=Magenta hi Special term=bold ctermfg=DarkMagenta ctermbg=253 guifg=Magenta
hi Statement term=bold ctermfg=DarkBlue gui=NONE guifg=Brown hi Statement term=bold ctermfg=DarkBlue gui=NONE guifg=Brown
hi StatusLine term=bold,reverse cterm=NONE ctermfg=Yellow ctermbg=DarkGray gui=NONE guifg=Yellow guibg=DarkGray
" 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
" (there are way too many command line tools that assume a black background and
" lightlight stuff in yellow).
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 ctermbg=Yellow ctermfg=Black guifg=Blue guibg=Yellow

1
.zshrc
View File

@ -1,4 +1,3 @@
echo ".zshrc: LANG=$LANG"
umask 022 umask 022
bindkey -v bindkey -v

7
GNUmakefile
View File

@ -7,8 +7,6 @@ ALLSRC = \
.zshenv \ .zshenv \
.zshrc \ .zshrc \
.gitconfig \ .gitconfig \
.vim/ \
.vim/colors/ \
.vim/colors/hjp.vim \ .vim/colors/hjp.vim \
.vimrc \ .vimrc \
@ -22,10 +20,7 @@ echo:
echo $(ALLDST) echo $(ALLDST)
$(HOME)/%: % $(HOME)/%: %
cp $^ $@ install -D $^ $@
$(HOME)/%/:
mkdir $@
diff: diff:
for i in $(ALLSRC); do diff -u $(HOME)/$$i $$i; done for i in $(ALLSRC); do diff -u $(HOME)/$$i $$i; done