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

Merge branch 'master' into wsr_shared

This commit is contained in:
Peter J. Holzer 2020-04-16 12:14:36 +02:00 committed by Peter J. Holzer
parent 5350f0046b 1fb9fc5a6c
commit e21bb78722
4 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.vimrc
View File

@ -41,3 +41,10 @@ autocmd FileType perl syntax on
autocmd FileType go set sw=8 autocmd FileType go set sw=8
autocmd FileType go set tw=79 autocmd FileType go set tw=79
autocmd FileType go set noexpandtab autocmd FileType go set noexpandtab
autocmd BufRead,BufNewFile *.ts set filetype=javascript
autocmd FileType javascript set sw=2
autocmd FileType html set sw=2
autocmd FileType crontab set tw=0

2
.znewterm
View File

@ -66,7 +66,7 @@ then
then then
. ~/.zxtermcolors . ~/.zxtermcolors
else else
perl -e 'printf(qq{if whence xtermcontrol >/dev/null\nthen\nxtermcontrol --bg "#%02X%02X%02X"\nexport BG=light\nfi\n}, map { rand(128)+128 } qw(1 1 1))' > ~/.zxtermcolors perl -e 'printf(qq{if whence xtermcontrol >/dev/null\nthen\nxtermcontrol --bg "#%02X%02X%02X" --fg "#000000"\nexport BG=light\nfi\n}, map { rand(128)+128 } qw(1 1 1))' > ~/.zxtermcolors
fi fi
fi fi

1
.zshenv
View File

@ -59,6 +59,7 @@ then
`$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 /usr/local/go-1.*/bin`
`$preppath -c -e -r $HOME/go/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`

13
.zshrc
View File

@ -27,8 +27,8 @@ if ack=`whence ack-grep`
then then
alias ack=$ack alias ack=$ack
fi fi
alias darkbg='xtermcontrol --bg "#000" --fg "#FFF --highlight="#00F""; export BG=dark' alias darkbg='xtermcontrol --bg "#000" --fg "#FFF" --highlight="#00F"; export BG=dark'
alias lightbg='xtermcontrol --bg "#EEE" --fg "#000" --highlight="#0FF"; export BG=light' alias lightbg='xtermcontrol --bg "#F0F0F0" --fg "#000" --highlight="#0FF"; export BG=light'
alias defaultbg='. ~/.zxtermcolors' alias defaultbg='. ~/.zxtermcolors'
alias ag='ag --color-path "34;47"' alias ag='ag --color-path "34;47"'
@ -121,7 +121,16 @@ fi
# don't want to recreate that mess manually. # don't want to recreate that mess manually.
if [ -d ~/bin/func ] if [ -d ~/bin/func ]
then then
export FPATH
FPATH=`preppath -v FPATH ~/bin/func` FPATH=`preppath -v FPATH ~/bin/func`
# We also have to mark all functions explicitely as undefined,
# or zsh won't look for them. (Is this new? I thought that zsh would
# automatically search for unknown commands in FPATH, too. Maybe
# there's an option for that.)
for f in ~/bin/func/*
do
typeset -fu $(basename $f)
done
fi fi
# for new style completion: # for new style completion: