From 6b10b8dba3b04f6bd26d61d7c4de6370aab2b4bb Mon Sep 17 00:00:00 2001 From: "Peter J. Holzer" Date: Wed, 16 Aug 2017 16:36:17 +0200 Subject: [PATCH 01/18] Set work email address --- .gitconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitconfig b/.gitconfig index 9bfa20c..5b6af25 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,6 +1,6 @@ [user] name = Peter J. Holzer - email = hjp@hjp.at + email = hjp@wsr.ac.at [alias] co = checkout ci = commit From d9831c2115c1e075c083c6145ff76283aa212acb Mon Sep 17 00:00:00 2001 From: "Peter J. Holzer" Date: Wed, 27 Sep 2017 09:40:01 +0200 Subject: [PATCH 02/18] Add shell function venv to activate python virtual environment --- .zshrc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.zshrc b/.zshrc index 70fd666..7277db2 100644 --- a/.zshrc +++ b/.zshrc @@ -79,6 +79,16 @@ man () { command man "$@" } +venv() { + for d in venv/"$1" ve/"$1" ~/venv/"$1" + do + if [ -f "$d"/bin/activate ] + then + . "$d"/bin/activate + fi + done +} + source ~/.znewterm # assume pseudo terminals are from a "safe" terminal From 8ccf56f58ae48de840556ed23706dc0e44da5aa8 Mon Sep 17 00:00:00 2001 From: "Peter J. Holzer" Date: Wed, 27 Sep 2017 09:40:53 +0200 Subject: [PATCH 03/18] Make TERM recognition a bit more flexible --- .znewterm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.znewterm b/.znewterm index 29d2163..fd204fa 100644 --- a/.znewterm +++ b/.znewterm @@ -28,8 +28,8 @@ then TERM=xterm fi -if [[ $TERM = xterm || $TERM = xterm-256color || $TERM = screen ]] -then +case "$TERM" in + xterm*|screen) # indicated exit status by smiley (suggested by Stig Sandbeck Mathisen) smiley="%b%(0?,%{%}:-),%{%}:-()%{%}%B" prompt="%{]0;%m(%l)%n %~%}%B%m:%~ %T $smiley %h%# %b" @@ -39,9 +39,11 @@ then # it doesn't work with konsole or gnome-terminal. echo -n '[?67h' stty erase  -else + ;; + *) prompt="%B%m:%~ %T %h%# %b" -fi + ;; +esac if [[ $TERM = xterm || $TERM = xterm-256color ]] then From 64ed1ceb5d22993425fe04bc05e6d53869f06754 Mon Sep 17 00:00:00 2001 From: "Peter J. Holzer" Date: Thu, 19 Oct 2017 12:13:34 +0200 Subject: [PATCH 04/18] Allow full name in venv and break after first match --- .zshrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.zshrc b/.zshrc index 7277db2..351cd83 100644 --- a/.zshrc +++ b/.zshrc @@ -80,11 +80,12 @@ man () { } venv() { - for d in venv/"$1" ve/"$1" ~/venv/"$1" + for d in venv/"$1" ve/"$1" ~/venv/"$1" "$1" do if [ -f "$d"/bin/activate ] then . "$d"/bin/activate + break fi done } From aa5909ec4ca53ad48b28e4977fec3766822c506e Mon Sep 17 00:00:00 2001 From: "Peter J. Holzer" Date: Wed, 27 Sep 2017 13:32:44 +0200 Subject: [PATCH 05/18] scrolloffset, incremental search no octal numbers --- .vimrc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.vimrc b/.vimrc index 18f781b..9c94eb1 100644 --- a/.vimrc +++ b/.vimrc @@ -8,15 +8,21 @@ set list set listchars=tab:»·,trail:· set modeline set nojoinspaces -set nrformats=hex +set nrformats-=octal +set nrformats+=hex set nu set printoptions=paper:A4,formfeed:y,portrait:n,number:y,left:10mm,right:10mm set ruler +set scrolloff=5 set secure set sm set sw=4 set tw=72 set viminfo='100,<50,s10,h,% +if has('reltime') + set incsearch +endif + colorscheme hjp syntax on map :cp From 4f1d87262bb9924b8580d48024c4e48bdb360f98 Mon Sep 17 00:00:00 2001 From: "Peter J. Holzer" Date: Thu, 19 Oct 2017 14:02:23 +0200 Subject: [PATCH 06/18] Increase reporttime Some autocompletions routinely take longer than 1 second and I don't like seeing timing information in the middle of an autocompletion. --- .zshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.zshrc b/.zshrc index 351cd83..66f8059 100644 --- a/.zshrc +++ b/.zshrc @@ -2,7 +2,7 @@ echo ".zshrc: LANG=$LANG" umask 022 bindkey -v -REPORTTIME=1 +REPORTTIME=2 alias amke=make alias a=alias From 402f5b6aad24a90836c7a118d45d6d104fd8c266 Mon Sep 17 00:00:00 2001 From: "Peter J. Holzer" Date: Thu, 19 Oct 2017 14:05:44 +0200 Subject: [PATCH 07/18] 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 08/18] 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 09/18] 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 10/18] 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 11/18] 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 From 23b275173bbbe3bf49f6d24fbc2cfb3b78c58d9e Mon Sep 17 00:00:00 2001 From: "Peter J. Holzer" Date: Thu, 14 Dec 2017 13:11:23 +0100 Subject: [PATCH 12/18] Set push.default to current --- .gitconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitconfig b/.gitconfig index d742a30..1d62cb0 100644 --- a/.gitconfig +++ b/.gitconfig @@ -10,4 +10,4 @@ type = cat-file -t dump = cat-file -p [push] - default = upstream + default = current From edbd930f448e7caec04cb403ff6400ff16ddfff4 Mon Sep 17 00:00:00 2001 From: "Peter J. Holzer" Date: Thu, 14 Dec 2017 15:28:05 +0100 Subject: [PATCH 13/18] Source /etc/profile.d/*.sh if it exists --- .zshenv | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.zshenv b/.zshenv index 1651b32..10f5b61 100644 --- a/.zshenv +++ b/.zshenv @@ -331,3 +331,10 @@ case "$FQDN" in ;; esac +if [ -d /etc/profile.d ] +then + for i in /etc/profile.d/*.sh + do + . $i + done +fi From beba1dff3c608a4dc4bd6cd9bbe2aca62c8f49d0 Mon Sep 17 00:00:00 2001 From: "Peter J. Holzer" Date: Thu, 14 Dec 2017 15:32:18 +0100 Subject: [PATCH 14/18] Remove references to obsolete host teal.hjp.at --- .zshenv | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.zshenv b/.zshenv index 10f5b61..ae30a07 100644 --- a/.zshenv +++ b/.zshenv @@ -184,14 +184,6 @@ then limit coredumpsize 64M fi -case "$FQDN" in - teal.hjp.at) - export MAIL=$HOME/Maildir - ;; - *.wsr.ac.at) - ;; -esac - case "$FQDN" in *.hjp.at) export NNTPSERVER=news.luga.at @@ -204,7 +196,7 @@ esac case "$FQDN" in - wsrgeh.wsr.ac.at|coney.wsr.ac.at|bernon.wsr.ac.at|ariel.wsr.ac.at|chthon.h.hjp.at|posbi.wsr.ac.at|braveheart.wsr.ac.at|dialog.wsr.ac.at|samkar.wsr.ac.at|yoyo.hjp.at|yoyo.wsr.ac.at|localhost.localdomain|teal.hjp.at) + wsrgeh.wsr.ac.at|coney.wsr.ac.at|bernon.wsr.ac.at|ariel.wsr.ac.at|chthon.h.hjp.at|posbi.wsr.ac.at|braveheart.wsr.ac.at|dialog.wsr.ac.at|samkar.wsr.ac.at|yoyo.hjp.at|yoyo.wsr.ac.at|localhost.localdomain) export LD_LIBRARY_PATH=/usr/local/lib ;; tanstaafl.wsr.ac.at|pashkan.wsr.ac.at) From eecf9741fb97412d755435c8b48d19cbf2f22cda Mon Sep 17 00:00:00 2001 From: "Peter J. Holzer" Date: Thu, 14 Dec 2017 15:37:14 +0100 Subject: [PATCH 15/18] Remove references to more obsolete hosts --- .zshenv | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/.zshenv b/.zshenv index ae30a07..dd2fef2 100644 --- a/.zshenv +++ b/.zshenv @@ -193,16 +193,11 @@ case "$FQDN" in ;; esac - - case "$FQDN" in - wsrgeh.wsr.ac.at|coney.wsr.ac.at|bernon.wsr.ac.at|ariel.wsr.ac.at|chthon.h.hjp.at|posbi.wsr.ac.at|braveheart.wsr.ac.at|dialog.wsr.ac.at|samkar.wsr.ac.at|yoyo.hjp.at|yoyo.wsr.ac.at|localhost.localdomain) - export LD_LIBRARY_PATH=/usr/local/lib - ;; - tanstaafl.wsr.ac.at|pashkan.wsr.ac.at) + pashkan.wsr.ac.at) export LD_LIBRARY_PATH=`preppath -v LD_LIBRARY_PATH /usr/local/lib` ;; - mri.wsr.ac.at|hrunkner.hjp.at) + hrunkner.hjp.at) export LD_LIBRARY_PATH=`apppath -v LD_LIBRARY_PATH /usr/lib/jni` ;; *.wsr.ac.at) @@ -245,12 +240,6 @@ case "$FQDN" in pashkan.wsr.ac.at) export WZRP_CONN=~/.dbi/fiwdevel ;; - mri.wsr.ac.at) - export WZRP_CONN=~/.dbi/fiwdevel - ;; - melbar.wsr.ac.at) - export WZRP_CONN=~/.dbi/fiwdevel - ;; algernon.wsr.ac.at) export WZRP_CONN=~/.dbi/fiwssd ;; @@ -264,9 +253,6 @@ case "$FQDN" in export PERL5LIB=`apppath -c -v PERL5LIB ~/lib/perl5 /usr/local/www/offline/$USER.fiw/lib/perl5 /usr/local/www/offline/dal.fiw/lib/perl5` PATH=`apppath -c /usr/local/www/offline/$USER.fiw/bin /usr/local/www/offline/dal.fiw/bin` ;; - mri.wsr.ac.at) - `apppath -e -v PERL5LIB /home/hjp/wrk/wds/Software/Import/wds-import` - ;; esac case "$FQDN" in @@ -300,7 +286,7 @@ then fi case "$FQDN" in - mri.wsr.ac.at) + tsimri.wsr.ac.at) export GET_PASS_FILES="/home/hjp/wrk/admin/info/pwd_work.gpg /home/hjp/Notes/pw.gpg" ;; esac @@ -310,13 +296,6 @@ then source ~/perl5/perlbrew/etc/bashrc fi -case "$FQDN" in - lemy.wsr.ac.at) - $(preppath -e -v PYTHONPATH -c ~/etc/wds) - ;; -esac - - case "$FQDN" in *.wsr.ac.at) export GIT_AUTHOR_EMAIL="$LOGNAME@wsr.ac.at" From 15d203b27d94e1b2991b15fafa4fdb0341eacfb6 Mon Sep 17 00:00:00 2001 From: "Peter J. Holzer" Date: Tue, 9 Jan 2018 14:43:19 +0100 Subject: [PATCH 16/18] Set push.default to current for compatibility --- .gitconfig | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitconfig b/.gitconfig index 5b6af25..862678f 100644 --- a/.gitconfig +++ b/.gitconfig @@ -10,4 +10,8 @@ type = cat-file -t dump = cat-file -p [push] - default = simple + # 1.7.1: nothing, matching, tracking, current + # 2.11.0: nothing, matching, upstream, current, simple + # nothing is inconvenietn, matching is dangerous. + # current is only compatible remaining option. + default = current From 4b965dea85d9f03786ad937d0105e82dda04d685 Mon Sep 17 00:00:00 2001 From: "Peter J. Holzer" Date: Sat, 13 Jan 2018 21:41:42 +0100 Subject: [PATCH 17/18] Set wds PYTHONPATH on oro --- .zshenv | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.zshenv b/.zshenv index 1651b32..3482ed0 100644 --- a/.zshenv +++ b/.zshenv @@ -319,8 +319,10 @@ then fi case "$FQDN" in - lemy.wsr.ac.at) - $(preppath -e -v PYTHONPATH -c ~/etc/wds) + oro.wsr.ac.at) + cleansing=~/wrk/wds/Software/WDS/Module/30_CLEANSING + $(preppath -e -v PYTHONPATH -c $cleansing/lib) + $(preppath -e -v PYTHONPATH -c $cleansing/system/app/extraction) ;; esac From 5899e9f3650f410e8b21c95bcd963188cb2e6f87 Mon Sep 17 00:00:00 2001 From: "Peter J. Holzer" Date: Mon, 22 Jan 2018 18:40:45 +0100 Subject: [PATCH 18/18] Set PGHOST to WDS server --- .zshenv | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.zshenv b/.zshenv index 1651b32..8f3217e 100644 --- a/.zshenv +++ b/.zshenv @@ -286,6 +286,9 @@ case "$FQDN" in export PGHOST=$FQDN export PGUSER=fiw ;; + teleute.wsr.ac.at) + export PGHOST=wds.wifo.ac.at + ;; esac case "$FQDN" in