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

Merge branch 'master' into wsr

This commit is contained in:
Peter J. Holzer 2019-10-10 10:12:12 +02:00
parent b20365383f c106c82fb8
commit 7a7fdc01b4
3 changed files with 20 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.vimrc
View File

@ -37,7 +37,6 @@ map <F7> :cp
map <F8> :cn map <F8> :cn
map!  >I<yypa/O map!  >I<yypa/O
autocmd FileType perl let perl_fold=1 autocmd FileType perl let perl_fold=1
autocmd FileType perl let perl_fold_blocks=1
autocmd FileType perl syntax on autocmd FileType perl syntax on
autocmd FileType go set sw=8 autocmd FileType go set sw=8

22
.zshenv
View File

@ -54,13 +54,12 @@ then
PATH=`$preppath -c /usr/bin/X11:/usr/games:/usr/contrib/bin` PATH=`$preppath -c /usr/bin/X11:/usr/games:/usr/contrib/bin`
PATH=`$preppath -c /bin:/usr/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/sbin:/sbin`
PATH=`$preppath -c /usr/local/sbin:/usr/local/bin` PATH=`$preppath -c /usr/local/sbin:/usr/local/bin`
`$preppath -c -e /usr/local/node-v8.9.4-linux-x86/bin` `$preppath -c -e /usr/local/node-v8.9.4-linux-x86/bin`
`$preppath -c -e /usr/local/node-v8.9.4-linux-x64/bin` `$preppath -c -e /usr/local/node-v8.9.4-linux-x64/bin`
`$preppath -c -e -r /usr/lib/go-1.*/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/scripts`
PATH=`$preppath -c $HOME/bin/hosts:$HOME/bin` PATH=`$preppath -c $HOME/bin/hosts:$HOME/bin`
@ -300,7 +299,24 @@ esac
case "$FQDN" in case "$FQDN" in
*.wsr.ac.at) *.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 esac

39
.zshrc
View File

@ -30,7 +30,7 @@ fi
alias darkbg='xtermcontrol --bg "#000" --fg "#FFF"; export BG=dark' alias darkbg='xtermcontrol --bg "#000" --fg "#FFF"; export BG=dark'
alias lightbg='xtermcontrol --bg "#EEE" --fg "#000" --highlight="#0FF"; export BG=light' alias lightbg='xtermcontrol --bg "#EEE" --fg "#000" --highlight="#0FF"; export BG=light'
alias defaultbg='. ~/.zxtermcolors' alias defaultbg='. ~/.zxtermcolors'
alias ag='ag --color-path 32' alias ag='ag --color-path "34;47"'
namedir(){ namedir(){
eval "$1=~+" eval "$1=~+"
@ -127,40 +127,3 @@ fi
# for new style completion: # for new style completion:
autoload -U compinit autoload -U compinit
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