Finally diving in to an overhaul of my vimrc.Most of the previous versions of the vimrc was cargo-cultedfrom other places, and it works *just enough* to avoidbeing completely annoying, but I really just need totake some time and fix my own sloppiness.

.vimrc

@@ -1,33 +1,116 @@
-" When started as "evim", evim.vim will already have done these settings.
+"   ##################################################
-if v:progname =~? "evim"
+"   #################################################
-  finish
+"   ##                  ####                      ##
-endif
+"   ##                 ####  ####                ##
+"                     ####  ####
+"                    ####  ####
+"                   ####  ####
+"                  ####  ####
+"                 ####  ####
+"                ####  ####
+"               ####  ####
+"              ####  ####
+"             ####  ####                 ##
+"            ####  ########################
+"           ####  #########################
+"
+" Thurstylark's vimrc
+"
+" I apologise for the mess, I really haven't been paying attention lately...
 
-" Use Vim settings, rather than Vi settings (much better!).
-" This must be first, because it changes other options as a side effect.
-set nocompatible
 
-" allow backspacing over everything in insert mode
+
+"""""""""""
+" OPTIONS "
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+""
+"" Setup, preferences, general nesting, etc.
+""
+
+""""""""""""""""""""""""""""""""""
+"" Allow backspacing over everything in insert mode
 set backspace=indent,eol,start
 
-if has("vms")
-  set nobackup		" do not keep a backup file, use versions instead
-else
-  " Attempt to create ~/.vim/tmp and ~/.vim/undo
-  silent !mkdir -p ~/.vim/{tmp,undo} > /dev/null 2>&1 
-  set dir=~/.vim/tmp    " Set the swapfile location elsewhere to reduce breadcrumbs.
-  set backup		" keep a backup file (restore to previous version)
-  set backupdir=~/.vim/tmp " keep backup (.swp) files in a specific directory instead of the same dir as the file being edited
-  set undofile		" keep an undo file (undo changes after closing)
-  set undodir=~/.vim/undo " keep undo files in a specific directory instead of the same directory as the file
-endif
-set history=50		" keep 50 lines of command line history
-set ruler		" show the cursor position all the time
-set showcmd		" display incomplete commands
-set incsearch		" do incremental searching
 
-" For Win32 GUI: remove 't' flag from 'guioptions': no tearoff menu entries
+""""""""""""""""""""""""""""""""""
-" let &guioptions = substitute(&guioptions, "t", "", "g")
+"" Backup and Undo file location modification
+"
+" Instead of leaving files around everywhere when using vim, just
+"  put them in their own cache dir
+
+" Attempt to create ~/.vim/tmp and ~/.vim/undo
+"  If this fails (if they already exist, for
+"  example), it will do so silently.
+silent !mkdir -p ~/.vim/{tmp,undo} > /dev/null 2>&1 
+
+" Set the swapfile location to our custom cache dirs
+set dir=~/.vim/tmp
+
+" Keep a backup file
+set backup
+
+" Set the backup file location to our custom cache dirs
+set backupdir=~/.vim/tmp
+
+" Keep an undo file
+set undofile
+
+" Set the undo file location to our custom cache dirs
+set undodir=~/.vim/undo
+
+" keep 50 lines of command line history
+set history=50
+
+
+""""""""""""""""""""""""""""""""""
+"" Show the cursor position all the time
+set ruler
+
+
+""""""""""""""""""""""""""""""""""
+"" Display incomplete commands
+set showcmd
+
+
+""""""""""""""""""""""""""""""""""
+"" Do incremental searching
+set incsearch
+
+
+""""""""""""""""""""""""""""""""""
+"" Enable Mouse
+if has('mouse')
+  set mouse=a
+endif
+
+
+
+""""""""
+" KEYS "
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+""
+"" Modifications or additions to vim's keymap
+""
+
+""""""""""""""""""""""""""""""""""
+"" Insert(paste) mode toggle 
+""  Key: <F2>
+" 
+" When in Insert Mode, use <F2> to disable automatic indenting
+"  and some other automatic formatting things that tend
+"  to mess up 
+nnoremap <F2> :set invpaste paste?<CR>
+set pastetoggle=<F2>
+set showmode
+
+
+
+""""""""
+" TODO "
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+""
+"" Sections that need cleanup, commenting, and categorization
+""
 
 " Don't use Ex mode, use Q for formatting
 map Q gq
