From 6c0e55563b7ae36b8d3b5fa81d731cbcf9db4312 Mon Sep 17 00:00:00 2001 From: Humphrey Lin Date: Thu, 26 Nov 2020 12:50:22 +0800 Subject: Add wsl2 config and emacs config --- .zshrc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to '.zshrc') diff --git a/.zshrc b/.zshrc index 70c1b22..c3b1f01 100644 --- a/.zshrc +++ b/.zshrc @@ -8,11 +8,6 @@ HISTSIZE=1000 SAVEHIST=1000 HISTFILE=~/.zsh_history -export EDITOR=/usr/bin/vim -[ -f /usr/local/bin/mvim ] && \ - export EDITOR='/usr/local/bin/mvim -v' \ - alias vim='mvim -v' - # file [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh [ -f /usr/local/etc/profile.d/autojump.sh ] && . /usr/local/etc/profile.d/autojump.sh @@ -27,9 +22,6 @@ export no_proxy=localhost,127.0.0.1 case `uname` in Darwin) # commands for macOS - export PATH="/usr/local/opt/openjdk/bin:$PATH" - export CPPFLAGS="-I/usr/local/opt/openjdk/include" - [ -d $HOME/.gem ] && export GEM_HOME="$HOME/.gem" ;; Linux) # commands for Linux @@ -39,10 +31,18 @@ FreeBSD) ;; esac +# WSL 2 +if [[ `uname -a` =~ "microsoft" ]]; then + export hostip=$(cat /etc/resolv.conf | grep -oP '(?<=nameserver\ ).*') + export http_proxy="socks5://${hostip}:7890" + export https_proxy="socks5://${hostip}:7890" + export all_proxy="socks5://${hostip}:7890" +fi + # zplug if [ ! -d ~/.zplug ]; then echo 'Installing zplug ... ' - git clone git@github.com:zplug/zplug.git ~/.zplug + git clone https://github.com/zplug/zplug.git ~/.zplug fi source ~/.zplug/init.zsh zplug "plugins/git", from:oh-my-zsh -- cgit v1.2.3