Update vim stuff

aliases

@@ -129,6 +129,12 @@ alias vs='vagrant ssh'
 alias vu='vagrant up'
 alias vimrc='vim ~/.vimrc'
 alias weather='curl wttr.in/toronto'
+alias yt-download-1080='youtube-dl.exe -f "137+140" -o "%(upload_date)s-%(title)s-youtube-%(id)s.%(ext)s" '
+alias yt-download-720='youtube-dl.exe -f "136+140" -o "%(upload_date)s-%(title)s-youtube-%(id)s.%(ext)s" '
+alias tw-download-60='youtube-dl.exe -f "1080p60" -o "%(upload_date)s-%(title)s-twitch-%(id)s.%(ext)s" '
+alias tw-download-720='youtube-dl.exe -f "720p-1" -o "%(upload_date)s-%(title)s-twitch-%(id)s.%(ext)s" '
+alias tw-download-4k='youtube-dl.exe -f "2160p" -o "%(upload_date)s-%(title)s-twitch-%(id)s.%(ext)s" '
+alias tw-download='youtube-dl.exe -f "1080p" -o "%(upload_date)s-%(title)s-twitch-%(id)s.%(ext)s" '
 
 # Git
 
@@ -160,6 +166,7 @@ alias gau='git add --update'
 alias gb='git branch -v'
 alias gbd='git branch -D'
 alias gbl='git branch --all'
+alias gblm='git blame -wMC'
 alias gbm='git branch -m'
 alias gbr='git branch -rv'
 alias gc='git commit'
@@ -177,6 +184,7 @@ alias gcpc='git cherry-pick --continue'
 alias gcps='git cherry-pick -n'
 alias gd='git diff'
 alias gdc='git diff --cached'
+alias gdcc='git diff --cached -w'
 alias gdm='git diff master'
 alias gds='git diff --stat=160,120'
 alias gdw='git diff --color-words'
@@ -242,6 +250,7 @@ alias grmr='git rm -r'
 alias grp='git reset -p'
 alias gsnapshot='git stash save "snapshot: $(date)" && git stash apply "stash@{0}"'
 alias gsh='git show'
+alias gshh='git show -w'
 alias gs='git stash'
 alias gsk='git stash -k -u'
 alias gss='git stash save'

vim/colors/campo-dark-green.vim

@@ -23,7 +23,8 @@ if has('termguicolors')
   let s:text = "cbc5b0"
 
   let s:foreground = s:text
-  let s:background = "132f32"
+  "let s:background = "132f32"
+  let s:background = "05353d"
   let s:selection = "546e7a"
   let s:line = "034a4a"
   let s:bad_spelling = "ee877d"

vim/spell/en.utf-8.add

@@ -192,4 +192,12 @@ nootropics
 teleportation
 teleportations
 codiing
-SET
+structs
+DVI
+HDMI
+PCI
+GPUs
+pushbuffer
+DirectX
+DLLs
+NVidia

vim/templates/c_header_notice

@@ -4,3 +4,28 @@
   Creator: Michael Campagnaro
   Notice: (C) Copyright $year by Jelly Pixel, Inc. All Rights Reserved.
   ================================================================================================*/
+
+// -------------------------------------------------------------------------------------------------
+// Defines
+// -------------------------------------------------------------------------------------------------
+
+// -------------------------------------------------------------------------------------------------
+// Globals
+// -------------------------------------------------------------------------------------------------
+
+// -------------------------------------------------------------------------------------------------
+// Structs
+// -------------------------------------------------------------------------------------------------
+
+// -------------------------------------------------------------------------------------------------
+// Macros
+// -------------------------------------------------------------------------------------------------
+
+// -------------------------------------------------------------------------------------------------
+// Private API
+// -------------------------------------------------------------------------------------------------
+
+// -------------------------------------------------------------------------------------------------
+// Public API
+// -------------------------------------------------------------------------------------------------
+

vimrc

@@ -60,7 +60,7 @@ Plug 'vim-scripts/AnsiEsc.vim'
 Plug 'embear/vim-localvimrc'
 Plug 'tpope/vim-obsession' " Continuously updated session files
 Plug 'tpope/vim-fugitive' " Git wrapper
