2 files changed, 29 insertions, 24 deletions
diff --git a/.vimrc b/.vimrc
index 6141b08..d14415e 100644
--- a/.vimrc
+++ b/.vimrc
@@ -107,7 +107,7 @@ let g:ycm_complete_in_strings = 1
 
 let g:ycm_filetype_whilelist = {
 \ "c": 1, "cpp": 1, "sh": 1, "zsh": 1,
- \ "python": 1, "go": 1,
+ \ "python": 1,
 \ }
 
 " vim-gutentags
diff --git a/.zshrc b/.zshrc
index b39f395..419c97b 100644
--- a/.zshrc
+++ b/.zshrc
@@ -9,39 +9,26 @@ SAVEHIST=1000
 HISTFILE=~/.zsh_history
 
 export EDITOR=/usr/bin/vim
-
-# zplug
-if [ ! -d ~/.zplug ]; then
- echo 'Installing zplug ... '
- git clone [email protected]:zplug/zplug.git ~/.zplug
-fi
-source ~/.zplug/init.zsh 
-zplug "plugins/git", from:oh-my-zsh
-zplug "zsh-users/zsh-completions"
-zplug "zsh-users/zsh-syntax-highlighting"
-zplug "dracula/zsh", as:theme
-if ! zplug check --verbose; then
- printf "Install? [y/N]: "
- if read -q; then
- echo; zplug install
- fi
-fi
-zplug load
+[ -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
 
 # proxy
-export http_proxy=http://127.0.0.1:1087
-export https_proxy=http://127.0.0.1:1087
-export all_proxy=socks5://127.0.0.1:1086
+export http_proxy=http://127.0.0.1:7890
+export https_proxy=http://127.0.0.1:7890
+export all_proxy=socks5://127.0.0.1:7891
+export no_proxy=localhost,127.0.0.1
 
 # System Specific
 case `uname` in 
 Darwin)
- alias vim='mvim -v'
- [ -f /usr/local/bin/mvim ] && export EDITOR='/usr/local/bin/mvim -v'
+ # commands for macOS
+ export PATH="/usr/local/opt/openjdk/bin:$PATH"
+ export CPPFLAGS="-I/usr/local/opt/openjdk/include"
 ;;
 Linux)
 # commands for Linux
@@ -50,3 +37,21 @@ FreeBSD)
 # commands for FreeBSD
 ;;
 esac
+
+# zplug
+if [ ! -d ~/.zplug ]; then
+ echo 'Installing zplug ... '
+ git clone [email protected]:zplug/zplug.git ~/.zplug
+fi
+source ~/.zplug/init.zsh 
+zplug "plugins/git", from:oh-my-zsh
+zplug "zsh-users/zsh-completions"
+zplug "zsh-users/zsh-syntax-highlighting"
+zplug "dracula/zsh", as:theme
+if ! zplug check --verbose; then
+ printf "Install? [y/N]: "
+ if read -q; then
+ echo; zplug install
+ fi
+fi
+zplug load