Compare commits

..

No commits in common. "0b530f0b8cb185b31116d2f92ebf7475f78b228a" and "f2fe56fb18764148aecfee6b41d86a5ba17a4f54" have entirely different histories.

View file

@ -11,31 +11,15 @@ if filereadable(expand("~/.vim/autoload/plug.vim")) || filereadable(expand("~/.c
Plug 'vim-scripts/gitignore.vim' Plug 'vim-scripts/gitignore.vim'
Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' } Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' }
Plug 'Xuyuanp/nerdtree-git-plugin' Plug 'Xuyuanp/nerdtree-git-plugin'
" Plug 'majutsushi/tagbar' Plug 'majutsushi/tagbar'
" Plug 'vim-scripts/taglist.vim' Plug 'vim-airline/vim-airline'
Plug 'vim-airline/vim-airline-themes'
Plug 'Townk/vim-autoclose' Plug 'Townk/vim-autoclose'
Plug 'tpope/vim-fugitive' Plug 'tpope/vim-fugitive'
Plug 'airblade/vim-gitgutter' Plug 'airblade/vim-gitgutter'
""" Markdown editing
Plug 'godlygeek/tabular'
Plug 'plasticboy/vim-markdown'
""" Themes
Plug 'vim-airline/vim-airline'
Plug 'vim-airline/vim-airline-themes'
Plug 'rakr/vim-one'
" Plug 'morhetz/gruvbox'
""" Languages
Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }
Plug 'vim-latex/vim-latex' Plug 'vim-latex/vim-latex'
" Plug 'dag/vim-fish' Plug 'morhetz/gruvbox'
" Plug 'KabbAmine/gulp-vim' Plug 'dag/vim-fish'
" Plug 'kovisoft/slimv'
" Plug 'vim-php/vim-phpunit'
" Plug 'StanAngeloff/php.vim'
call plug#end() call plug#end()
else else
@ -92,9 +76,8 @@ set tm=500
" Color " Color
syntax on syntax on
" colorscheme gruvbox colorscheme gruvbox
colorscheme one set background=dark
set background=light
set termguicolors set termguicolors
set cursorline set cursorline
if has("gui_running") if has("gui_running")
@ -109,8 +92,8 @@ endif
set t_Co=256 set t_Co=256
set encoding=utf-8 set encoding=utf-8
set ffs=unix,dos,mac set ffs=unix,dos,mac
" set textwidth=80 set textwidth=80
" set colorcolumn=+1 set colorcolumn=+1
hi ColorColumn guibg=#2d2d2d ctermbg=238 hi ColorColumn guibg=#2d2d2d ctermbg=238
" Files, Backups and undo " Files, Backups and undo
@ -212,8 +195,7 @@ set clipboard+=unnamedplus
" airline " airline
let g:airline_powerline_fonts = 1 let g:airline_powerline_fonts = 1
let g:airline#extensions#tabline#enabled = 1 let g:airline#extensions#tabline#enabled = 1
" let g:airline_theme='base16_gruvbox_dark_hard' let g:airline_theme='base16_gruvbox_dark_hard'
let g:airline_theme='one'
" deoplete " deoplete
let g:deoplete#enable_at_startup = 1 let g:deoplete#enable_at_startup = 1