# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1716486623 14400
# Node ID f77ee236cdf3b2eb18fb2a85d465c414e8983d4d
# Parent  1e75bf5d6f48871d233c187f73ec30d5d1e23b4d
More

diff -r 1e75bf5d6f48 -r f77ee236cdf3 .hgsub
--- a/.hgsub	Wed May 08 10:22:28 2024 -0400
+++ b/.hgsub	Thu May 23 13:50:23 2024 -0400
@@ -30,6 +30,7 @@
 vim/bundle/sexp                  = [git]https://github.com/guns/vim-sexp
 vim/bundle/shellcheck            = [git]https://github.com/itspriddle/vim-shellcheck
 vim/bundle/simpylfold            = [git]https://github.com/tmhedberg/SimpylFold
+vim/bundle/singularity-syntax    = [git]https://github.com/rbberger/vim-singularity-syntax
 vim/bundle/splice                = [hg]ssh://hg.stevelosh.com/repos/splice.vim
 vim/bundle/strftimedammit        = [hg]ssh://hg.stevelosh.com/repos/strftimedammit.vim/
 vim/bundle/surround              = [git]https://github.com/tpope/vim-surround
diff -r 1e75bf5d6f48 -r f77ee236cdf3 .hgsubstate
--- a/.hgsubstate	Wed May 08 10:22:28 2024 -0400
+++ b/.hgsubstate	Thu May 23 13:50:23 2024 -0400
@@ -2,7 +2,7 @@
 1fc4a9fbead7e0acc4c828b346f3be2658ec3df9 mercurial/templates
 dcbfe065297d31823561ba787f51056c147aa682 vim/bundle/abolish
 36e40f9ec91bdbf6f1adf408522a73a6925c3042 vim/bundle/ack
-ab888cd09b71e17d1d46ef893d6131213d0b1426 vim/bundle/badwolf
+6185ce07bdc162a5f3555ff9ddcba661c0f031b2 vim/bundle/badwolf
 b7f789f305b1c5b0b4623585e0f10adb417f2966 vim/bundle/boxdraw
 b542a7bc4d9bc5da8fb12e110fe7975131fb57a4 vim/bundle/clam
 e87cd90dc09c2a203e13af9704bd0ef79303d755 vim/bundle/commentary
@@ -20,7 +20,7 @@
 9310f91476a94ee9c2f3a587171893743a343e26 vim/bundle/nerdtree
 47f6d8508757559fcfa8f49cd93cd5c86ce847f0 vim/bundle/nextflow-vim
 f68f7745fe92429d1fa080a8a7d6d6075be9f752 vim/bundle/nvim-r
-c76e0987ec45c84103b408691ec0506e7b99cb30 vim/bundle/paredit
+989d1c046bbe36f7d71878636dbe6af8ea3f4f86 vim/bundle/paredit
 1a436f7d875b4ec630da081b041c73264235c7e7 vim/bundle/pgsql
 d241974f40e8d206f9970e51fb0069951862ba35 vim/bundle/python-mode
 eb8baa5428bde10ecc1cb14eed1d6e16f5f24695 vim/bundle/rainbow-parentheses
@@ -30,6 +30,7 @@
 b4398689f7483b01684044ab6b55bf369744c9b3 vim/bundle/sexp
 4346419ac57ef341a15aa39c827c0848f17c6faf vim/bundle/shellcheck
 0459df8a0bbfc8ef1bfd88db889e881626f65914 vim/bundle/simpylfold
+caaba2594df4f1859a448e6cf13c64d956419acd vim/bundle/singularity-syntax
 062b18eebd153c13e6f36577707acb17893cd959 vim/bundle/splice
 26fbdd7d1f1aa5600d2ebf39bbdd292c38aac16e vim/bundle/strftimedammit
 aa1f120ad3a29c27cc41d581cda3751c59343cce vim/bundle/surround
@@ -38,5 +39,5 @@
 b393ba65386d47664421e1f8b246a87a6e8b218c vim/bundle/ultisnips
 e9d7ff3eb4a369f0cb2069c8f77ae68796bca308 vim/bundle/vim-go
 9df79e15bf035d1cfb32c11fffed38dd7b6a0501 vim/bundle/vimtex
