From e61253c79de4e19acbf42517a7ba0984305df2f5 Mon Sep 17 00:00:00 2001 From: Michael Campagnaro Date: Thu, 15 Mar 2018 14:39:50 -0400 Subject: [PATCH] Update vim stuff --- aliases | 9 +++++++++ vim/colors/campo-dark-green.vim | 3 ++- vim/spell/en.utf-8.add | 10 +++++++++- vim/spell/en.utf-8.add.spl | Bin 2269 -> 2369 bytes vim/templates/c_header_notice | 25 +++++++++++++++++++++++++ vimrc | 27 ++++++++++++++++----------- 6 files changed, 61 insertions(+), 13 deletions(-) diff --git a/aliases b/aliases index 2d5962e..d5358cf 100644 --- a/aliases +++ b/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' diff --git a/vim/colors/campo-dark-green.vim b/vim/colors/campo-dark-green.vim index 8b337cc..c27bf40 100644 --- a/vim/colors/campo-dark-green.vim +++ b/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" diff --git a/vim/spell/en.utf-8.add b/vim/spell/en.utf-8.add index 75177df..4140f14 100644 --- a/vim/spell/en.utf-8.add +++ b/vim/spell/en.utf-8.add @@ -192,4 +192,12 @@ nootropics teleportation teleportations codiing -SET +structs +DVI +HDMI +PCI +GPUs +pushbuffer +DirectX +DLLs +NVidia diff --git a/vim/spell/en.utf-8.add.spl b/vim/spell/en.utf-8.add.spl index cd5cdaa958da00f28d696fb67ec906d3c148b7ac..8d5d9f69a716e91001b39a216678e5b040d12f06 100644 GIT binary patch delta 762 zcmXX^O=}ZT6n*ziJ`pNPHdU0G21{D7_>n?f6vRrbrrP?^b|J!K=Cv7_FJ>ktvk+WJ za4Ed4_ydG2+_)9duDf%mn?i8wFVJ(JVVFBJ=iGPCx%bY`Ghffn?QU+RvGVwEQza6j(Nmruz0~ihcPmMyP~=cXAf_WqDW?FJ`j6}+yG3 zJ-r~;Xj$*c&*y14DBG?IqAaIAvklvvrE#De)*Y(p7uJ~8^&hK!`L`bpkRscmibbL(B)ziwyqZE(a8N`Yj47a^F z9!dl}CIu@jWxaP$J~5*S5INbw(}?Z(7#h@m_4RS_=D8)WZ1A9>r`faKGY(3`=XT?KKdvj>1gwX(d=!4;+@-;iMBl&0YqAj z#}}XhydUZL@=A3Q8pfLFt?~+;=)C;u^l}0xgPCvnO&2Sd8nq#<;gkq&Py~+o9w{m0 zYazsk>g|or<^$cSTx`j%M_taWr)EL3U#h-O+l)4!QYhUFqHM{f4U?+#%HqR?kal5p owzawqo4l`%$>^dZ8($gZ1G;Ch$HvMNV}%73J!1TB2bP5R2hB5|mjD0& delta 550 zcmXX@&r20i6u#%q+&AwTzA%DRw2+K=iW(11j9f&;!>mO=kc0?koSSdx&JX5C`oIuc zxPEe$ZQ8dI!Bv|!wQN^z{9Ed~Lo>|GIp25gcfNDx`<08a_SVL;BGbln{|ceLoV538 zM3E4)fsRbd#}q8uEH9{_0mZmAl?3Q{Zr@9W_9y}8gF(KR@v^*29eyv*u8F0}^KDV6 z{)dG$y<%L-pCFF&NZJk)?Tj<;4Azukl5OM*U>1w zm0KppO8Q_6%e3tj8nGRoK5GhOR)E|G2wK?@V;Dqy%A4MNYnarGGvq^Wo__FG@8ji8 z4l5NZYhx$8+MK}xx0_S$LF3^DA2hFDr9_4$PFmfN9zjps;9t#~52h2SYy6{LjXi}C cA6ZFuK~HMzCE|)+;R)(o(+m5((-Zdk2QSrkY5)KL diff --git a/vim/templates/c_header_notice b/vim/templates/c_header_notice index c8bf46e..dc80bf2 100644 --- a/vim/templates/c_header_notice +++ b/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 +// ------------------------------------------------------------------------------------------------- + diff --git a/vimrc b/vimrc index 4ebdedf..1e756f8 100644 --- a/vimrc +++ b/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 , :Calendar -view=year (-split=veritcal -width=) " :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 backupdir=$HOME/tmp// +set backupcopy=yes +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 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " CUSTOM AUTOCMDS """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" + augroup campoCmds " Clear all autocmds in the group autocmd! @@ -455,8 +457,9 @@ vnoremap p "_dP nnoremap pp :silent !open -a Marked.app '%:p' " Switch between C++ source and header files -map v :e %:p:s,.h$,.X123X,:s,.c$,.h,:s,.X123X$,.c, -map vv :e %:p:s,.h$,.X123X,:s,.cpp$,.h,:s,.X123X$,.cpp, +map v :e %:p:s,.h$,.X123X,:s,.cpp$,.h,:s,.X123X$,.cpp, +"map vv :e %:p:s,.h$,.X123X,:s,.c$,.h,:s,.X123X$,.c, +"map vvv :e %:p:s,.h$,.X123X,:s,.cc$,.h,:s,.X123X$,.cc, "//////////////////////////////////////////////////////////////// " QUICKLY OPEN C++ SOURCE OR HEADER FILE @@ -546,8 +549,9 @@ let g:syntastic_check_on_wq = 0 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " GIT """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -map gb :Gblame - +map gb :Gblame -w +" Ignore whitespace changes; follow renames and copies. +command! -bar -bang -nargs=* Blame :Gblame -wCM """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " 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()"