diff --git a/dotfiles/config/nvim/init.vim b/dotfiles/config/nvim/init.vim index 8a44ff3..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') @@ -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 - " 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 +" 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 diff --git a/dotfiles/joerc b/dotfiles/joerc index 431b393..ef663be 100644 --- a/dotfiles/joerc +++ b/dotfiles/joerc @@ -10,3 +10,6 @@ -force -assume_256color -colors solarized +-purify +-spaces +-csmode diff --git a/dotfiles/zshrc b/dotfiles/zshrc index 574a380..bc5d9df 100644 --- 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' diff --git a/iterm2/material-design-colors.itermcolors b/iterm2/material-design-colors.itermcolors new file mode 100644 index 0000000..a1e5cf9 --- /dev/null +++ b/iterm2/material-design-colors.itermcolors @@ -0,0 +1,213 @@ + + + + + Ansi 0 Color + + Blue Component + 0.40253299474716187 + Green Component + 0.35616019368171692 + Red Component + 0.26286587119102478 + + Ansi 1 Color + + Blue Component + 0.25575384497642517 + Green Component + 0.22098405659198761 + Red Component + 0.9871404767036438 + + Ansi 10 Color + + Blue Component + 0.74659085273742676 + Green Component + 0.96712285280227661 + Red Component + 0.67800694704055786 + + Ansi 11 Color + + Blue Component + 0.42511638998985291 + Green Component + 0.88262283802032471 + Red Component + 0.99765938520431519 + + Ansi 12 Color + + Blue Component + 0.99898606538772583 + Green Component + 0.81066548824310303 + Red Component + 0.43880558013916016 + + Ansi 13 Color + + Blue Component + 0.60766077041625977 + Green Component + 0.40164706110954285 + Red Component + 0.9887651801109314 + + Ansi 14 Color + + Blue Component + 0.90182536840438843 + Green Component + 1 + Red Component + 0.60292786359786987 + + Ansi 15 Color + + Blue Component + 0.99999129772186279 + Green Component + 0.99997437000274658 + Red Component + 1 + + Ansi 2 Color + + Blue Component + 0.62042194604873657 + Green Component + 0.94388872385025024 + Red Component + 0.36202818155288696 + + Ansi 3 Color + + Blue Component + 0.19727933406829834 + Green Component + 0.81672251224517822 + Red Component + 0.99627053737640381 + + Ansi 4 Color + + Blue Component + 0.99871528148651123 + Green Component + 0.7149810791015625 + Red Component + 0.215079665184021 + + Ansi 5 Color + + Blue Component + 0.43182668089866638 + Green Component + 0.13310989737510681 + Red Component + 0.986469566822052 + + Ansi 6 Color + + Blue Component + 0.82062870264053345 + Green Component + 1 + Red Component + 0.34860008955001831 + + Ansi 7 Color + + Blue Component + 0.99999129772186279 + Green Component + 0.99997437000274658 + Red Component + 1 + + Ansi 8 Color + + Blue Component + 0.72321081161499023 + Green Component + 0.69167852401733398 + Red Component + 0.63061976432800293 + + Ansi 9 Color + + Blue Component + 0.42818409204483032 + Green Component + 0.45310419797897339 + Red Component + 0.98958194255828857 + + Background Color + + Blue Component + 0.16608485579490662 + Green Component + 0.14745020866394043 + Red Component + 0.11278382688760757 + + Bold Color + + Blue Component + 0.91648769378662109 + Green Component + 0.91671288013458252 + Red Component + 0.91654461622238159 + + Cursor Color + + Blue Component + 0.91648769378662109 + Green Component + 0.91671288013458252 + Red Component + 0.91654461622238159 + + Cursor Text Color + + Blue Component + 0.0 + Green Component + 0.0 + Red Component + 0.0 + + Foreground Color + + Blue Component + 0.93115901947021484 + Green Component + 0.92142927646636963 + Red Component + 0.90730977058410645 + + Selected Text Color + + Blue Component + 0.93115901947021484 + Green Component + 0.92142927646636963 + Red Component + 0.90730977058410645 + + Selection Color + + Blue Component + 0.47096589207649231 + Green Component + 0.41462835669517517 + Red Component + 0.30659490823745728 + + +