From 205866f67b824267af3feb4b2d3f59b703d8f009 Mon Sep 17 00:00:00 2001 From: hophacker Date: Thu, 12 Apr 2018 14:17:45 +0800 Subject: [PATCH] remove start_polipo, use port 1087 as http proxy --- git/gitconfig.lock | 0 zsh/aliases.zsh | 1 - zsh/functions.zsh | 4 +--- zsh/git.zsh | 1 + 4 files changed, 2 insertions(+), 4 deletions(-) create mode 100644 git/gitconfig.lock diff --git a/git/gitconfig.lock b/git/gitconfig.lock new file mode 100644 index 0000000..e69de29 diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh index b454bfe..9175c8e 100644 --- a/zsh/aliases.zsh +++ b/zsh/aliases.zsh @@ -256,4 +256,3 @@ alias gcaa="gia .; gcF" alias ror_ctags="ctags -R --languages=ruby --exclude=.git --exclude=log . \$(bundle list --paths)" alias docker_clean_images='docker rmi $(docker images -a --filter=dangling=true -q)' alias find_large_files="sudo find / -xdev -type f -size +50M" -alias start_polipo='polipo socksParentProxy=localhost:1080' diff --git a/zsh/functions.zsh b/zsh/functions.zsh index b739d11..89ff661 100644 --- a/zsh/functions.zsh +++ b/zsh/functions.zsh @@ -38,9 +38,7 @@ function cp_container() { cd .. } function set_proxy() { - export all_proxy=http://127.0.0.1:8123/ - # export https_proxy=socks5://127.0.0.1:1080/ - # export http_proxy=socks5://127.0.0.1:1080/ + export all_proxy=http://127.0.0.1:1087/ } function set_ss_proxy() { export https_proxy=socks5://127.0.0.1:1080/ diff --git a/zsh/git.zsh b/zsh/git.zsh index 3c9c5c4..90fda24 100644 --- a/zsh/git.zsh +++ b/zsh/git.zsh @@ -4,3 +4,4 @@ __git_files () { } alias gfR='gf origin master; gwR origin/master' alias gpb='git push origin "$(git-branch-current 2> /dev/null):build"' +alias gitUserRallet="git config user.name rallets;git config user.email rallet@rallets.com"