Merge branch 'wsr' of github.com:hjp/dot into wsr

This commit is contained in:
Peter J. Holzer 2019-10-10 10:28:10 +02:00
commit 23343a4b26
2 changed files with 1 additions and 3 deletions

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

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`