-c1ac16c1a50bec4c30da87cd4ce2af12e26fb022 vim/bundle/vlime
+ce5710a1afe5787ec3e9a60445e21016d0802e7f vim/bundle/vlime
 6876fe38b33732cb124d415ffc4156f16da5e118 vim/bundle/windowswap
diff -r 1e75bf5d6f48 -r f77ee236cdf3 bash_profile
--- a/bash_profile	Wed May 08 10:22:28 2024 -0400
+++ b/bash_profile	Thu May 23 13:50:23 2024 -0400
@@ -6,6 +6,7 @@
 
 shopt -s expand_aliases
 shopt -s histappend
+shopt -s checkwinsize
 
 # Save multiline commands as a single history entry.
 shopt -s cmdhist
diff -r 1e75bf5d6f48 -r f77ee236cdf3 remote/bash_profile
--- a/remote/bash_profile	Wed May 08 10:22:28 2024 -0400
+++ b/remote/bash_profile	Thu May 23 13:50:23 2024 -0400
@@ -8,6 +8,7 @@
 
 shopt -s expand_aliases
 shopt -s histappend
+shopt -s checkwinsize
 
 # Save multiline commands as a single history entry.
 shopt -s cmdhist
diff -r 1e75bf5d6f48 -r f77ee236cdf3 vim/custom-dictionary.utf-8.add
--- a/vim/custom-dictionary.utf-8.add	Wed May 08 10:22:28 2024 -0400
+++ b/vim/custom-dictionary.utf-8.add	Thu May 23 13:50:23 2024 -0400
@@ -452,3 +452,14 @@
 CCTC
 BLASTs
 mosaicism
