Stuff

5 years ago · 3ee4c9680b
4 changed files with 253 additions and 30 deletions
--- 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')
@ -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

--- a/dotfiles/joerc
+++ b/dotfiles/joerc
@ -10,3 +10,6 @@
 -force
 -assume_256color
 -colors solarized
+-purify
+-spaces
+-csmode
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@ -25,7 +25,6 @@ export PATH=$PATH:$GOBIN
 # TODO: PUT THIS IN AN IF PYENV EXISTS CHECK
 eval "$(pyenv init -)"

-
 # Emacs needs to be setup different on Linux and Mac
 if [[ "$OSTYPE" == "darwin"* ]]; then
    alias emacs='/Applications/Emacs.app/Contents/MacOS/Emacs -nw'
--- a/iterm2/material-design-colors.itermcolors
+++ b/iterm2/material-design-colors.itermcolors
@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Ansi 0 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.40253299474716187</real>
+		<key>Green Component</key>
+		<real>0.35616019368171692</real>
+		<key>Red Component</key>
+		<real>0.26286587119102478</real>
+	</dict>
+	<key>Ansi 1 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.25575384497642517</real>
+		<key>Green Component</key>
+		<real>0.22098405659198761</real>
+		<key>Red Component</key>
+		<real>0.9871404767036438</real>
+	</dict>
+	<key>Ansi 10 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.74659085273742676</real>
+		<key>Green Component</key>
+		<real>0.96712285280227661</real>
+		<key>Red Component</key>
+		<real>0.67800694704055786</real>
+	</dict>
+	<key>Ansi 11 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.42511638998985291</real>
+		<key>Green Component</key>
+		<real>0.88262283802032471</real>
+		<key>Red Component</key>
+		<real>0.99765938520431519</real>
+	</dict>
+	<key>Ansi 12 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.99898606538772583</real>
+		<key>Green Component</key>
+		<real>0.81066548824310303</real>
+		<key>Red Component</key>
+		<real>0.43880558013916016</real>
+	</dict>
+	<key>Ansi 13 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.60766077041625977</real>
+		<key>Green Component</key>
+		<real>0.40164706110954285</real>
+		<key>Red Component</key>
+		<real>0.9887651801109314</real>
+	</dict>
+	<key>Ansi 14 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.90182536840438843</real>
+		<key>Green Component</key>
+		<real>1</real>
+		<key>Red Component</key>
+		<real>0.60292786359786987</real>
+	</dict>
+	<key>Ansi 15 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.99999129772186279</real>
+		<key>Green Component</key>
+		<real>0.99997437000274658</real>
+		<key>Red Component</key>
+		<real>1</real>
+	</dict>
+	<key>Ansi 2 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.62042194604873657</real>
+		<key>Green Component</key>
+		<real>0.94388872385025024</real>
+		<key>Red Component</key>
+		<real>0.36202818155288696</real>
+	</dict>
+	<key>Ansi 3 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.19727933406829834</real>
+		<key>Green Component</key>
+		<real>0.81672251224517822</real>
+		<key>Red Component</key>
+		<real>0.99627053737640381</real>
+	</dict>
+	<key>Ansi 4 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.99871528148651123</real>
+		<key>Green Component</key>
+		<real>0.7149810791015625</real>
+		<key>Red Component</key>
+		<real>0.215079665184021</real>
+	</dict>
+	<key>Ansi 5 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.43182668089866638</real>
+		<key>Green Component</key>
+		<real>0.13310989737510681</real>
+		<key>Red Component</key>
+		<real>0.986469566822052</real>
+	</dict>
+	<key>Ansi 6 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.82062870264053345</real>
+		<key>Green Component</key>
+		<real>1</real>
+		<key>Red Component</key>
+		<real>0.34860008955001831</real>
+	</dict>
+	<key>Ansi 7 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.99999129772186279</real>
+		<key>Green Component</key>
+		<real>0.99997437000274658</real>
+		<key>Red Component</key>
+		<real>1</real>
+	</dict>
+	<key>Ansi 8 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.72321081161499023</real>
+		<key>Green Component</key>
+		<real>0.69167852401733398</real>
+		<key>Red Component</key>
+		<real>0.63061976432800293</real>
+	</dict>
+	<key>Ansi 9 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.42818409204483032</real>
+		<key>Green Component</key>
+		<real>0.45310419797897339</real>
+		<key>Red Component</key>
+		<real>0.98958194255828857</real>
+	</dict>
+	<key>Background Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.16608485579490662</real>
+		<key>Green Component</key>
+		<real>0.14745020866394043</real>
+		<key>Red Component</key>
+		<real>0.11278382688760757</real>
+	</dict>
+	<key>Bold Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.91648769378662109</real>
+		<key>Green Component</key>
+		<real>0.91671288013458252</real>
+		<key>Red Component</key>
+		<real>0.91654461622238159</real>
+	</dict>
+	<key>Cursor Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.91648769378662109</real>
+		<key>Green Component</key>
+		<real>0.91671288013458252</real>
+		<key>Red Component</key>
+		<real>0.91654461622238159</real>
+	</dict>
+	<key>Cursor Text Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.0</real>
+		<key>Green Component</key>
+		<real>0.0</real>
+		<key>Red Component</key>
+		<real>0.0</real>
+	</dict>
+	<key>Foreground Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.93115901947021484</real>
+		<key>Green Component</key>
+		<real>0.92142927646636963</real>
+		<key>Red Component</key>
+		<real>0.90730977058410645</real>
+	</dict>
+	<key>Selected Text Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.93115901947021484</real>
+		<key>Green Component</key>
+		<real>0.92142927646636963</real>
+		<key>Red Component</key>
+		<real>0.90730977058410645</real>
+	</dict>
+	<key>Selection Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.47096589207649231</real>
+		<key>Green Component</key>
+		<real>0.41462835669517517</real>
+		<key>Red Component</key>
+		<real>0.30659490823745728</real>
+	</dict>
+</dict>
+</plist>