Merge branch 'wsr' into wsr_shared
This commit is contained in:
Peter J. Holzer
commit
a1401aa2cc
|
|
@ -6,7 +6,7 @@
|
|||
ci = commit
|
||||
st = status
|
||||
br = branch
|
||||
hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
|
||||
hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short --date-order
|
||||
type = cat-file -t
|
||||
dump = cat-file -p
|
||||
[push]
|
||||
|
|
|
|||
|
|
@ -15,27 +15,28 @@ let g:colors_name = "hjp"
|
|||
hi Comment term=bold ctermfg=88 ctermbg=White guifg=Red
|
||||
hi Constant term=underline ctermfg=90 guifg=Magenta
|
||||
hi Error term=reverse ctermfg=15 ctermbg=9 guifg=White guibg=Red
|
||||
hi ErrorMsg term=standout cterm=NONE ctermfg=226 ctermbg=DarkRed gui=NONE guifg=Yellow guibg=DarkRed
|
||||
hi Identifier term=underline ctermfg=22 ctermbg=NONE guifg=Blue
|
||||
hi LineNr term=bold cterm=NONE ctermfg=Gray ctermbg=Blue gui=NONE guifg=DarkGrey guibg=NONE
|
||||
hi Underlined term=underline cterm=underline ctermfg=163 gui=underline guifg=SlateBlue
|
||||
hi MatchParen ctermbg=yellow
|
||||
hi Normal guifg=black guibg=white
|
||||
hi PreProc term=underline ctermfg=Magenta ctermbg=253 guifg=Purple
|
||||
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 Search term=reverse cterm=NONE ctermfg=White ctermbg=19 gui=NONE guifg=Black guibg=Cyan
|
||||
hi Special term=bold ctermfg=53 ctermbg=NONE guifg=Magenta
|
||||
hi Statement term=bold ctermfg=DarkBlue gui=NONE guifg=Brown
|
||||
hi Underlined term=underline cterm=underline ctermfg=163 gui=underline guifg=SlateBlue
|
||||
|
||||
" 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).
|
||||
" hilight 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
|
||||
hi Todo term=standout ctermfg=Black ctermbg=Yellow guifg=Blue guibg=Yellow
|
||||
hi Type term=underline ctermfg=Blue gui=NONE guifg=Blue
|
||||
hi Visual term=reverse ctermfg=Yellow ctermbg=Red gui=NONE guifg=Black guibg=Yellow
|
||||
hi Visual term=reverse ctermfg=White ctermbg=DarkBlue gui=NONE guifg=Black guibg=Yellow
|
||||
hi Title ctermfg=black
|
||||
hi link Boolean Constant
|
||||
hi link Character Constant
|
||||
|
|
|
|||
11
.zjava
11
.zjava
|
|
@ -6,8 +6,8 @@
|
|||
if whence apppath > /dev/null
|
||||
then
|
||||
for i in \
|
||||
/usr/local/jdk-10.0.1 \
|
||||
/usr/local/jdk1.8.0_112 \
|
||||
/usr/local/jre1.6.0_14 \
|
||||
/usr/local/java \
|
||||
/usr/lib/java
|
||||
do
|
||||
|
|
@ -62,13 +62,4 @@ then
|
|||
fi
|
||||
done
|
||||
|
||||
for i in /usr/local/openxchange
|
||||
do
|
||||
if [ -d "$i" ]
|
||||
then
|
||||
export OX_HOME="$i"
|
||||
PATH=$(apppath "$i/bin" "$i/sbin")
|
||||
break;
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#
|
||||
# $Id: .zprofile,v 1.22 2012-10-19 11:03:15 hjp Exp $
|
||||
#
|
||||
# this is sourced for login shells after .zshenv but before .zshrc
|
||||
#
|
||||
# Once upon a tim this was also sourced at the start of an Xsession, but
|
||||
# that doesn't seem to be the case for my current debian systems (with
|
||||
# lightdm/xfce) any more. So everything set here isn't available in X11.
|
||||
umask 022
|
||||
|
||||
unset MAILCHECK
|
||||
|
|
|
|||
19
.zshenv
19
.zshenv
|
|
@ -50,6 +50,8 @@ then
|
|||
|
||||
# first prepend important stuff - in order of increasing priority:
|
||||
|
||||
setopt NULL_GLOB
|
||||
|
||||
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
|
||||
|
|
@ -57,11 +59,15 @@ then
|
|||
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`
|
||||
`$preppath -c -e /usr/local/node-v8.9.4-linux-x64/bin`
|
||||
`$preppath -c -e -r /usr/lib/go-1.*/bin`
|
||||
PATH=`$preppath -c $HOME/scripts`
|
||||
PATH=`$preppath -c $HOME/bin/hosts:$HOME/bin`
|
||||
|
||||
# then append less important stuff
|
||||
PATH=`apppath -c /usr/local/www/offline/devel.fiw/bin`
|
||||
|
||||
unsetopt NULL_GLOB
|
||||
fi
|
||||
|
||||
if [ -r /etc/MANPATH ]
|
||||
|
|
@ -272,19 +278,6 @@ case "$FQDN" in
|
|||
;;
|
||||
esac
|
||||
|
||||
if [ -d $HOME/go ]
|
||||
then
|
||||
export GOROOT=$HOME/go
|
||||
export GOOS=linux
|
||||
case `uname -m` in
|
||||
x86_64)
|
||||
export GOARCH=amd64
|
||||
;;
|
||||
*)
|
||||
export GOARCH=386
|
||||
esac
|
||||
fi
|
||||
|
||||
case "$FQDN" in
|
||||
tsimri.wsr.ac.at)
|
||||
export GET_PASS_FILES="/home/hjp/wrk/admin/info/pwd_work.gpg /home/hjp/Notes/pw.gpg"
|
||||
|
|
|
|||
Loading…
Reference in New Issue