@@ -36,10 +119,6 @@ map Q gq
 " so that you can undo CTRL-U after inserting a line break.
 inoremap <C-U> <C-G>u<C-U>
 
-" In many terminal emulators the mouse works just fine, thus enable it.
-if has('mouse')
-  set mouse=a
-endif
 
 " Switch syntax highlighting on, when the terminal has colors
 " Also switch on highlighting the last used search pattern.
@@ -62,7 +141,7 @@ if has("autocmd")
   au!
 
   " For all text files set 'textwidth' to 78 characters.
-"  autocmd FileType text setlocal textwidth=78
+  "autocmd FileType text setlocal textwidth=78
 
   " When editing a file, always jump to the last known cursor position.
   " Don't do it when the position is invalid or when inside an event handler
@@ -94,34 +173,51 @@ if has('langmap') && exists('+langnoremap')
   " compatible).
   set langnoremap
 endif
+
+
 " Use W to call sudo to write a read-only file with elevated privileges
 command W :execute ':silent w !sudo tee % > /dev/null' | :edit!
 au BufRead /tmp/mutt-* set tw=72
 
-nnoremap <F2> :set invpaste paste?<CR>
-set pastetoggle=<F2>
-set showmode
 
-let g:vimwiki_list = [{
+
-  \ 'template_path': '$HOME/vimwiki/html-template',
+" Disable temporary wikis
-  \ 'template_default': 'index',
+let g:vimwiki_global_ext = 0
-  \ 'template_ext': '.html'}]
+
+
+" vim-markdown options
+let g:vim_markdown_frontmatter = 1
+let g:vim_markdown_toml_frontmatter = 1
+let g:vim_markdown_json_frontmatter = 1
+let g:vim_markdown_new_list_item_indent = 2
+let g:vim_markdown_no_extensions_in_markdown = 1
+let g:vim_markdown_autowrite = 1
+let g:vim_markdown_edit_url_in = 'tab'
+let g:vim_markdown_follow_anchor = 1
+let g:vim_markdown_toc_autofit = 1
+let g:vim_markdown_strikethrough = 1
+let g:vim_markdown_folding_disabled = 1
+
 
 " Show trailing whitespace 
 let c_space_errors = 1
 
+
 " Only use unix mode, and show DOS line endings as ^M
 " This can be disabled with :e ++ff=dos
 set fileformats=unix
 
+
 " Show line numbers
 set number
 highlight LineNr ctermfg=darkgrey
 highlight LineNr ctermbg=black
 
+
 " Tagbar options
 nmap <F8> :TagbarToggle<CR>
 
+
 " Functionally replace NERDTree
 map <silent> <C-E> :15Lexplore<CR>
 let g:netrw_browse_split = 4
@@ -132,15 +228,19 @@ let g:netrw_use_errorwindow = 0
 let g:netrw_usetab = 1
 let g:netrw_keepdir = 0
 
-"" Default to tree mode
+
+" Default to tree mode
 let g:netrw_liststyle=3
 
-"" Change directory to the current buffer when opening files.
+
+" Change directory to the current buffer when opening files.
 set autochdir
 
+
 " VCSCommand options
 let g:VCSCommandSplit = "vertical"
 
+
 " CSV Files auto-arrange
 aug CSV_Editing
 		au!
@@ -150,5 +250,6 @@ aug CSV_Editing
 		au InsertLeave *.csv :%ArrangeColumn!
 aug end
 
+
 " ttymouse explicit setting
 set ttymouse=sgr