Merge pull request #99 from benknoble/dev-1.2

Version 1.2!

.gitmodules

@@ -7,12 +7,6 @@
 [submodule "vim/bundle/vim-airline-themes"]
 	path = vim/bundle/vim-airline-themes
 	url = https://github.com/vim-airline/vim-airline-themes
-[submodule "vim/bundle/vim-auto-pairs"]
-	path = vim/bundle/vim-auto-pairs
-	url = git://github.com/jiangmiao/auto-pairs.git
-[submodule "vim/bundle/vim-ctrlp"]
-	path = vim/bundle/vim-ctrlp
-	url = https://github.com/ctrlpvim/ctrlp.vim.git
 [submodule "vim/bundle/vim-fugitive"]
 	path = vim/bundle/vim-fugitive
 	url = https://github.com/tpope/vim-fugitive
@@ -22,9 +16,24 @@
 [submodule "vim/bundle/vim-syntastic"]
 	path = vim/bundle/vim-syntastic
 	url = https://github.com/vim-syntastic/syntastic.git
-[submodule "vim/bundle/vim-windowswap"]
-	path = vim/bundle/vim-windowswap
-	url = https://github.com/wesQ3/vim-windowswap.git
 [submodule "vim/bundle/vim-winresizer"]
 	path = vim/bundle/vim-winresizer
 	url = https://github.com/simeji/winresizer.git
+[submodule "vim/bundle/vim-undotree"]
+	path = vim/bundle/vim-undotree
+	url = https://github.com/mbbill/undotree
+[submodule "vim/bundle/vim-markology"]
+	path = vim/bundle/vim-markology
+	url = https://github.com/jeetsukumaran/vim-markology
+[submodule "vim/bundle/vim-surround"]
+	path = vim/bundle/vim-surround
+	url = https://github.com/tpope/vim-surround
+[submodule "vim/bundle/vim-commentary"]
+	path = vim/bundle/vim-commentary
+	url = https://github.com/tpope/vim-commentary
+[submodule "vim/bundle/vim-clam"]
+	path = vim/bundle/vim-clam
+	url = https://github.com/benknoble/clam.vim.git
+[submodule "vim/bundle/vim-auto-origami"]
+	path = vim/bundle/vim-auto-origami
+	url = https://github.com/benknoble/vim-auto-origami

bash/aliases.bash

@@ -29,3 +29,4 @@ alias brewclean="$brewscripts/cleanup.sh"   # Clean up brew
 alias brewupdate="$brewscripts/update.sh"   # Update brew
 alias today='date -j +"%e %B %Y"'           # A format of the date
 alias battery='pmset -g batt'               # Display battery info
+alias lvim='vim -c ''"normal '"'0"'"'       # Start vim with it's last cursor position

brew/brewlist

@@ -2,9 +2,11 @@ archey
 autoconf
 automake
 bash
+brew-cask-completion
 cairo
 coreutils
 cowsay
+ctags
 figlet
 findutils
 fontconfig
@@ -17,6 +19,7 @@ git
 glib
 gmp
 gnu-sed
+hub
 isl
 jpeg
 libffi
@@ -28,6 +31,7 @@ libtiff
 libtool
 libyaml
 lolcat
+make
 moreutils
 mpfr
 nethack

docs/aliases.md

@@ -101,3 +101,7 @@ accessed with `<F1>`.
 **`battery`**
 
 *Display battery information.* Don't die!
+
+**`lvim`**
+
+*Open your last vim position.* Because you needed *another* way to invoke vim.

docs/features.md

@@ -141,9 +141,8 @@ Here's the quick list:
 
 ### Vimrc
 
