20 files changed, 264 insertions, 3 deletions
diff --git a/.bashrc b/.bashrc
index 698684a..e8264f2 100644
--- a/.bashrc
+++ b/.bashrc
@@ -98,7 +98,7 @@ alias l='ls -CF'
 
 alias grep='grep --color=tty -d skip'
 
-alias vi=vim
+alias vi=nvim
 alias cp="cp -i"    #confirms before overwrite
 
 # Add an "alert" alias for long running commands.  Use like so:
@@ -125,7 +125,7 @@ if ! shopt -oq posix; then
   fi
 fi
 
-EDITOR=/usr/bin/vim
+export EDITOR=/usr/bin/nvim
 
 export PAGER='vimpager'
 alias less=$PAGER
diff --git a/.gitconfig b/.gitconfig
index b1635ce..85d6f84 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -10,5 +10,5 @@
 	graph1 = log --graph --full-history --all --color --pretty=tformat:"%x1b[31m%h%x09%x1b[32m%d%x1b[0m%x20%s%x20%x1b[33m(%an)%x1b[0m"
 	graph2 = log --graph --full-history --all --color --pretty=tformat:"%C(red)%h%C(reset)%x09%C(green)%d%C(reset)%C(bold)%s%C(reset)%C(yellow)(%an)%C(reset)"
 [core]
-	editor = vim
+	editor = nvim
 	excludesfile = /home/matt/.gitignore_global
diff --git a/linker.sh b/linker.sh
index a3a290a..7c4b382 100755
--- a/linker.sh
+++ b/linker.sh
@@ -33,3 +33,16 @@ fi
 ln -s "$DIR"/.gitconfig ~/.gitconfig
 ln -s "$DIR"/.gitignore_global ~/.gitignore_global
 