+amyloid
+microcentrifuge
+P1000
+P10
+Trypan
+mL
+vortexer
+OOM
+Nanopal
+Slurm
+hardcode
diff -r 1e75bf5d6f48 -r f77ee236cdf3 vim/syntax/htmlten.vim
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/syntax/htmlten.vim	Thu May 23 13:50:23 2024 -0400
@@ -0,0 +1,38 @@
+" based on the htmldjango syntax
+
+if exists("b:current_syntax")
+  finish
+endif
+
+if !exists("main_syntax")
+  let main_syntax = 'html'
+endif
+
+runtime! syntax/html.vim
+unlet b:current_syntax
+
+syn region tenArgument contained start=/"/ skip=/\\"/ end=/"/
+
+syn match tenError "%}\|}}\|#}"
+syn match tenTagError contained "#}\|{{\|[^%]}}\|[#]"
+syn match tenVarError contained "#}\|{%\|%}\|[<>!#]"
+
+syn cluster tenBlocks add=tenTagBlock,tenVarBlock,tenComment,tenComBlock
+
+syn region tenTagBlock start="{%" end="%}" contains=tenArgument,tenTagError display containedin=ALLBUT,@djangoBlocks
+syn region tenVarBlock start="{{" end="}}" contains=tenArgument,tenVarError display containedin=ALLBUT,@djangoBlocks
+syn region tenComment start="{%\s*comment\(\s\+.\{-}\)\?%}" end="{%\s*endcomment\s*%}" containedin=ALLBUT,@tenBlocks
+syn region tenComBlock start="{#" end="#}" containedin=ALLBUT,@tenBlocks
+
+
+hi def link tenTagBlock PreProc
+hi def link tenVarBlock PreProc
+hi def link tenComment Comment
+hi def link tenComBlock Comment
+
+hi def link tenArgument Constant
+hi def link tenError Error
+hi def link tenTagError Error
+hi def link tenVarError Error
+
+let b:current_syntax = "htmlten"
diff -r 1e75bf5d6f48 -r f77ee236cdf3 vim/ultisnips-bullshit/htmldjango.snippets
--- a/vim/ultisnips-bullshit/htmldjango.snippets	Wed May 08 10:22:28 2024 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-extends html
-
-
-snippet % "Django tag" i
-{% ${1:tag_name} $2%}
-    $0
-{% end$1 %}
-endsnippet
-
-snippet { "Django var" i
-{{ $1 }}$0
-endsnippet
-
-snippet block "" i
-{% block $1 %}$2{% endblock $1 %}
-endsnippet
-
-snippet Block "" i
-{% block $1 %}
-    $2
-{% endblock $1 %}
-endsnippet
-
-snippet extends "" b
-{% extends "${1:foo}" %}$2
-endsnippet
diff -r 1e75bf5d6f48 -r f77ee236cdf3 vim/ultisnips-bullshit/htmlten.snippets
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/ultisnips-bullshit/htmlten.snippets	Thu May 23 13:50:23 2024 -0400
@@ -0,0 +1,29 @@
+extends html
+
+snippet % "Tag" i
+{% ${1:tag} %}
+    $0
+{% end %}
+endsnippet
+
+snippet { "Var" i
+{{ $1 }}$0
+endsnippet
+
+snippet section "Section (single line)" i
+{% section ${1:name} %}$2{% end %}
+endsnippet
+
+snippet Section "Section (multiline)" i
+{% section ${1:name} %}
+    $2
+{% end %}
+endsnippet
+
+snippet template "Template" b
+{% template ${1:name} (${2::extends ${3:base}}) (&key$4) %}
+
+$5
+
+{% end %}
+endsnippet
diff -r 1e75bf5d6f48 -r f77ee236cdf3 vim/vimrc
--- a/vim/vimrc	Wed May 08 10:22:28 2024 -0400
+++ b/vim/vimrc	Thu May 23 13:50:23 2024 -0400
@@ -949,24 +949,8 @@
 
     au BufNewFile,BufRead *.djula setlocal filetype=htmldjango
     au BufNewFile,BufRead *.dram setlocal filetype=htmldjango
-    au BufNewFile,BufRead *.ten setlocal filetype=htmldjango
 
     au FileType html,jinja,htmldjango,gohtmltmpl setlocal foldmethod=manual
-
-    " Use <localleader>f to fold the current tag.
-    au FileType html,jinja,htmldjango,gohtmltmpl nnoremap <buffer> <localleader>f Vatzf
-
-    " Use <localleader>t to fold the current templatetag.
-    au FileType html,jinja,htmldjango nmap <buffer> <localleader>t viikojozf
-
-    " Indent tag
-    au FileType html,jinja,htmldjango,gohtmltmpl nnoremap <buffer> <localleader>= Vat=
-
-    " Django tags
-    au FileType jinja,htmldjango inoremap <buffer> <c-t> {%<space><space>%}<left><left><left>
-
-    " Django variables
-    au FileType jinja,htmldjango inoremap <buffer> <c-b> {{<space><space>}}<left><left><left>
 augroup END
 
 " }}}
@@ -1343,6 +1327,8 @@
 augroup ft_sh
     au!
 
+    au BufRead,BufNewFile *.sbat set ft=sh
+
     au FileType sh nnoremap <buffer> <localleader>e :call NeoReplSendCurrentLine()<cr>
     au FileType sh nnoremap <buffer> <localleader>E :call SendShellParagraph()<cr>
     au FileType sh nnoremap <buffer> <localleader>F :call NeoReplSendEntireFile(1)<cr>
@@ -1396,6 +1382,7 @@
 augroup ft_ten
     au!
 
+    au BufNewFile,BufRead *.ten setlocal filetype=htmlten
     au BufNewFile,BufRead *.ten nnoremap <buffer> <localleader>q :call RecompileTENTemplates()<cr>
 augroup END
 
@@ -1701,7 +1688,7 @@
 
 let g:paredit_smartjump = 1
 let g:paredit_shortmaps = 0
-let g:paredit_electric_return = 0
+let g:paredit_electric_return = 1
 let g:paredit_matchlines = 200
 
 let g:paredit_disable_lisp = 1
@@ -2105,7 +2092,7 @@
     au FileType lisp,vlime_repl,vlime_inspector,vlime_sldb,vlime_notes,vlime_xref,vlime_preview call MapVlimeKeys()
 
     " Fix <cr>
-    au FileType lisp            inoremap <buffer> <cr> <cr><c-r>=vlime#plugin#VlimeKey("cr")<cr>
+    au FileType lisp            inoremap <buffer> <cr> <c-r>=vlime#plugin#VlimeKey("cr")<cr>
     au FileType vlime_xref      nnoremap <buffer> <cr> :call vlime#ui#xref#OpenCurXref()<cr>
     au FileType vlime_notes     nnoremap <buffer> <cr> :call vlime#ui#compiler_notes#OpenCurNote()<cr>
     au FileType vlime_sldb      nnoremap <buffer> <cr> :call vlime#ui#sldb#ChooseCurRestart()<cr>