-*Starts a lot of arguments.* Well, not too many. Like, I'm not stupid enough not
-to not `set nocompatible`. Read the full file for all the features. Here's a
-quick look.
+*Starts a lot of arguments.* Well, not too many. Like, I'm smart enough to `set
+nocompatible`. Read the full file for all the features. Here's a quick look.
 
 - `<Leader> = <Space>`
 
@@ -166,7 +165,11 @@ them all.
 
 - Save with `<Leader>s`.
 
-- Reload vimrc with `<F6>` or `:Reload`.
+- Quit with `<Leader>q`.
+
+- And do *all* the window things with a quick `<Leader>w`!
+
+- Reload vimrc with `<F5>` or `:Reload`.
 
 - Use the `Man` plugin! Finally, browse man pages from Vim.
 

docs/installed.md

@@ -32,13 +32,16 @@ Quick list:
 
 - Airline
   - Airline themes
-- Auto Pairs
-- Ctrl P
+- Auto Origami
+- Commentary
+- Clam
 - Fugitive
 - Invader
+- Markology
 - Pathogen
+- Surround
 - Syntastic
-- Windowswap
+- Undotree
 - Winresizer
 
 If you want links to the github repos that contain these plugins, you can check

docs/tree.md

@@ -58,18 +58,33 @@
 │   └── makesymlinks.sh
 ├── update.sh
 ├── vim
+│   ├── after
+│   │   └── ftplugin
 │   ├── autoload
 │   ├── bundle
 │   │   ├── vim-airline
 │   │   ├── vim-airline-themes
-│   │   ├── vim-auto-pairs
-│   │   ├── vim-ctrlp
+│   │   ├── vim-auto-origami
+│   │   ├── vim-clam
+│   │   ├── vim-commentary
 │   │   ├── vim-fugitive
 │   │   ├── vim-invader
+│   │   ├── vim-markology
 │   │   ├── vim-pathogen
+│   │   ├── vim-surround
 │   │   ├── vim-syntastic
-│   │   ├── vim-windowswap
+│   │   ├── vim-undotree
 │   │   └── vim-winresizer
+│   ├── ftplugin
+│   │   ├── c.vim
+│   │   ├── gitcommit.vim
+│   │   ├── help.vim
+│   │   ├── markdown.vim
+│   │   ├── sh.vim
+│   │   ├── text.vim
+│   │   └── vim.vim
+│   ├── plugin
+│   │   └── grep-operator.vim
 │   └── spell
 │       ├── en.utf-8.add
 │       └── en.utf-8.add.spl

vim/after/ftplugin/man.vim

@@ -0,0 +1,6 @@
+" Vim filetype plugin
+" Language              Man
+" Maintainer            Ben Knoble <ben.knoble@gmail.com>
+
+" Don't show fancy whitespace
+setlocal nolist

vim/ftplugin/c.vim

@@ -0,0 +1,9 @@
+" Vim filetype plugin
+" Language              C
+" Maintainer            Ben Knoble <ben.knoble@gmail.com>
+
+" Add system tags
+setlocal tags+=~/.sys_c_tags
+
+" Rebuild tags
+nnoremap <buffer> <LocalLeader>tr :!ctags --extra=+f -R *<CR><CR>

vim/ftplugin/gitcommit.vim

@@ -0,0 +1,6 @@
+" Vim filetype plugin
+" Language              Git commit file
+" Maintainer            Ben Knoble <ben.knoble@gmail.com>
+
+" Spell check on for commit messages
+setlocal spell spelllang=en_us

vim/ftplugin/help.vim

@@ -0,0 +1,6 @@
+" Vim filetype plugin
+" Language              Help
+" Maintainer            Ben Knoble <ben.knoble@gmail.com>
+
+" Spell check off, by default
+setlocal nospell

vim/ftplugin/markdown.vim

@@ -0,0 +1,28 @@
+" Vim filetype plugin
+" Language              Markdown
+" Maintainer            Ben Knoble <ben.knoble@gmail.com>
+
+" Wrap at 80 characters
+setlocal textwidth=80
+" Spell check on
+setlocal spell spelllang=en_us
+
+function! UnderlineHeading(level)
+  if a:level == 1
+    normal! yypVr=
+  elseif a:level == 2
+    normal! yypVr-
+  else
+    execute "normal! I### "
+  endif
+endfunction
+
+nnoremap <buffer> <LocalLeader>u1 :call UnderlineHeading(1)<CR>
+nnoremap <buffer> <LocalLeader>u2 :call UnderlineHeading(2)<CR>
+nnoremap <buffer> <LocalLeader>u3 :call UnderlineHeading(3)<CR>
+
+onoremap <buffer> ih= :<C-u>execute "normal! ?^==\\+$\r:nohlsearch\rkvg_"<CR>
+onoremap <buffer> ih- :<C-u>execute "normal! ?^--\\+$\r:nohlsearch\rkvg_"<CR>
+onoremap <buffer> i#1 :<C-u>execute "normal! ?^#\\s.?e\r:nohlsearch\rvg_"<CR>
+onoremap <buffer> i#2 :<C-u>execute "normal! ?^##\\s.?e\r:nohlsearch\rvg_"<CR>
+onoremap <buffer> i#3 :<C-u>execute "normal! ?^###\\s.?e\r:nohlsearch\rvg_"<CR>

vim/ftplugin/sh.vim

@@ -0,0 +1,8 @@
+" Vim filetype plugin
+" Language              [ba]sh script
+" Maintainer            Ben Knoble <ben.knoble@gmail.com>
+
+" Wrap at 80 characters
+setlocal textwidth=80
+" Indent two spaces
+setlocal shiftwidth=2 softtabstop=2

vim/ftplugin/text.vim

@@ -0,0 +1,8 @@
+" Vim filetype plugin
+" Language              Text
+" Maintainer            Ben Knoble <ben.knoble@gmail.com>
+
+" Wrap at 78 characters
+setlocal textwidth=78
+" Spell check on, by default
+setlocal spell spelllang=en_us

vim/ftplugin/vim.vim

@@ -0,0 +1,6 @@
+" Vim filetype plugin
+" Language              Vim script
+" Maintainer            Ben Knoble <ben.knoble@gmail.com>
+
+" Indent two spaces
+setlocal shiftwidth=2 softtabstop=2

vim/plugin/grep-operator.vim

@@ -0,0 +1,21 @@
+nnoremap <Leader>g :set operatorfunc=<SID>GrepOperator<CR>g@
+vnoremap <Leader>g :<C-u>call <SID>GrepOperator(visualmode())<CR>
+
+function! s:GrepOperator(type)
+  let s:saved_unnamed_register = @@
+
+  if a:type ==# 'v'
+    execute "normal! `<v`>y"
+  elseif a:type ==# 'char'
+    execute "normal! `[v`]y"
+  else
+    return
+  endif
+
+  silent execute "grep! -R " . shellescape(@@) . " ."
+  redraw!
+  copen
+
+  let @@ = s:saved_unnamed_register
+  unlet s:saved_unnamed_register
+endfunction

vim/spell/en.utf-8.add

@@ -15,3 +15,9 @@ Drow
 flayers
 Jiminy
 formulae
+Montpellier
+UNC
+advisors
+advisor
+identifiably
+transformative