modify .bashrc

2 files changed, 11 insertions, 3 deletions

diff --git a/.bashrc b/.bashrc
index c2c4cfa..1711ce8 100644
--- a/.bashrc
+++ b/.bashrc
@@ -116,6 +116,15 @@ if ! shopt -oq posix; then
   fi
 fi
 
+# default editor
+export EDITOR=/usr/bin/vim
+
+# alias
+alias g='git'
+alias gaa='git add --all'
+alias gc='git commit -v'
+alias gp='git push'
+
 # autojump
 if [ ! -d /usr/share/autojump ]; then
     sudo apt install autojump
@@ -123,8 +132,8 @@ fi
 . /usr/share/autojump/autojump.sh
 
 # proxy
-export http_proxy='http://localhost:8118'
-export https_proxy='http://localhost:8118'
+export http_proxy='http://localhost:7890'
+export https_proxy='http://localhost:7890'
 
 # fzf
 [ -f ~/.fzf.bash ] && source ~/.fzf.bash
diff --git a/.vimrc b/.vimrc
index 03bf64f..a1bd492 100644
--- a/.vimrc
+++ b/.vimrc
@@ -52,7 +52,6 @@ Plug 'vim-airline/vim-airline-themes'
 Plug 'flazz/vim-colorschemes'
 Plug 'junegunn/fzf', {'dir': '~/.fzf', 'do': './install --all'}
 Plug 'scrooloose/nerdtree'
-Plug 'vimwiki/vimwiki'
 call plug#end()
 
 " Plugin config