diff --git a/.zshrc b/.zshrc index 22c7fad..4c1d9d3 100644 --- a/.zshrc +++ b/.zshrc @@ -115,7 +115,7 @@ export HOMEBREW_NO_AUTO_UPDATE=true # 禁止 brew 每次安装软件都 upate export REVIEW_BASE="master" # go -export GOPATH=$HOME/go +export GOPATH=$HOME/go:$HOME/workrepo/go export PATH=$PATH:$GOPATH/bin export GOPROXY=goproxy.cn export GOSUMDB="sum.golang.google.cn" @@ -124,6 +124,7 @@ export GOSUMDB="sum.golang.google.cn" [ -f ~/.zprofile ] && source ~/.zprofile [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh test -e /home/linuxbrew/.linuxbrew/ && export PATH=$PATH:/home/linuxbrew/.linuxbrew/bin +test -e ~/.pri_scripts && export PATH=$PATH:~/.pri_scripts # add z if command -v lua >/dev/null; then diff --git a/git/.gitconfig b/git/.gitconfig index 7772065..e996e96 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -10,8 +10,8 @@ default = current [merge] tool = vimdiff -[include] - path = ~/.subgitconfig +[includeIf "gitdir:~/workrepo"] + path = ~/.workgitconfig [branch] autoSetupMerge = always [alias]