Merge branch 'master' into hjp
This commit is contained in:
commit
d5dafc5cc4
1
.vimrc
1
.vimrc
|
@ -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
|
||||||
|
|
12
.znewterm
12
.znewterm
|
@ -28,6 +28,18 @@ then
|
||||||
TERM=xterm
|
TERM=xterm
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [[ $TERM == xterm ]]
|
||||||
|
then
|
||||||
|
for t in xterm-256color xterm+256color
|
||||||
|
do
|
||||||
|
if [[ -f /usr/share/terminfo/x/$t ]]
|
||||||
|
then
|
||||||
|
TERM=$t
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
case "$TERM" in
|
case "$TERM" in
|
||||||
xterm*|screen)
|
xterm*|screen)
|
||||||
# indicated exit status by smiley (suggested by Stig Sandbeck Mathisen)
|
# indicated exit status by smiley (suggested by Stig Sandbeck Mathisen)
|
||||||
|
|
21
.zshenv
21
.zshenv
|
@ -54,12 +54,11 @@ 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 -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`
|
||||||
|
|
||||||
|
@ -134,6 +133,7 @@ case "$LANG" in
|
||||||
esac
|
esac
|
||||||
|
|
||||||
export NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS'
|
export NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS'
|
||||||
|
export NLS_TIMESTAMP_FORMAT='YYYY-MM-DD HH24:MI:SS.FF'
|
||||||
|
|
||||||
|
|
||||||
if [ -x /usr/bin/less ]
|
if [ -x /usr/bin/less ]
|
||||||
|
@ -299,7 +299,24 @@ esac
|
||||||
|
|
||||||
case "$FQDN" in
|
case "$FQDN" in
|
||||||
*.wsr.ac.at)
|
*.wsr.ac.at)
|
||||||
|
if [ -z "$GIT_AUTHOR_EMAIL" ]
|
||||||
|
then
|
||||||
export GIT_AUTHOR_EMAIL="$LOGNAME@wsr.ac.at"
|
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
|
||||||
|
|
||||||
|
|
2
.zshrc
2
.zshrc
|
@ -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=~+"
|
||||||
|
|
Loading…
Reference in New Issue