From 9c56342e6da86221ec839c6f467b397104472303 Mon Sep 17 00:00:00 2001
From: Nicole Tietz-Sokolskaya <me@ntietz.com>
Date: Thu, 6 Dec 2018 18:13:33 -0500
Subject: [PATCH] Update vim config

---
 .gitignore                  |  3 ++-
 nvim/.config/nvim/init.vim  | 22 +++++++++----------
 nvim/.config/nvim/plugs.vim | 44 +++----------------------------------
 3 files changed, 16 insertions(+), 53 deletions(-)

diff --git a/.gitignore b/.gitignore
index ef05ffe..80221ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 # we want to ignore swap files...
 *.swp
-
+Session.vim
+.netrwhist
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index 603c265..c0ce63e 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -7,33 +7,32 @@ map <C-n> :NERDTreeToggle<CR>
 " Display buffers in the tab line
 let g:airline#extensions#tabline#enabled = 1
 
-set mouse=a
+" Disable mouse input
+set mouse=
 
 " Keep context visible
 set scrolloff=2
 set sidescrolloff=0
 
+" Display our current line number and the offset of other lines
 set nu
 set relativenumber
 
+" Setup good wrapping so we don't wrap for most files and when we do, it's
+" pretty.
 set nowrap
-set linebreak " if we do wrap, do it at word boundaries
+set linebreak " wraps at word boundaries
 autocmd FileType markdown set wrap
 autocmd FileType tex set wrap
 
-" TODO: do I want these all?
+" Set tabbing to depth 2 and always use spaces.
 set tabstop=2
-set expandtab
-set shiftwidth=2
 set softtabstop=2
-set sw=2
+set shiftwidth=2
+set expandtab
+set smarttab
 set autoindent
 set smartindent
-set smarttab
-
-" TODO: do I want this?
-"set splitright
-"set splitbelow
 
 let g:vimwiki_list = [ {'path': '~/Code/ntietz/vimwiki'} ]
 
@@ -50,3 +49,4 @@ au CursorHoldI * checktime
 
 set wildignore +=*/tmp/*,*.pyc,*/__pycache__/*
 
+" TODO: add auto whitespace stripping
diff --git a/nvim/.config/nvim/plugs.vim b/nvim/.config/nvim/plugs.vim
index 8d025f9..a6f733d 100644
--- a/nvim/.config/nvim/plugs.vim
+++ b/nvim/.config/nvim/plugs.vim
@@ -17,59 +17,21 @@ Plug 'sheerun/vim-polyglot' " Automatic syntax highlighting
 " vimwiki
 Plug 'vimwiki/vimwiki'
 
+" TODO: pull out just the colorscheme I want to remove a dependency
 " add a ton of colorschemes to pick from
 Plug 'flazz/vim-colorschemes'
 
-" [submodule "bundle/vim-graphql"]
-" 	path = vim/.vim/bundle/vim-graphql
-" 	url = https://github.com/jparise/vim-graphql
-" [submodule "bundle/vim-elixir"]
-" 	path = vim/.vim/bundle/vim-elixir
-" 	url = https://github.com/elixir-lang/vim-elixir.git
-" [submodule "vim/.vim/bundle/alchemist"]
-" 	path = vim/.vim/bundle/alchemist
-" 	url = https://github.com/slashmili/alchemist.vim
-" [submodule "vim/.vim/bundle/vim-css-color"]
-" 	path = vim/.vim/bundle/vim-css-color
-" 	url = https://github.com/ap/vim-css-color
+Plug 'tpope/vim-obsession'
+
 " [submodule "vim/.vim/bundle/ctrlp"]
 " 	path = vim/.vim/bundle/ctrlp
 " 	url = https://github.com/ctrlpvim/ctrlp.vim
 "
 
 
-" Plug 'ap/vim-css-color' " Highlight hex colors
-" Plug 'autozimu/LanguageClient-neovim', { 'branch': 'next', 'do': 'bash install.sh' } " LSP
-" Plug 'christoomey/vim-tmux-navigator' " Navigate vim and tmux panes the same way
-" Plug 'dhruvasagar/vim-table-mode' " Easy markdown table editing
-" Plug 'easymotion/vim-easymotion' " Jump to characters
-" Plug 'haya14busa/incsearch.vim' " Improved searching
-" Plug 'iamcco/markdown-preview.vim' " Markdown preview
-" Plug 'iamcco/mathjax-support-for-mkdp' " Mathjax markdown
 " Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --bin' } " fzf binary
 " Plug 'junegunn/fzf.vim' " fzf vim plugin
-" Plug 'mattn/emmet-vim' " emmet HTML editing
-" Plug 'maxbrunsfeld/vim-yankstack' " Cycle through yanked items
-" Plug 'mileszs/ack.vim' " Search across files
-" Plug 'mtth/scratch.vim' " Scratchpad
-" Plug 'raimondi/delimitmate' " Auto-complete quotes, parens, etc.
-" Plug 'reasonml-editor/vim-reason-plus' " Reason syntax highlighting
-" Plug 'scrooloose/nerdcommenter' " Automatically comment lines
-" Plug 'scrooloose/nerdtree' " NERDTree
 " Plug 'shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins', 'commit': '865747efe41ea1d923758617d71e8e5b59da292e' } " Auto-completion
-" Plug 'sirver/ultisnips' " Snippet engine
-" Plug 'sjl/gundo.vim' " Visual undo tree
-" Plug 'slashmili/alchemist.vim' " Elixir support
-" Plug 'styled-components/vim-styled-components' " Styled-components highlighting
-" Plug 'terryma/vim-expand-region' " Expand visually selected region
-" Plug 'tomasr/molokai' " Colorscheme
-" Plug 'tpope/tpope-vim-abolish' " Abbreviation, Substitution, Coercion
-" Plug 'tpope/vim-endwise' " Auto-insert do/end
 " Plug 'tpope/vim-obsession' " Save and restore sessions
-" Plug 'tpope/vim-repeat' " Use . for more complex commands
-" Plug 'tpope/vim-surround' " Surrounding things in characters
-" Plug 'tpope/vim-unimpaired' " Simple mappings for transforming text
-" Plug 'vim-airline/vim-airline' " 'powerline'-like status bar
-" Plug 'wellle/targets.vim' " More text objects to operate on (edit next parens)
 call plug#end()