diff --git a/init.lua b/init.lua index 74e3049..2cdd970 100644 --- a/init.lua +++ b/init.lua @@ -1,7 +1,7 @@ require("base") -if not vim.g.vscode then - require("specifics") - require("plugins") - require("buffer_tools").init() +if (not vim.g.vscode) and os.getenv("NO_PLUGINS") == nil then + require("specifics") + require("plugins") + require("buffer_tools").init() end diff --git a/lua/plugins/config.lua b/lua/plugins/config.lua index 143e717..e4a1a49 100644 --- a/lua/plugins/config.lua +++ b/lua/plugins/config.lua @@ -247,9 +247,9 @@ function M.null_ls() local null_ls = require("null-ls") local config = lsp_config_defaults() - local sqlfluff_args = { - extra_args = { "--dialect", "postgres" }, - } + --local sqlfluff_args = { + -- extra_args = { "--dialect", "postgres" }, + --} -- ORDER IN TABLE DETERMINES EXECUTION ORDER local sources = { @@ -419,6 +419,17 @@ function M.lsp_zero() filetypes = { "html", "htmldjango" }, }) + lsp.on_attach(function(client, bufnr) + if client.name == "svelte" then + vim.api.nvim_create_autocmd("BufWritePost", { + pattern = { "*.js", "*.ts" }, + callback = function(ctx) + client.notify("$/onDidChangeTsOrJsFile", { uri = ctx.file }) + end, + }) + end + end) + -- (Optional) Configure lua language server for neovim lsp.nvim_workspace() diff --git a/lua/plugins/startup.lua b/lua/plugins/startup.lua index c230712..b1d9dee 100644 --- a/lua/plugins/startup.lua +++ b/lua/plugins/startup.lua @@ -100,4 +100,7 @@ require("packer").startup(function(use) -- ZIG use("ziglang/zig.vim") + + -- C# + use("jlcrochet/vim-razor") end) diff --git a/queries/htmldjango/highlights.scm b/queries/htmldjango/highlights.scm index c0a7bc7..6136aa7 100644 --- a/queries/htmldjango/highlights.scm +++ b/queries/htmldjango/highlights.scm @@ -47,4 +47,5 @@ "endif" "else" "empty" + "elif" ] @keyword