+# .config stuff
+cd ~
+if [[ ! -e .config ]] ; then
+    mkdir .config
+fi
+
+# Neovim
+cd .config
+if [[ -e nvim ]] ; then
+    cp -r nvim nvim.original
+fi
+ln -s "$DIR"/nvim ~/.config/nvim
+
diff --git a/nvim/.vim b/nvim/.vim
new file mode 120000
index 0000000..bdbaa8a
--- /dev/null
+++ b/nvim/.vim
@@ -0,0 +1 @@
+/home/matt/dotfiles/.vim
+\ No newline at end of file
diff --git a/nvim/bundle/Vundle.vim b/nvim/bundle/Vundle.vim
new file mode 160000
+Subproject f6cc06238d5ac888ddfc514f80392f44cb2e21a
diff --git a/nvim/bundle/ctrlp.vim b/nvim/bundle/ctrlp.vim
new file mode 160000
+Subproject 564176f01d7f3f7f8ab452ff4e1f5314de7b098
diff --git a/nvim/bundle/delimitMate b/nvim/bundle/delimitMate
new file mode 160000
+Subproject b5719054beebe0135c94f4711a06dc7588041f0
diff --git a/nvim/bundle/gruvbox b/nvim/bundle/gruvbox
new file mode 160000
+Subproject 127c9d14d4bac1bac31e328b835a8919a255789
diff --git a/nvim/bundle/nerdtree b/nvim/bundle/nerdtree
new file mode 160000
+Subproject e671e403dd1ec1da59f70605c73aaedb6cb0e63
diff --git a/nvim/bundle/previm b/nvim/bundle/previm
new file mode 160000
+Subproject e9967c225ddbcc67b45f6de7d3e2c5c656ef8fb
diff --git a/nvim/bundle/salt-vim b/nvim/bundle/salt-vim
new file mode 160000
+Subproject 5b15d379fbcbb84f82c6a345abc08cea9d374be
diff --git a/nvim/bundle/syntastic b/nvim/bundle/syntastic
new file mode 160000
+Subproject 48e8b0e9d2721f608fd1d1157c9388b2626cbdd
diff --git a/nvim/bundle/vim-airline b/nvim/bundle/vim-airline
new file mode 160000
+Subproject 46b0b6bf5a5cab3704bb8b7ba1b16b847006c57
diff --git a/nvim/bundle/vim-ansible-yaml b/nvim/bundle/vim-ansible-yaml
new file mode 160000
+Subproject 33643fc45b20e217e985436d005685dc8f476f0
diff --git a/nvim/bundle/vim-bufferline b/nvim/bundle/vim-bufferline
new file mode 160000
+Subproject 651fd010aa9613a4b8636a4af8a2db0d2280026
diff --git a/nvim/bundle/vim-commentary b/nvim/bundle/vim-commentary
new file mode 160000
+Subproject be79030b3e8c0ee3c5f45b4333919e4830531e8
diff --git a/nvim/bundle/vim-fugitive b/nvim/bundle/vim-fugitive
new file mode 160000
+Subproject 87c1bda4d5573185a1f79c42a919c4b62bc34c4
diff --git a/nvim/bundle/vim-gitgutter b/nvim/bundle/vim-gitgutter
new file mode 160000
+Subproject 1c034be0d31168c8f4770ef7b69adb67d00d6f3
diff --git a/nvim/colors/256_jungle.vim b/nvim/colors/256_jungle.vim
new file mode 100644
index 0000000..5a58587
--- /dev/null
+++ b/nvim/colors/256_jungle.vim
@@ -0,0 +1,102 @@
+" Vim color file - 256_jungle
+" Generated by http://bytefluent.com/vivify 2016-02-13
+set background=dark
+if version > 580
+	hi clear
+	if exists("syntax_on")
+		syntax reset
+	endif
+endif
+
+set t_Co=256
+let g:colors_name = "256_jungle"
+
+"hi IncSearch -- no settings --
+"hi WildMenu -- no settings --
+"hi SignColumn -- no settings --
+"hi Title -- no settings --
+"hi CTagsMember -- no settings --
+"hi CTagsGlobalConstant -- no settings --
+hi Normal guifg=#dadada guibg=#1c1c1c guisp=#1c1c1c gui=NONE ctermfg=253 ctermbg=234 cterm=NONE
+"hi CTagsImport -- no settings --
+"hi CTagsGlobalVariable -- no settings --
+"hi SpellRare -- no settings --
+"hi EnumerationValue -- no settings --
+"hi Float -- no settings --
+"hi CursorLine -- no settings --
+"hi Union -- no settings --
+"hi Question -- no settings --
+"hi WarningMsg -- no settings --
+"hi VisualNOS -- no settings --
+"hi DiffDelete -- no settings --
+"hi ModeMsg -- no settings --
+"hi CursorColumn -- no settings --
+"hi EnumerationName -- no settings --
+"hi MoreMsg -- no settings --
+"hi SpellCap -- no settings --
+"hi DiffChange -- no settings --
+"hi SpellLocal -- no settings --
+"hi DefinedName -- no settings --
+"hi MatchParen -- no settings --
+"hi LocalVariable -- no settings --
+"hi SpellBad -- no settings --
+"hi CTagsClass -- no settings --
+"hi Underlined -- no settings --
+"hi DiffAdd -- no settings --
+"hi clear -- no settings --
+hi SpecialComment guifg=#d78700 guibg=NONE guisp=NONE gui=NONE ctermfg=172 ctermbg=NONE cterm=NONE
+hi Typedef guifg=#d75f00 guibg=NONE guisp=NONE gui=NONE ctermfg=166 ctermbg=NONE cterm=NONE
+hi Folded guifg=#af5f87 guibg=NONE guisp=NONE gui=NONE ctermfg=132 ctermbg=NONE cterm=NONE
+hi PreCondit guifg=#767676 guibg=NONE guisp=NONE gui=NONE ctermfg=243 ctermbg=NONE cterm=NONE
+hi Include guifg=#767676 guibg=NONE guisp=NONE gui=NONE ctermfg=243 ctermbg=NONE cterm=NONE
+hi TabLineSel guifg=#8787d7 guibg=#303030 guisp=#303030 gui=NONE ctermfg=104 ctermbg=236 cterm=NONE
+hi StatusLineNC guifg=#a8a8a8 guibg=#4e4e4e guisp=#4e4e4e gui=NONE ctermfg=248 ctermbg=239 cterm=NONE
+hi NonText guifg=#8787ff guibg=NONE guisp=NONE gui=NONE ctermfg=105 ctermbg=NONE cterm=NONE
+hi DiffText guifg=#d700ff guibg=#808080 guisp=#808080 gui=NONE ctermfg=165 ctermbg=8 cterm=NONE
+hi ErrorMsg guifg=#d70000 guibg=#8a8a8a guisp=#8a8a8a gui=NONE ctermfg=160 ctermbg=245 cterm=NONE
+hi Ignore guifg=#ffd75f guibg=NONE guisp=NONE gui=NONE ctermfg=221 ctermbg=NONE cterm=NONE
+hi Debug guifg=#d78700 guibg=NONE guisp=NONE gui=NONE ctermfg=172 ctermbg=NONE cterm=NONE
+hi PMenuSbar guifg=#9e9e9e guibg=#121212 guisp=#121212 gui=NONE ctermfg=247 ctermbg=233 cterm=NONE
+hi Identifier guifg=#afaf00 guibg=NONE guisp=NONE gui=NONE ctermfg=142 ctermbg=NONE cterm=NONE
+hi SpecialChar guifg=#d78700 guibg=NONE guisp=NONE gui=NONE ctermfg=172 ctermbg=NONE cterm=NONE
+hi Conditional guifg=#d75f00 guibg=NONE guisp=NONE gui=NONE ctermfg=166 ctermbg=NONE cterm=NONE
+hi StorageClass guifg=#d75f00 guibg=NONE guisp=NONE gui=NONE ctermfg=166 ctermbg=NONE cterm=NONE
+hi Todo guifg=#d70087 guibg=NONE guisp=NONE gui=NONE ctermfg=162 ctermbg=NONE cterm=NONE
+hi Special guifg=#d78700 guibg=NONE guisp=NONE gui=NONE ctermfg=172 ctermbg=NONE cterm=NONE
+hi LineNr guifg=#808080 guibg=#121212 guisp=#121212 gui=NONE ctermfg=8 ctermbg=233 cterm=NONE
+hi StatusLine guifg=#00afff guibg=#4e4e4e guisp=#4e4e4e gui=NONE ctermfg=39 ctermbg=239 cterm=NONE
+hi Label guifg=#d75f00 guibg=NONE guisp=NONE gui=NONE ctermfg=166 ctermbg=NONE cterm=NONE
+hi PMenuSel guifg=#5f87ff guibg=#080808 guisp=#080808 gui=NONE ctermfg=69 ctermbg=232 cterm=NONE
+hi Search guifg=#af005f guibg=NONE guisp=NONE gui=NONE ctermfg=125 ctermbg=NONE cterm=NONE
+hi Delimiter guifg=#d78700 guibg=NONE guisp=NONE gui=NONE ctermfg=172 ctermbg=NONE cterm=NONE
+hi Statement guifg=#d78700 guibg=NONE guisp=NONE gui=NONE ctermfg=172 ctermbg=NONE cterm=NONE
+hi Comment guifg=#585858 guibg=NONE guisp=NONE gui=NONE ctermfg=240 ctermbg=NONE cterm=NONE
+hi Character guifg=#5fd700 guibg=NONE guisp=NONE gui=NONE ctermfg=76 ctermbg=NONE cterm=NONE
+hi Number guifg=#5fd700 guibg=NONE guisp=NONE gui=NONE ctermfg=76 ctermbg=NONE cterm=NONE
+hi Boolean guifg=#d78700 guibg=NONE guisp=NONE gui=NONE ctermfg=172 ctermbg=NONE cterm=NONE
+hi Operator guifg=#d75f00 guibg=NONE guisp=NONE gui=NONE ctermfg=166 ctermbg=NONE cterm=NONE
+hi TabLineFill guifg=#4e4e4e guibg=#4e4e4e guisp=#4e4e4e gui=NONE ctermfg=239 ctermbg=239 cterm=NONE
+hi Define guifg=#767676 guibg=NONE guisp=NONE gui=NONE ctermfg=243 ctermbg=NONE cterm=NONE
+hi Function guifg=#afaf00 guibg=NONE guisp=NONE gui=NONE ctermfg=142 ctermbg=NONE cterm=NONE
+hi FoldColumn guifg=#af5f87 guibg=NONE guisp=NONE gui=NONE ctermfg=132 ctermbg=NONE cterm=NONE
+hi PreProc guifg=#767676 guibg=NONE guisp=NONE gui=NONE ctermfg=243 ctermbg=NONE cterm=NONE
+hi Visual guifg=#a8a8a8 guibg=#444444 guisp=#444444 gui=NONE ctermfg=248 ctermbg=238 cterm=NONE
+hi VertSplit guifg=#4e4e4e guibg=#4e4e4e guisp=#4e4e4e gui=NONE ctermfg=239 ctermbg=239 cterm=NONE
+hi Exception guifg=#d75f00 guibg=NONE guisp=NONE gui=NONE ctermfg=166 ctermbg=NONE cterm=NONE
+hi Keyword guifg=#d75f00 guibg=NONE guisp=NONE gui=NONE ctermfg=166 ctermbg=NONE cterm=NONE
+hi Type guifg=#d75f00 guibg=NONE guisp=NONE gui=NONE ctermfg=166 ctermbg=NONE cterm=NONE
+hi Cursor guifg=#dadada guibg=#5f00ff guisp=#5f00ff gui=NONE ctermfg=253 ctermbg=57 cterm=NONE
+hi Error guifg=NONE guibg=#ff0000 guisp=#ff0000 gui=NONE ctermfg=NONE ctermbg=196 cterm=NONE
+hi PMenu guifg=#5f5fd7 guibg=#121212 guisp=#121212 gui=NONE ctermfg=62 ctermbg=233 cterm=NONE
+hi SpecialKey guifg=#5faf00 guibg=NONE guisp=NONE gui=NONE ctermfg=70 ctermbg=NONE cterm=NONE
+hi Constant guifg=#5fd700 guibg=NONE guisp=NONE gui=NONE ctermfg=76 ctermbg=NONE cterm=NONE
+hi Tag guifg=#d78700 guibg=NONE guisp=NONE gui=NONE ctermfg=172 ctermbg=NONE cterm=NONE
+hi String guifg=#5fd700 guibg=NONE guisp=NONE gui=NONE ctermfg=76 ctermbg=NONE cterm=NONE
+hi PMenuThumb guifg=#a8a8a8 guibg=#121212 guisp=#121212 gui=NONE ctermfg=248 ctermbg=233 cterm=NONE
+hi Repeat guifg=#d75f00 guibg=NONE guisp=NONE gui=NONE ctermfg=166 ctermbg=NONE cterm=NONE
+hi Directory guifg=#5f00ff guibg=#e4e4e4 guisp=#e4e4e4 gui=NONE ctermfg=57 ctermbg=254 cterm=NONE
+hi Structure guifg=#d75f00 guibg=NONE guisp=NONE gui=NONE ctermfg=166 ctermbg=NONE cterm=NONE
+hi Macro guifg=#767676 guibg=NONE guisp=NONE gui=NONE ctermfg=243 ctermbg=NONE cterm=NONE
+hi TabLine guifg=#8a8a8a guibg=#4e4e4e guisp=#4e4e4e gui=NONE ctermfg=245 ctermbg=239 cterm=NONE
+hi cursorim guifg=#192224 guibg=#536991 guisp=#536991 gui=NONE ctermfg=235 ctermbg=60 cterm=NONE
+hi underline guifg=#afafff guibg=NONE guisp=NONE gui=NONE ctermfg=147 ctermbg=NONE cterm=NONE
diff --git a/nvim/init.vim b/nvim/init.vim
new file mode 100644
index 0000000..2879f44
--- /dev/null
+++ b/nvim/init.vim
@@ -0,0 +1,145 @@
+" BEGIN VUNDLE CONFIG
+filetype off
+set rtp+=~/.vim/bundle/Vundle.vim
+call vundle#begin()
+
+" Vundle, a plugin manager for vim
+Plugin 'gmarik/Vundle.vim'
+
+" gruvbox colorscheme
+Plugin 'morhetz/gruvbox'
+
+" Syntastic syntax checking
+" Install developer tools for syntax checking
+" Install flake8 for Python PEP8
+Plugin 'scrooloose/syntastic'
+
+" File tree
+" Use :NERDTree to open the tree
+Plugin 'scrooloose/nerdtree'
+
+" Fancy statusbar
+" Powerline fonts recommended
+Plugin 'bling/vim-airline'
+Plugin 'bling/vim-bufferline'
+
+" Git integration
+Plugin 'tpope/vim-fugitive'
+Plugin 'airblade/vim-gitgutter'
+
+" CtrlP fuzzy search
+" Use Ctrl+P to search a project for a file
+Plugin 'kien/ctrlp.vim'
+
+" Ansible syntax and indentation
+Plugin 'chase/vim-ansible-yaml'
+
+" Salt syntax and indentation
+Plugin 'saltstack/salt-vim'
+
+" Automatically close parentheses, etc.
+Plugin 'Raimondi/delimitMate'
+
+" Hotkeys for commenting/uncommenting
+" g-c-c to toggle a line, g-c-Motion to toggle a motion
+Plugin 'tpope/vim-commentary'
+
+" Markdown Preview
+" Use :PrevimOpen while editing Markdown to open a live preview
+Plugin 'kannokanno/previm'
+
+call vundle#end()
+filetype plugin indent on
+" END VUNDLE CONFIG
+
+" Allow the use of project-specific vimrc
+set exrc
+set secure
+
+" Color scheme
+let g:gruvbox_italic=1
+colorscheme gruvbox
+set background=dark
+syntax on
+
+" Sane defaults for indentation
+" set expandtab
+set softtabstop=4
+set shiftwidth=4
+set autoindent
+
+" Show line numbers
+set number
+
+" Highlight current line
+" set cursorline
+
+" Highlight columns 80 and 120
+"set colorcolumn=80,120
+
+" Allow mouse
+set mouse=a
+
+" Spell check
+set spell
+set spellsuggest=best,10
+
+" Wrap searches
+set wrapscan
+let mapleader = ","
+
+" Smart search case sensitivity
+set ignorecase
+set smartcase
+
+" Show completions when using commands like :edit
+set wildmenu
+
+" Allow switching buffer even if current buffer contains unsaved changes
+set hidden
+
+" Disable scratch preview window
+set completeopt-=preview
+
+" Use comma as the leader key
+let mapleader=','
+
+" Use Alt+hjkl to switch between windows
+nmap <silent> <A-h> :wincmd h<CR>
+nmap <silent> <A-j> :wincmd j<CR>
+nmap <silent> <A-k> :wincmd k<CR>
+nmap <silent> <A-l> :wincmd l<CR>
+
+" Airline tweaks
+" Always show statusline
+set laststatus=2
+" Use Powerline fonts
+let g:airline_powerline_fonts = 1
+
+" CtrlP tweaks
+" keybinds
+let g:ctrlp_map = '<c-p>'
+let g:ctrlp_cmd = 'CtrlP'
+
+" Command to open browser for Markdown Preview
+let g:previm_open_cmd = 'firefox'
+
+" Syntastic Tweaks
+" Display a statusline message if errors are detected
+let g:syntastic_stl_format = '%E{Errors: %e}%B{,}%W{Warnings: %w}'
+set statusline+=%#warningmsg#
+set statusline+=%{SyntasticStatuslineFlag()}
+set statusline+=%*
+" Automatically populate the list of error -> line number mappings
+" (Disabled by default for compatibility)
+let g:syntastic_always_populate_loc_list = 1
+" Check files when they are opened
+let g:syntastic_check_on_open = 1
+" Don't check files when they are closed
+let g:syntastic_check_on_wq = 0
+
+" GitGutter tweaks
+" Display diff markers between index and HEAD
+let g:gitgutter_diff_args = ' HEAD '
+
+set clipboard+=unnamedplus