Update vim config

vim/after/ftplugin/html.vim

@@ -1,2 +1,3 @@
+setlocal expandtab
 setlocal shiftwidth=2
 setlocal tabstop=2

vim/autoload/plug.vim

@@ -18,7 +18,7 @@
 "   " Any valid git URL is allowed
 "   Plug 'https://github.com/junegunn/vim-github-dashboard.git'
 "
-"   " Group dependencies, vim-snippets depends on ultisnips
+"   " Multiple Plug commands can be written in a single line using | separators
 "   Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets'
 "
 "   " On-demand loading
@@ -40,7 +40,7 @@
 "   " Unmanaged plugin (manually installed and updated)
 "   Plug '~/my-prototype-plugin'
 "
-"   " Add plugins to &runtimepath
+"   " Initialize plugin system
 "   call plug#end()
 "
 " Then reload .vimrc and :PlugInstall to install plugins.
@@ -2288,7 +2288,12 @@ function! s:preview_commit()
     wincmd P
   endif
   setlocal previewwindow filetype=git buftype=nofile nobuflisted modifiable
-  execute 'silent %!cd' s:shellesc(g:plugs[name].dir) '&& git show --no-color --pretty=medium' sha
+  try
+    let [sh, shrd] = s:chsh(1)
+    execute 'silent %!cd' s:shellesc(g:plugs[name].dir) '&& git show --no-color --pretty=medium' sha
+  finally
+    let [&shell, &shellredir] = [sh, shrd]
+  endtry
   setlocal nomodifiable
   nnoremap <silent> <buffer> q :q<cr>
   wincmd p

vim/vimrc

@@ -9,10 +9,13 @@ Plug 'gabrielelana/vim-markdown'
 Plug 'itchyny/lightline.vim'
 Plug 'junegunn/fzf.vim'
 Plug 'majutsushi/tagbar'
+Plug 'nvie/vim-flake8'
 Plug 'rhysd/committia.vim'
 Plug 'scrooloose/nerdcommenter'
 Plug 'scrooloose/nerdtree'
 Plug 'tmhedberg/matchit'
+Plug 'tpope/vim-fugitive'
+Plug 'tpope/vim-surround'
 call plug#end()
 
 filetype plugin indent on
@@ -38,6 +41,7 @@ set scrolloff=3
 set shell=zsh
 set shortmess=atI
 set showbreak=+++
+set pastetoggle=<F10>
 set showcmd
 set showmatch
 set showmode
@@ -129,3 +133,7 @@ let g:ackprg="ack-grep -H --nocolor --nogroup --column"
 let g:lightline = {
         \ 'colorscheme': 'PaperColor',
         \ }
+
+
+" vim-flake8
+autocmd FileType python map <buffer> <leader>f :call Flake8()<CR>