diff --git a/after/syntax/gohtmltmpl.vim b/after/syntax/gohtmltmpl.vim
deleted file mode 100644
index ea3dbf0..0000000
--- a/after/syntax/gohtmltmpl.vim
+++ /dev/null
@@ -1,17 +0,0 @@
-if exists("b:current_syntax")
- finish
-endif
-
-if !exists("g:main_syntax")
- let g:main_syntax = 'html'
-endif
-
-runtime! syntax/gotexttmpl.vim
-runtime! syntax/html.vim
-unlet b:current_syntax
-
-syn cluster htmlPreproc add=gotplAction,goTplComment
-
-let b:current_syntax = "gohtmltmpl"
-
-" vim: sw=2 ts=2 et
diff --git a/after/syntax/gotexttmpl.vim b/after/syntax/gotexttmpl.vim
deleted file mode 100644
index f38bb26..0000000
--- a/after/syntax/gotexttmpl.vim
+++ /dev/null
@@ -1,83 +0,0 @@
-" Copyright 2011 The Go Authors. All rights reserved.
-" Use of this source code is governed by a BSD-style
-" license that can be found in the LICENSE file.
-"
-" gotexttmpl.vim: Vim syntax file for Go templates.
-
-" Quit when a (custom) syntax file was already loaded
-if exists("b:current_syntax")
- finish
-endif
-
-syn case match
-
-" Go escapes
-syn match goEscapeOctal display contained "\\[0-7]\{3}"
-syn match goEscapeC display contained +\\[abfnrtv\\'"]+
-syn match goEscapeX display contained "\\x\x\{2}"
-syn match goEscapeU display contained "\\u\x\{4}"
-syn match goEscapeBigU display contained "\\U\x\{8}"
-syn match goEscapeError display contained +\\[^0-7xuUabfnrtv\\'"]+
-
-hi def link goEscapeOctal goSpecialString
-hi def link goEscapeC goSpecialString
-hi def link goEscapeX goSpecialString
-hi def link goEscapeU goSpecialString
-hi def link goEscapeBigU goSpecialString
-hi def link goSpecialString Special
-hi def link goEscapeError Error
-
-" Strings and their contents
-syn cluster goStringGroup contains=goEscapeOctal,goEscapeC,goEscapeX,goEscapeU,goEscapeBigU,goEscapeError
-syn region goString contained start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=@goStringGroup
-syn region goRawString contained start=+`+ end=+`+
-
-hi def link goString String
-hi def link goRawString String
-
-" Characters; their contents
-syn cluster goCharacterGroup contains=goEscapeOctal,goEscapeC,goEscapeX,goEscapeU,goEscapeBigU
-syn region goCharacter contained start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=@goCharacterGroup
-
-hi def link goCharacter Character
-
-" Integers
-syn match goDecimalInt contained "\<\d\+\([Ee]\d\+\)\?\>"
-syn match goHexadecimalInt contained "\<0x\x\+\>"
-syn match goOctalInt contained "\<0\o\+\>"
-syn match goOctalError contained "\<0\o*[89]\d*\>"
-syn cluster goInt contains=goDecimalInt,goHexadecimalInt,goOctalInt
-" Floating point
-syn match goFloat contained "\<\d\+\.\d*\([Ee][-+]\d\+\)\?\>"
-syn match goFloat contained "\<\.\d\+\([Ee][-+]\d\+\)\?\>"
-syn match goFloat contained "\<\d\+[Ee][-+]\d\+\>"
-" Imaginary literals
-syn match goImaginary contained "\<\d\+i\>"
-syn match goImaginary contained "\<\d\+\.\d*\([Ee][-+]\d\+\)\?i\>"
-syn match goImaginary contained "\<\.\d\+\([Ee][-+]\d\+\)\?i\>"
-syn match goImaginary contained "\<\d\+[Ee][-+]\d\+i\>"
-
-hi def link goInt Number
-hi def link goFloat Number
-hi def link goImaginary Number
-
-" Token groups
-syn cluster gotplLiteral contains=goString,goRawString,goCharacter,@goInt,goFloat,goImaginary
-syn keyword gotplControl contained if else end range with template
-syn keyword gotplFunctions contained and html index js len not or print printf println urlquery eq ne lt le gt ge
-syn match gotplVariable contained /\$[a-zA-Z0-9_]*\>/
-syn match goTplIdentifier contained /\.[^[:blank:]}]\+\>/
-
-hi def link gotplControl Keyword
-hi def link gotplFunctions Function
-hi def link goTplVariable Special
-
-syn region gotplAction start="{{" end="}}" contains=@gotplLiteral,gotplControl,gotplFunctions,gotplVariable,goTplIdentifier display
-syn region goTplComment start="{{\(- \)\?/\*" end="\*/\( -\)\?}}" display
-
-hi def link gotplAction PreProc
-hi def link goTplComment Comment
-
-let b:current_syntax = "gotexttmpl"
-
-" vim: sw=2 ts=2 et
diff --git a/filetype.lua b/filetype.lua
index fbec480..27948dc 100644
--- a/filetype.lua
+++ b/filetype.lua
@@ -34,7 +34,7 @@ vim.filetype.add {
resi = 'rescript',
river = 'hcl',
templ = 'templ',
- tmpl = 'gohtmltmpl',
+ tmpl = 'gotmpl',
typ = 'typst',
w = 'wisp',
wisp = 'wisp',
@@ -46,8 +46,8 @@ vim.filetype.add {
['.*/roles/[^/]+/handlers/[^/]+%.ya?ml'] = 'yaml.ansible',
['.*/playbooks/[^/]+%.ya?ml'] = 'yaml.ansible',
-- Helm chart templates
- ['.*/templates/.+%.ya?ml'] = 'yaml.helm',
- ['.*/templates/.+%.tpl'] = 'yaml.helm',
+ ['.*/templates/.+%.ya?ml'] = 'helm',
+ ['.*/templates/.+%.tpl'] = 'helm',
-- Waybar config
['${XDG_CONFIG_HOME}/waybar/config'] = 'jsonc',
-- please.build
diff --git a/lazy-lock.json b/lazy-lock.json
index 7ce187d..96e68e7 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,7 +1,7 @@
{
- "LuaSnip": { "branch": "master", "commit": "f3b3d3446bcbfa62d638b1903ff00a78b2b730a1" },
- "SchemaStore.nvim": { "branch": "main", "commit": "ebe6fe2e78c19a0cf6e82752ab6f3ac55c35ef99" },
- "aerial.nvim": { "branch": "master", "commit": "8da95fd05b343cc967db519d773288bede39f3dc" },
+ "LuaSnip": { "branch": "master", "commit": "a7a4b4682c4b3e2ba82b82a4e6e5f5a0e79dec32" },
+ "SchemaStore.nvim": { "branch": "main", "commit": "d91daa5bf63c409f9e752e55082c3ba088b04c0b" },
+ "aerial.nvim": { "branch": "master", "commit": "31fbd369bbbeb53080c4b1ead9e76be322725ef5" },
"alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" },
"better-escape.nvim": { "branch": "master", "commit": "7e86edafb8c7e73699e0320f225464a298b96d12" },
"carbon-now.nvim": { "branch": "main", "commit": "16e843489ba00493466170919abfe144fc9aa158" },
@@ -12,11 +12,11 @@
"cmp-fish": { "branch": "main", "commit": "8ae7bfb1b3251d433c4adf4e64396ef929fbd91f" },
"cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
- "conform.nvim": { "branch": "master", "commit": "f882877f03ebd46067c6a5493d259c4b9a9280f0" },
+ "conform.nvim": { "branch": "master", "commit": "34b81e70da83e26c048290204de44268eb59814e" },
"dial.nvim": { "branch": "master", "commit": "27eb570085db2ef44bff4f620d3806039184651c" },
"diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" },
"dressing.nvim": { "branch": "master", "commit": "6f212262061a2120e42da0d1e87326e8a41c0478" },
- "emmylua-nvim": { "branch": "master", "commit": "60f301b41df9744543f1d6d9895915d8ddcc868f" },
+ "emmylua-nvim": { "branch": "master", "commit": "66fca023fd619aac8ce738c65b2b232194f970da" },
"flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" },
"flatten.nvim": { "branch": "main", "commit": "92c59ae6200e6b04aff167577ebb8a9035a6d2b3" },
"friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" },
@@ -39,9 +39,9 @@
"mini.pairs": { "branch": "main", "commit": "04f58f2545ed80ac3b52dd4826e93f33e15b2af6" },
"mini.surround": { "branch": "main", "commit": "a1b590cc3b676512de507328d6bbab5e43794720" },
"neo-tree.nvim": { "branch": "main", "commit": "459c60317cc1d251f6eb3b6f010d015d5d24b806" },
- "neoconf.nvim": { "branch": "main", "commit": "2feab3abaa2c00dc21f490619f5c0f4ccf0ba495" },
- "neogen": { "branch": "main", "commit": "70127baaff25611deaf1a29d801fc054ad9d2dc1" },
- "neogit": { "branch": "master", "commit": "0d0879b0045fb213c328126969a3317c0963d34a" },
+ "neoconf.nvim": { "branch": "main", "commit": "8d7150e9d6113f01421c34c5aeb0f586afa232e0" },
+ "neogen": { "branch": "main", "commit": "b95347a588401a755eadd17482edc1662876bd58" },
+ "neogit": { "branch": "master", "commit": "9c5b1392f22203c1ea082ad42f2c97f3ca6b5de1" },
"neotest": { "branch": "master", "commit": "4440cc2227894c2ae9b0673a30e6cc6f1836e8c2" },
"neotest-go": { "branch": "main", "commit": "6a2f996d89fe4631942e035b1c114544ee045043" },
"neotest-jest": { "branch": "main", "commit": "959d45b133de938c79e3f064db188680eaf69055" },
@@ -49,28 +49,28 @@
"neotest-vitest": { "branch": "main", "commit": "ae774282a592b872e84ffdcc5b4d11fc991eca7b" },
"neotest-zig": { "branch": "main", "commit": "742f97f971a39d44b4832b432083608834a0e59c" },
"noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" },
- "nui.nvim": { "branch": "main", "commit": "b81333d12f824dbed5eb231c8a4409a290fdd848" },
+ "nui.nvim": { "branch": "main", "commit": "fbb139c6f14896b434d0229099e1acd863ae6bec" },
"nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
"nvim-cokeline": { "branch": "main", "commit": "7310f192af74c6912ca7a40ae1b16253aa95e50e" },
"nvim-coverage": { "branch": "main", "commit": "cf4b5c61dfac977026a51a2bcad9173c272986ce" },
"nvim-dap": { "branch": "master", "commit": "fc880e82059eb21c0fa896be60146e5f17680648" },
"nvim-dap-repl-highlights": { "branch": "master", "commit": "902d533b2682c26d6be4f8a4d1dfd895cbba4840" },
"nvim-dap-ui": { "branch": "master", "commit": "9720eb5fa2f41988e8770f973cd11b76dd568a5d" },
- "nvim-dap-virtual-text": { "branch": "master", "commit": "d4542ac257d3c7ee4131350db6179ae6340ce40b" },
+ "nvim-dap-virtual-text": { "branch": "master", "commit": "a5fc69240869c0fee8ff176bc9e4efdf8bdfb596" },
"nvim-lint": { "branch": "master", "commit": "e824adb9bc01647f71e55457353a68f0f37f9931" },
- "nvim-lspconfig": { "branch": "master", "commit": "9553725789be682ecd945a527ec552e489ea8534" },
+ "nvim-lspconfig": { "branch": "master", "commit": "7f5cf1121f772850a30bdaf83fb448e88846aa58" },
"nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" },
"nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" },
"nvim-spectre": { "branch": "master", "commit": "3712ff0cdf4f9f877d9ca708d835a877d9a0abaf" },
- "nvim-treesitter": { "branch": "master", "commit": "a47540fd737eb5c03ee21ee69eb8134ce5568fb6" },
- "nvim-treesitter-context": { "branch": "master", "commit": "b8d1ffe58a88e0356da56b167373e89c4579ce15" },
- "nvim-treesitter-textobjects": { "branch": "master", "commit": "95933e762e28f9d38b572d65e7e4da9d2f4d90cb" },
+ "nvim-treesitter": { "branch": "master", "commit": "70f03829afa31f8b619b56296cdcaa921118d912" },
+ "nvim-treesitter-context": { "branch": "master", "commit": "53cdd58446521575d8f1052152099e08b15ca53c" },
+ "nvim-treesitter-textobjects": { "branch": "master", "commit": "3532f6095efd4723f7c066a5ac3fe632506cc09e" },
"nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" },
"nvim-ts-context-commentstring": { "branch": "main", "commit": "7ab799a9792f7cf3883cf28c6a00ad431f3d382a" },
"nvim-web-devicons": { "branch": "master", "commit": "4adea17610d140a99c313e3f79a9dc01825d59ae" },
"nvim-window-picker": { "branch": "main", "commit": "41cfaa428577c53552200a404ae9b3a0b5719706" },
- "oil.nvim": { "branch": "master", "commit": "132b4ea0740c417b9d717411cab4cf187e1fd095" },
- "orgmode": { "branch": "master", "commit": "9ec93bf826e2808532f075a15544a5dd855c2332" },
+ "oil.nvim": { "branch": "master", "commit": "c437f3c5b0da0a9cc6a222d87212cce11b80ba75" },
+ "orgmode": { "branch": "master", "commit": "cfc371ce91348b53c286b4954a3ae4623ac9d62f" },
"overseer.nvim": { "branch": "master", "commit": "4855aefcf335bbac71eea9c6a888958fb1ed1e1a" },
"pantran.nvim": { "branch": "main", "commit": "461799624948bfb66f73b20b6fffa7e4c8ca6d08" },
"parinfer-rust": { "branch": "master", "commit": "0e4d52e712641ad351a1bfe6cee3d34d63ed087b" },
@@ -87,7 +87,7 @@
"telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
"telescope-symbols.nvim": { "branch": "master", "commit": "a6d0127a53d39b9fc2af75bd169d288166118aec" },
"telescope-tabs": { "branch": "master", "commit": "0a678eefcb71ebe5cb0876aa71dd2e2583d27fd3" },
- "telescope.nvim": { "branch": "master", "commit": "aa83606299c5beeaf80e656efbf07bde258db7be" },
+ "telescope.nvim": { "branch": "master", "commit": "dc1ea28cc2a02cd1cebb9d80e967807d668f78f8" },
"todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" },
"toggleterm.nvim": { "branch": "main", "commit": "193786e0371e3286d3bc9aa0079da1cd41beaa62" },
"treesj": { "branch": "main", "commit": "60e27280030f9cd8dfb6ceb335922c6ff76682cc" },
diff --git a/scripts/download-vim-syntax/main.go b/scripts/download-vim-syntax/main.go
index 7d887ae..f09b0e3 100644
--- a/scripts/download-vim-syntax/main.go
+++ b/scripts/download-vim-syntax/main.go
@@ -13,14 +13,12 @@ import (
var nvim_config_dir string
var syntaxes = map[string]string{
- "djot.vim": "https://github.com/jgm/djot/raw/main/editors/vim/syntax/djot.vim",
- "gohtmltmpl.vim": "https://github.com/fatih/vim-go/raw/master/syntax/gohtmltmpl.vim",
- "gotexttmpl.vim": "https://github.com/fatih/vim-go/raw/master/syntax/gotexttmpl.vim",
- "jinja.vim": "https://gitlab.com/HiPhish/jinja.vim/-/raw/master/syntax/jinja.vim",
- "kcl.vim": "https://github.com/kcl-lang/kcl.nvim/raw/main/syntax/kcl.vim",
- "nftables.vim": "https://github.com/nfnty/vim-nftables/raw/master/syntax/nftables.vim",
- "rescript.vim": "https://github.com/rescript-lang/vim-rescript/raw/master/syntax/rescript.vim",
- "vifm.vim": "https://github.com/vifm/vifm.vim/raw/master/syntax/vifm.vim",
+ "djot.vim": "https://github.com/jgm/djot/raw/main/editors/vim/syntax/djot.vim",
+ "jinja.vim": "https://gitlab.com/HiPhish/jinja.vim/-/raw/master/syntax/jinja.vim",
+ "kcl.vim": "https://github.com/kcl-lang/kcl.nvim/raw/main/syntax/kcl.vim",
+ "nftables.vim": "https://github.com/nfnty/vim-nftables/raw/master/syntax/nftables.vim",
+ "rescript.vim": "https://github.com/rescript-lang/vim-rescript/raw/master/syntax/rescript.vim",
+ "vifm.vim": "https://github.com/vifm/vifm.vim/raw/master/syntax/vifm.vim",
}
func main() {