-Plug 'tpope/vim-classpath' " TODO: still need this?
+" Plug 'tpope/vim-classpath' " For Java
 Plug 'junegunn/goyo.vim' " Distraction-free mode with centered buffer
 Plug 'fedorenchik/VimCalc3' " A calculator inside vim
 
@@ -69,7 +69,6 @@ if IsWindows()
 endif
 
 Plug 'itchyny/vim-cursorword' " Underlines the word under the cursor
-Plug 'itchyny/thumbnail.vim' " View open buffers in a Chrome-inspired thumbnail layout
 " Google Calendar - :Calendar, :Calendar <year> <m#> <d#>, :Calendar -view=year (-split=veritcal -width=<n>)
 " :Calendar -view=day, :Calendar -first_day=monday
 Plug 'itchyny/calendar.vim'
@@ -163,6 +162,7 @@ Plug 'peterhoeg/vim-qml'
 
 " Markdown
 Plug 'tpope/vim-markdown'
+"Plug 'vim-pandoc/vim-pandoc-syntax'
 
 " C++
 Plug 'bfrg/vim-cpp-enhanced-highlight'
@@ -205,7 +205,7 @@ set incsearch " Highlight matches as you type
 set hlsearch " Highlight matches
 set dictionary+=/usr/share/dict/words
 "set clipboard=unnamed " yank and paste with the system clipboard
-set nonumber
+set number
 " make searches case-sensitive only if they contain upper-case characters
 set ignorecase smartcase
 set visualbell " No bell sounds
@@ -232,8 +232,9 @@ set scrolloff=3
 
 " Store temporary files in a central spot
 set backup
-set directory=$HOME/tmp// " For swap files
+set backupcopy=yes
-set backupdir=$HOME/tmp//
+set directory=X://tmp//vim// " For swap files
+set backupdir=X://tmp//vim//
 :au BufWritePre * let &bex = '.' . strftime("%Y-%m-%d-%T") . '.bak'
 set writebackup
 
@@ -298,6 +299,7 @@ imap <right> <nop>
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " CUSTOM AUTOCMDS
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
 augroup campoCmds
   " Clear all autocmds in the group
   autocmd!
@@ -455,8 +457,9 @@ vnoremap p "_dP
 nnoremap <leader>pp :silent !open -a Marked.app '%:p'<cr>
 
 " Switch between C++ source and header files
-map <leader>v :e %:p:s,.h$,.X123X,:s,.c$,.h,:s,.X123X$,.c,<CR>
+map <leader>v :e %:p:s,.h$,.X123X,:s,.cpp$,.h,:s,.X123X$,.cpp,<CR>
-map <leader>vv :e %:p:s,.h$,.X123X,:s,.cpp$,.h,:s,.X123X$,.cpp,<CR>
+"map <leader>vv :e %:p:s,.h$,.X123X,:s,.c$,.h,:s,.X123X$,.c,<CR>
+"map <leader>vvv :e %:p:s,.h$,.X123X,:s,.cc$,.h,:s,.X123X$,.cc,<CR>
 
 "////////////////////////////////////////////////////////////////
 " QUICKLY OPEN C++ SOURCE OR HEADER FILE
@@ -546,8 +549,9 @@ let g:syntastic_check_on_wq = 0
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " GIT
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-map <leader>gb :Gblame<cr>
+map <leader>gb :Gblame -w<cr>
-
+" Ignore whitespace changes; follow renames and copies.
+command! -bar -bang -nargs=* Blame :Gblame<bang> -wCM <args>
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " GIST VIM
@@ -671,9 +675,10 @@ set statusline=%<%f\ (%{&ft})\ %-4(%m%)%=%-19(%3l,%02c%03V%)
 " COLORS
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
-" alternative dark theme: 'campo-dark'
 let g:campo_theme_use_rainbow_parens = 1
-let s:dark_theme = 'campo-dark-green'
+"let s:dark_theme = 'campo-dark-green'
+let s:dark_theme = 'campo-flux-dark-green'
+"let s:dark_theme = 'campo-dark'
 let s:light_theme = 'campo-light'
 
 execute "autocmd ColorScheme " . s:dark_theme . " call ReloadRainbow()"