remove start_polipo, use port 1087 as http proxy

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'

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/

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"