From 402f5b6aad24a90836c7a118d45d6d104fd8c266 Mon Sep 17 00:00:00 2001 From: "Peter J. Holzer" Date: Thu, 19 Oct 2017 14:05:44 +0200 Subject: [PATCH 1/5] Remove debug output --- .zshrc | 1 - 1 file changed, 1 deletion(-) diff --git a/.zshrc b/.zshrc index 66f8059..eb51c5f 100644 --- a/.zshrc +++ b/.zshrc @@ -1,4 +1,3 @@ -echo ".zshrc: LANG=$LANG" umask 022 bindkey -v From aeeb4b477d2725f520b18b06937199075b84a9db Mon Sep 17 00:00:00 2001 From: "Peter J. Holzer" Date: Tue, 24 Oct 2017 10:54:27 +0200 Subject: [PATCH 2/5] Change StatusLine colors --- .vim/colors/hjp.vim | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.vim/colors/hjp.vim b/.vim/colors/hjp.vim index f0d0dfa..7748e20 100644 --- a/.vim/colors/hjp.vim +++ b/.vim/colors/hjp.vim @@ -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 Special term=bold ctermfg=DarkMagenta ctermbg=253 guifg=Magenta 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 Tag term=bold ctermfg=DarkGreen guifg=DarkGreen hi Todo term=standout ctermbg=Yellow ctermfg=Black guifg=Blue guibg=Yellow From 5b51d01e7ec7af8ae11fece798c4eac76781c5b2 Mon Sep 17 00:00:00 2001 From: "Peter J. Holzer" Date: Fri, 27 Oct 2017 21:07:12 +0200 Subject: [PATCH 3/5] Add explicit rules for directorys --- GNUmakefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/GNUmakefile b/GNUmakefile index a84c2b7..9ad0cdc 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -24,7 +24,10 @@ echo: $(HOME)/%: % cp $^ $@ -$(HOME)/%/: +$(HOME)/.vim/: + mkdir $@ + +$(HOME)/.vim/colors/: mkdir $@ diff: From 57ca79d82de0e959e9f0b89882cfa19a24f5f695 Mon Sep 17 00:00:00 2001 From: "Peter J. Holzer" Date: Tue, 14 Nov 2017 16:22:46 +0100 Subject: [PATCH 4/5] Use install instead of cp Install aquired a new useful option (-D) since I last looked at it (20 years or so ago), so let's use that. --- GNUmakefile | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 9ad0cdc..2b1f3c5 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -7,8 +7,6 @@ ALLSRC = \ .zshenv \ .zshrc \ .gitconfig \ - .vim/ \ - .vim/colors/ \ .vim/colors/hjp.vim \ .vimrc \ @@ -22,13 +20,7 @@ echo: echo $(ALLDST) $(HOME)/%: % - cp $^ $@ - -$(HOME)/.vim/: - mkdir $@ - -$(HOME)/.vim/colors/: - mkdir $@ + install -D $^ $@ diff: for i in $(ALLSRC); do diff -u $(HOME)/$$i $$i; done From dfabce5c14f7c510f2f9bd50c225a271a85d12b2 Mon Sep 17 00:00:00 2001 From: "Peter J. Holzer" Date: Thu, 14 Dec 2017 12:39:32 +0100 Subject: [PATCH 5/5] Set push.default to upstream The default changed from matching to simple in git 2.0, but simple was only introduced in git 1.7.11, and we have older gits, so I can't just set it to that. upstream is the closest in functionality, and I think I don't need the extra security of simple, so I'll just set it unconditionally to upstream instead of checking the git version. --- .gitconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitconfig b/.gitconfig index 5b6af25..d742a30 100644 --- a/.gitconfig +++ b/.gitconfig @@ -10,4 +10,4 @@ type = cat-file -t dump = cat-file -p [push] - default = simple + default = upstream