Move from vim to neovim

7 files changed, 64 insertions, 39 deletions

diff --git a/README.md b/README.md
index 517df4f..a58f692 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1 @@
-# Setup
-Now that I use Neovim exclusively, this has become my vim repo that I call when I want to install vim on a remote machine.
-```
-git clone https://github.com/thornycrackers/.vim.git && cd .vim && make install
-```
-
+# Neovim Setup
diff --git a/backups/.gitignore b/backups/.gitignore
deleted file mode 100644
index d6b7ef3..0000000
--- a/backups/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/init.vim b/init.vim
new file mode 100644
index 0000000..1556676
--- /dev/null
+++ b/init.vim
@@ -0,0 +1,54 @@
+"-----------------------------------------------------------------------------------------------------------------------
+" Plugins
+"----------------------------------------------------------------------------------------------------------------------
+call plug#begin('~/.config/nvim/plugged')
+
+Plug 'gcmt/taboo.vim' " Rename Tabs
+Plug 'jremmen/vim-ripgrep' " Use ripgrep for search
+Plug 'FooSoft/vim-argwrap' " Wrap or unwrap arguments to functions
+Plug 'w0rp/ale' " Async linting
+Plug 'tpope/vim-commentary' " Better commenting commands
+Plug 'tpope/vim-fugitive' " Git integration with vim
+Plug 'tpope/vim-surround' " Helps with surrounding text
+Plug 'tpope/vim-repeat' " Enable Repeating of plugin maps
+Plug 'Thornycrackers-Forks/nord-vim' " Pretty colorscheme
+Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } " Autocomplete
+"Plug 'deoplete-plugins/deoplete-jedi' " Jedi integration with deoplete
+" can't find plugin right now
+Plug 'rbgrouleff/bclose.vim' " Ranger dep for neovim
+Plug 'francoiscabrol/ranger.vim'  " Ranger integration
+Plug 'nathanaelkane/vim-indent-guides' " Creates indent lines, makes code a bit easier to read
+Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' } " Install fzf
+Plug 'junegunn/fzf.vim' " fzf integration
+Plug 'eapache/rainbow_parentheses.vim' " Colored Brackets
+Plug 'saltstack/salt-vim' " Salt file plugin
+Plug 'Thornycrackers-Forks/vim-markdown' " Markdown highlighting
+Plug 'dkarter/bullets.vim' " Better bullet list handling
+Plug 'reedes/vim-pencil' " Writing utility
+Plug 'junegunn/goyo.vim' " Distraction Free writing
+Plug 'mattn/emmet-vim' " Html expansion plugin
+Plug 'majutsushi/tagbar' " Tagbar explorer
+Plug 'hashivim/vim-terraform' " Terraform plugin
+Plug 'godlygeek/tabular' " Formatting code
+Plug 'vim-scripts/camelcasemotion' " Additional word objects
+Plug 'LnL7/vim-nix' " Nix for vim
+Plug 'easymotion/vim-easymotion' " faster jumping
+
+" File Type Specific
+Plug 'ledger/vim-ledger' " Ledger plugin
+Plug 'python-mode/python-mode' " Python awesomeness in vim
+Plug 'chr4/nginx.vim' " nginx goodness
+Plug 'Glench/Vim-Jinja2-Syntax' " Jinja Syntax
+
+" My custom options
+Plug 'thornycrackers/vim-options'
+
+call plug#end()
+
+" These options don't work inside vim-options
+let g:ale_lint_on_text_changed = 'never'
+let g:ale_lint_on_enter = 0
+
+" Deoplete
+let g:deoplete#enable_at_startup = 1
+"-----------------------------------------------------------------------------------------------------------------------
diff --git a/install-plugins.sh b/install-plugins.sh
deleted file mode 100755
index 9885243..0000000
--- a/install-plugins.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# This script is simply for automating the downloading of the vim plugins
-echo "Installing Plugins"
-vim -i NONE -c PlugInstall -c quitall > /dev/null 2>&1
-echo "Done Installling Plugins"
diff --git a/install_plugins b/install_plugins
new file mode 100755
index 0000000..1eca5e0
--- /dev/null
+++ b/install_plugins
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+readonly PLUG_FILE="${HOME}/.config/nvim/autoload/plug.vim"
+readonly PLUG_URL="https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim"
+
+# Install plug if it doesn't exist
+[[ ! -f "${PLUG_FILE}" ]] && curl -fLo "${PLUG_FILE}" --create-dirs "${PLUG_URL}" &> /dev/null
+# Install neovim plugins
+nvim -i NONE -c PlugInstall -c quitall > /dev/null 2>&1
diff --git a/swap/.gitignore b/swap/.gitignore
deleted file mode 100644
index d6b7ef3..0000000
--- a/swap/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/vimrc b/vimrc
deleted file mode 100644
index 2f24c82..0000000
--- a/vimrc
+++ /dev/null
@@ -1,23 +0,0 @@
-" Plugins
-call plug#begin('~/.vim/plugged')
-Plug 'w0rp/ale' " Async linting
-Plug 'tpope/vim-commentary' " Better commenting commands
-Plug 'tpope/vim-fugitive' " Git integration with vim
-Plug 'tpope/vim-surround' " Helps with surrounding text
-Plug 'tpope/vim-repeat' " Enable Repeating of plugin maps
-Plug 'Thornycrackers-Forks/nord-vim' " Pretty colorscheme
-Plug 'francoiscabrol/ranger.vim'  " Ranger integration
-Plug 'ledger/vim-ledger' " Ledger plugin
-Plug 'python-mode/python-mode' " Python awesomeness in vim
-Plug 'chr4/nginx.vim' " nginx stuff
-Plug 'saltstack/salt-vim' " Salt file syntax
-Plug 'plasticboy/vim-markdown' " Markdown highlighting
-Plug 'nathanaelkane/vim-indent-guides' " Creates indent lines, makes code a bit easier to read
-Plug '/usr/bin/fzf' " fzf runtime path
-Plug 'junegunn/fzf.vim' " fzf plugin for quick file searching
-Plug 'vim-scripts/camelcasemotion' " Additional word objects
-Plug 'reedes/vim-pencil' " Writing utility
-Plug 'junegunn/goyo.vim' " Distraction Free writing
-
-Plug 'thornycrackers/vim-options' " Custom options
-call plug#end()