fix conflict

dotfiles/config/nvim/init.vim

@@ -1,9 +1,13 @@
 set fileencoding=utf-8
 
-if empty(glob('~/.config/nvim/autoload/plug.vim'))
-  silent !curl -fLo ~/.config/nvim/autoload/plug.vim --create-dirs
-    \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
-  autocmd VimEnter * PlugInstall | source %
+" I have no idea how to auto-install vim-plug on Windows
+" so you will have to install it manually.
+if !(has('win16') || has('win32') || has('win64'))
+  if empty(glob('~/.config/nvim/autoload/plug.vim'))
+    silent !curl -fLo ~/.config/nvim/autoload/plug.vim --create-dirs
+      \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
+    autocmd VimEnter * PlugInstall | source %
+  endif
 endif
 
 call plug#begin('~/.config/nvim/plugged')
@@ -45,7 +49,6 @@ Plug 'derekwyatt/vim-scala'
 Plug 'leafgarland/typescript-vim'
 Plug 'kchmck/vim-coffee-script'
 Plug 'rust-lang/rust.vim'
-Plug 'klen/python-mode'
 Plug 'groenewege/vim-less'
 Plug 'cakebaker/scss-syntax.vim'
 Plug 'pangloss/vim-javascript'
@@ -57,36 +60,38 @@ Plug 'OCamlPro/ocp-indent'
 Plug 'slim-template/vim-slim'
 Plug 'isRuslan/vim-es6'
 
+" Flake8 Integration
+Plug 'nvie/vim-flake8'
+
+
 " SBT integration for vim
 Plug 'ktvoelker/sbt-vim'
 
 " Org Mode
 Plug 'jceb/vim-orgmode'
 
-if !has("win32") || !has("win16")
-  "Code Completion
-  " Post-update hook for YCM
-  " Make sure to sudo pip install neovim before running this
-  function! BuildYCM(info)
-    if a:info.status == 'installed' || a:info.force
-      !./install.sh
-    endif
-  endfunction
-  Plug 'Valloric/YouCompleteMe', { 'do': function('BuildYCM') }
-
-
-  Plug 'scrooloose/nerdtree'
-  " For nerdtree indicators of what has changed
-  Plug 'Xuyuanp/nerdtree-git-plugin'
-
-  " For some modern file icons
-  Plug 'ryanoasis/vim-devicons'
-
-  " Make Vim play nice with tmux
-  " Use <c-h> <c-j> <c-k> <c-l>
-  " to move between window panes in tmux or vim
-  Plug 'christoomey/vim-tmux-navigator'
-endif
+"Code Completion
+" Post-update hook for YCM
+" Make sure to sudo pip install neovim before running this
+function! BuildYCM(info)
+  if a:info.status == 'installed' || a:info.force
+    !./install.sh
+  endif
+endfunction
+Plug 'Valloric/YouCompleteMe', { 'do': function('BuildYCM') }
+
+
+Plug 'scrooloose/nerdtree'
+" For nerdtree indicators of what has changed
+Plug 'Xuyuanp/nerdtree-git-plugin'
+
+" For some modern file icons
+Plug 'ryanoasis/vim-devicons'
+
+" Make Vim play nice with tmux
+" Use <c-h> <c-j> <c-k> <c-l>
+" to move between window panes in tmux or vim
+Plug 'christoomey/vim-tmux-navigator'
 
 " Markdown
 Plug 'godlygeek/tabular'
@@ -157,6 +162,9 @@ autocmd BufRead,BufNewFile *.rs set filetype=rust
 " Set column width to 80 only on python files
 autocmd BufNewFile,BufRead *.py setlocal colorcolumn=80
 
+" Set Python syntax checking to Python3
+let python_highlight_all=1
+
 " Indent YAML files correctly
 au FileType yaml setlocal tabstop=2 expandtab shiftwidth=2 softtabstop=2
 

dotfiles/joerc

@@ -10,3 +10,6 @@
 -force
 -assume_256color
 -colors solarized
+-purify
+-spaces
+-csmode