From c9e58b8be0238be9617bd7727551e18276d9d62f Mon Sep 17 00:00:00 2001 From: "Peter J. Holzer" Date: Wed, 4 Sep 2019 15:59:29 +0200 Subject: [PATCH 1/6] Remove redaundant setting of LANG, etc. We already to this in .zshenv, don't have to do it again. More importantly, we do it *right* in .zshenv ... --- .zshrc | 37 ------------------------------------- 1 file changed, 37 deletions(-) diff --git a/.zshrc b/.zshrc index dc5dd1e..a86ba07 100644 --- a/.zshrc +++ b/.zshrc @@ -127,40 +127,3 @@ fi # for new style completion: autoload -U compinit compinit - -utf=`locale -a | grep en_US.utf8` -if [ -n "$utf" ] -then - # this is a bit of a hack - - # locale -a advertises the locale as "en_US.utf8", - # but the glibc accepts both "en_US.utf8" and - # "en_US.UTF-8" and xterm recogizes only the latter. - # So we explicitely set the latter, even though that's - # not the canonical name and may break some day. - # - case "`uname -sr`" in - Linux*) - LANG=en_US.UTF-8 - ;; - HP-UX*) - # UTF-8 locale on HP-UX is broken - LANG=en_US.iso88591 - ;; - *) - LANG=en_US.utf8 - ;; - esac -else - # fall back to latin 1. - LANG=en_US.iso88591 -fi -export LANG -case "$LANG" in -*.iso88591) - export LESSCHARSET=latin1 - export NLS_LANG=american_america.WE8ISO8859P1 - ;; -*.UTF-8) - export NLS_LANG=american_america.UTF8 - ;; -esac From 9c62e51afcba86b39c35273e23c1ab5ef899e4c2 Mon Sep 17 00:00:00 2001 From: "Peter J. Holzer" Date: Sun, 8 Sep 2019 12:19:56 +0200 Subject: [PATCH 2/6] Set ag path color to blue on white This is better readable than green on whatever. --- .zshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.zshrc b/.zshrc index a86ba07..4b56f37 100644 --- a/.zshrc +++ b/.zshrc @@ -30,7 +30,7 @@ fi alias darkbg='xtermcontrol --bg "#000" --fg "#FFF"; export BG=dark' alias lightbg='xtermcontrol --bg "#EEE" --fg "#000" --highlight="#0FF"; export BG=light' alias defaultbg='. ~/.zxtermcolors' -alias ag='ag --color-path 32' +alias ag='ag --color-path "34;47"' namedir(){ eval "$1=~+" From 4e4abd20881eedb5335b043b790a01d0e3ebe1c5 Mon Sep 17 00:00:00 2001 From: "Peter J. Holzer" Date: Sat, 28 Sep 2019 10:25:13 +0200 Subject: [PATCH 3/6] Set GIT_AUTHOR_* (only) if not set --- .zshenv | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/.zshenv b/.zshenv index e5420a3..651fa8e 100644 --- a/.zshenv +++ b/.zshenv @@ -299,7 +299,24 @@ esac case "$FQDN" in *.wsr.ac.at) - export GIT_AUTHOR_EMAIL="$LOGNAME@wsr.ac.at" + if [ -z "$GIT_AUTHOR_EMAIL" ] + then + export GIT_AUTHOR_EMAIL="$LOGNAME@wsr.ac.at" + fi + if [ -z "$GIT_AUTHOR_NAME" ] + then + export GIT_AUTHOR_NAME="Peter J. Holzer" + fi + ;; + *.hjp.at) + if [ -z "$GIT_AUTHOR_EMAIL" ] + then + export GIT_AUTHOR_EMAIL="$LOGNAME@hjp.at" + fi + if [ -z "$GIT_AUTHOR_NAME" ] + then + export GIT_AUTHOR_NAME="Peter J. Holzer" + fi ;; esac From 814044968d5898c287b4af1b1947c72342364af7 Mon Sep 17 00:00:00 2001 From: "Peter J. Holzer" Date: Sat, 28 Sep 2019 11:31:15 +0200 Subject: [PATCH 4/6] Remove perl_fold_blocks It's really slow --- .vimrc | 1 - 1 file changed, 1 deletion(-) diff --git a/.vimrc b/.vimrc index 098a304..a4bdc73 100644 --- a/.vimrc +++ b/.vimrc @@ -37,7 +37,6 @@ map :cp map :cn map!  >I<yypa/O autocmd FileType perl let perl_fold=1 -autocmd FileType perl let perl_fold_blocks=1 autocmd FileType perl syntax on autocmd FileType go set sw=8 From 6cefd7e45888a06e32b5c55beaa0bfa08f181b0f Mon Sep 17 00:00:00 2001 From: "Peter J. Holzer" Date: Thu, 10 Oct 2019 09:58:55 +0200 Subject: [PATCH 5/6] Remove obsolete comment --- .zshenv | 2 -- 1 file changed, 2 deletions(-) diff --git a/.zshenv b/.zshenv index 651fa8e..7c57377 100644 --- a/.zshenv +++ b/.zshenv @@ -54,8 +54,6 @@ then PATH=`$preppath -c /usr/bin/X11:/usr/games:/usr/contrib/bin` PATH=`$preppath -c /bin:/usr/bin` - # Debian's open/libre office is in /usr/bin, so we need to prepend - # the current version before it: PATH=`$preppath -c /usr/sbin:/sbin` PATH=`$preppath -c /usr/local/sbin:/usr/local/bin` `$preppath -c -e /usr/local/node-v8.9.4-linux-x86/bin` From c106c82fb8c74f00cb78752afd34cb1bf7067a64 Mon Sep 17 00:00:00 2001 From: "Peter J. Holzer" Date: Thu, 10 Oct 2019 10:10:43 +0200 Subject: [PATCH 6/6] Add local go bin directory to path --- .zshenv | 1 + 1 file changed, 1 insertion(+) diff --git a/.zshenv b/.zshenv index 7c57377..606839f 100644 --- a/.zshenv +++ b/.zshenv @@ -58,6 +58,7 @@ then PATH=`$preppath -c /usr/local/sbin:/usr/local/bin` `$preppath -c -e /usr/local/node-v8.9.4-linux-x86/bin` `$preppath -c -e -r /usr/lib/go-1.*/bin` + `$preppath -c -e -r $HOME/go/bin` PATH=`$preppath -c $HOME/scripts` PATH=`$preppath -c $HOME/bin/hosts:$HOME/bin`