--- a/vim/vimrc Fri Mar 18 14:57:09 2022 -0400
+++ b/vim/vimrc Fri Mar 18 15:16:25 2022 -0400
@@ -798,7 +798,7 @@
" 1. Close all folds.
" 2. Open just the folds containing the current line.
" 3. Move the line to a bit (25 lines) down from the top of the screen.
-" 4. Pulse the cursor line. My eyes are bad.
+" 4. Pulse the line.
"
" This mapping wipes out the z mark, which I never use.
"
@@ -831,17 +831,6 @@
" }}}
" Filetype-specific ------------------------------------------------------- {{{
-" Arduino {{{
-
-augroup ft_arduino
- au!
-
- au FileType arduino setlocal noexpandtab shiftwidth=8 tabstop=8 softtabstop=8 foldmethod=syntax
- au FileType arduino inoremap <buffer> ☃ <esc>A;<cr>
- au FileType arduino inoremap <buffer> ☂ <esc>mzA;<esc>`z
-augroup END
-
-" }}}
" Assembly {{{
augroup ft_asm
@@ -1208,18 +1197,6 @@
augroup END " }}}
" }}}
-" Confluence {{{
-
-augroup ft_c
- au!
-
- au BufRead,BufNewFile *.confluencewiki setlocal filetype=confluencewiki
-
- " Wiki pages should be soft-wrapped.
- au FileType confluencewiki setlocal wrap linebreak nolist
-augroup END
-
-" }}}
" Cram {{{
let cram_fold=1
@@ -1379,18 +1356,6 @@
augroup END
" }}}
-" GLSL {{{
-
-augroup ft_glsl
- au!
-
- au BufNewFile,BufRead *.shader setlocal filetype=glsl
-
- au FileType glsl setlocal foldmethod=marker foldmarker={,}
- au FileType glsl setlocal ts=8 sts=8 sw=8 noexpandtab
-augroup END
-
-" }}}
" gnuplot {{{
function! OpenGnuplotRepl() "{{{
@@ -1564,16 +1529,6 @@
augroup END
" }}}
-" Jade Templates {{{
-
-augroup ft_jade
- au!
-
- au BufRead,BufNewFile *.jade setlocal filetype=jade
- au FileType jade setlocal foldmethod=indent
-augroup END
-
-" }}}
" Java {{{
augroup ft_java
@@ -1614,15 +1569,6 @@
augroup END
" }}}
-" Lilypond {{{
-
-augroup ft_lilypond
- au!
-
- au FileType lilypond setlocal foldmethod=marker foldmarker={,}
-augroup END
-
-" }}}
" Mail {{{
augroup ft_mail
@@ -1738,15 +1684,6 @@
augroup END
" }}}
-" Nand2Tetris HDL {{{
-
-augroup ft_n2thdl
- au!
-
- au BufNewFile,BufRead *.hdl set filetype=n2thdl
-augroup END
-
-" }}}
" Nginx {{{
augroup ft_nginx
@@ -1761,25 +1698,6 @@
augroup END
" }}}
-" PandaBT {{{
-
-augroup ft_pandabt
- au!
- au BufNewFile,BufRead *.BT.txt set filetype=pandabt
-
- au FileType pandabt setlocal noexpandtab shiftwidth=8
-augroup END
-
-" }}}
-" Pentadactyl {{{
-
-augroup ft_pentadactyl
- au!
- au BufNewFile,BufRead .pentadactylrc set filetype=pentadactyl
- au BufNewFile,BufRead ~/Library/Caches/TemporaryItems/pentadactyl-*.tmp set nolist wrap linebreak columns=100 colorcolumn=0
-augroup END
-
-" }}}
" .plan {{{
function! PlanLinkPaste()
@@ -1861,46 +1779,6 @@
augroup END
" }}}
-" ReStructuredText {{{
-
-augroup ft_rest
- au!
-
- au Filetype rst nnoremap <buffer> <localleader>1 yypVr=:redraw<cr>
- au Filetype rst nnoremap <buffer> <localleader>2 yypVr-:redraw<cr>
- au Filetype rst nnoremap <buffer> <localleader>3 yypVr~:redraw<cr>
- au Filetype rst nnoremap <buffer> <localleader>4 yypVr`:redraw<cr>
-augroup END
-
-" }}}
-" Rubby {{{
-
-augroup ft_ruby
- au!
- au Filetype ruby setlocal foldmethod=syntax
- au BufRead,BufNewFile Capfile setlocal filetype=ruby
-augroup END
-
-" }}}
-" Scala {{{
-
-augroup ft_scala
- au!
-
- au FileType scala setlocal foldmethod=syntax
- au FileType scala setlocal foldlevel=1
- au FileType scala setlocal cc=100 tw=100
- au FileType scala setlocal expandtab
-
- au FileType scala nnoremap <buffer> <leader>s :SortSimpleScalaImports<cr>
- au FileType scala nnoremap <buffer> <c-]> :call LanguageClient_textDocument_definition()<CR>
- au FileType scala nnoremap <buffer> <localleader>r :call LanguageClient_textDocument_references()<CR>
- au FileType scala inoremap <buffer> <c-n> <c-x><c-o>
-
- au FileType scala setlocal omnifunc=LanguageClient#complete
-augroup END
-
-" }}}
" Sh {{{
function! SendShellParagraph() "{{{
@@ -1918,16 +1796,6 @@
augroup END
" }}}
-" ShaderLab {{{
-
-augroup ft_shaderlab " {{{
- au!
-
- au FileType shaderlab setlocal shiftwidth=4
- au FileType shaderlab setlocal expandtab
-augroup END " }}}
-
-" }}}
" Standard In {{{
augroup ft_stdin
@@ -1938,15 +1806,6 @@
augroup END
" }}}
-" stevelosh.com Blog Entries {{{
-
-augroup ft_steveloshcom
- au!
- au BufRead,BufNewFile */stevelosh/content/blog/20*/*/*.html set ft=markdown
- au BufRead,BufNewFile */stevelosh/content/projects/*.html set ft=markdown
-augroup END
-
-" }}}
" Terminal {{{
augroup ft_terminal
@@ -1997,15 +1856,6 @@
augroup END
" }}}
-" Wisp {{{
-
-augroup ft_wisp
- au!
-
- au BufRead,BufNewFile *.wisp set ft=clojure
-augroup END
-
-" }}}
" XML {{{
augroup ft_xml
@@ -2172,20 +2022,6 @@
let g:atia_attributes_complete = 0
" }}}
-" Language Server Protocol {{{
-
-let g:LanguageClient_serverCommands = {
- \ 'scala': ['netcat', 'localhost', '62831'],
- \ 'java': ['netcat', 'localhost', '62831'],
- \ }
-let g:LanguageClient_autoStart = 1
-
-nnoremap <silent> gd :call LanguageClient_textDocument_definition()<CR>
-
-" nnoremap <silent> K :call LanguageClient_textDocument_hover()<CR>
-" nnoremap <silent> <F2> :call LanguageClient_textDocument_rename()<CR>
-
-" }}}
" MiniYank {{{
map p <Plug>(miniyank-autoput)
@@ -2356,12 +2192,6 @@
let g:rbpt_max = 1
" }}}
-" Scala {{{
-
-let g:scala_use_builtin_tagbar_defs = 0
-let g:scala_use_default_keymappings = 0
-
-" }}}
" Scratch {{{
command! ScratchToggle call ScratchToggle()
@@ -2536,13 +2366,6 @@
endfunction
" }}}
-" Supertab {{{
-
-let g:SuperTabDefaultCompletionType = "<c-n>"
-let g:SuperTabLongestHighlight = 1
-let g:SuperTabCrMapping = 1
-
-"}}}
" Splice {{{
let g:splice_prefix = "-"
@@ -2756,7 +2579,7 @@
" Mini-plugins ------------------------------------------------------------ {{{
" Stuff that should probably be broken out into plugins, but hasn't proved to be
" worth the time to do so just yet.
-"
+
" HTTP Statuses {{{
function! HTTPStatuses()
@@ -2766,7 +2589,6 @@
command! HTTPStatuses call HTTPStatuses()
" }}}
-
" Synstack {{{
" Show the stack of syntax hilighting classes affecting whatever is under the
@@ -2814,9 +2636,6 @@
nnoremap <leader>V :call ToggleVirtualEdit()<cr>
-" TODO: Figure out the diffexpr shit necessary to make this buffer-local.
-" nnoremap <leader>W :call ToggleDiffWhitespace()<CR>
-
" }}}
" Error Toggles {{{
@@ -2942,15 +2761,6 @@
nnoremap <leader>h<space> :!hg<space>
" }}}
-" J {{{
-
-function! s:JumpTo(dest)
- call system("tmux split-window -h 'j " . a:dest . "; and myctags &; and nvim .'")
-endfunction
-
-command! -nargs=1 J call s:JumpTo(<f-args>)
-
-" }}}
" Ack motions {{{
" Motions to Ack for things. Works with pretty much everything, including:
@@ -3024,6 +2834,7 @@
execute 'hi ' . old_hi
endfunction " }}}
+
command! -nargs=0 Pulse call s:Pulse()
" }}}
@@ -3155,7 +2966,6 @@
end
else
" Console Vim
- " For me, this means iTerm2, possibly through tmux
" Mouse support
set mouse=a