Merge branch 'master' of gitee.com:klesh/dotfiles
This commit is contained in:
commit
270ab37f22
|
@ -53,7 +53,15 @@ if status is-interactive
|
||||||
alias dt='date "+%Y%m%d-%H%M%S"'
|
alias dt='date "+%Y%m%d-%H%M%S"'
|
||||||
|
|
||||||
# === PATH and file sourcing
|
# === PATH and file sourcing
|
||||||
append_paths ~/go/bin ~/bin ~/.local/bin ~/.yarn/bin ~/.config/yarn/global/node_modules/.bin ~/dotfiles/bin ~/dotfiles/devops/bin ~/Nextcloud/bin
|
append_paths ~/go/bin \
|
||||||
|
~/bin \
|
||||||
|
~/.local/bin \
|
||||||
|
~/.yarn/bin \
|
||||||
|
~/.config/yarn/global/node_modules/.bin \
|
||||||
|
~/dotfiles/bin \
|
||||||
|
~/dotfiles/devops/bin \
|
||||||
|
~/Nextcloud/bin \
|
||||||
|
/usr/local/go/bin
|
||||||
source_files /usr/share/autojump/autojump.fish /usr/local/share/autojump/autojump.fish \
|
source_files /usr/share/autojump/autojump.fish /usr/local/share/autojump/autojump.fish \
|
||||||
~/.jabba/jabba.fish \
|
~/.jabba/jabba.fish \
|
||||||
~/.asdf/asdf.fish \
|
~/.asdf/asdf.fish \
|
||||||
|
|
|
@ -10,8 +10,9 @@ NODE_URL=https://nodejs.org/dist
|
||||||
NODE_VERSION=v14.15.4
|
NODE_VERSION=v14.15.4
|
||||||
NPM_BIN=npm
|
NPM_BIN=npm
|
||||||
if in_china; then
|
if in_china; then
|
||||||
NODE_URL=https://npm.taobao.org/mirrors/node
|
NPM_REGISTRY_URL=https://npmreg.mirrors.ustc.edu.cn
|
||||||
NPM_BIN=cnpm
|
NODE_URL=$NPM_REGISTRY
|
||||||
|
NPM_BIN=npm
|
||||||
fi
|
fi
|
||||||
export NPM_BIN
|
export NPM_BIN
|
||||||
|
|
||||||
|
@ -62,7 +63,7 @@ install() {
|
||||||
rm "/tmp/$NAME"
|
rm "/tmp/$NAME"
|
||||||
sudo npm install -g yarn
|
sudo npm install -g yarn
|
||||||
if in_china; then
|
if in_china; then
|
||||||
#sudo npm install -g cnpm --registry=https://registry.npm.taobao.org
|
echo "registry=$NPM_REGISTRY_URL" > ~/.npmrc
|
||||||
yarnpkg config set registry https://registry.npm.taobao.org --global
|
yarnpkg config set registry https://registry.npm.taobao.org --global
|
||||||
yarnpkg config set disturl https://npm.taobao.org/dist --global
|
yarnpkg config set disturl https://npm.taobao.org/dist --global
|
||||||
yarnpkg config set sass_binary_site https://npm.taobao.org/mirrors/node-sass --global
|
yarnpkg config set sass_binary_site https://npm.taobao.org/mirrors/node-sass --global
|
||||||
|
|
Loading…
Reference in New Issue
Block a user