diff --git a/lua/autocmd.lua b/lua/autocmd.lua index 53778e5..5c7833d 100644 --- a/lua/autocmd.lua +++ b/lua/autocmd.lua @@ -2,7 +2,7 @@ local vim = vim local api = vim.api local M = {} -- function to create a list of commands and convert them to autocommands --------- This function is taken from https://github.com/norcalli/nvim_utils + function M.nvim_create_augroups(definitions) for group_name, definition in pairs(definitions) do api.nvim_command("augroup " .. group_name) diff --git a/lua/keybindings.lua b/lua/keybindings.lua index 8696e51..9835d6f 100644 --- a/lua/keybindings.lua +++ b/lua/keybindings.lua @@ -59,6 +59,7 @@ wk.register({ n = { ":AdvancedNewFile", "New file" }, s = { ":Telescope live_grep", "Search in project" }, f = { ":Telescope find_files", "Search file" }, + c = { ":source $MYVIMRC", "Reload config file" }, }, }) diff --git a/lua/lsp/cmp.lua b/lua/lsp/cmp.lua index 325094b..e34e1a2 100644 --- a/lua/lsp/cmp.lua +++ b/lua/lsp/cmp.lua @@ -1,5 +1,6 @@ local lspkind = require("lspkind") local cmp = require("cmp") + cmp.setup({ -- 指定 snippet 引擎 snippet = { @@ -17,6 +18,7 @@ cmp.setup({ -- require'snippy'.expand_snippet(args.body) end, }, + -- 来源 sources = cmp.config.sources({ { name = "orgmode" }, @@ -77,8 +79,7 @@ require("lsp_signature").setup(signature_config) -- 补全时自动添加括号 local cmp_autopairs = require("nvim-autopairs.completion.cmp") - -cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done({ map_char = { tex = "" } })) +cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done()) -- use friendly snippet require("luasnip.loaders.from_vscode").lazy_load() diff --git a/lua/lsp/null-ls.lua b/lua/lsp/null-ls.lua index 43446ce..5fe7df5 100644 --- a/lua/lsp/null-ls.lua +++ b/lua/lsp/null-ls.lua @@ -18,6 +18,7 @@ require("null-ls").setup({ disabled_filetypes = { "cs", "js" }, }), require("null-ls").builtins.formatting.csharpier, + require("null-ls").builtins.formatting.latexindent, require("null-ls").builtins.formatting.gofmt, require("null-ls").builtins.formatting.black, require("null-ls").builtins.formatting.prettier, diff --git a/lua/plugin-config/lua_snip.lua b/lua/plugin-config/lua_snip.lua index c7e3cb8..0b79f68 100644 --- a/lua/plugin-config/lua_snip.lua +++ b/lua/plugin-config/lua_snip.lua @@ -57,4 +57,24 @@ ls.add_snippets("markdown", { }), }) -require("luasnip.loaders.from_lua").lazy_load({ include = { "all", "markdown" } }) +ls.add_snippets("tex", { + s("usepackage", { + t("\\usepackage{"), + i(1), + t("}"), + }), + s("begin", { + t("\\begin{"), + i(1, "enumerate"), + t("}"), + t({ "", "" }), + i(2, "(content)"), + t({ "", "\\end{" }), + f(function(args) + return args[1][1] + end, { 1 }), + t("}"), + }), +}) + +require("luasnip.loaders.from_lua").lazy_load({ include = { "all", "markdown", "tex" } }) diff --git a/lua/plugin-config/treesitter.lua b/lua/plugin-config/treesitter.lua index 07a45b2..33a5a66 100644 --- a/lua/plugin-config/treesitter.lua +++ b/lua/plugin-config/treesitter.lua @@ -25,7 +25,7 @@ require("nvim-treesitter.configs").setup({ -- disable = { "c", "rust" }, -- Or use a function for more flexibility, e.g. to disable slow treesitter highlight for large files disable = { - "latex", + -- "latex", function(lang, buf) local max_filesize = 100 * 1024 -- 100 KB local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf)) diff --git a/lua/plugin-config/vimtex.lua b/lua/plugin-config/vimtex.lua index 22fda1e..4367b52 100644 --- a/lua/plugin-config/vimtex.lua +++ b/lua/plugin-config/vimtex.lua @@ -12,6 +12,7 @@ vim.g.vimtex_view_method = "skim" vim.g.vimtex_complete_close_braces = 1 vim.g.vimtex_syntax_enabled = 1 +vim.g.vimtex_indent_lists = {} vim.g.vimtex_compiler_latexmk_engines = { ["_"] = "-xelatex", }