diff options
| author | Humphrey Lin <[email protected]> | 2020-04-12 17:36:51 +0800 |
|---|---|---|
| committer | Humphrey Lin <[email protected]> | 2020-04-12 17:36:51 +0800 |
| commit | af69ba9bd2b12b5c30766c9c6c25812d79132725 (patch) | |
| tree | 9b5fa3c1bf87695ead4ba9cbd6497d1ca873ef8e | |
| parent | 2550a4baabf21646d72394cbaa1dd70487daf01d (diff) | |
| download | dotfiles-af69ba9bd2b12b5c30766c9c6c25812d79132725.tar.gz dotfiles-af69ba9bd2b12b5c30766c9c6c25812d79132725.tar.bz2 dotfiles-af69ba9bd2b12b5c30766c9c6c25812d79132725.zip | |
Some modification
| -rw-r--r-- | .vimrc | 27 | ||||
| -rw-r--r-- | .zshrc | 30 | ||||
| -rw-r--r-- | install.sh | 2 |
3 files changed, 42 insertions, 17 deletions
@@ -1,11 +1,24 @@ +" General Config + set nocompatible set number +set backspace=indent,eol,start syntax on set encoding=utf-8 set t_Co=256 set showcmd +set autoread filetype indent on +set hidden + +" MacVim + +set guifont=Monaco:h16 +set transparency=30 + +" Identation + set autoindent set tabstop=4 set shiftwidth=4 @@ -27,12 +40,14 @@ set incsearch set ignorecase set smartcase -set autoread +" Completion set wildmenu set wildmode=longest:list,full - -set backspace=indent,eol,start +set wildignore=*.o,*.obj,*~ +set wildignore+=*DS_Store* +set wildignore+=*.gem +set wildignore+=*.png,*.jpg,*.gif " change default directory let s:vim_swapfiles_dir = expand('~/.vim/.swp/') @@ -58,16 +73,18 @@ if empty(glob('~/.vim/autoload/plug.vim')) endif call plug#begin('~/.vim/plugged') -Plug 'Valloric/YouCompleteMe', {'do': 'python3 ./install.py --clang-completer'} +Plug 'Valloric/YouCompleteMe', {'do': 'python3 ./install.py --clangd-completer'} Plug 'vim-airline/vim-airline' Plug 'vim-airline/vim-airline-themes' -Plug 'junegunn/fzf', {'dir': '~/.fzf', 'do': './install --all'} +Plug 'junegunn/fzf', {'do': { -> fzf#install() }} Plug 'junegunn/fzf.vim' Plug 'scrooloose/nerdtree', {'on': 'NERDTreeToggle'} Plug 'rdnetto/YCM-Generator', {'branch': 'stable'} Plug 'ludovicchabant/vim-gutentags' Plug 'junegunn/vim-easy-align' Plug 'skywind3000/asyncrun.vim' +Plug 'rust-lang/rust.vim', {'for': 'rust'} +Plug 'fatih/vim-go', {'do': ':GoUpdateBinaries', 'for': 'go'} call plug#end() " Plugin config @@ -30,17 +30,23 @@ zplug load # file [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh -[[ -s /usr/share/autojump/autojump.zsh ]] && . /usr/share/autojump/autojump.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:1080 -export https_proxy=http://127.0.0.1:1080 - -# alias -if grep -q Microsoft /proc/version; then - alias psh='powershell.exe' - alias expl='explorer.exe' -fi - -# Rust -[ -d "$HOME/.cargo/bin" ] && export PATH="$HOME/.cargo/bin:$PATH" +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 + +# System Specific +case `uname` in +Darwin) + alias vim='mvim -v' + [ -f /usr/local/bin/mvim ] && export EDITOR='/usr/local/bin/mvim -v' +;; +Linux) + # commands for Linux +;; +FreeBSD) + # commands for FreeBSD +;; +esac @@ -39,6 +39,8 @@ base_install() { libxml2-dev else if command -v pacman > /dev/null; then pacman -S autojump + else if command -v brew > /dev/null; then + brew install autojump fi # Universal Ctags git clone [email protected]:universal-ctags/ctags.git |