From a843f7d4acb1b626623af669ef236c8c2f5ddba0 Mon Sep 17 00:00:00 2001
From: Taylor Bockman <tbockman@xchg.sh>
Date: Wed, 28 Aug 2019 17:49:17 -0700
Subject: [PATCH 1/5] ok

---
 dotfiles/joerc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dotfiles/joerc b/dotfiles/joerc
index 431b393..9930642 100644
--- a/dotfiles/joerc
+++ b/dotfiles/joerc
@@ -10,3 +10,5 @@
 -force
 -assume_256color
 -colors solarized
+-purify
+-spaces

From a167477b3d7754d292699f687ebfbde9b27fc100 Mon Sep 17 00:00:00 2001
From: Taylor Bockman <tbockman@xchg.sh>
Date: Wed, 28 Aug 2019 17:58:10 -0700
Subject: [PATCH 2/5] JOE Continuous Search Mode

---
 dotfiles/joerc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dotfiles/joerc b/dotfiles/joerc
index 9930642..ef663be 100644
--- a/dotfiles/joerc
+++ b/dotfiles/joerc
@@ -12,3 +12,4 @@
 -colors solarized
 -purify
 -spaces
+-csmode

From e859ec2d6f45161930f96f554f5fb1f8ed95a3cb Mon Sep 17 00:00:00 2001
From: Taylor Bockman <tbockman@xchg.sh>
Date: Fri, 30 Aug 2019 17:30:26 -0700
Subject: [PATCH 3/5] Remove python-mode

---
 dotfiles/config/nvim/init.vim | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dotfiles/config/nvim/init.vim b/dotfiles/config/nvim/init.vim
index 8a44ff3..83ba351 100644
--- a/dotfiles/config/nvim/init.vim
+++ b/dotfiles/config/nvim/init.vim
@@ -45,7 +45,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,6 +56,10 @@ 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'
 
@@ -157,6 +160,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
 

From e3ba0dde93ffd7f840ee11d5e5ecf46729560222 Mon Sep 17 00:00:00 2001
From: Taylor Bockman <tbockman@xchg.sh>
Date: Fri, 30 Aug 2019 17:31:45 -0700
Subject: [PATCH 4/5] Make nvim nvim

---
 dotfiles/zshrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dotfiles/zshrc b/dotfiles/zshrc
index a3e0b00..f250ea5 100644
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@@ -14,7 +14,7 @@ fi
 
 if [[ "$OSTYPE" == "linux-gnu" ]]; then
   # Linux
-  export VISUAL="emacs"
+  export VISUAL="nvim"
   alias emacs="$VISUAL"
 elif [[ "$OSTYPE" == "darwin"* ]]; then
   # Mac OSX

From 347d63f1d8cace2559781a760a70722732c2808e Mon Sep 17 00:00:00 2001
From: Taylor Bockman <tbockman@xchg.sh>
Date: Fri, 30 Aug 2019 20:19:43 -0700
Subject: [PATCH 5/5] Make vim plug work right on windows

---
 dotfiles/config/nvim/init.vim | 58 ++++++++++++++++++++++---------------------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/dotfiles/config/nvim/init.vim b/dotfiles/config/nvim/init.vim
index 83ba351..cd77cb4 100644
--- a/dotfiles/config/nvim/init.vim
+++ b/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')
@@ -66,30 +70,28 @@ 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'