diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index c1a804e..73a57a6 100644 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -112,7 +112,7 @@ require("nvim-treesitter.configs").setup({ }, }, }) -vim.filetype.add({ extension = { grlx = "grlx", mdx = "mdx" } }) +vim.filetype.add({ extension = { mdx = "mdx" } }) local parser_config = require("nvim-treesitter.parsers").get_parser_configs() -- local ft_parser = require("nvim-treesitter.parsers").filetype_to_parsername ---@class gotmpl @@ -122,7 +122,7 @@ parser_config.gotmpl = { files = { "src/parser.c" }, }, filetype = "gotmpl", - used_by = { "gohtmltmpl", "gotexttmpl", "gotmpl", "yaml", "grlx" }, + used_by = { "gohtmltmpl", "gotexttmpl", "gotmpl", "yaml" }, } vim.treesitter.language.register("markdown", "mdx") vim.treesitter.language.register("html", "superhtml") diff --git a/nvim/.config/nvim/lua/custom/grlx.lua b/nvim/.config/nvim/lua/custom/grlx.lua deleted file mode 100644 index dc8fb6e..0000000 --- a/nvim/.config/nvim/lua/custom/grlx.lua +++ /dev/null @@ -1,12 +0,0 @@ -vim.api.nvim_create_autocmd("FileType", { - group = vim.api.nvim_create_augroup("grlx", {}), - pattern = "grlx", - callback = function() - vim.lsp.start({ - name = "grlx-lsp", - cmd = { "grlx-lsp" }, - root_dir = vim.loop.cwd(), - flags = { exit_timeout = 1000 }, - }) - end, -}) diff --git a/nvim/.config/nvim/lua/custom/init.lua b/nvim/.config/nvim/lua/custom/init.lua index fb12286..7260fc0 100644 --- a/nvim/.config/nvim/lua/custom/init.lua +++ b/nvim/.config/nvim/lua/custom/init.lua @@ -3,6 +3,3 @@ require("custom.set") -- Set LSP vars require("custom.lsp") - --- grlx develpment -require("custom.grlx") diff --git a/nvim/.config/nvim/syntax/grlx.vim b/nvim/.config/nvim/syntax/grlx.vim deleted file mode 100644 index ec90728..0000000 --- a/nvim/.config/nvim/syntax/grlx.vim +++ /dev/null @@ -1,71 +0,0 @@ -" Vim syntax file -" Language: Salt States template -" Maintainer: Seth House -" Last Change: 2012 June 20 -" -if exists("b:current_syntax") - finish -endif - -if !exists("main_syntax") - let main_syntax = 'yaml' -endif - -let b:current_syntax = '' -unlet b:current_syntax -runtime! syntax/yaml.vim - -let b:current_syntax = '' -unlet b:current_syntax -syntax include @Yaml syntax/yaml.vim - -let b:current_syntax = '' -unlet b:current_syntax - -" Default to look for Jinja syntax file -let s:load_jinja_syntax = 0 -let s:search_for_jinja_syntax = 1 -if exists("g:sls_use_jinja_syntax") - let s:search_for_jinja_syntax = 0 - let s:load_jinja_syntax = g:sls_use_jinja_syntax -endif -if s:search_for_jinja_syntax - let s:jinja_path = findfile("syntax/jinja.vim", &rtp, 1) - if s:jinja_path != "" - let s:load_jinja_syntax = 1 - endif -endif - -if s:load_jinja_syntax - syntax include @Jinja syntax/jinja.vim - - syn cluster jinjaSLSBlocks add=jinjaTagBlock,jinjaVarBlock,jinjaComment - " Mostly copy/pasted from - " https://github.com/mitsuhiko/jinja2/blob/6b7c0c23/ext/Vim/jinja.vim - syn region jinjaTagBlock matchgroup=jinjaTagDelim start=/{%-\?/ end=/-\?%}/ containedin=ALLBUT,jinjaTagBlock,jinjaVarBlock,jinjaRaw,jinjaString,jinjaNested,jinjaComment,@jinjaSLSBlocks - syn region jinjaVarBlock matchgroup=jinjaVarDelim start=/{{-\?/ end=/-\?}}/ containedin=ALLBUT,jinjaTagBlock,jinjaVarBlock,jinjaRaw,jinjaString,jinjaNested,jinjaComment,@jinjaSLSBlocks - syn region jinjaComment matchgroup=jinjaCommentDelim start="{#" end="#}" containedin=ALLBUT,jinjaTagBlock,jinjaVarBlock,jinjaString,@jinjaSLSBlocks -else - " Fall back to Django template syntax - syntax include @Jinja syntax/django.vim - - syn cluster djangoBlocks add=djangoTagBlock,djangoVarBlock,djangoComment,djangoComBlock - syn region djangoTagBlock start="{%" end="%}" contains=djangoStatement,djangoFilter,djangoArgument,djangoTagError display containedin=ALLBUT,@djangoBlocks - syn region djangoVarBlock start="{{" end="}}" contains=djangoFilter,djangoArgument,djangoVarError display containedin=ALLBUT,@djangoBlocks - syn region djangoComBlock start="{#" end="#}" contains=djangoTodo containedin=ALLBUT,@djangoBlocks -endif - -syn keyword salt_stateInclude include extend containedin=yamlBlockMappingKey -highlight link salt_stateInclude Include - -syn keyword salt_stateSpecialArgs name names check_cmd listen listen_in onchanges onchanges_in onfail onfail_in onlyif prereq prereq_in require require_in unless use use_in watch watch_in containedin=yamlBlockMappingKey -highlight link salt_stateSpecialArgs Special - -syn keyword salt_stateErrors requires requires_in watches watches_in includes extends containedin=yamlBlockMappingKey -highlight link salt_stateErrors Error - -let g:NERDCustomDelimiters = { - \ 'sls': { 'left': '#' }, -\ } - -let b:current_syntax = "grlx"