From 5b2f6e73a633cc474a8b305d3cd32e5a472557ec Mon Sep 17 00:00:00 2001
From: humphreylin <humpylin@gmail.com>
Date: Sun, 2 Feb 2020 17:33:25 +0800
Subject: Many modification ..

---
 .vimrc     |  4 +---
 .zshrc     | 16 ++++++++--------
 install.sh | 18 ++++++++++--------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/.vimrc b/.vimrc
index 93add8f..5b77c85 100644
--- a/.vimrc
+++ b/.vimrc
@@ -59,7 +59,6 @@ call plug#begin('~/.vim/plugged')
 Plug 'Valloric/YouCompleteMe', {'do': 'python3 ./install.py --clang-completer'}
 Plug 'vim-airline/vim-airline'
 Plug 'vim-airline/vim-airline-themes'
-Plug 'flazz/vim-colorschemes'
 Plug 'junegunn/fzf', {'dir': '~/.fzf', 'do': './install --all'}
 Plug 'junegunn/fzf.vim'
 Plug 'scrooloose/nerdtree', {'on': 'NERDTreeToggle'}
@@ -70,8 +69,7 @@ Plug 'skywind3000/asyncrun.vim'
 call plug#end()
 
 " Plugin config
-colorscheme molokai
-let g:airline='molokai'
+" let g:airline='molokai'
 let g:airline#extensions#tabline#enabled = 1
 map <C-n> :NERDTreeToggle<CR>
 " YouCompleteMe
diff --git a/.zshrc b/.zshrc
index dcf7c3c..b77130d 100644
--- a/.zshrc
+++ b/.zshrc
@@ -10,13 +10,6 @@ HISTFILE=~/.zsh_history
 
 export EDITOR=/usr/bin/vim
 
-# autojump
-if [ ! -d /usr/share/autojump ]; then
-    echo 'Installing autojump ... '
-    sudo apt install autojump
-fi
-. /usr/share/autojump/autojump.zsh 
-
 # zplug
 if [ ! -d ~/.zplug ]; then
     echo 'Installing zplug ... '
@@ -35,8 +28,13 @@ if ! zplug check --verbose; then
 fi
 zplug load
 
-# fzf
+# file
 [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
+[[ -s /usr/share/autojump/autojump.zsh ]] && . /usr/share/autojump/autojump.zsh
+
+# proxy
+export http_proxy=http://127.0.0.1:1080
+export https_proxy=http://127.0.0.1:1080
 
 # alias
 if grep -q Microsoft /proc/version; then
@@ -44,3 +42,5 @@ if grep -q Microsoft /proc/version; then
     alias expl='explorer.exe'
 fi
 
+# Rust
+[ -d "$HOME/.cargo/bin" ] && export PATH="$HOME/.cargo/bin:$PATH"
diff --git a/install.sh b/install.sh
index 2031187..fc0fbc7 100644
--- a/install.sh
+++ b/install.sh
@@ -29,16 +29,18 @@ base_install() {
             autojump \
             zsh \
             gcc \
-            make
-    fi
+            make \
 
+            pkg-config autoconf automake \
+            python3-docutils \
+            libseccomp-dev \
+            libjansson-dev \
+            libyaml-dev \
+            libxml2-dev
+    else if command -v pacman > /dev/null; then
+        pacman -S autojump
+    fi
     # Universal Ctags
-    apt install pkg-config autoconf automake \
-        python3-docutils \
-        libseccomp-dev \
-        libjansson-dev \
-        libyaml-dev \
-        libxml2-dev
     git clone git@github.com:universal-ctags/ctags.git
     (
     cd ctags
-- 
cgit v1.2.3